Skip to content
This repository was archived by the owner on Sep 26, 2023. It is now read-only.

Commit b7098ae

Browse files
elharoelharo
authored
Merge branch 'master' into context
2 parents d365fd2 + c41fb62 commit b7098ae

5 files changed

Lines changed: 100 additions & 298 deletions

File tree

‎dependencies.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ maven.com_google_http_client_google_http_client=com.google.http-client:google-ht
5454
maven.com_google_http_client_google_http_client_jackson2=com.google.http-client:google-http-client-jackson2:1.38.0
5555
maven.com_fasterxml_jackson_core_jackson_core=com.fasterxml.jackson.core:jackson-core:2.11.3
5656
maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.18
57-
maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.6
5857
maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2
5958

6059
# Testing maven artifacts

‎gax-grpc/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ _TEST_COMPILE_DEPS = [
3838
"@com_google_truth_truth//jar",
3939
"@io_grpc_grpc_java//core:inprocess",
4040
"@com_google_api_grpc_grpc_google_common_protos//jar",
41-
"@org_apache_commons_commons_lang3//jar",
4241
"//gax:gax_testlib",
4342
"@com_googlecode_java_diff_utils_diffutils//jar",
4443
]

‎gax-grpc/src/test/java/com/google/api/gax/grpc/SettingsTest.java‎

Lines changed: 8 additions & 289 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
*/
3030
package com.google.api.gax.grpc;
3131

32+
import static org.junit.Assert.assertEquals;
33+
3234
import com.google.api.gax.batching.BatchingSettings;
3335
import com.google.api.gax.core.CredentialsProvider;
3436
import com.google.api.gax.core.FixedCredentialsProvider;
@@ -40,7 +42,6 @@
4042
import com.google.api.gax.rpc.BatchingCallSettings;
4143
import com.google.api.gax.rpc.BatchingDescriptor;
4244
import com.google.api.gax.rpc.ClientContext;
43-
import com.google.api.gax.rpc.ClientSettings;
4445
import com.google.api.gax.rpc.FixedWatchdogProvider;
4546
import com.google.api.gax.rpc.NoHeaderProvider;
4647
import com.google.api.gax.rpc.PagedCallSettings;
@@ -56,7 +57,6 @@
5657
import com.google.common.collect.Lists;
5758
import com.google.common.truth.Truth;
5859
import java.io.IOException;
59-
import org.apache.commons.lang3.builder.EqualsBuilder;
6060
import org.junit.Test;
6161
import org.junit.runner.RunWith;
6262
import org.junit.runners.JUnit4;
@@ -142,10 +142,6 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
142142
return GoogleCredentialsProvider.newBuilder().setScopesToApply(DEFAULT_SERVICE_SCOPES);
143143
}
144144

145-
public static InstantiatingGrpcChannelProvider.Builder defaultChannelProviderBuilder() {
146-
return InstantiatingGrpcChannelProvider.newBuilder().setEndpoint(DEFAULT_SERVICE_ENDPOINT);
147-
}
148-
149145
public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() {
150146
return InstantiatingExecutorProvider.newBuilder();
151147
}
@@ -170,10 +166,6 @@ public static Builder newBuilder() {
170166
return Builder.createDefault();
171167
}
172168

173-
public static Builder newBuilder(ClientContext clientContext) {
174-
return new Builder(clientContext);
175-
}
176-
177169
public Builder toBuilder() {
178170
return new Builder(this);
179171
}
@@ -237,10 +229,6 @@ private static Builder createDefault() {
237229
return builder;
238230
}
239231

240-
protected Builder(ClientContext clientContext) {
241-
super(clientContext);
242-
}
243-
244232
private Builder(FakeStubSettings settings) {
245233
super(settings);
246234

@@ -268,77 +256,6 @@ public BatchingCallSettings.Builder<Integer, Integer> fakeMethodBatching() {
268256
}
269257
}
270258

