From cd9d96eee7d2df1e8aad31104f81b4f413943111 Mon Sep 17 00:00:00 2001 From: Google Team Member Date: Fri, 3 Apr 2026 11:41:53 -0700 Subject: [PATCH] refactor: Cleanup unused, depricated methods Cleanup unused methods from BigQueryLoggerConfig PiperOrigin-RevId: 894179703 --- .../agentanalytics/BigQueryLoggerConfig.java | 146 ------------------ .../BigQueryAgentAnalyticsPluginE2ETest.java | 14 +- .../BigQueryAgentAnalyticsPluginTest.java | 2 +- 3 files changed, 8 insertions(+), 154 deletions(-) diff --git a/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java b/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java index 149c8a92c..73659b255 100644 --- a/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java +++ b/core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java @@ -126,185 +126,64 @@ public static Builder builder() { @AutoValue.Builder public abstract static class Builder { - @Deprecated - @CanIgnoreReturnValue - public final Builder setEnabled(boolean enabled) { - return enabled(enabled); - } - @CanIgnoreReturnValue public abstract Builder enabled(boolean enabled); - @Deprecated - @CanIgnoreReturnValue - public final Builder setEventAllowlist(@Nullable List eventAllowlist) { - return eventAllowlist(eventAllowlist); - } - @CanIgnoreReturnValue public abstract Builder eventAllowlist(@Nullable List eventAllowlist); - @Deprecated - @CanIgnoreReturnValue - public final Builder setEventDenylist(@Nullable List eventDenylist) { - return eventDenylist(eventDenylist); - } - @CanIgnoreReturnValue public abstract Builder eventDenylist(@Nullable List eventDenylist); - @Deprecated - @CanIgnoreReturnValue - public final Builder setMaxContentLength(int maxContentLength) { - return maxContentLength(maxContentLength); - } - @CanIgnoreReturnValue public abstract Builder maxContentLength(int maxContentLength); - @Deprecated - @CanIgnoreReturnValue - public final Builder setProjectId(String projectId) { - return projectId(projectId); - } - @CanIgnoreReturnValue public abstract Builder projectId(String projectId); - @Deprecated - @CanIgnoreReturnValue - public final Builder setDatasetId(String datasetId) { - return datasetId(datasetId); - } - @CanIgnoreReturnValue public abstract Builder datasetId(String datasetId); - @Deprecated - @CanIgnoreReturnValue - public final Builder setTableName(String tableName) { - return tableName(tableName); - } - @CanIgnoreReturnValue public abstract Builder tableName(String tableName); - @Deprecated - @CanIgnoreReturnValue - public final Builder setClusteringFields(List clusteringFields) { - return clusteringFields(clusteringFields); - } - @CanIgnoreReturnValue public abstract Builder clusteringFields(List clusteringFields); - @Deprecated - @CanIgnoreReturnValue - public final Builder setLogMultiModalContent(boolean logMultiModalContent) { - return logMultiModalContent(logMultiModalContent); - } - @CanIgnoreReturnValue public abstract Builder logMultiModalContent(boolean logMultiModalContent); - @Deprecated - @CanIgnoreReturnValue - public final Builder setRetryConfig(RetryConfig retryConfig) { - return retryConfig(retryConfig); - } - @CanIgnoreReturnValue public abstract Builder retryConfig(RetryConfig retryConfig); - @Deprecated - @CanIgnoreReturnValue - public final Builder setBatchSize(int batchSize) { - return batchSize(batchSize); - } - @CanIgnoreReturnValue public abstract Builder batchSize(int batchSize); - @Deprecated - @CanIgnoreReturnValue - public final Builder setBatchFlushInterval(Duration batchFlushInterval) { - return batchFlushInterval(batchFlushInterval); - } - @CanIgnoreReturnValue public abstract Builder batchFlushInterval(Duration batchFlushInterval); - @Deprecated - @CanIgnoreReturnValue - public final Builder setShutdownTimeout(Duration shutdownTimeout) { - return shutdownTimeout(shutdownTimeout); - } - @CanIgnoreReturnValue public abstract Builder shutdownTimeout(Duration shutdownTimeout); - @Deprecated - @CanIgnoreReturnValue - public final Builder setQueueMaxSize(int queueMaxSize) { - return queueMaxSize(queueMaxSize); - } - @CanIgnoreReturnValue public abstract Builder queueMaxSize(int queueMaxSize); - @Deprecated - @CanIgnoreReturnValue - public final Builder setContentFormatter( - @Nullable BiFunction contentFormatter) { - return contentFormatter(contentFormatter); - } - @CanIgnoreReturnValue public abstract Builder contentFormatter( @Nullable BiFunction contentFormatter); - @Deprecated - @CanIgnoreReturnValue - public final Builder setConnectionId(String connectionId) { - return connectionId(connectionId); - } - @CanIgnoreReturnValue public abstract Builder connectionId(String connectionId); - @Deprecated - @CanIgnoreReturnValue - public final Builder setLogSessionMetadata(boolean logSessionMetadata) { - return logSessionMetadata(logSessionMetadata); - } - @CanIgnoreReturnValue public abstract Builder logSessionMetadata(boolean logSessionMetadata); - @Deprecated - @CanIgnoreReturnValue - public final Builder setCustomTags(Map customTags) { - return customTags(customTags); - } - @CanIgnoreReturnValue public abstract Builder customTags(Map customTags); - @Deprecated - @CanIgnoreReturnValue - public final Builder setAutoSchemaUpgrade(boolean autoSchemaUpgrade) { - return autoSchemaUpgrade(autoSchemaUpgrade); - } - @CanIgnoreReturnValue public abstract Builder autoSchemaUpgrade(boolean autoSchemaUpgrade); - @Deprecated - @CanIgnoreReturnValue - public final Builder setCredentials(Credentials credentials) { - return credentials(credentials); - } - @CanIgnoreReturnValue public abstract Builder credentials(Credentials credentials); @@ -333,40 +212,15 @@ public static Builder builder() { /** Builder for {@link RetryConfig}. */ @AutoValue.Builder public abstract static class Builder { - - @Deprecated - @CanIgnoreReturnValue - public final Builder setMaxRetries(int maxRetries) { - return maxRetries(maxRetries); - } - @CanIgnoreReturnValue public abstract Builder maxRetries(int maxRetries); - @Deprecated - @CanIgnoreReturnValue - public final Builder setInitialDelay(Duration initialDelay) { - return initialDelay(initialDelay); - } - @CanIgnoreReturnValue public abstract Builder initialDelay(Duration initialDelay); - @Deprecated - @CanIgnoreReturnValue - public final Builder setMultiplier(double multiplier) { - return multiplier(multiplier); - } - @CanIgnoreReturnValue public abstract Builder multiplier(double multiplier); - @Deprecated - @CanIgnoreReturnValue - public final Builder setMaxDelay(Duration maxDelay) { - return maxDelay(maxDelay); - } - @CanIgnoreReturnValue public abstract Builder maxDelay(Duration maxDelay); diff --git a/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginE2ETest.java b/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginE2ETest.java index c4f8dc2cf..53faf3329 100644 --- a/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginE2ETest.java +++ b/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginE2ETest.java @@ -77,13 +77,13 @@ public void setUp() throws Exception { config = BigQueryLoggerConfig.builder() - .setEnabled(true) - .setProjectId("project") - .setDatasetId("dataset") - .setTableName("table") - .setBatchSize(10) - .setBatchFlushInterval(Duration.ofSeconds(10)) - .setCredentials(mock(Credentials.class)) + .enabled(true) + .projectId("project") + .datasetId("dataset") + .tableName("table") + .batchSize(10) + .batchFlushInterval(Duration.ofSeconds(10)) + .credentials(mock(Credentials.class)) .build(); when(mockBigQuery.getOptions()) diff --git a/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginTest.java b/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginTest.java index 1d066e632..04987ed3c 100644 --- a/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginTest.java +++ b/core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginTest.java @@ -612,7 +612,7 @@ public void logEvent_includesSessionMetadata_whenEnabled() throws Exception { @Test public void logEvent_excludesSessionMetadata_whenDisabled() throws Exception { - BigQueryLoggerConfig disabledConfig = config.toBuilder().setLogSessionMetadata(false).build(); + BigQueryLoggerConfig disabledConfig = config.toBuilder().logSessionMetadata(false).build(); BigQueryAgentAnalyticsPlugin disabledPlugin = new BigQueryAgentAnalyticsPlugin(disabledConfig, mockBigQuery) { @Override