refactor: reducing object creation by moving orElse() to orElseGet()

PiperOrigin-RevId: 856123195

Author: google-genai-bot

a2a/src/main/java/com/google/adk/a2a/converters/PartConverter.java

@@ -123,9 +123,9 @@ private static Optional<com.google.genai.types.Part> convertFilePartToGenAiPart(
   private static Optional<com.google.genai.types.Part> convertDataPartToGenAiPart(
       DataPart dataPart) {
     Map<String, Object> data =
-        Optional.ofNullable(dataPart.getData()).map(HashMap::new).orElse(new HashMap<>());
+        Optional.ofNullable(dataPart.getData()).map(HashMap::new).orElseGet(HashMap::new);
     Map<String, Object> metadata =
-        Optional.ofNullable(dataPart.getMetadata()).map(HashMap::new).orElse(new HashMap<>());
+        Optional.ofNullable(dataPart.getMetadata()).map(HashMap::new).orElseGet(HashMap::new);
 
     String metadataType = metadata.getOrDefault(A2A_DATA_PART_METADATA_TYPE_KEY, "").toString();
 

contrib/firestore-session-service/src/main/java/com/google/adk/sessions/FirestoreSessionService.java

@@ -164,7 +164,8 @@ public Maybe<Session> getSession(
               }
 
               // Fetch events based on config
-              GetSessionConfig config = configOpt.orElse(GetSessionConfig.builder().build());
+              GetSessionConfig config =
+                  configOpt.orElseGet(() -> GetSessionConfig.builder().build());
               CollectionReference eventsCollection =
                   document.getReference().collection(EVENTS_SUBCOLLECTION_NAME);
               Query eventsQuery = eventsCollection.orderBy(TIMESTAMP_KEY);

core/src/main/java/com/google/adk/agents/LlmAgent.java

@@ -443,7 +443,7 @@ private void maybeSaveOutputToState(Event event) {
       // Concatenate text from all parts, excluding thoughts.
       Object output;
       String rawResult =
-          event.content().flatMap(Content::parts).orElse(ImmutableList.of()).stream()
+          event.content().flatMap(Content::parts).orElseGet(ImmutableList::of).stream()
               .filter(part -> !isThought(part))
               .map(part -> part.text().orElse(""))
               .collect(joining());

core/src/main/java/com/google/adk/codeexecutors/BuiltInCodeExecutor.java

@@ -45,7 +45,7 @@ public void processLlmRequest(LlmRequest.Builder llmRequestBuilder) {
     LlmRequest llmRequest = llmRequestBuilder.build();
     if (ModelNameUtils.isGemini2Model(llmRequest.model().orElse(null))) {
       GenerateContentConfig.Builder configBuilder =
-          llmRequest.config().map(c -> c.toBuilder()).orElse(GenerateContentConfig.builder());
+          llmRequest.config().map(c -> c.toBuilder()).orElseGet(GenerateContentConfig::builder);
       ImmutableList.Builder<Tool> toolsBuilder =
           ImmutableList.<Tool>builder()
               .addAll(configBuilder.build().tools().orElse(ImmutableList.<Tool>of()));

core/src/main/java/com/google/adk/events/Event.java

@@ -605,8 +605,8 @@ public Event build() {
       event.branch(branch);
       event.setGroundingMetadata(groundingMetadata);
       event.setModelVersion(modelVersion);
-      event.setActions(actions().orElse(EventActions.builder().build()));
-      event.setTimestamp(timestamp().orElse(Instant.now().toEpochMilli()));
+      event.setActions(actions().orElseGet(() -> EventActions.builder().build()));
+      event.setTimestamp(timestamp().orElseGet(() -> Instant.now().toEpochMilli()));
       return event;
     }
   }

core/src/main/java/com/google/adk/flows/llmflows/Basic.java

@@ -54,7 +54,10 @@ public Single<RequestProcessor.RequestProcessingResult> processRequest(
     LlmRequest.Builder builder =
         request.toBuilder()
             .model(modelName)
-            .config(agent.generateContentConfig().orElse(GenerateContentConfig.builder().build()))
+            .config(
+                agent
+                    .generateContentConfig()
+                    .orElseGet(() -> GenerateContentConfig.builder().build()))
             .liveConnectConfig(liveConnectConfigBuilder.build());
 
     agent.outputSchema().ifPresent(builder::outputSchema);

core/src/main/java/com/google/adk/flows/llmflows/CodeExecution.java

@@ -254,7 +254,9 @@ private static Flowable<Event> runPreProcessor(
                           llmRequest
                               .contents()
                               .add(
-                                  executionResultEvent.content().orElse(Content.builder().build())))
+                                  executionResultEvent
+                                      .content()
+                                      .orElseGet(() -> Content.builder().build())))
                   .map(executionResultEvent -> ImmutableList.of(codeEvent, executionResultEvent))
                   .flatMap(Flowable::fromIterable);
             });

core/src/main/java/com/google/adk/models/LlmRequest.java

@@ -109,7 +109,7 @@ public ImmutableList<String> getSystemInstructions() {
                     .map(Part::text)
                     .flatMap(Optional::stream)
                     .collect(toImmutableList()))
-        .orElse(ImmutableList.of());
+        .orElseGet(ImmutableList::of);
   }
 
   public static Builder builder() {
@@ -223,7 +223,8 @@ public final Builder appendTools(List<BaseTool> tools) {
      */
     @CanIgnoreReturnValue
     public final Builder outputSchema(Schema schema) {
-      GenerateContentConfig config = config().orElse(GenerateContentConfig.builder().build());
+      GenerateContentConfig config =
+          config().orElseGet(() -> GenerateContentConfig.builder().build());
       return config(
           config.toBuilder().responseSchema(schema).responseMimeType("application/json").build());
     }

core/src/main/java/com/google/adk/plugins/PluginManager.java

@@ -75,7 +75,7 @@ public void registerPlugin(Plugin plugin) {
           "Plugin with name '" + plugin.getName() + "' already registered.");
     }
     plugins.add(plugin);
-    logger.info("Plugin '{}' registered.", plugin.getName());
+    logger.trace("Plugin '{}' registered.", plugin.getName());
   }
 
   /**

core/src/main/java/com/google/adk/runner/Runner.java

@@ -554,14 +554,12 @@ private Completable compactEvents(Session session) {
     return Optional.ofNullable(eventsCompactionConfig)
         .map(SlidingWindowEventCompactor::new)
         .map(c -> c.compact(session, sessionService))
-        .orElse(Completable.complete());
+        .orElseGet(Completable::complete);
   }
 
   private void copySessionStates(Session source, Session target) {
     // TODO: remove this hack when deprecating all runAsync with Session.
-    for (var entry : source.state().entrySet()) {
-      target.state().put(entry.getKey(), entry.getValue());
-    }
+    target.state().putAll(source.state());
   }
 
   /**
@@ -621,7 +619,7 @@ private InvocationContext.Builder newInvocationContextBuilder(
             .pluginManager(this.pluginManager)
             .agent(rootAgent)
             .session(session)
-            .userContent(newMessage.orElse(Content.fromParts()))
+            .userContent(newMessage.orElseGet(() -> Content.fromParts()))
             .runConfig(runConfig)
             .resumabilityConfig(this.resumabilityConfig)
             .agent(this.findAgentToRun(session, rootAgent));