271-
private static class FakeSettings extends ClientSettings {
272-
273-
public UnaryCallSettings<Integer, Integer> fakeMethodSimple() {
274-
return ((FakeStubSettings) getStubSettings()).fakeMethodSimple();
275-
}
276-
277-
public PagedCallSettings<Integer, Integer, FakePagedListResponse> fakePagedMethod() {
278-
return ((FakeStubSettings) getStubSettings()).fakePagedMethod();
279-
}
280-
281-
public BatchingCallSettings<Integer, Integer> fakeMethodBatching() {
282-
return ((FakeStubSettings) getStubSettings()).fakeMethodBatching();
283-
}
284-
285-
public static Builder newBuilder() {
286-
return Builder.createDefault();
287-
}
288-
289-
public Builder toBuilder() {
290-
return new Builder(this);
291-
}
292-
293-
private FakeSettings(Builder settingsBuilder) throws IOException {
294-
super(settingsBuilder);
295-
}
296-
297-
private static class Builder extends ClientSettings.Builder {
298-
299-
protected Builder() throws IOException {
300-
this((ClientContext) null);
301-
}
302-
303-
protected Builder(ClientContext clientContext) {
304-
super(FakeStubSettings.newBuilder(clientContext));
305-
}
306-
307-
private static Builder createDefault() {
308-
return new Builder(FakeStubSettings.newBuilder());
309-
}
310-
311-
protected Builder(FakeSettings settings) {
312-
super(settings.getStubSettings().toBuilder());
313-
}
314-
315-
protected Builder(FakeStubSettings.Builder stubSettings) {
316-
super(stubSettings);
317-
}
318-
319-
public FakeStubSettings.Builder getStubSettingsBuilder() {
320-
return ((FakeStubSettings.Builder) getStubSettings());
321-
}
322-
323-
public UnaryCallSettings.Builder<Integer, Integer> fakeMethodSimple() {
324-
return getStubSettingsBuilder().fakeMethodSimple();
325-
}
326-
327-
public PagedCallSettings.Builder<Integer, Integer, FakePagedListResponse> fakePagedMethod() {
328-
return getStubSettingsBuilder().fakePagedMethod();
329-
}
330-
331-
public BatchingCallSettings.Builder<Integer, Integer> fakeMethodBatching() {
332-
return getStubSettingsBuilder().fakeMethodBatching();
333-
}
334-
335-
@Override
336-
public FakeSettings build() throws IOException {
337-
return new FakeSettings(this);
338-
}
339-
}
340-
}
341-
342259
// RetrySettings
343260
// ====
344261

