Skip to content

Commit c531a0a

Browse files
pongadpongad
authored
Regenerating SPI: use setEndpoint (#1879)
Reflects googleapis/gapic-generator#1172. Updates #1835.
1 parent d71d8c1 commit c531a0a

File tree

20 files changed

+90
-274
lines changed

20 files changed

+90
-274
lines changed

‎google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorGroupServiceSettings.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,6 @@
7070
@Generated("by GAPIC v0.0.5")
7171
@ExperimentalApi
7272
public class ErrorGroupServiceSettings extends ClientSettings {
73-
/** The default address of the service. */
74-
private static final String DEFAULT_SERVICE_ADDRESS = "clouderrorreporting.googleapis.com";
75-
76-
/** The default port of the service. */
77-
private static final int DEFAULT_SERVICE_PORT = 443;
78-
7973
/** The default scopes of the service. */
8074
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
8175
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
@@ -106,14 +100,9 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
106100
return InstantiatingExecutorProvider.newBuilder();
107101
}
108102

109-
/** Returns the default service address. */
110-
public static String getDefaultServiceAddress() {
111-
return DEFAULT_SERVICE_ADDRESS;
112-
}
113-
114-
/** Returns the default service port. */
115-
public static int getDefaultServicePort() {
116-
return DEFAULT_SERVICE_PORT;
103+
/** Returns the default service endpoint. */
104+
public static String getDefaultEndpoint() {
105+
return "clouderrorreporting.googleapis.com:443";
117106
}
118107

119108
/** Returns the default service scopes. */
@@ -129,8 +118,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
129118
/** Returns a builder for the default ChannelProvider for this service. */
130119
public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder() {
131120
return InstantiatingChannelProvider.newBuilder()
132-
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
133-
.setPort(DEFAULT_SERVICE_PORT)
121+
.setEndpoint(getDefaultEndpoint())
134122
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
135123
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
136124
}

‎google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ErrorStatsServiceSettings.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,6 @@
8383
@Generated("by GAPIC v0.0.5")
8484
@ExperimentalApi
8585
public class ErrorStatsServiceSettings extends ClientSettings {
86-
/** The default address of the service. */
87-
private static final String DEFAULT_SERVICE_ADDRESS = "clouderrorreporting.googleapis.com";
88-
89-
/** The default port of the service. */
90-
private static final int DEFAULT_SERVICE_PORT = 443;
91-
9286
/** The default scopes of the service. */
9387
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
9488
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
@@ -131,14 +125,9 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
131125
return InstantiatingExecutorProvider.newBuilder();
132126
}
133127

134-
/** Returns the default service address. */
135-
public static String getDefaultServiceAddress() {
136-
return DEFAULT_SERVICE_ADDRESS;
137-
}
138-
139-
/** Returns the default service port. */
140-
public static int getDefaultServicePort() {
141-
return DEFAULT_SERVICE_PORT;
128+
/** Returns the default service endpoint. */
129+
public static String getDefaultEndpoint() {
130+
return "clouderrorreporting.googleapis.com:443";
142131
}
143132

144133
/** Returns the default service scopes. */
@@ -154,8 +143,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
154143
/** Returns a builder for the default ChannelProvider for this service. */
155144
public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder() {
156145
return InstantiatingChannelProvider.newBuilder()
157-
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
158-
.setPort(DEFAULT_SERVICE_PORT)
146+
.setEndpoint(getDefaultEndpoint())
159147
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
160148
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
161149
}

‎google-cloud-errorreporting/src/main/java/com/google/cloud/errorreporting/spi/v1beta1/ReportErrorsServiceSettings.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@
6969
@Generated("by GAPIC v0.0.5")
7070
@ExperimentalApi
7171
public class ReportErrorsServiceSettings extends ClientSettings {
72-
/** The default address of the service. */
73-
private static final String DEFAULT_SERVICE_ADDRESS = "clouderrorreporting.googleapis.com";
74-
75-
/** The default port of the service. */
76-
private static final int DEFAULT_SERVICE_PORT = 443;
77-
7872
/** The default scopes of the service. */
7973
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
8074
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
@@ -101,14 +95,9 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
10195
return InstantiatingExecutorProvider.newBuilder();
10296
}
10397

104-
/** Returns the default service address. */
105-
public static String getDefaultServiceAddress() {
106-
return DEFAULT_SERVICE_ADDRESS;
107-
}
108-
109-
/** Returns the default service port. */
110-
public static int getDefaultServicePort() {
111-
return DEFAULT_SERVICE_PORT;
98+
/** Returns the default service endpoint. */
99+
public static String getDefaultEndpoint() {
100+
return "clouderrorreporting.googleapis.com:443";
112101
}
113102

114103
/** Returns the default service scopes. */
@@ -124,8 +113,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
124113
/** Returns a builder for the default ChannelProvider for this service. */
125114
public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder() {
126115
return InstantiatingChannelProvider.newBuilder()
127-
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
128-
.setPort(DEFAULT_SERVICE_PORT)
116+
.setEndpoint(getDefaultEndpoint())
129117
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
130118
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
131119
}

‎google-cloud-language/src/main/java/com/google/cloud/language/spi/v1/LanguageServiceSettings.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,6 @@
7474
@Generated("by GAPIC v0.0.5")
7575
@ExperimentalApi
7676
public class LanguageServiceSettings extends ClientSettings {
77-
/** The default address of the service. */
78-
private static final String DEFAULT_SERVICE_ADDRESS = "language.googleapis.com";
79-
80-
/** The default port of the service. */
81-
private static final int DEFAULT_SERVICE_PORT = 443;
82-
8377
/** The default scopes of the service. */
8478
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
8579
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
@@ -127,14 +121,9 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
127121
return InstantiatingExecutorProvider.newBuilder();
128122
}
129123

130-
/** Returns the default service address. */
131-
public static String getDefaultServiceAddress() {
132-
return DEFAULT_SERVICE_ADDRESS;
133-
}
134-
135-
/** Returns the default service port. */
136-
public static int getDefaultServicePort() {
137-
return DEFAULT_SERVICE_PORT;
124+
/** Returns the default service endpoint. */
125+
public static String getDefaultEndpoint() {
126+
return "language.googleapis.com:443";
138127
}
139128

140129
/** Returns the default service scopes. */
@@ -150,8 +139,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
150139
/** Returns a builder for the default ChannelProvider for this service. */
151140
public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder() {
152141
return InstantiatingChannelProvider.newBuilder()
153-
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
154-
.setPort(DEFAULT_SERVICE_PORT)
142+
.setEndpoint(getDefaultEndpoint())
155143
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
156144
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
157145
}

‎google-cloud-language/src/main/java/com/google/cloud/language/spi/v1beta2/LanguageServiceSettings.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,6 @@
7676
@Generated("by GAPIC v0.0.5")
7777
@ExperimentalApi
7878
public class LanguageServiceSettings extends ClientSettings {
79-
/** The default address of the service. */
80-
private static final String DEFAULT_SERVICE_ADDRESS = "language.googleapis.com";
81-
82-
/** The default port of the service. */
83-
private static final int DEFAULT_SERVICE_PORT = 443;
84-
8579
/** The default scopes of the service. */
8680
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
8781
ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
@@ -137,14 +131,9 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
137131
return InstantiatingExecutorProvider.newBuilder();
138132
}
139133

140-
/** Returns the default service address. */
141-
public static String getDefaultServiceAddress() {
142-
return DEFAULT_SERVICE_ADDRESS;
143-
}
144-
145-
/** Returns the default service port. */
146-
public static int getDefaultServicePort() {
147-
return DEFAULT_SERVICE_PORT;
134+
/** Returns the default service endpoint. */
135+
public static String getDefaultEndpoint() {
136+
return "language.googleapis.com:443";
148137
}
149138

150139
/** Returns the default service scopes. */
@@ -160,8 +149,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
160149
/** Returns a builder for the default ChannelProvider for this service. */
161150
public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder() {
162151
return InstantiatingChannelProvider.newBuilder()
163-
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
164-
.setPort(DEFAULT_SERVICE_PORT)
152+
.setEndpoint(getDefaultEndpoint())
165153
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
166154
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
167155
}

‎google-cloud-logging/src/main/java/com/google/cloud/logging/LoggingOptions.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public class LoggingOptions extends ServiceOptions<Logging, LoggingOptions> {
3434
private static final String API_SHORT_NAME = "Logging";
3535
private static final String LOGGING_SCOPE = "https://www.googleapis.com/auth/logging.admin";
3636
private static final Set<String> SCOPES = ImmutableSet.of(LOGGING_SCOPE);
37-
private static final String DEFAULT_HOST = LoggingSettings.getDefaultServiceAddress()
38-
+ ':' + LoggingSettings.getDefaultServicePort();
37+
private static final String DEFAULT_HOST = LoggingSettings.getDefaultEndpoint();
3938
private static final long serialVersionUID = 5753499510627426717L;
4039

4140
public static class DefaultLoggingFactory implements LoggingFactory {

‎google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/ConfigSettings.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@
8181
@Generated("by GAPIC v0.0.5")
8282
@ExperimentalApi
8383
public class ConfigSettings extends ClientSettings {
84-
/** The default address of the service. */
85-
private static final String DEFAULT_SERVICE_ADDRESS = "logging.googleapis.com";
86-
87-
/** The default port of the service. */
88-
private static final int DEFAULT_SERVICE_PORT = 443;
89-
9084
/** The default scopes of the service. */
9185
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
9286
ImmutableList.<String>builder()
@@ -143,14 +137,9 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
143137
return InstantiatingExecutorProvider.newBuilder();
144138
}
145139

146-
/** Returns the default service address. */
147-
public static String getDefaultServiceAddress() {
148-
return DEFAULT_SERVICE_ADDRESS;
149-
}
150-
151-
/** Returns the default service port. */
152-
public static int getDefaultServicePort() {
153-
return DEFAULT_SERVICE_PORT;
140+
/** Returns the default service endpoint. */
141+
public static String getDefaultEndpoint() {
142+
return "logging.googleapis.com:443";
154143
}
155144

156145
/** Returns the default service scopes. */
@@ -166,8 +155,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
166155
/** Returns a builder for the default ChannelProvider for this service. */
167156
public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder() {
168157
return InstantiatingChannelProvider.newBuilder()
169-
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
170-
.setPort(DEFAULT_SERVICE_PORT)
158+
.setEndpoint(getDefaultEndpoint())
171159
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
172160
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
173161
}

‎google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/LoggingSettings.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,6 @@
9696
@Generated("by GAPIC v0.0.5")
9797
@ExperimentalApi
9898
public class LoggingSettings extends ClientSettings {
99-
/** The default address of the service. */
100-
private static final String DEFAULT_SERVICE_ADDRESS = "logging.googleapis.com";
101-
102-
/** The default port of the service. */
103-
private static final int DEFAULT_SERVICE_PORT = 443;
104-
10599
/** The default scopes of the service. */
106100
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
107101
ImmutableList.<String>builder()
@@ -170,14 +164,9 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
170164
return InstantiatingExecutorProvider.newBuilder();
171165
}
172166

173-
/** Returns the default service address. */
174-
public static String getDefaultServiceAddress() {
175-
return DEFAULT_SERVICE_ADDRESS;
176-
}
177-
178-
/** Returns the default service port. */
179-
public static int getDefaultServicePort() {
180-
return DEFAULT_SERVICE_PORT;
167+
/** Returns the default service endpoint. */
168+
public static String getDefaultEndpoint() {
169+
return "logging.googleapis.com:443";
181170
}
182171

183172
/** Returns the default service scopes. */
@@ -193,8 +182,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
193182
/** Returns a builder for the default ChannelProvider for this service. */
194183
public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder() {
195184
return InstantiatingChannelProvider.newBuilder()
196-
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
197-
.setPort(DEFAULT_SERVICE_PORT)
185+
.setEndpoint(getDefaultEndpoint())
198186
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
199187
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
200188
}

‎google-cloud-logging/src/main/java/com/google/cloud/logging/spi/v2/MetricsSettings.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@
8181
@Generated("by GAPIC v0.0.5")
8282
@ExperimentalApi
8383
public class MetricsSettings extends ClientSettings {
84-
/** The default address of the service. */
85-
private static final String DEFAULT_SERVICE_ADDRESS = "logging.googleapis.com";
86-
87-
/** The default port of the service. */
88-
private static final int DEFAULT_SERVICE_PORT = 443;
89-
9084
/** The default scopes of the service. */
9185
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
9286
ImmutableList.<String>builder()
@@ -145,14 +139,9 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
145139
return InstantiatingExecutorProvider.newBuilder();
146140
}
147141

148-
/** Returns the default service address. */
149-
public static String getDefaultServiceAddress() {
150-
return DEFAULT_SERVICE_ADDRESS;
151-
}
152-
153-
/** Returns the default service port. */
154-
public static int getDefaultServicePort() {
155-
return DEFAULT_SERVICE_PORT;
142+
/** Returns the default service endpoint. */
143+
public static String getDefaultEndpoint() {
144+
return "logging.googleapis.com:443";
156145
}
157146

158147
/** Returns the default service scopes. */
@@ -168,8 +157,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
168157
/** Returns a builder for the default ChannelProvider for this service. */
169158
public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder() {
170159
return InstantiatingChannelProvider.newBuilder()
171-
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
172-
.setPort(DEFAULT_SERVICE_PORT)
160+
.setEndpoint(getDefaultEndpoint())
173161
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
174162
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
175163
}

‎google-cloud-monitoring/src/main/java/com/google/cloud/monitoring/spi/v3/GroupServiceSettings.java‎

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,6 @@
8585
@Generated("by GAPIC v0.0.5")
8686
@ExperimentalApi
8787
public class GroupServiceSettings extends ClientSettings {
88-
/** The default address of the service. */
89-
private static final String DEFAULT_SERVICE_ADDRESS = "monitoring.googleapis.com";
90-
91-
/** The default port of the service. */
92-
private static final int DEFAULT_SERVICE_PORT = 443;
93-
9488
/** The default scopes of the service. */
9589
private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
9690
ImmutableList.<String>builder()
@@ -156,14 +150,9 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
156150
return InstantiatingExecutorProvider.newBuilder();
157151
}
158152

159-
/** Returns the default service address. */
160-
public static String getDefaultServiceAddress() {
161-
return DEFAULT_SERVICE_ADDRESS;
162-
}
163-
164-
/** Returns the default service port. */
165-
public static int getDefaultServicePort() {
166-
return DEFAULT_SERVICE_PORT;
153+
/** Returns the default service endpoint. */
154+
public static String getDefaultEndpoint() {
155+
return "monitoring.googleapis.com:443";
167156
}
168157

169158
/** Returns the default service scopes. */
@@ -179,8 +168,7 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
179168
/** Returns a builder for the default ChannelProvider for this service. */
180169
public static InstantiatingChannelProvider.Builder defaultChannelProviderBuilder() {
181170
return InstantiatingChannelProvider.newBuilder()
182-
.setServiceAddress(DEFAULT_SERVICE_ADDRESS)
183-
.setPort(DEFAULT_SERVICE_PORT)
171+
.setEndpoint(getDefaultEndpoint())
184172
.setGeneratorHeader(DEFAULT_GAPIC_NAME, getGapicVersion())
185173
.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
186174
}

0 commit comments

Comments
 (0)