Skip to content

Commit 843990f

Browse files
committed
fix: make Version and its variable package private
1 parent abb8dde commit 843990f

17 files changed

Lines changed: 15 additions & 43 deletions

File tree

gapic-generator-java/src/main/java/com/google/api/generator/engine/ast/ClassDefinition.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ public ClassDefinition build() {
203203
expr instanceof AssignmentExpr,
204204
"Class expression statement must be assignment or variable declaration");
205205
VariableExpr variableExpr = ((AssignmentExpr) expr).variableExpr();
206-
Preconditions.checkState(
207-
!variableExpr.scope().equals(ScopeNode.LOCAL),
208-
"Class variable in assignment statement cannot have a local scope");
209206
}
210207
}
211208
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public GapicClass generate(GapicContext context, Service service) {
5959
.setVariableExpr(
6060
versionVarExpr.toBuilder()
6161
.setIsDecl(true)
62-
.setScope(ScopeNode.PUBLIC)
62+
.setScope(ScopeNode.LOCAL)
6363
.setIsStatic(true)
6464
.setIsFinal(true)
6565
.build())

gapic-generator-java/src/test/java/com/google/api/generator/engine/ast/ClassDefinitionTest.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -293,31 +293,6 @@ void invalidClassDefinition_extendsImplementsSameType() {
293293
});
294294
}
295295

296-
@Test
297-
void invalidClassDefinition_assignmentWithUnscopedVariableExprStatement() {
298-
Variable variable = createVariable("x", TypeNode.INT);
299-
VariableExpr variableExpr =
300-
VariableExpr.builder().setVariable(variable).setIsDecl(true).build();
301-
302-
Variable anotherVariable = createVariable("y", TypeNode.INT);
303-
Expr valueExpr = VariableExpr.builder().setVariable(anotherVariable).build();
304-
305-
AssignmentExpr assignmentExpr =
306-
AssignmentExpr.builder().setVariableExpr(variableExpr).setValueExpr(valueExpr).build();
307-
308-
List<Statement> statements = Arrays.asList(ExprStatement.withExpr(assignmentExpr));
309-
assertThrows(
310-
IllegalStateException.class,
311-
() -> {
312-
ClassDefinition.builder()
313-
.setPackageString("com.google.example.library.v1.stub")
314-
.setName("LibraryServiceStub")
315-
.setScope(ScopeNode.PUBLIC)
316-
.setStatements(statements)
317-
.build();
318-
});
319-
}
320-
321296
@Test
322297
void invalidClassDefinition_unscopedVariableExprStatement() {
323298
List<Statement> statements =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import com.google.api.core.InternalApi;
55
@InternalApi("For internal use only")
66
final class Version {
77
// {x-version-update-start:gapic-showcase:current}
8-
public static final String VERSION = "0.0.0-SNAPSHOT";
8+
static final String VERSION = "0.0.0-SNAPSHOT";
99
// {x-version-update-end}
1010

1111
}

java-showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@InternalApi("For internal use only")
2222
final class Version {
2323
// {x-version-update-start:gapic-showcase:current}
24-
public static final String VERSION = "0.0.0-SNAPSHOT";
24+
static final String VERSION = "0.0.0-SNAPSHOT";
2525
// {x-version-update-end}
2626

2727
}

test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@InternalApi("For internal use only")
2222
final class Version {
2323
// {x-version-update-start:null:current}
24-
public static final String VERSION = "0.0.0-SNAPSHOT";
24+
static final String VERSION = "0.0.0-SNAPSHOT";
2525
// {x-version-update-end}
2626

2727
}

test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@InternalApi("For internal use only")
2222
final class Version {
2323
// {x-version-update-start:null:current}
24-
public static final String VERSION = "0.0.0-SNAPSHOT";
24+
static final String VERSION = "0.0.0-SNAPSHOT";
2525
// {x-version-update-end}
2626

2727
}

test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@InternalApi("For internal use only")
2222
final class Version {
2323
// {x-version-update-start:null:current}
24-
public static final String VERSION = "0.0.0-SNAPSHOT";
24+
static final String VERSION = "0.0.0-SNAPSHOT";
2525
// {x-version-update-end}
2626

2727
}

test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@InternalApi("For internal use only")
2222
final class Version {
2323
// {x-version-update-start:null:current}
24-
public static final String VERSION = "0.0.0-SNAPSHOT";
24+
static final String VERSION = "0.0.0-SNAPSHOT";
2525
// {x-version-update-end}
2626

2727
}

test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
@InternalApi("For internal use only")
2222
final class Version {
2323
// {x-version-update-start:null:current}
24-
public static final String VERSION = "0.0.0-SNAPSHOT";
24+
static final String VERSION = "0.0.0-SNAPSHOT";
2525
// {x-version-update-end}
2626

2727
}

0 commit comments

Comments
 (0)