Skip to content

Commit 8ca140c

Browse files
chanseokohchanseokoh
authored
Remove warnings (unused vars, dead code, missing annotations, missing generic reference, etc) (#840)
1 parent d335340 commit 8ca140c

46 files changed

Lines changed: 107 additions & 212 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/com/google/api/generator/engine/ast/AnnotationNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public abstract class AnnotationNode implements AstNode {
2525
public static AnnotationNode DEPRECATED =
2626
AnnotationNode.builder().setType(annotationType(Deprecated.class)).build();
2727

28-
private static TypeNode annotationType(Class clazz) {
28+
private static TypeNode annotationType(Class<?> clazz) {
2929
return TypeNode.withReference(ConcreteReference.withClazz(clazz));
3030
}
3131

‎src/main/java/com/google/api/generator/engine/ast/ArithmeticOperationExpr.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@ public abstract class ArithmeticOperationExpr implements OperationExpr {
2424

2525
public abstract Expr rhsExpr();
2626

27+
@Override
2728
public abstract OperatorKind operatorKind();
2829

30+
@Override
2931
public abstract TypeNode type();
3032

3133
@Override

‎src/main/java/com/google/api/generator/engine/ast/AssignmentOperationExpr.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public abstract class AssignmentOperationExpr implements OperationExpr {
2323

2424
public abstract Expr valueExpr();
2525

26+
@Override
2627
public abstract OperatorKind operatorKind();
2728

2829
@Override

‎src/main/java/com/google/api/generator/engine/ast/BlockComment.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
@AutoValue
2020
public abstract class BlockComment implements Comment {
21+
@Override
2122
public abstract String comment();
2223

2324
@Override

‎src/main/java/com/google/api/generator/engine/ast/ConcreteReference.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ public abstract class ConcreteReference implements Reference {
3232
private static final String RIGHT_ANGLE = ">";
3333
private static final String QUESTION_MARK = "?";
3434

35-
private static final Class WILDCARD_CLAZZ = ReferenceWildcard.class;
35+
private static final Class<?> WILDCARD_CLAZZ = ReferenceWildcard.class;
3636

3737
// Private.
38-
abstract Class clazz();
38+
abstract Class<?> clazz();
3939

4040
@Override
4141
public void accept(AstNodeVisitor visitor) {
@@ -105,7 +105,7 @@ public ImmutableList<String> enclosingClassNames() {
105105
}
106106
// The innermost type will be the last element in the list.
107107
ImmutableList.Builder<String> listBuilder = new ImmutableList.Builder<>();
108-
Class currentClz = clazz();
108+
Class<?> currentClz = clazz();
109109
while (currentClz.getEnclosingClass() != null) {
110110
listBuilder.add(currentClz.getEnclosingClass().getSimpleName());
111111
currentClz = currentClz.getEnclosingClass();
@@ -198,7 +198,7 @@ public Reference copyAndSetGenerics(List<Reference> generics) {
198198
return toBuilder().setGenerics(generics).build();
199199
}
200200

201-
public static ConcreteReference withClazz(Class clazz) {
201+
public static ConcreteReference withClazz(Class<?> clazz) {
202202
return builder().setClazz(clazz).build();
203203
}
204204

@@ -222,7 +222,7 @@ public static Builder builder() {
222222

223223
@AutoValue.Builder
224224
public abstract static class Builder {
225-
public abstract Builder setClazz(Class clazz);
225+
public abstract Builder setClazz(Class<?> clazz);
226226

227227
public abstract Builder setUseFullName(boolean useFullName);
228228

@@ -239,7 +239,7 @@ public Builder setGenerics(Reference... references) {
239239
public abstract ConcreteReference autoBuild();
240240

241241
// Private.
242-
abstract Class clazz();
242+
abstract Class<?> clazz();
243243

244244
abstract ImmutableList<Reference> generics();
245245

‎src/main/java/com/google/api/generator/engine/ast/EnumRefExpr.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
public abstract class EnumRefExpr implements Expr {
2222
public abstract IdentifierNode identifier();
2323

24+
@Override
2425
public abstract TypeNode type();
2526

2627
@Override

‎src/main/java/com/google/api/generator/engine/ast/Expr.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
public interface Expr extends AstNode {
1818
TypeNode type();
1919

20+
@Override
2021
void accept(AstNodeVisitor visitor);
2122
}

‎src/main/java/com/google/api/generator/engine/ast/LogicalOperationExpr.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ public abstract class LogicalOperationExpr implements OperationExpr {
2424

2525
public abstract Expr rhsExpr();
2626

27+
@Override
2728
public abstract OperatorKind operatorKind();
2829

2930
@Override

‎src/main/java/com/google/api/generator/engine/ast/MethodDefinition.java‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,20 +244,18 @@ public MethodDefinition build() {
244244
"Abstract methods cannot be static, final, or private");
245245
}
246246

247-
// If this method overrides another, ensure that the Override annotaiton is the last one.
247+
// If this method overrides another, ensure that the Override annotation is the last one.
248248
ImmutableList<AnnotationNode> processedAnnotations = annotations();
249249
if (isOverride()) {
250250
processedAnnotations =
251-
annotations()
252-
.<AnnotationNode>builder()
251+
ImmutableList.<AnnotationNode>builder()
253252
.addAll(annotations())
254253
.add(AnnotationNode.OVERRIDE)
255254
.build();
256255
}
257256
// Remove duplicates while maintaining insertion order.
258257
setAnnotations(
259-
new LinkedHashSet<AnnotationNode>(processedAnnotations)
260-
.stream().collect(Collectors.toList()));
258+
new LinkedHashSet<>(processedAnnotations).stream().collect(Collectors.toList()));
261259

262260
MethodDefinition method = autoBuild();
263261

‎src/main/java/com/google/api/generator/engine/ast/NewObjectExpr.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
@AutoValue
2525
public abstract class NewObjectExpr implements Expr {
26+
@Override
2627
public abstract TypeNode type();
2728

2829
public abstract ImmutableList<Expr> arguments();

0 commit comments

Comments
 (0)