Skip to content
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

[ggj] feat: instantiate exceptions in MockServiceImpl #167

Merged
merged 16 commits into from
Aug 8, 2020
Merged

[ggj] feat: instantiate exceptions in MockServiceImpl #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0d4216d
feat: add initial resource name def parsing
miraleung Aug 5, 2020
8c5252c
feat: add early failure for missing fields
miraleung Aug 5, 2020
2ffbe86
Merge branch 'master' of github.com:googleapis/gapic-generator-java i…
miraleung Aug 5, 2020
4c9d4f4
feat: couple resnames and message parsing
miraleung Aug 5, 2020
288933f
fix!: refactor method arg parsing away from class creation
miraleung Aug 6, 2020
1ae13d6
feat: add resource_reference parsing
miraleung Aug 6, 2020
0b55c21
fix: dot name parsing
miraleung Aug 6, 2020
f186d1a
feat: extract arg resource names and parse parents
miraleung Aug 6, 2020
22039ff
feat: flatten sigs, handle wildcards, update Client methods
miraleung Aug 7, 2020
ddb9e59
fix: fix TernaryExpr type checking and imports
miraleung Aug 7, 2020
4c812d1
feat: add resname null check to ServiceClient generation
miraleung Aug 7, 2020
3fcdbcc
feat: generate starter resource name helper classes
miraleung Aug 7, 2020
0a07823
fix: instantiate objects in SerivceClientTest generation
miraleung Aug 8, 2020
5d38e5f
fix: instantiate and use this in MockServiceImpl generation
miraleung Aug 8, 2020
b1365ef
feat: instantiate exceptions in MockServiceImpl
miraleung Aug 8, 2020
f83e930
Merge branch 'master' into gp/g12
miraleung Aug 8, 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
11 changes: 10 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 @@ -30,6 +30,7 @@
import com.google.api.generator.engine.ast.NewObjectExpr;
import com.google.api.generator.engine.ast.ScopeNode;
import com.google.api.generator.engine.ast.Statement;
import com.google.api.generator.engine.ast.StringObjectValue;
import com.google.api.generator.engine.ast.ThisObjectValue;
import com.google.api.generator.engine.ast.TypeNode;
import com.google.api.generator.engine.ast.ValueExpr;
Expand Down Expand Up @@ -186,7 +187,6 @@ private static MethodDefinition createAddResponseMethod() {
}

private static MethodDefinition createSetResponsesMethod(Service service) {
// TODO(miraleung): Re-instantiate the fields here.
VariableExpr responsesArgVarExpr =
VariableExpr.withVariable(
Variable.builder()
Expand Down Expand Up @@ -490,6 +490,14 @@ private static Statement createHandleObjectStatement(
}

TypeNode exceptionType = TypeNode.withReference(ConcreteReference.withClazz(Exception.class));
Expr newExceptionExpr =
NewObjectExpr.builder()
.setType(
TypeNode.withReference(ConcreteReference.withClazz(IllegalArgumentException.class)))
.setArguments(
Arrays.asList(
ValueExpr.withValue(StringObjectValue.withValue("Unrecognized response type"))))
.build();

return IfStatement.builder()
.setConditionExpr(
Expand Down Expand Up @@ -524,6 +532,7 @@ private static Statement createHandleObjectStatement(
MethodInvocationExpr.builder()
.setMethodName("onError")
.setExprReferenceExpr(responseObserverVarExpr)
.setArguments(Arrays.asList(newExceptionExpr))
.build())))
.build();
}
Expand Down
24 changes: 16 additions & 8 deletions src/test/java/com/google/api/generator/gapic/composer/MockServiceImplClassComposerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ public void generateServiceClasses() {
+ " } else if (response instanceof Exception) {\n"
+ " responseObserver.onError(((Exception) response));\n"
+ " } else {\n"
+ " responseObserver.onError();\n"
+ " responseObserver.onError(new "
+ "IllegalArgumentException(\"Unrecognized response type\"));\n"
+ " }\n"
+ " }\n"
+ "\n"
Expand All @@ -138,7 +139,8 @@ public void generateServiceClasses() {
+ " } else if (response instanceof Exception) {\n"
+ " responseObserver.onError(((Exception) response));\n"
+ " } else {\n"
+ " responseObserver.onError();\n"
+ " responseObserver.onError(new "
+ "IllegalArgumentException(\"Unrecognized response type\"));\n"
+ " }\n"
+ " }\n"
+ "\n"
Expand All @@ -156,7 +158,8 @@ public void generateServiceClasses() {
+ " } else if (response instanceof Exception) {\n"
+ " responseObserver.onError(((Exception) response));\n"
+ " } else {\n"
+ " responseObserver.onError();\n"
+ " responseObserver.onError(new "
+ "IllegalArgumentException(\"Unrecognized response type\"));\n"
+ " }\n"
+ " }\n"
+ "\n"
Expand Down Expand Up @@ -187,7 +190,8 @@ public void generateServiceClasses() {
+ " } else if (response instanceof Exception) {\n"
+ " responseObserver.onError(((Exception) response));\n"
+ " } else {\n"
+ " responseObserver.onError();\n"
+ " responseObserver.onError(new "
+ "IllegalArgumentException(\"Unrecognized response type\"));\n"
+ " }\n"
+ " }\n"
+ "\n"
Expand Down Expand Up @@ -218,7 +222,8 @@ public void generateServiceClasses() {
+ " } else if (response instanceof Exception) {\n"
+ " responseObserver.onError(((Exception) response));\n"
+ " } else {\n"
+ " responseObserver.onError();\n"
+ " responseObserver.onError(new "
+ "IllegalArgumentException(\"Unrecognized response type\"));\n"
+ " }\n"
+ " }\n"
+ "\n"
Expand Down Expand Up @@ -247,7 +252,8 @@ public void generateServiceClasses() {
+ " } else if (response instanceof Exception) {\n"
+ " responseObserver.onError(((Exception) response));\n"
+ " } else {\n"
+ " responseObserver.onError();\n"
+ " responseObserver.onError(new "
+ "IllegalArgumentException(\"Unrecognized response type\"));\n"
+ " }\n"
+ " }\n"
+ "\n"
Expand All @@ -262,7 +268,8 @@ public void generateServiceClasses() {
+ " } else if (response instanceof Exception) {\n"
+ " responseObserver.onError(((Exception) response));\n"
+ " } else {\n"
+ " responseObserver.onError();\n"
+ " responseObserver.onError(new "
+ "IllegalArgumentException(\"Unrecognized response type\"));\n"
+ " }\n"
+ " }\n"
+ "\n"
Expand All @@ -277,7 +284,8 @@ public void generateServiceClasses() {
+ " } else if (response instanceof Exception) {\n"
+ " responseObserver.onError(((Exception) response));\n"
+ " } else {\n"
+ " responseObserver.onError();\n"
+ " responseObserver.onError(new "
+ "IllegalArgumentException(\"Unrecognized response type\"));\n"
+ " }\n"
+ " }\n"
+ "}\n";
Expand Down