Skip to content

Commit 37c9087

Browse files
garrettjonesgooglegarrettjonesgoogle
authored
---
yaml --- r: 7997 b: refs/heads/tswast-patch-1 c: 455f739 h: refs/heads/master i: 7995: 744216a
1 parent 7aa8330 commit 37c9087

5 files changed

Lines changed: 3 additions & 142 deletions

File tree

‎[refs]‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ refs/tags/v0.18.0: 9d193c4c4b9d1c6f21515dd8e50836b9194ec9bb
5757
refs/tags/v0.19.0: e67b56e4d8dad5f9a7b38c9b2107c23c828f2ed5
5858
refs/tags/v0.20.0: 839f7fb7156535146aa1cb2c5aadd8d375d854e8
5959
refs/tags/v0.20.1: 370471f437f1f4f68a11e068df5cd6bf39edb1fa
60-
refs/heads/tswast-patch-1: d476ef7904467233e83168b8d1f5a934a0aae711
60+
refs/heads/tswast-patch-1: 455f7397e3e2d048f4d58a6bf291d8ff59f9a2f6
6161
refs/heads/pubsub-streaming-pull: 19262b752ee874eb2ca3b950eb2aef44d5a5267b

‎branches/tswast-patch-1/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java‎

Lines changed: 2 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,6 @@ public class GrpcTransportOptions implements TransportOptions {
4545

4646
private static final long serialVersionUID = -9049538465533951165L;
4747
private final String executorFactoryClassName;
48-
private final int initialTimeout;
49-
private final double timeoutMultiplier;
50-
private final int maxTimeout;
5148

5249
private transient ExecutorFactory<ScheduledExecutorService> executorFactory;
5350

@@ -118,17 +115,11 @@ public synchronized void release(ScheduledExecutorService executor) {
118115
public static class Builder {
119116

120117
private ExecutorFactory executorFactory;
121-
private int initialTimeout = 20_000;
122-
private double timeoutMultiplier = 1.5;
123-
private int maxTimeout = 100_000;
124118

125119
private Builder() {}
126120

127121
private Builder(GrpcTransportOptions options) {
128122
executorFactory = options.executorFactory;
129-
initialTimeout = options.initialTimeout;
130-
timeoutMultiplier = options.timeoutMultiplier;
131-
maxTimeout = options.maxTimeout;
132123
}
133124

134125
public GrpcTransportOptions build() {
@@ -145,54 +136,13 @@ public Builder setExecutorFactory(ExecutorFactory<ScheduledExecutorService> exec
145136
this.executorFactory = executorFactory;
146137
return this;
147138
}
148-
149-
/**
150-
* Sets the timeout for the initial RPC, in milliseconds. Subsequent calls will use this value
151-
* adjusted according to {@link #setTimeoutMultiplier(double)}. Default value is 20000.
152-
*
153-
* @return the builder
154-
* @throws IllegalArgumentException if the provided timeout is &lt; 0
155-
*/
156-
public Builder setInitialTimeout(int initialTimeout) {
157-
Preconditions.checkArgument(initialTimeout > 0, "Initial timeout must be > 0");
158-
this.initialTimeout = initialTimeout;
159-
return this;
160-
}
161-
162-
/**
163-
* Sets the timeout multiplier. This value is used to compute the timeout for a retried RPC.
164-
* Timeout is computed as {@code timeoutMultiplier * previousTimeout}. Default value is 1.5.
165-
*
166-
* @return the builder
167-
* @throws IllegalArgumentException if the provided timeout multiplier is &lt; 0
168-
*/
169-
public Builder setTimeoutMultiplier(double timeoutMultiplier) {
170-
Preconditions.checkArgument(timeoutMultiplier >= 1.0, "Timeout multiplier must be >= 1");
171-
this.timeoutMultiplier = timeoutMultiplier;
172-
return this;
173-
}
174-
175-
/**
176-
* Sets the maximum timeout for a RPC call, in milliseconds. Default value is 100000. If
177-
* {@code maxTimeout} is lower than the initial timeout the {@link #setInitialTimeout(int)}
178-
* value is used instead.
179-
*
180-
* @return the builder
181-
*/
182-
public Builder setMaxTimeout(int maxTimeout) {
183-
this.maxTimeout = maxTimeout;
184-
return this;
185-
}
186139
}
187140

188141
@SuppressWarnings("unchecked")
189142
private GrpcTransportOptions(Builder builder) {
190143
executorFactory = firstNonNull(builder.executorFactory,
191144
ServiceOptions.getFromServiceLoader(ExecutorFactory.class, DefaultExecutorFactory.INSTANCE));
192145
executorFactoryClassName = executorFactory.getClass().getName();
193-
initialTimeout = builder.initialTimeout;
194-
timeoutMultiplier = builder.timeoutMultiplier;
195-
maxTimeout = builder.maxTimeout <= initialTimeout ? initialTimeout : builder.maxTimeout;
196146
}
197147

198148
/**
@@ -225,37 +175,13 @@ public static ChannelProvider setUpChannelProvider(
225175
}
226176

227177

228-
/**
229-
* Returns the timeout for the initial RPC, in milliseconds. Subsequent calls will use this value
230-
* adjusted according to {@link #getTimeoutMultiplier()}. Default value is 20000.
231-
*/
232-
public int getInitialTimeout() {
233-
return initialTimeout;
234-
}
235-
236-
/**
237-
* Returns the timeout multiplier. This values is used to compute the timeout for a RPC. Timeout
238-
* is computed as {@code timeoutMultiplier * previousTimeout}. Default value is 1.5.
239-
*/
240-
public double getTimeoutMultiplier() {
241-
return timeoutMultiplier;
242-
}
243-
244-
/**
245-
* Returns the maximum timeout for a RPC call, in milliseconds. Default value is 100000.
246-
*/
247-
public int getMaxTimeout() {
248-
return maxTimeout;
249-
}
250-
251178
public Builder toBuilder() {
252179
return new Builder(this);
253180
}
254181

255182
@Override
256183
public int hashCode() {
257-
return Objects.hash(executorFactoryClassName, initialTimeout,
258-
timeoutMultiplier, maxTimeout);
184+
return Objects.hash(executorFactoryClassName);
259185
}
260186

261187
@Override
@@ -267,10 +193,7 @@ public boolean equals(Object obj) {
267193
return false;
268194
}
269195
GrpcTransportOptions other = (GrpcTransportOptions) obj;
270-
return Objects.equals(executorFactoryClassName, other.executorFactoryClassName)
271-
&& Objects.equals(initialTimeout, other.initialTimeout)
272-
&& Objects.equals(timeoutMultiplier, other.timeoutMultiplier)
273-
&& Objects.equals(maxTimeout, other.maxTimeout);
196+
return Objects.equals(executorFactoryClassName, other.executorFactoryClassName);
274197
}
275198

276199
private void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException {

‎branches/tswast-patch-1/google-cloud-core/src/test/java/com/google/cloud/GrpcTransportOptionsTest.java‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ public class GrpcTransportOptionsTest {
3333
private static final ExecutorFactory MOCK_EXECUTOR_FACTORY =
3434
EasyMock.createMock(ExecutorFactory.class);
3535
private static final GrpcTransportOptions OPTIONS = GrpcTransportOptions.newBuilder()
36-
.setInitialTimeout(1234)
37-
.setTimeoutMultiplier(1.6)
38-
.setMaxTimeout(5678)
3936
.setExecutorFactory(MOCK_EXECUTOR_FACTORY)
4037
.build();
4138
private static final GrpcTransportOptions DEFAULT_OPTIONS =
@@ -44,50 +41,10 @@ public class GrpcTransportOptionsTest {
4441

4542
@Test
4643
public void testBuilder() {
47-
assertEquals(1234, OPTIONS.getInitialTimeout());
48-
assertEquals(1.6, OPTIONS.getTimeoutMultiplier(), 0.0);
49-
assertEquals(5678, OPTIONS.getMaxTimeout());
5044
assertSame(MOCK_EXECUTOR_FACTORY, OPTIONS.getExecutorFactory());
51-
assertEquals(20000, DEFAULT_OPTIONS.getInitialTimeout());
52-
assertEquals(1.5, DEFAULT_OPTIONS.getTimeoutMultiplier(), 0.0);
53-
assertEquals(100000, DEFAULT_OPTIONS.getMaxTimeout());
5445
assertTrue(DEFAULT_OPTIONS.getExecutorFactory() instanceof DefaultExecutorFactory);
5546
}
5647

57-
@Test
58-
public void testBuilderError() {
59-
try {
60-
GrpcTransportOptions.newBuilder().setInitialTimeout(0);
61-
fail("IllegalArgumentException expected");
62-
} catch (IllegalArgumentException ex) {
63-
assertEquals("Initial timeout must be > 0", ex.getMessage());
64-
}
65-
try {
66-
GrpcTransportOptions.newBuilder().setInitialTimeout(-1);
67-
fail("IllegalArgumentException expected");
68-
} catch (IllegalArgumentException ex) {
69-
assertEquals("Initial timeout must be > 0", ex.getMessage());
70-
}
71-
try {
72-
GrpcTransportOptions.newBuilder().setTimeoutMultiplier(0.9);
73-
fail("IllegalArgumentException expected");
74-
} catch (IllegalArgumentException ex) {
75-
assertEquals("Timeout multiplier must be >= 1", ex.getMessage());
76-
}
77-
}
78-
79-
@Test
80-
public void testBuilderInvalidMaxTimeout() {
81-
GrpcTransportOptions options = GrpcTransportOptions.newBuilder()
82-
.setInitialTimeout(1234)
83-
.setTimeoutMultiplier(1.6)
84-
.setMaxTimeout(123)
85-
.build();
86-
assertEquals(1234, options.getInitialTimeout());
87-
assertEquals(1.6, options.getTimeoutMultiplier(), 0.0);
88-
assertEquals(1234, options.getMaxTimeout());
89-
}
90-
9148
@Test
9249
public void testBaseEquals() {
9350
assertEquals(OPTIONS, OPTIONS_COPY);

‎branches/tswast-patch-1/google-cloud-logging/src/main/java/com/google/cloud/logging/testing/RemoteLoggingHelper.java‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@
3434
* {@link LoggingOptions#getRetrySettings()}: {@link RetrySettings#getMaxRetryDelay()} is
3535
* {@code 30000}, {@link RetrySettings#getTotalTimeout()} is {@code 120000} and
3636
* {@link RetrySettings#getInitialRetryDelay()} is {@code 250}.
37-
* {@link GrpcTransportOptions#getInitialTimeout()} is set to 60000,
38-
* {@link GrpcTransportOptions#getMaxTimeout()} is set to {@code 240000} and
39-
* {@link GrpcTransportOptions#getTimeoutMultiplier()} is set to {@code 1.5}.
4037
*/
4138
public class RemoteLoggingHelper {
4239

@@ -69,12 +66,6 @@ public static RemoteLoggingHelper create(String projectId, InputStream keyStream
6966
throws LoggingHelperException {
7067
try {
7168
GrpcTransportOptions transportOptions = LoggingOptions.getDefaultGrpcTransportOptions();
72-
transportOptions =
73-
transportOptions.toBuilder()
74-
.setInitialTimeout(60000)
75-
.setMaxTimeout(120000)
76-
.setTimeoutMultiplier(1.5)
77-
.build();
7869
LoggingOptions storageOptions = LoggingOptions.newBuilder()
7970
.setCredentials(ServiceAccountCredentials.fromStream(keyStream))
8071
.setProjectId(projectId)
@@ -96,12 +87,6 @@ public static RemoteLoggingHelper create(String projectId, InputStream keyStream
9687
*/
9788
public static RemoteLoggingHelper create() throws LoggingHelperException {
9889
GrpcTransportOptions transportOptions = LoggingOptions.getDefaultGrpcTransportOptions();
99-
transportOptions =
100-
transportOptions.toBuilder()
101-
.setInitialTimeout(60000)
102-
.setMaxTimeout(120000)
103-
.setTimeoutMultiplier(1.5)
104-
.build();
10590
LoggingOptions loggingOptions = LoggingOptions.newBuilder()
10691
.setRetrySettings(retrySettings())
10792
.setTransportOptions(transportOptions)

‎branches/tswast-patch-1/google-cloud-logging/src/test/java/com/google/cloud/logging/SerializationTest.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ public class SerializationTest extends BaseSerializationTest {
8282
@Override
8383
protected Serializable[] serializableObjects() {
8484
GrpcTransportOptions transportOptions = LoggingOptions.getDefaultGrpcTransportOptions();
85-
transportOptions =
86-
transportOptions.toBuilder()
87-
.setInitialTimeout(1234)
88-
.build();
8985
LoggingOptions options = LoggingOptions.newBuilder()
9086
.setProjectId("p1")
9187
.setTransportOptions(transportOptions)

0 commit comments

Comments
 (0)