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

Commit 0582719

Browse files
chore: update gapic-generator-java (#402)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 454939894 Source-Link: googleapis/googleapis@519ca44 Source-Link: https://github.com/googleapis/googleapis-gen/commit/fc639d21a7cbc30aa0a9b862586942a0fb46c5c8 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZmM2MzlkMjFhN2NiYzMwYWEwYTliODYyNTg2OTQyYTBmYjQ2YzVjOCJ9 feat: Add Java REST transport to analytics, servicecontrol, servicemanagement, serviceusage and langauge APIs PiperOrigin-RevId: 454254635 Source-Link: googleapis/googleapis@84fb822 Source-Link: https://github.com/googleapis/googleapis-gen/commit/4ffb61264d6fb634c430829dd2da75c5bed08304 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNGZmYjYxMjY0ZDZmYjYzNGM0MzA4MjlkZDJkYTc1YzViZWQwODMwNCJ9 chore: Integrate new gapic-generator-java and rules_gapic PiperOrigin-RevId: 454027580 Source-Link: googleapis/googleapis@1b22277 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e04cea20d0d12eb5c3bdb360a9e72b654edcb638 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTA0Y2VhMjBkMGQxMmViNWMzYmRiMzYwYTllNzJiNjU0ZWRjYjYzOCJ9 chore(deps): upgrade gapic-generator-java to 2.8.0 and update gax-java to 2.18.1 PiperOrigin-RevId: 450543911 Source-Link: googleapis/googleapis@5528344 Source-Link: https://github.com/googleapis/googleapis-gen/commit/9f6775cab1958982b88967a43e5e806af0f135db Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOWY2Nzc1Y2FiMTk1ODk4MmI4ODk2N2E0M2U1ZTgwNmFmMGYxMzVkYiJ9 fix: CustomDimension and CustomMetric resource configuration in Analytics Admin API PiperOrigin-RevId: 448304423 Source-Link: googleapis/googleapis@d018d54 Source-Link: https://github.com/googleapis/googleapis-gen/commit/6c363eea0f99d00a216a4efc8015e69272ccaa83 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNmMzNjNlZWEwZjk5ZDAwYTIxNmE0ZWZjODAxNWU2OTI3MmNjYWE4MyJ9
1 parent 92af5be commit 0582719

File tree

13 files changed

+11113
-168
lines changed

13 files changed

+11113
-168
lines changed

google-analytics-admin/pom.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@
5858
<groupId>com.google.api</groupId>
5959
<artifactId>gax-grpc</artifactId>
6060
</dependency>
61+
<dependency>
62+
<groupId>com.google.api</groupId>
63+
<artifactId>gax-httpjson</artifactId>
64+
</dependency>
6165
<dependency>
6266
<groupId>org.threeten</groupId>
6367
<artifactId>threetenbp</artifactId>
@@ -76,12 +80,24 @@
7680
<scope>test</scope>
7781
</dependency>
7882
<!-- Need testing utility classes for generated gRPC clients tests -->
83+
<dependency>
84+
<groupId>com.google.api</groupId>
85+
<artifactId>gax</artifactId>
86+
<classifier>testlib</classifier>
87+
<scope>test</scope>
88+
</dependency>
7989
<dependency>
8090
<groupId>com.google.api</groupId>
8191
<artifactId>gax-grpc</artifactId>
8292
<classifier>testlib</classifier>
8393
<scope>test</scope>
8494
</dependency>
95+
<dependency>
96+
<groupId>com.google.api</groupId>
97+
<artifactId>gax-httpjson</artifactId>
98+
<classifier>testlib</classifier>
99+
<scope>test</scope>
100+
</dependency>
85101
</dependencies>
86102

87103
<profiles>

google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient.java

Lines changed: 48 additions & 34 deletions
Large diffs are not rendered by default.

google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceSettings.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import com.google.api.gax.core.GoogleCredentialsProvider;
3939
import com.google.api.gax.core.InstantiatingExecutorProvider;
4040
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
41+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
4142
import com.google.api.gax.rpc.ApiClientHeaderProvider;
4243
import com.google.api.gax.rpc.ClientContext;
4344
import com.google.api.gax.rpc.ClientSettings;
@@ -589,11 +590,18 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
589590
return AnalyticsAdminServiceStubSettings.defaultCredentialsProviderBuilder();
590591
}
591592