@@ -431,42 +348,12 @@ public void channelCustomCredentialScopes() throws IOException {
431348

432349
@Test
433350
public void callSettingsToBuilder() throws IOException {
434-
FakeSettings.Builder builderA = FakeSettings.Builder.createDefault();
435-
FakeSettings settingsA = builderA.build();
436-
FakeSettings.Builder builderB = settingsA.toBuilder();
437-
FakeSettings settingsB = builderB.build();
438-
439-
assertIsReflectionEqual(builderA, builderB);
440-
assertIsReflectionEqual(settingsA, settingsB);
441-
}
442-
443-
@Test
444-
public void callSettingsTimeoutNoRetries() throws IOException {
445-
Duration timeout = Duration.ofMillis(60000);
446-
447-
FakeSettings.Builder builderA = FakeSettings.Builder.createDefault();
448-
builderA.fakeMethodSimple().setSimpleTimeoutNoRetries(timeout);
449-
FakeSettings settingsA = builderA.build();
450-
451-
FakeSettings.Builder builderB = FakeSettings.Builder.createDefault();
452-
builderB
453-
.fakeMethodSimple()
454-
.setRetryableCodes()
455-
.setRetrySettings(
456-
RetrySettings.newBuilder()
457-
.setTotalTimeout(timeout)
458-
.setInitialRetryDelay(Duration.ZERO)
459-
.setRetryDelayMultiplier(1)
460-
.setMaxRetryDelay(Duration.ZERO)
461-
.setInitialRpcTimeout(timeout)
462-
.setRpcTimeoutMultiplier(1)
463-
.setMaxRpcTimeout(timeout)
464-
.setMaxAttempts(1)
465-
.build());
466-
FakeSettings settingsB = builderB.build();
351+
UnaryCallSettings.Builder builderA = UnaryCallSettings.newUnaryCallSettingsBuilder();
352+
UnaryCallSettings settingsA = builderA.build();
353+
UnaryCallSettings.Builder builderB = settingsA.toBuilder();
354+
UnaryCallSettings settingsB = builderB.build();
467355

468-
assertIsReflectionEqual(builderA, builderB);
469-
assertIsReflectionEqual(settingsA, settingsB);
356+
assertEquals(settingsA, settingsB);
470357
}
471358

472359
@Test
@@ -502,174 +389,6 @@ public void callSettingsBuildFromTimeoutNoRetries() throws IOException {
502389
.build());
503390
UnaryCallSettings<Integer, Integer> settingsB = builderB.build();
504391

505-
assertIsReflectionEqual("UnaryCallSettings.Builder", builderA, builderB);
506-
assertIsReflectionEqual("UnaryCallSettings", settingsA, settingsB);
507-
}
508-
509-
// Reflection Helper Methods
510-
// ====
511-
512-
/*
513-
* The pattern for the assertIsReflectionEqual methods below is to exclude fields that would
514-
* cause the reflectionEquals check to fail, then explicitly recurse on those fields with another
515-
* call to assertIsReflectionEqual.
516-
*/
517-
518-
private static void assertIsReflectionEqual(
519-
String path, Object objA, Object objB, String[] excludes) {
520-
Truth.assertWithMessage(path + " should be equal")
521-
.that(EqualsBuilder.reflectionEquals(objA, objB, excludes))
522-
.isTrue();
523-
}
524-
525-
private static void assertIsReflectionEqual(String path, Object objA, Object objB) {
526-
assertIsReflectionEqual(path, objA, objB, null);
527-
}
528-
529-
private static void assertIsReflectionEqual(FakeSettings settingsA, FakeSettings settingsB) {
530-
assertIsReflectionEqual(
531-
"FakeSettings",
532-
settingsA,
533-
settingsB,
534-
new String[] {"fakeMethodSimple", "fakePagedMethod", "fakeMethodBatching", "stubSettings"});
535-
assertIsReflectionEqual(
536-
"FakeSettings.fakeMethodSimple",
537-
settingsA.fakeMethodSimple(),
538-
settingsB.fakeMethodSimple());
539-
assertIsReflectionEqual(
540-
"FakeSettings.fakePagedMethod", settingsA.fakePagedMethod(), settingsB.fakePagedMethod());
541-
assertIsReflectionEqual(
542-
"FakeSettings.fakeMethodBatching",
543-
settingsA.fakeMethodBatching(),
544-
settingsB.fakeMethodBatching());
545-
assertIsReflectionEqual(
546-
"FakeSettings.getStubSettings",
547-
settingsA.getStubSettings(),
548-
settingsB.getStubSettings(),
549-
new String[] {
550-
"fakeMethodSimple",
551-
"fakePagedMethod",
552-
"fakeMethodBatching",
553-
"executorProvider",
554-
"credentialsProvider",
555-
"headerProvider",
556-
"internalHeaderProvider",
557-
"transportChannelProvider",
558-
"streamWatchdogProvider"
559-
});
560-
assertIsReflectionEqual(
561-
"FakeSettings.getExecutorProvider",
562-
settingsA.getExecutorProvider(),
563-
settingsB.getExecutorProvider());
564-
assertIsReflectionEqual(
565-
"FakeSettings.getCredentialsProvider",
566-
settingsA.getCredentialsProvider(),
567-
settingsB.getCredentialsProvider());
568-
assertIsReflectionEqual(
569-
"FakeSettings.getTransportChannelProvider",
570-
settingsA.getTransportChannelProvider(),
571-
settingsB.getTransportChannelProvider());
572-
assertIsReflectionEqual(
573-
"FakeSettings.getHeaderProvider",
574-
settingsA.getHeaderProvider(),
575-
settingsB.getHeaderProvider());
576-
assertIsReflectionEqual(
577-
"FakeSettings.getStubSettings.getExecutorProvider",
578-
settingsA.getStubSettings().getExecutorProvider(),
579-
settingsB.getStubSettings().getExecutorProvider());
580-
assertIsReflectionEqual(
581-
"FakeSettings.getStubSettings.getCredentialsProvider",
582-
settingsA.getStubSettings().getCredentialsProvider(),
583-
settingsB.getStubSettings().getCredentialsProvider());
584-
assertIsReflectionEqual(
585-
"FakeSettings.getStubSettings.getTransportChannelProvider",
586-
settingsA.getStubSettings().getTransportChannelProvider(),
587-
settingsB.getStubSettings().getTransportChannelProvider());
588-
assertIsReflectionEqual(
589-
"FakeSettings.getStubSettings.getHeaderProvider",
590-
settingsA.getStubSettings().getHeaderProvider(),
591-
settingsB.getStubSettings().getHeaderProvider());
592-
}
593-
594-
private static void assertIsReflectionEqual(
595-
FakeSettings.Builder builderA, FakeSettings.Builder builderB) {
596-
assertIsReflectionEqual(
597-
"FakeSettings.Builder",
598-
builderA,
599-
builderB,
600-
new String[] {"fakeMethodSimple", "fakePagedMethod", "fakeMethodBatching", "stubSettings"});
601-
assertIsReflectionEqual(
602-
"FakeSettings.Builder.fakeMethodSimple",
603-
builderA.fakeMethodSimple(),
604-
builderB.fakeMethodSimple());
605-
assertIsReflectionEqual(
606-
"FakeSettings.Builder.fakePagedMethod",
607-
builderA.fakePagedMethod(),
608-
builderB.fakePagedMethod());
609-
assertIsReflectionEqual(
610-
"FakeSettings.Builder.fakeMethodBatching",
611-
builderA.fakeMethodBatching(),
612-
builderB.fakeMethodBatching());
613-
assertIsReflectionEqual(
614-
"FakeSettings.Builder.getExecutorProvider",
615-
builderA.getExecutorProvider(),
616-
builderB.getExecutorProvider());
617-
assertIsReflectionEqual(
618-
"FakeSettings.Builder.getCredentialsProvider",
619-
builderA.getCredentialsProvider(),
620-
builderB.getCredentialsProvider());
621-
assertIsReflectionEqual(
622-
"FakeSettings.Builder.getTransportChannelProvider",
623-
builderA.getTransportChannelProvider(),
624-
builderB.getTransportChannelProvider());
625-
}
626-
627-
private static void assertIsReflectionEqual(
628-
String path,
629-
UnaryCallSettings.Builder<?, ?> builderA,
630-
UnaryCallSettings.Builder<?, ?> builderB) {
631-
assertIsReflectionEqual(path, builderA, builderB, new String[] {"retrySettingsBuilder"});
632-
assertIsReflectionEqual(
633-
path + ".retrySettingsBuilder", builderA.getRetrySettings(), builderB.getRetrySettings());
634-
}
635-
636-
private static <RequestT, ResponseT> void assertIsReflectionEqual(
637-
String path,
638-
BatchingCallSettings<RequestT, ResponseT> settingsA,
639-
BatchingCallSettings<RequestT, ResponseT> settingsB) {
640-
assertIsReflectionEqual(
641-
path,
642-
settingsA,
643-
settingsB,
644-
new String[] {"retrySettings", "batchingDescriptor", "batchingSettings", "flowController"});
645-
646-
assertIsReflectionEqual(
647-
path + ".getRetrySettings", settingsA.getRetrySettings(), settingsA.getRetrySettings());
648-
assertIsReflectionEqual(
649-
path + ".getBatchingSettings",
650-
settingsB.getBatchingSettings(),
651-
settingsB.getBatchingSettings());
652-
// TODO compare other batching things (batchingDescriptor, flowController)
653-
}
654-
655-
private static <RequestT, ResponseT> void assertIsReflectionEqual(
656-
String path,
657-
BatchingCallSettings.Builder<RequestT, ResponseT> builderA,
658-
BatchingCallSettings.Builder<RequestT, ResponseT> builderB) {
659-
assertIsReflectionEqual(
660-
path,
661-
builderA,
662-
builderB,
663-
new String[] {
664-
"retrySettingsBuilder", "batchingDescriptor", "batchingSettings", "flowController"
665-
});
666-
667-
assertIsReflectionEqual(
668-
path + ".retrySettingsBuilder", builderA.getRetrySettings(), builderB.getRetrySettings());
669-
assertIsReflectionEqual(
670-
path + ".getBatchingSettings",
671-
builderA.getBatchingSettings(),
672-
builderB.getBatchingSettings());
673-
// TODO compare other batching things (batchingDescriptor, flowController)
392+
assertEquals("UnaryCallSettings", settingsA, settingsB);
674393
}
675394
}

0 commit comments

Comments
 (0)