Skip to content

refactor: Cleanup unused, depricated methods #1110

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
copybara-service wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: Cleanup unused, depricated methods #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
146 changes: 0 additions & 146 deletions core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> eventAllowlist) {
return eventAllowlist(eventAllowlist);
}

@CanIgnoreReturnValue
public abstract Builder eventAllowlist(@Nullable List<String> eventAllowlist);

@Deprecated
@CanIgnoreReturnValue
public final Builder setEventDenylist(@Nullable List<String> eventDenylist) {
return eventDenylist(eventDenylist);
}

@CanIgnoreReturnValue
public abstract Builder eventDenylist(@Nullable List<String> 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<String> clusteringFields) {
return clusteringFields(clusteringFields);
}

@CanIgnoreReturnValue
public abstract Builder clusteringFields(List<String> 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<Object, String, Object> contentFormatter) {
return contentFormatter(contentFormatter);
}

@CanIgnoreReturnValue
public abstract Builder contentFormatter(
@Nullable BiFunction<Object, String, Object> 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<String, Object> customTags) {
return customTags(customTags);
}

@CanIgnoreReturnValue
public abstract Builder customTags(Map<String, Object> 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);

Expand Down Expand Up @@ -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);

Expand Down
14 changes: 7 additions & 7 deletions .../test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginE2ETest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion ...src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down