Skip to content

[ggj][engx] fix: remove obsolete TODOs #485

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

Merged
miraleung merged 2 commits into from
Nov 13, 2020
Merged

[ggj][engx] fix: remove obsolete TODOs #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
23830cf
fix: remove obsolete TODOs
miraleung Nov 13, 2020
a6268a3
Merge branch 'master' into cleanup/c0
miraleung Nov 13, 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
8 changes: 3 additions & 5 deletions src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ public static Expr createLroSettingsBuilderExpr(
.build())
.build();

// TODO(miraleung): Determine fianl LRO settings values here.
Expr lroRetrySettingsExpr = createLroRetrySettingsExpr();
Expr pollAlgoExpr =
MethodInvocationExpr.builder()
Expand Down Expand Up @@ -488,7 +487,6 @@ private static List<Expr> createRetrySettingsExprs(
}

private static Expr createLroRetrySettingsExpr() {
// TODO(miraleung): Determine fianl LRO settings values here.
Expr lroRetrySettingsExpr =
MethodInvocationExpr.builder()
.setStaticReferenceType(STATIC_TYPES.get("RetrySettings"))
Expand Down Expand Up @@ -519,23 +517,23 @@ private static Expr createLroRetrySettingsExpr() {

Expr zeroDurationExpr =
EnumRefExpr.builder().setType(STATIC_TYPES.get("Duration")).setName("ZERO").build();
// TODO(miraleung): Find a way to add an "// ignored" comment here.
// TODO(miraleung): Add an "// ignored" comment here.
lroRetrySettingsExpr =
MethodInvocationExpr.builder()
.setExprReferenceExpr(lroRetrySettingsExpr)
.setMethodName("setInitialRpcTimeout")
.setArguments(zeroDurationExpr)
.build();

// TODO(miraleung): Find a way to add an "// ignored" comment here.
// TODO(miraleung): Add an "// ignored" comment here.
lroRetrySettingsExpr =
MethodInvocationExpr.builder()
.setExprReferenceExpr(lroRetrySettingsExpr)
.setMethodName("setRpcTimeoutMultiplier")
.setArguments(toValExpr(LRO_DEFAULT_MAX_RPC_TIMEOUT))
.build();

// TODO(miraleung): Find a way to add an "// ignored" comment here.
// TODO(miraleung): Add an "// ignored" comment here.
lroRetrySettingsExpr =
MethodInvocationExpr.builder()
.setExprReferenceExpr(lroRetrySettingsExpr)
Expand Down
1 change: 0 additions & 1 deletion src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1464,7 +1464,6 @@ private static List<Statement> createRpcExceptionTestStatements(
.setVariableExpr(varExpr.toBuilder().setIsDecl(true).build())
.setValueExpr(valExpr)
.build());
// TODO(miraleung): Empty line here.
}
}
String rpcJavaName = JavaStyle.toLowerCamelCase(method.name());
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/google/api/generator/gapic/protoparser/TypeParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import javax.annotation.Nonnull;

public class TypeParser {
// TODO(miraleung): Add a test.
private static Reference REFERENCE_BYTE_STRING = ConcreteReference.withClazz(ByteString.class);
private static TypeNode TYPE_NODE_BYTE_STRING = TypeNode.withReference(REFERENCE_BYTE_STRING);

Expand Down Expand Up @@ -115,9 +114,9 @@ static Reference parseFieldReference(FieldDescriptor field) {

@VisibleForTesting
static Reference parseMessageReference(@Nonnull Descriptor messageDescriptor) {
// TODO(miraleung): Handle deeper levels of nesting.
List<String> outerNestedTypeNames = new ArrayList<>();
Descriptor containingType = messageDescriptor.getContainingType();
// Handles nesting.
while (containingType != null) {
// Outermost type in the nested type hierarchy lies at index 0.
outerNestedTypeNames.add(0, containingType.getName());
Expand Down Expand Up @@ -150,13 +149,13 @@ static Reference parseEnumReference(@Nonnull EnumDescriptor enumDescriptor) {
// EnumDescriptor and Descriptor are sibling types.
List<String> outerNestedTypeNames = new ArrayList<>();
Descriptor containingType = enumDescriptor.getContainingType();
// Handles nesting.
while (containingType != null) {
// Outermost type in the nested type hierarchy lies at index 0.
outerNestedTypeNames.add(0, containingType.getName());
containingType = containingType.getContainingType();
}

// TODO(miraleung): Handle deeper levels of nesting.
String pakkage = getPackage(enumDescriptor.getFile());
Reference enumReference =
VaporReference.builder()
Expand Down