592-
/** Returns a builder for the default ChannelProvider for this service. */
593+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
593594
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
594595
return AnalyticsAdminServiceStubSettings.defaultGrpcTransportProviderBuilder();
595596
}
596597

598+
/** Returns a builder for the default REST ChannelProvider for this service. */
599+
@BetaApi
600+
public static InstantiatingHttpJsonChannelProvider.Builder
601+
defaultHttpJsonTransportProviderBuilder() {
602+
return AnalyticsAdminServiceStubSettings.defaultHttpJsonTransportProviderBuilder();
603+
}
604+
597605
public static TransportChannelProvider defaultTransportChannelProvider() {
598606
return AnalyticsAdminServiceStubSettings.defaultTransportChannelProvider();
599607
}
@@ -603,11 +611,17 @@ public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuil
603611
return AnalyticsAdminServiceStubSettings.defaultApiClientHeaderProviderBuilder();
604612
}
605613

606-
/** Returns a new builder for this class. */
614+
/** Returns a new gRPC builder for this class. */
607615
public static Builder newBuilder() {
608616
return Builder.createDefault();
609617
}
610618

619+
/** Returns a new REST builder for this class. */
620+
@BetaApi
621+
public static Builder newHttpJsonBuilder() {
622+
return Builder.createHttpJsonDefault();
623+
}
624+
611625
/** Returns a new builder for this class. */
612626
public static Builder newBuilder(ClientContext clientContext) {
613627
return new Builder(clientContext);
@@ -646,6 +660,11 @@ private static Builder createDefault() {
646660
return new Builder(AnalyticsAdminServiceStubSettings.newBuilder());
647661
}
648662

663+
@BetaApi
664+
private static Builder createHttpJsonDefault() {
665+
return new Builder(AnalyticsAdminServiceStubSettings.newHttpJsonBuilder());
666+
}
667+
649668
public AnalyticsAdminServiceStubSettings.Builder getStubSettingsBuilder() {
650669
return ((AnalyticsAdminServiceStubSettings.Builder) getStubSettings());
651670
}

google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/stub/AnalyticsAdminServiceStubSettings.java

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,9 @@
152152
import com.google.api.gax.grpc.GaxGrpcProperties;
153153
import com.google.api.gax.grpc.GrpcTransportChannel;
154154
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
155+
import com.google.api.gax.httpjson.GaxHttpJsonProperties;
156+
import com.google.api.gax.httpjson.HttpJsonTransportChannel;
157+
import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider;
155158
import com.google.api.gax.retrying.RetrySettings;
156159
import com.google.api.gax.rpc.ApiCallContext;
157160
import com.google.api.gax.rpc.ApiClientHeaderProvider;
@@ -1811,13 +1814,17 @@ public UnaryCallSettings<GetDataStreamRequest, DataStream> getDataStreamSettings
18111814
return getDataStreamSettings;
18121815
}
18131816

