Skip to content

Commit 400f7df

Browse files
committed
fix: use stub package for vesion
1 parent 529d91c commit 400f7df

12 files changed

Lines changed: 1 addition & 12 deletions

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2143,7 +2143,7 @@ private MethodDefinition createGetLibraryMetadataMethod(GapicContext context, Se
21432143
TypeNode.withReference(
21442144
VaporReference.builder()
21452145
.setName("Version")
2146-
.setPakkage(service.pakkage())
2146+
.setPakkage(String.format("%s.stub", service.pakkage()))
21472147
.build()))
21482148
.setVariable(
21492149
Variable.builder().setName("VERSION").setType(TypeNode.STRING).build())

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/ApiVersionTestingStubSettings.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import com.google.api.gax.rpc.TransportChannelProvider;
1818
import com.google.api.gax.rpc.UnaryCallSettings;
1919
import com.google.api.version.test.EchoRequest;
2020
import com.google.api.version.test.EchoResponse;
21-
import com.google.api.version.test.Version;
2221
import com.google.common.collect.ImmutableList;
2322
import com.google.common.collect.ImmutableMap;
2423
import com.google.common.collect.ImmutableSet;

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import com.google.common.collect.ImmutableSet;
2222
import com.google.common.collect.Lists;
2323
import com.google.protobuf.Empty;
2424
import com.google.testdata.v1.FibonacciRequest;
25-
import com.google.testdata.v1.Version;
2625
import java.io.IOException;
2726
import java.time.Duration;
2827
import java.util.List;

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoServiceSelectiveGapicStubSettings.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import com.google.common.collect.ImmutableSet;
2525
import com.google.common.collect.Lists;
2626
import com.google.selective.generate.v1beta1.EchoRequest;
2727
import com.google.selective.generate.v1beta1.EchoResponse;
28-
import com.google.selective.generate.v1beta1.Version;
2928
import java.io.IOException;
3029
import java.util.List;
3130
import javax.annotation.Generated;

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ import com.google.showcase.v1beta1.Object;
4747
import com.google.showcase.v1beta1.PagedExpandLegacyRequest;
4848
import com.google.showcase.v1beta1.PagedExpandRequest;
4949
import com.google.showcase.v1beta1.PagedExpandResponse;
50-
import com.google.showcase.v1beta1.Version;
5150
import com.google.showcase.v1beta1.WaitMetadata;
5251
import com.google.showcase.v1beta1.WaitRequest;
5352
import com.google.showcase.v1beta1.WaitResponse;

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/JobServiceStubSettings.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import com.google.api.gax.rpc.TransportChannelProvider;
2626
import com.google.api.gax.rpc.UnaryCallSettings;
2727
import com.google.api.gax.rpc.UnaryCallable;
2828
import com.google.cloud.bigquery.v2.JobProto;
29-
import com.google.cloud.bigquery.v2.Version;
3029
import com.google.common.collect.ImmutableList;
3130
import com.google.common.collect.ImmutableMap;
3231
import com.google.common.collect.ImmutableSet;

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import com.google.logging.v2.ListMonitoredResourceDescriptorsResponse;
5151
import com.google.logging.v2.LogEntry;
5252
import com.google.logging.v2.TailLogEntriesRequest;
5353
import com.google.logging.v2.TailLogEntriesResponse;
54-
import com.google.logging.v2.Version;
5554
import com.google.logging.v2.WriteLogEntriesRequest;
5655
import com.google.logging.v2.WriteLogEntriesResponse;
5756
import com.google.protobuf.Empty;

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ import com.google.pubsub.v1.PublishRequest;
5454
import com.google.pubsub.v1.PublishResponse;
5555
import com.google.pubsub.v1.Topic;
5656
import com.google.pubsub.v1.UpdateTopicRequest;
57-
import com.google.pubsub.v1.Version;
5857
import java.io.IOException;
5958
import java.time.Duration;
6059
import java.util.ArrayList;

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import com.google.showcase.grpcrest.v1beta1.Object;
5151
import com.google.showcase.grpcrest.v1beta1.PagedExpandRequest;
5252
import com.google.showcase.grpcrest.v1beta1.PagedExpandResponse;
5353
import com.google.showcase.grpcrest.v1beta1.UpdateCaseRequest;
54-
import com.google.showcase.grpcrest.v1beta1.Version;
5554
import com.google.showcase.grpcrest.v1beta1.WaitMetadata;
5655
import com.google.showcase.grpcrest.v1beta1.WaitRequest;
5756
import com.google.showcase.grpcrest.v1beta1.WaitResponse;

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import com.google.common.collect.ImmutableSet;
2424
import com.google.common.collect.Lists;
2525
import com.google.showcase.v1beta1.EvilRequest;
2626
import com.google.showcase.v1beta1.EvilResponse;
27-
import com.google.showcase.v1beta1.Version;
2827
import java.io.IOException;
2928
import java.util.List;
3029
import javax.annotation.Generated;

0 commit comments

Comments
 (0)