Skip to content

Feature/us2153687 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tomekpanek wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Feature/us2153687 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0220b2
returning non empty session state
Oct 21, 2025
acd7d5c
handling null sessionState in map
Oct 21, 2025
354f92f
refactoring
tomekpanek Oct 21, 2025
1aa3d81
changing group id for parent
tomekpanek Oct 22, 2025
5d5f04b
Merge branch 'main' of https://github.com/tomekpanek/adk-java into fe…
tomekpanek Oct 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>com.google.adk</groupId>
<groupId>com.sabre.adk</groupId>
<artifactId>google-adk-parent</artifactId>
<version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
</parent>

<groupId>com.sabre.adk</groupId>
<artifactId>google-adk</artifactId>
<name>Agent Development Kit</name>
<description>Agent Development Kit: an open-source, code-first toolkit designed to simplify building, evaluating, and deploying advanced AI agents anywhere.</description>
Expand Down Expand Up @@ -201,6 +202,7 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>

</plugins>
</build>
</project>
7 changes: 6 additions & 1 deletion core/src/main/java/com/google/adk/sessions/VertexAiSessionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,12 @@ private ListSessionsResponse parseListSessionsResponse(
Session.builder(sessionId)
.appName(appName)
.userId(userId)
.state(new ConcurrentHashMap<>())
.state(
apiSession.get("sessionState") == null
? new ConcurrentHashMap<>()
: objectMapper.convertValue(
apiSession.get("sessionState"),
new TypeReference<ConcurrentMap<String, Object>>() {}))
.lastUpdateTime(updateTimestamp)
.build();
sessions.add(session);
Expand Down
42 changes: 10 additions & 32 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>com.google.adk</groupId>
<groupId>com.sabre.adk</groupId>
<artifactId>google-adk-parent</artifactId>
<version>0.3.1-SNAPSHOT</version><!-- {x-version-update:google-adk:current} -->
<packaging>pom</packaging>
Expand All @@ -26,13 +26,6 @@

<modules>
<module>core</module>
<module>dev</module>
<module>maven_plugin</module>
<module>contrib/langchain4j</module>
<module>contrib/samples</module>
<module>tutorials/city-time-weather</module>
<module>a2a</module>
<module>a2a/webservice</module>
</modules>

<properties>
Expand Down Expand Up @@ -383,27 +376,11 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>

</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.8.0</version>
<extensions>true</extensions>
<configuration>
<publishingServerId>central</publishingServerId>
</configuration>
</plugin>

<plugin>
<groupId>com.spotify.fmt</groupId>
<artifactId>fmt-maven-plugin</artifactId>
Expand Down Expand Up @@ -537,14 +514,15 @@
</developers>
<distributionManagement>
<repository>
<id>central</id>
<name>Maven Central Repository</name>
<url>https://central.sonatype.com/api/v1/publisher</url>
<id>sabre-repo-stages</id>
<url>https://repository.sabre-gcp.com/repository/maven-staging/</url>
<layout>default</layout>
</repository>
<snapshotRepository>
<id>central</id>
<name>Maven Central Repository Snapshots</name>
<url>https://central.sonatype.com/repository/maven-snapshots/</url>
<id>gcp.repository.sabre.com-snapshots</id>
<url>https://repository.sabre-gcp.com/repository/maven-snapshots/</url>
<layout>default</layout>
<uniqueVersion>true</uniqueVersion>
</snapshotRepository>
</distributionManagement>
</project>