Skip to content

Default method generated from [here](https://github.com/googleapis/gapic-generator-java/blob/d3dce0538a527e0214a1a72bc27e8418b0e2905e/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java#L474) #516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 41 commits into from
Closed

Default method generated from [here](https://github.com/googleapis/gapic-generator-java/blob/d3dce0538a527e0214a1a72bc27e8418b0e2905e/src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java#L474) #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
de732d4
Implement sample code of customize credentials in service client clas…
summer-ji-eng Nov 16, 2020
e5df14b
Add license
summer-ji-eng Nov 16, 2020
81d71db
Merge branch 'master' into service_client_credential_sample_code1
summer-ji-eng Nov 16, 2020
e214824
Add comments in composer, add TODOs, refactor the signatures
summer-ji-eng Nov 17, 2020
b9f8024
format the files
summer-ji-eng Nov 17, 2020
85b6f27
Merge branch 'master' into service_client_credential_sample_code1
summer-ji-eng Nov 17, 2020
2ae0cce
refactor signature
summer-ji-eng Nov 17, 2020
e390c07
Merge branch 'service_client_credential_sample_code1' of github.com:g…
summer-ji-eng Nov 17, 2020
cc843c6
simplify the input parameters
summer-ji-eng Nov 17, 2020
aa87b09
Merge branch 'master' into service_client_credential_sample_code1
summer-ji-eng Nov 17, 2020
d164c52
Merge branch 'master' into service_client_credential_sample_code1
summer-ji-eng Nov 18, 2020
f997138
Implement set endpoint in service client class comment header
summer-ji-eng Nov 16, 2020
e5e6014
Refactor signatures, add todos, and comments
summer-ji-eng Nov 17, 2020
260d668
simplify the input parameters
summer-ji-eng Nov 17, 2020
6306d16
Structure sample code in rpc methods
summer-ji-eng Nov 17, 2020
5b7a57c
add license
summer-ji-eng Nov 18, 2020
0a5b153
fix note for default unary rpc
summer-ji-eng Nov 18, 2020
4b74392
use placeholder
summer-ji-eng Nov 18, 2020
cacf7d0
Implement pure rpc sample code
summer-ji-eng Nov 18, 2020
afc5a36
refactor unary rpc method
summer-ji-eng Nov 18, 2020
9abb259
fix revert changed
summer-ji-eng Nov 18, 2020
4d9e3d7
refactor signature pass Map<String, ResourceName> resourceNames
summer-ji-eng Nov 18, 2020
790cf67
run google format
summer-ji-eng Nov 18, 2020
5d53029
Implement paged unary rpc method' sample code
summer-ji-eng Nov 18, 2020
3a9e88c
fix client
summer-ji-eng Nov 18, 2020
a3f5f22
rebase previous branch
summer-ji-eng Nov 18, 2020
bb14577
add missing comment
summer-ji-eng Nov 18, 2020
d21b247
add missing request assignment expr
summer-ji-eng Nov 18, 2020
34877cf
Implement lro unary rpc method's sample code
summer-ji-eng Nov 18, 2020
06fe431
remove request assignment
summer-ji-eng Nov 18, 2020
8c42a62
rebase upstream
summer-ji-eng Nov 18, 2020
2d8fd9d
Implement paged unary rpc method' sample code
summer-ji-eng Nov 18, 2020
30526c4
rebase previous branch
summer-ji-eng Nov 18, 2020
fae22c3
add missing request assignment expr
summer-ji-eng Nov 18, 2020
761c134
remove request assignment expr
summer-ji-eng Nov 18, 2020
29b5606
run google format
summer-ji-eng Nov 18, 2020
08c3440
rebase previous branch
summer-ji-eng Nov 18, 2020
611901c
add missing request assignment expr
summer-ji-eng Nov 18, 2020
17faa41
rebase upstream
summer-ji-eng Nov 18, 2020
3b2d445
Implement default unary rpc sample code
summer-ji-eng Nov 18, 2020
82e7d38
rebase branch33
summer-ji-eng Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ java_library(
deps = [
"//:service_config_java_proto",
"//src/main/java/com/google/api/generator/engine/ast",
"//src/main/java/com/google/api/generator/engine/writer",
"//src/main/java/com/google/api/generator/gapic:status_java_proto",
"//src/main/java/com/google/api/generator/gapic/model",
"//src/main/java/com/google/api/generator/gapic/utils",
"//src/main/java/com/google/api/generator/gapic/composer/samplecode",
"@com_google_api_api_common//jar",
"@com_google_api_gax_java//gax",
"@com_google_api_gax_java//gax-grpc:gax_grpc",
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/google/api/generator/gapic/composer/ClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@

import com.google.api.generator.gapic.model.GapicClass;
import com.google.api.generator.gapic.model.Message;
import com.google.api.generator.gapic.model.ResourceName;
import com.google.api.generator.gapic.model.Service;
import java.util.Map;

public interface ClassComposer {
GapicClass generate(Service service, Map<String, Message> messageTypes);
GapicClass generate(
Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes);
}
31 changes: 20 additions & 11 deletions src/main/java/com/google/api/generator/gapic/composer/Composer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ public static List<GapicClass> generateServiceClasses(
@Nonnull Map<String, ResourceName> resourceNames,
@Nonnull Map<String, Message> messageTypes) {
List<GapicClass> clazzes = new ArrayList<>();
clazzes.addAll(generateStubClasses(service, serviceConfig, messageTypes));
clazzes.addAll(generateClientSettingsClasses(service, messageTypes));
clazzes.addAll(generateStubClasses(service, serviceConfig, messageTypes, resourceNames));
clazzes.addAll(generateClientSettingsClasses(service, messageTypes, resourceNames));
clazzes.addAll(generateMocksAndTestClasses(service, resourceNames, messageTypes));
// TODO(miraleung): Generate test classes.
return clazzes;
Expand All @@ -76,29 +76,38 @@ public static List<GapicClass> generateResourceNameHelperClasses(
}

public static List<GapicClass> generateStubClasses(
Service service, GapicServiceConfig serviceConfig, Map<String, Message> messageTypes) {
Service service,
GapicServiceConfig serviceConfig,
Map<String, Message> messageTypes,
Map<String, ResourceName> resourceNames) {
List<GapicClass> clazzes = new ArrayList<>();
clazzes.add(ServiceStubClassComposer.instance().generate(service, messageTypes));
clazzes.add(ServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes));
clazzes.add(
ServiceStubSettingsClassComposer.instance().generate(service, serviceConfig, messageTypes));
clazzes.add(GrpcServiceCallableFactoryClassComposer.instance().generate(service, messageTypes));
clazzes.add(GrpcServiceStubClassComposer.instance().generate(service, messageTypes));
clazzes.add(
GrpcServiceCallableFactoryClassComposer.instance()
.generate(service, resourceNames, messageTypes));
clazzes.add(
GrpcServiceStubClassComposer.instance().generate(service, resourceNames, messageTypes));
return clazzes;
}

public static List<GapicClass> generateClientSettingsClasses(
Service service, Map<String, Message> messageTypes) {
Service service, Map<String, Message> messageTypes, Map<String, ResourceName> resourceNames) {
List<GapicClass> clazzes = new ArrayList<>();
clazzes.add(ServiceClientClassComposer.instance().generate(service, messageTypes));
clazzes.add(ServiceSettingsClassComposer.instance().generate(service, messageTypes));
clazzes.add(
ServiceClientClassComposer.instance().generate(service, resourceNames, messageTypes));
clazzes.add(
ServiceSettingsClassComposer.instance().generate(service, resourceNames, messageTypes));
return clazzes;
}

public static List<GapicClass> generateMocksAndTestClasses(
Service service, Map<String, ResourceName> resourceNames, Map<String, Message> messageTypes) {
List<GapicClass> clazzes = new ArrayList<>();
clazzes.add(MockServiceClassComposer.instance().generate(service, messageTypes));
clazzes.add(MockServiceImplClassComposer.instance().generate(service, messageTypes));
clazzes.add(MockServiceClassComposer.instance().generate(service, resourceNames, messageTypes));
clazzes.add(
MockServiceImplClassComposer.instance().generate(service, resourceNames, messageTypes));
clazzes.add(
ServiceClientTestClassComposer.instance().generate(service, resourceNames, messageTypes));
return clazzes;
Expand Down
4 changes: 3 additions & 1 deletion ...java/com/google/api/generator/gapic/composer/GrpcServiceCallableFactoryClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import com.google.api.generator.gapic.model.GapicClass;
import com.google.api.generator.gapic.model.GapicClass.Kind;
import com.google.api.generator.gapic.model.Message;
import com.google.api.generator.gapic.model.ResourceName;
import com.google.api.generator.gapic.model.Service;
import com.google.common.base.Preconditions;
import com.google.longrunning.Operation;
Expand All @@ -64,7 +65,8 @@ public static GrpcServiceCallableFactoryClassComposer instance() {
}

@Override
public GapicClass generate(Service service, Map<String, Message> ignore) {
public GapicClass generate(
Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
Map<String, TypeNode> types = createTypes(service);
String className = String.format("Grpc%sCallableFactory", service.name());
GapicClass.Kind kind = Kind.STUB;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/google/api/generator/gapic/composer/GrpcServiceStubClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
import com.google.api.generator.gapic.model.GapicClass.Kind;
import com.google.api.generator.gapic.model.Message;
import com.google.api.generator.gapic.model.Method;
import com.google.api.generator.gapic.model.ResourceName;
import com.google.api.generator.gapic.model.Service;
import com.google.api.generator.gapic.utils.JavaStyle;
import com.google.common.base.Preconditions;
Expand Down Expand Up @@ -112,7 +113,8 @@ public static GrpcServiceStubClassComposer instance() {
}

@Override
public GapicClass generate(Service service, Map<String, Message> ignore) {
public GapicClass generate(
Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
String pakkage = service.pakkage() + ".stub";
Map<String, TypeNode> types = createDynamicTypes(service, pakkage);
String className = getThisClassName(service.name());
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/google/api/generator/gapic/composer/MockServiceClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import com.google.api.generator.gapic.model.GapicClass;
import com.google.api.generator.gapic.model.GapicClass.Kind;
import com.google.api.generator.gapic.model.Message;
import com.google.api.generator.gapic.model.ResourceName;
import com.google.api.generator.gapic.model.Service;
import com.google.protobuf.AbstractMessage;
import io.grpc.ServerServiceDefinition;
Expand All @@ -55,7 +56,8 @@ public static MockServiceClassComposer instance() {
}

@Override
public GapicClass generate(Service service, Map<String, Message> ignore) {
public GapicClass generate(
Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
Map<String, TypeNode> types = createTypes(service);
String className = String.format(MOCK_SERVICE_NAME_PATTERN, service.name());
GapicClass.Kind kind = Kind.TEST;
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
import com.google.api.generator.gapic.model.Message;
import com.google.api.generator.gapic.model.Method;
import com.google.api.generator.gapic.model.Method.Stream;
import com.google.api.generator.gapic.model.ResourceName;
import com.google.api.generator.gapic.model.Service;
import com.google.api.generator.gapic.utils.JavaStyle;
import com.google.longrunning.Operation;
Expand Down Expand Up @@ -94,7 +95,8 @@ public static MockServiceImplClassComposer instance() {
}

@Override
public GapicClass generate(Service service, Map<String, Message> ignore) {
public GapicClass generate(
Service service, Map<String, ResourceName> resourceNames, Map<String, Message> ignore) {
Map<String, TypeNode> types = createDynamicTypes(service);
String className = String.format(MOCK_SERVICE_IMPL_NAME_PATTERN, service.name());
GapicClass.Kind kind = Kind.TEST;
Expand Down
Loading