1814-
@BetaApi("A restructuring of stub classes is planned, so this may break in the future")
18151817
public AnalyticsAdminServiceStub createStub() throws IOException {
18161818
if (getTransportChannelProvider()
18171819
.getTransportName()
18181820
.equals(GrpcTransportChannel.getGrpcTransportName())) {
18191821
return GrpcAnalyticsAdminServiceStub.create(this);
18201822
}
1823+
if (getTransportChannelProvider()
1824+
.getTransportName()
1825+
.equals(HttpJsonTransportChannel.getHttpJsonTransportName())) {
1826+
return HttpJsonAnalyticsAdminServiceStub.create(this);
1827+
}
18211828
throw new UnsupportedOperationException(
18221829
String.format(
18231830
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
@@ -1850,30 +1857,56 @@ public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilde
18501857
.setUseJwtAccessWithScope(true);
18511858
}
18521859

1853-
/** Returns a builder for the default ChannelProvider for this service. */
1860+
/** Returns a builder for the default gRPC ChannelProvider for this service. */
18541861
public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() {
18551862
return InstantiatingGrpcChannelProvider.newBuilder()
18561863
.setMaxInboundMessageSize(Integer.MAX_VALUE);
18571864
}
18581865

1866+
/** Returns a builder for the default REST ChannelProvider for this service. */
1867+
@BetaApi
1868+
public static InstantiatingHttpJsonChannelProvider.Builder
1869+
defaultHttpJsonTransportProviderBuilder() {
1870+
return InstantiatingHttpJsonChannelProvider.newBuilder();
1871+
}
1872+
18591873
public static TransportChannelProvider defaultTransportChannelProvider() {
18601874
return defaultGrpcTransportProviderBuilder().build();
18611875
}
18621876

18631877
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
1864-
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
1878+
public static ApiClientHeaderProvider.Builder defaultGrpcApiClientHeaderProviderBuilder() {
18651879
return ApiClientHeaderProvider.newBuilder()
18661880
.setGeneratedLibToken(
18671881
"gapic", GaxProperties.getLibraryVersion(AnalyticsAdminServiceStubSettings.class))
18681882
.setTransportToken(
18691883
GaxGrpcProperties.getGrpcTokenName(), GaxGrpcProperties.getGrpcVersion());
18701884
}
18711885

1872-
/** Returns a new builder for this class. */
1886+
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
1887+
public static ApiClientHeaderProvider.Builder defaultHttpJsonApiClientHeaderProviderBuilder() {
1888+
return ApiClientHeaderProvider.newBuilder()
1889+
.setGeneratedLibToken(
1890+
"gapic", GaxProperties.getLibraryVersion(AnalyticsAdminServiceStubSettings.class))
1891+
.setTransportToken(
1892+
GaxHttpJsonProperties.getHttpJsonTokenName(),
1893+
GaxHttpJsonProperties.getHttpJsonVersion());
1894+
}
1895+
1896+
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
1897+
return AnalyticsAdminServiceStubSettings.defaultGrpcApiClientHeaderProviderBuilder();
1898+
}
1899+
1900+
/** Returns a new gRPC builder for this class. */
18731901
public static Builder newBuilder() {
18741902
return Builder.createDefault();
18751903
}
18761904

1905+
/** Returns a new REST builder for this class. */
1906+
public static Builder newHttpJsonBuilder() {
1907+
return Builder.createHttpJsonDefault();
1908+
}
1909+
18771910
/** Returns a new builder for this class. */
18781911
public static Builder newBuilder(ClientContext clientContext) {
18791912
return new Builder(clientContext);
@@ -2546,6 +2579,19 @@ private static Builder createDefault() {
25462579
return initDefaults(builder);
25472580
}
25482581

2582+
private static Builder createHttpJsonDefault() {
2583+
Builder builder = new Builder(((ClientContext) null));
2584+
2585+
builder.setTransportChannelProvider(defaultHttpJsonTransportProviderBuilder().build());
2586+
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
2587+
builder.setInternalHeaderProvider(defaultHttpJsonApiClientHeaderProviderBuilder().build());
2588+
builder.setEndpoint(getDefaultEndpoint());
2589+
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
2590+
builder.setSwitchToMtlsEndpointAllowed(true);
2591+
2592+
return initDefaults(builder);
2593+
}
2594+
25492595
private static Builder initDefaults(Builder builder) {
25502596
builder
25512597
.getAccountSettings()
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
/*
2+
* Copyright 2022 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* https://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.google.analytics.admin.v1alpha.stub;
18+
19+
import com.google.api.core.BetaApi;
20+
import com.google.api.gax.httpjson.HttpJsonCallSettings;
21+
import com.google.api.gax.httpjson.HttpJsonCallableFactory;
22+
import com.google.api.gax.httpjson.HttpJsonOperationSnapshotCallable;
23+
import com.google.api.gax.httpjson.HttpJsonStubCallableFactory;
24+
import com.google.api.gax.httpjson.longrunning.stub.OperationsStub;
25+
import com.google.api.gax.rpc.BatchingCallSettings;
26+
import com.google.api.gax.rpc.ClientContext;
27+
import com.google.api.gax.rpc.OperationCallSettings;
28+
import com.google.api.gax.rpc.OperationCallable;
29+
import com.google.api.gax.rpc.PagedCallSettings;
30+
import com.google.api.gax.rpc.ServerStreamingCallSettings;
31+
import com.google.api.gax.rpc.ServerStreamingCallable;
32+
import com.google.api.gax.rpc.UnaryCallSettings;
33+
import com.google.api.gax.rpc.UnaryCallable;
34+
import com.google.longrunning.Operation;
35+
import javax.annotation.Generated;
36+
37+
// AUTO-GENERATED DOCUMENTATION AND CLASS.
38+
/**
39+
* REST callable factory implementation for the AnalyticsAdminService service API.
40+
*
41+
* <p>This class is for advanced usage.
42+
*/
43+
@BetaApi
44+
@Generated("by gapic-generator-java")
45+
public class HttpJsonAnalyticsAdminServiceCallableFactory
46+
implements HttpJsonStubCallableFactory<Operation, OperationsStub> {
47+
48+
@Override
49+
public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createUnaryCallable(
50+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
51+
UnaryCallSettings<RequestT, ResponseT> callSettings,
52+
ClientContext clientContext) {
53+
return HttpJsonCallableFactory.createUnaryCallable(
54+
httpJsonCallSettings, callSettings, clientContext);
55+
}
56+
57+
@Override
58+
public <RequestT, ResponseT, PagedListResponseT>
59+
UnaryCallable<RequestT, PagedListResponseT> createPagedCallable(
60+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
61+
PagedCallSettings<RequestT, ResponseT, PagedListResponseT> callSettings,
62+
ClientContext clientContext) {
63+
return HttpJsonCallableFactory.createPagedCallable(
64+
httpJsonCallSettings, callSettings, clientContext);
65+
}
66+
67+
@Override
68+
public <RequestT, ResponseT> UnaryCallable<RequestT, ResponseT> createBatchingCallable(
69+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
70+
BatchingCallSettings<RequestT, ResponseT> callSettings,
71+
ClientContext clientContext) {
72+
return HttpJsonCallableFactory.createBatchingCallable(
73+
httpJsonCallSettings, callSettings, clientContext);
74+
}
75+
76+
@BetaApi(
77+
"The surface for long-running operations is not stable yet and may change in the future.")
78+
@Override
79+
public <RequestT, ResponseT, MetadataT>
80+
OperationCallable<RequestT, ResponseT, MetadataT> createOperationCallable(
81+
HttpJsonCallSettings<RequestT, Operation> httpJsonCallSettings,
82+
OperationCallSettings<RequestT, ResponseT, MetadataT> callSettings,
83+
ClientContext clientContext,
84+
OperationsStub operationsStub) {
85+
UnaryCallable<RequestT, Operation> innerCallable =
86+
HttpJsonCallableFactory.createBaseUnaryCallable(
87+
httpJsonCallSettings, callSettings.getInitialCallSettings(), clientContext);
88+
HttpJsonOperationSnapshotCallable<RequestT, Operation> initialCallable =
89+
new HttpJsonOperationSnapshotCallable<RequestT, Operation>(
90+
innerCallable,
91+
httpJsonCallSettings.getMethodDescriptor().getOperationSnapshotFactory());
92+
return HttpJsonCallableFactory.createOperationCallable(
93+
callSettings, clientContext, operationsStub.longRunningClient(), initialCallable);
94+
}
95+
96+
@Override
97+
public <RequestT, ResponseT>
98+
ServerStreamingCallable<RequestT, ResponseT> createServerStreamingCallable(
99+
HttpJsonCallSettings<RequestT, ResponseT> httpJsonCallSettings,
100+
ServerStreamingCallSettings<RequestT, ResponseT> callSettings,
101+
ClientContext clientContext) {
102+
return HttpJsonCallableFactory.createServerStreamingCallable(
103+
httpJsonCallSettings, callSettings, clientContext);
104+
}
105+
}

0 commit comments

Comments
 (0)