Skip to content

Commit 7e477d9

Browse files
google-genai-botcopybara-github
authored andcommitted
refactor: Cleanup unused, depricated methods
Cleanup unused methods from BigQueryLoggerConfig PiperOrigin-RevId: 894179703
1 parent ec88c64 commit 7e477d9

File tree

3 files changed

+8
-154
lines changed

3 files changed

+8
-154
lines changed

core/src/main/java/com/google/adk/plugins/agentanalytics/BigQueryLoggerConfig.java

Lines changed: 0 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -126,185 +126,64 @@ public static Builder builder() {
126126
@AutoValue.Builder
127127
public abstract static class Builder {
128128

129-
@Deprecated
130-
@CanIgnoreReturnValue
131-
public final Builder setEnabled(boolean enabled) {
132-
return enabled(enabled);
133-
}
134-
135129
@CanIgnoreReturnValue
136130
public abstract Builder enabled(boolean enabled);
137131

138-
@Deprecated
139-
@CanIgnoreReturnValue
140-
public final Builder setEventAllowlist(@Nullable List<String> eventAllowlist) {
141-
return eventAllowlist(eventAllowlist);
142-
}
143-
144132
@CanIgnoreReturnValue
145133
public abstract Builder eventAllowlist(@Nullable List<String> eventAllowlist);
146134

147-
@Deprecated
148-
@CanIgnoreReturnValue
149-
public final Builder setEventDenylist(@Nullable List<String> eventDenylist) {
150-
return eventDenylist(eventDenylist);
151-
}
152-
153135
@CanIgnoreReturnValue
154136
public abstract Builder eventDenylist(@Nullable List<String> eventDenylist);
155137

156-
@Deprecated
157-
@CanIgnoreReturnValue
158-
public final Builder setMaxContentLength(int maxContentLength) {
159-
return maxContentLength(maxContentLength);
160-
}
161-
162138
@CanIgnoreReturnValue
163139
public abstract Builder maxContentLength(int maxContentLength);
164140

165-
@Deprecated
166-
@CanIgnoreReturnValue
167-
public final Builder setProjectId(String projectId) {
168-
return projectId(projectId);
169-
}
170-
171141
@CanIgnoreReturnValue
172142
public abstract Builder projectId(String projectId);
173143

174-
@Deprecated
175-
@CanIgnoreReturnValue
176-
public final Builder setDatasetId(String datasetId) {
177-
return datasetId(datasetId);
178-
}
179-
180144
@CanIgnoreReturnValue
181145
public abstract Builder datasetId(String datasetId);
182146

183-
@Deprecated
184-
@CanIgnoreReturnValue
185-
public final Builder setTableName(String tableName) {
186-
return tableName(tableName);
187-
}
188-
189147
@CanIgnoreReturnValue
190148
public abstract Builder tableName(String tableName);
191149

192-
@Deprecated
193-
@CanIgnoreReturnValue
194-
public final Builder setClusteringFields(List<String> clusteringFields) {
195-
return clusteringFields(clusteringFields);
196-
}
197-
198150
@CanIgnoreReturnValue
199151
public abstract Builder clusteringFields(List<String> clusteringFields);
200152

201-
@Deprecated
202-
@CanIgnoreReturnValue
203-
public final Builder setLogMultiModalContent(boolean logMultiModalContent) {
204-
return logMultiModalContent(logMultiModalContent);
205-
}
206-
207153
@CanIgnoreReturnValue
208154
public abstract Builder logMultiModalContent(boolean logMultiModalContent);
209155

210-
@Deprecated
211-
@CanIgnoreReturnValue
212-
public final Builder setRetryConfig(RetryConfig retryConfig) {
213-
return retryConfig(retryConfig);
214-
}
215-
216156
@CanIgnoreReturnValue
217157
public abstract Builder retryConfig(RetryConfig retryConfig);
218158

219-
@Deprecated
220-
@CanIgnoreReturnValue
221-
public final Builder setBatchSize(int batchSize) {
222-
return batchSize(batchSize);
223-
}
224-
225159
@CanIgnoreReturnValue
226160
public abstract Builder batchSize(int batchSize);
227161

228-
@Deprecated
229-
@CanIgnoreReturnValue
230-
public final Builder setBatchFlushInterval(Duration batchFlushInterval) {
231-
return batchFlushInterval(batchFlushInterval);
232-
}
233-
234162
@CanIgnoreReturnValue
235163
public abstract Builder batchFlushInterval(Duration batchFlushInterval);
236164

237-
@Deprecated
238-
@CanIgnoreReturnValue
239-
public final Builder setShutdownTimeout(Duration shutdownTimeout) {
240-
return shutdownTimeout(shutdownTimeout);
241-
}
242-
243165
@CanIgnoreReturnValue
244166
public abstract Builder shutdownTimeout(Duration shutdownTimeout);
245167

246-
@Deprecated
247-
@CanIgnoreReturnValue
248-
public final Builder setQueueMaxSize(int queueMaxSize) {
249-
return queueMaxSize(queueMaxSize);
250-
}
251-
252168
@CanIgnoreReturnValue
253169
public abstract Builder queueMaxSize(int queueMaxSize);
254170

255-
@Deprecated
256-
@CanIgnoreReturnValue
257-
public final Builder setContentFormatter(
258-
@Nullable BiFunction<Object, String, Object> contentFormatter) {
259-
return contentFormatter(contentFormatter);
260-
}
261-
262171
@CanIgnoreReturnValue
263172
public abstract Builder contentFormatter(
264173
@Nullable BiFunction<Object, String, Object> contentFormatter);
265174

266-
@Deprecated
267-
@CanIgnoreReturnValue
268-
public final Builder setConnectionId(String connectionId) {
269-
return connectionId(connectionId);
270-
}
271-
272175
@CanIgnoreReturnValue
273176
public abstract Builder connectionId(String connectionId);
274177

275-
@Deprecated
276-
@CanIgnoreReturnValue
277-
public final Builder setLogSessionMetadata(boolean logSessionMetadata) {
278-
return logSessionMetadata(logSessionMetadata);
279-
}
280-
281178
@CanIgnoreReturnValue
282179
public abstract Builder logSessionMetadata(boolean logSessionMetadata);
283180

284-
@Deprecated
285-
@CanIgnoreReturnValue
286-
public final Builder setCustomTags(Map<String, Object> customTags) {
287-
return customTags(customTags);
288-
}
289-
290181
@CanIgnoreReturnValue
291182
public abstract Builder customTags(Map<String, Object> customTags);
292183

293-
@Deprecated
294-
@CanIgnoreReturnValue
295-
public final Builder setAutoSchemaUpgrade(boolean autoSchemaUpgrade) {
296-
return autoSchemaUpgrade(autoSchemaUpgrade);
297-
}
298-
299184
@CanIgnoreReturnValue
300185
public abstract Builder autoSchemaUpgrade(boolean autoSchemaUpgrade);
301186

302-
@Deprecated
303-
@CanIgnoreReturnValue
304-
public final Builder setCredentials(Credentials credentials) {
305-
return credentials(credentials);
306-
}
307-
308187
@CanIgnoreReturnValue
309188
public abstract Builder credentials(Credentials credentials);
310189

@@ -333,40 +212,15 @@ public static Builder builder() {
333212
/** Builder for {@link RetryConfig}. */
334213
@AutoValue.Builder
335214
public abstract static class Builder {
336-
337-
@Deprecated
338-
@CanIgnoreReturnValue
339-
public final Builder setMaxRetries(int maxRetries) {
340-
return maxRetries(maxRetries);
341-
}
342-
343215
@CanIgnoreReturnValue
344216
public abstract Builder maxRetries(int maxRetries);
345217

346-
@Deprecated
347-
@CanIgnoreReturnValue
348-
public final Builder setInitialDelay(Duration initialDelay) {
349-
return initialDelay(initialDelay);
350-
}
351-
352218
@CanIgnoreReturnValue
353219
public abstract Builder initialDelay(Duration initialDelay);
354220

355-
@Deprecated
356-
@CanIgnoreReturnValue
357-
public final Builder setMultiplier(double multiplier) {
358-
return multiplier(multiplier);
359-
}
360-
361221
@CanIgnoreReturnValue
362222
public abstract Builder multiplier(double multiplier);
363223

364-
@Deprecated
365-
@CanIgnoreReturnValue
366-
public final Builder setMaxDelay(Duration maxDelay) {
367-
return maxDelay(maxDelay);
368-
}
369-
370224
@CanIgnoreReturnValue
371225
public abstract Builder maxDelay(Duration maxDelay);
372226

core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginE2ETest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ public void setUp() throws Exception {
7777

7878
config =
7979
BigQueryLoggerConfig.builder()
80-
.setEnabled(true)
81-
.setProjectId("project")
82-
.setDatasetId("dataset")
83-
.setTableName("table")
84-
.setBatchSize(10)
85-
.setBatchFlushInterval(Duration.ofSeconds(10))
86-
.setCredentials(mock(Credentials.class))
80+
.enabled(true)
81+
.projectId("project")
82+
.datasetId("dataset")
83+
.tableName("table")
84+
.batchSize(10)
85+
.batchFlushInterval(Duration.ofSeconds(10))
86+
.credentials(mock(Credentials.class))
8787
.build();
8888

8989
when(mockBigQuery.getOptions())

core/src/test/java/com/google/adk/plugins/agentanalytics/BigQueryAgentAnalyticsPluginTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ public void logEvent_includesSessionMetadata_whenEnabled() throws Exception {
612612

613613
@Test
614614
public void logEvent_excludesSessionMetadata_whenDisabled() throws Exception {
615-
BigQueryLoggerConfig disabledConfig = config.toBuilder().setLogSessionMetadata(false).build();
615+
BigQueryLoggerConfig disabledConfig = config.toBuilder().logSessionMetadata(false).build();
616616
BigQueryAgentAnalyticsPlugin disabledPlugin =
617617
new BigQueryAgentAnalyticsPlugin(disabledConfig, mockBigQuery) {
618618
@Override

0 commit comments

Comments
 (0)