foo

apache · Oct 13, 2024 · 1957eea · 1957eea
1 parent 3c2cc55
commit 1957eea
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 20 deletions.
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/AutoValueSchemaTest.java
@@ -891,14 +891,14 @@ public void testSchema_SchemaFieldDescription() throws NoSuchSchemaException {
 
  @AutoValue
  @DefaultSchema(AutoValueSchema.class)
- abstract static class ParameterizedAutoValue<T, ST, VT, MT> {
- abstract VT getValue1();
+ abstract static class ParameterizedAutoValue<T, V, W, X> {
+ abstract W getValue1();
 
  abstract T getValue2();
 
- abstract ST getValue3();
+ abstract V getValue3();
 
- abstract MT getValue4();
+ abstract X getValue4();
  }
 
  @Test

diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/TestJavaBeans.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/TestJavaBeans.java
@@ -1399,17 +1399,17 @@ public void setValue(@Nullable Float value) {
  .build();
 
  @DefaultSchema(JavaBeanSchema.class)
- public static class SimpleParameterizedBean<T, ST, VT, MT> {
- @Nullable private VT value1;
+ public static class SimpleParameterizedBean<T, V, W, X> {
+ @Nullable private W value1;
  @Nullable private T value2;
- @Nullable private ST value3;
- @Nullable private MT value4;
+ @Nullable private V value3;
+ @Nullable private X value4;
 
- public VT getValue1() {
+ public W getValue1() {
  return value1;
  }
 
- public void setValue1(VT value1) {
+ public void setValue1(W value1) {
  this.value1 = value1;
  }
 
@@ -1421,19 +1421,19 @@ public void setValue2(T value2) {
  this.value2 = value2;
  }
 
- public ST getValue3() {
+ public V getValue3() {
  return value3;
  }
 
- public void setValue3(ST value3) {
+ public void setValue3(V value3) {
  this.value3 = value3;
  }
 
- public MT getValue4() {
+ public X getValue4() {
  return value4;
  }
 
- public void setValue4(MT value4) {
+ public void setValue4(X value4) {
  this.value4 = value4;
  }
  }

diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/TestPOJOs.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/schemas/utils/TestPOJOs.java
@@ -496,15 +496,15 @@ public int hashCode() {
  .build();
 
  @DefaultSchema(JavaFieldSchema.class)
- public static class SimpleParameterizedPOJO<T, ST, VT, MT> {
- public VT value1;
+ public static class SimpleParameterizedPOJO<T, V, W, X> {
+ public W value1;
  public T value2;
- public ST value3;
- public MT value4;
+ public V value3;
+ public X value4;
 
  public SimpleParameterizedPOJO() {}
 
- public SimpleParameterizedPOJO(VT value1, T value2, ST value3, MT value4) {
+ public SimpleParameterizedPOJO(W value1, T value2, V value3, X value4) {
  this.value1 = value1;
  this.value2 = value2;
  this.value3 = value3;
@@ -599,7 +599,9 @@ public NestedParameterizedPOJO(T nested) {
 
  @Override
  public boolean equals(Object o) {
- if (this == o) return true;
+ if (this == o) {
+ return true;
+ }
  if (!(o instanceof NestedParameterizedPOJO)) {
  return false;
  }