Update target Java version to 21

cushon · Javac Team · commit 4214fb61a0b3 · 2025-11-12T07:24:18.000-08:00
Also `getFirst()` and `getLast()`

PiperOrigin-RevId: 831378131
diff --git a/java/com/google/turbine/binder/ConstEvaluator.java b/java/com/google/turbine/binder/ConstEvaluator.java
@@ -22,7 +22,6 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
 import com.google.turbine.binder.bound.EnumConstantValue;
 import com.google.turbine.binder.bound.TurbineAnnotationValue;
 import com.google.turbine.binder.bound.TurbineClassValue;
@@ -215,7 +214,7 @@ private ClassSymbol resolveNext(int position, ClassSymbol sym, Ident bit) {
   }
 
   @Nullable FieldInfo resolveField(ConstVarName t) {
-    Ident simpleName = t.name().get(0);
+    Ident simpleName = t.name().getFirst();
     FieldInfo field = lexicalField(env, owner, simpleName);
     if (field != null) {
       return field;
@@ -267,7 +266,7 @@ private ClassSymbol resolveNext(int position, ClassSymbol sym, Ident bit) {
         return null;
       }
     }
-    return Resolve.resolveField(env, origin, sym, Iterables.getLast(result.remaining()));
+    return Resolve.resolveField(env, origin, sym, result.remaining().getLast());
   }
 
   /** Search for constant variables in lexically enclosing scopes. */
@@ -1022,7 +1021,7 @@ AnnoInfo evaluateAnnotation(AnnoInfo info) {
     LookupResult result = scope.lookup(new LookupKey(t.name()));
     if (result == null) {
       log.error(
-          t.name().get(0).position(), ErrorKind.CANNOT_RESOLVE, Joiner.on(".").join(t.name()));
+          t.name().getFirst().position(), ErrorKind.CANNOT_RESOLVE, Joiner.on(".").join(t.name()));
       return null;
     }
     ClassSymbol sym = (ClassSymbol) result.sym();
diff --git a/java/com/google/turbine/binder/DisambiguateTypeAnnotations.java b/java/com/google/turbine/binder/DisambiguateTypeAnnotations.java
@@ -240,7 +240,7 @@ private static Type addAnnotationsToType(Type type, ImmutableList<AnnoInfo> extr
       }
       case CLASS_TY -> {
         ClassTy classTy = (ClassTy) type;
-        SimpleClassTy base = classTy.classes().get(0);
+        SimpleClassTy base = classTy.classes().getFirst();
         SimpleClassTy simple =
             SimpleClassTy.create(base.sym(), base.targs(), appendAnnotations(base.annos(), extra));
         yield Type.ClassTy.create(
diff --git a/java/com/google/turbine/binder/TypeBinder.java b/java/com/google/turbine/binder/TypeBinder.java
@@ -16,7 +16,6 @@
 
 package com.google.turbine.binder;
 
-import static com.google.common.collect.Iterables.getLast;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static java.util.Objects.requireNonNull;
 
@@ -530,7 +529,7 @@ private MethodInfo syntheticConstructor(
     int access = visibility.flag();
     access |= (base.access() & TurbineFlag.ACC_STRICT);
     if (!formals.isEmpty()
-        && (getLast(formals).access() & TurbineFlag.ACC_VARARGS) == TurbineFlag.ACC_VARARGS) {
+        && (formals.getLast().access() & TurbineFlag.ACC_VARARGS) == TurbineFlag.ACC_VARARGS) {
       access |= TurbineFlag.ACC_VARARGS;
     }
     return new MethodInfo(
@@ -934,7 +933,7 @@ private Type bindClassTy(CompoundScope scope, Tree.ClassTy t) {
     // resolve the prefix to a symbol
     LookupResult result = scope.lookup(new LookupKey(names));
     if (result == null || result.sym() == null) {
-      log.error(names.get(0).position(), ErrorKind.CANNOT_RESOLVE, Joiner.on('.').join(names));
+      log.error(names.getFirst().position(), ErrorKind.CANNOT_RESOLVE, Joiner.on('.').join(names));
       return Type.ErrorTy.create(names, bindTyArgs(scope, t.tyargs()));
     }
     Symbol sym = result.sym();
diff --git a/java/com/google/turbine/binder/bytecode/BytecodeBinder.java b/java/com/google/turbine/binder/bytecode/BytecodeBinder.java
@@ -21,7 +21,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
 import com.google.turbine.binder.bound.EnumConstantValue;
 import com.google.turbine.binder.bound.ModuleInfo;
 import com.google.turbine.binder.bound.TurbineAnnotationValue;
@@ -88,7 +87,7 @@ private static Type.ClassTy bindClassTy(
       sb.append(sig.pkg()).append('/');
     }
     boolean first = true;
-    Map<ClassSymbol, Sig.SimpleClassTySig> syms = new LinkedHashMap<>();
+    LinkedHashMap<ClassSymbol, Sig.SimpleClassTySig> syms = new LinkedHashMap<>();
     for (Sig.SimpleClassTySig s : sig.classes()) {
       if (!first) {
         sb.append('$');
@@ -99,7 +98,7 @@ private static Type.ClassTy bindClassTy(
       first = false;
     }
     ArrayDeque<ClassSymbol> outers = new ArrayDeque<>();
-    for (ClassSymbol curr = Iterables.getLast(syms.keySet());
+    for (ClassSymbol curr = syms.sequencedKeySet().getLast();
         curr != null;
         curr = scope.outer(curr)) {
       outers.addFirst(curr);
diff --git a/java/com/google/turbine/binder/lookup/ImportIndex.java b/java/com/google/turbine/binder/lookup/ImportIndex.java
@@ -16,8 +16,6 @@
 
 package com.google.turbine.binder.lookup;
 
-import static com.google.common.collect.Iterables.getLast;
-
 import com.google.common.base.Joiner;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
@@ -66,7 +64,7 @@ public static ImportIndex create(
         continue;
       }
       thunks.put(
-          getLast(i.type()).value(),
+          i.type().getLast().value(),
           Suppliers.memoize(
               new Supplier<@Nullable ImportScope>() {
                 @Override
@@ -81,7 +79,7 @@ public static ImportIndex create(
       if (!i.stat() || i.wild()) {
         continue;
       }
-      String last = getLast(i.type()).value();
+      String last = i.type().getLast().value();
       thunks.putIfAbsent(
           last,
           Suppliers.memoize(
diff --git a/java/com/google/turbine/binder/lookup/LookupKey.java b/java/com/google/turbine/binder/lookup/LookupKey.java
@@ -35,7 +35,7 @@ public LookupKey(ImmutableList<Ident> simpleNames) {
 
   /** The first simple name in the qualified type name. */
   public Ident first() {
-    return simpleNames.get(0);
+    return simpleNames.getFirst();
   }
 
   boolean hasNext() {
diff --git a/java/com/google/turbine/binder/lookup/MemberImportIndex.java b/java/com/google/turbine/binder/lookup/MemberImportIndex.java
@@ -16,8 +16,6 @@
 
 package com.google.turbine.binder.lookup;
 
-import static com.google.common.collect.Iterables.getLast;
-
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
@@ -69,7 +67,7 @@ public MemberImportIndex(
                 }));
       } else {
         cache.put(
-            getLast(i.type()).value(),
+            i.type().getLast().value(),
             Suppliers.memoize(
                 new Supplier<@Nullable ClassSymbol>() {
                   @Override
diff --git a/java/com/google/turbine/processing/TurbineAnnotationMirror.java b/java/com/google/turbine/processing/TurbineAnnotationMirror.java
@@ -17,7 +17,6 @@
 package com.google.turbine.processing;
 
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.collect.Iterables.getLast;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Joiner;
@@ -86,7 +85,7 @@ public DeclaredType get() {
                 if (anno.sym() == null) {
                   return (ErrorType)
                       factory.asTypeMirror(
-                          ErrorTy.create(getLast(anno.tree().name()).value(), ImmutableList.of()));
+                          ErrorTy.create(anno.tree().name().getLast().value(), ImmutableList.of()));
                 }
                 return (DeclaredType) factory.typeElement(anno.sym()).asType();
               }
diff --git a/java/com/google/turbine/processing/TurbineTypeMirror.java b/java/com/google/turbine/processing/TurbineTypeMirror.java
@@ -16,7 +16,6 @@
 
 package com.google.turbine.processing;
 
-import static com.google.common.collect.Iterables.getLast;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Joiner;
@@ -211,7 +210,7 @@ public TypeMirror getEnclosingType() {
             new Supplier<ImmutableList<TypeMirror>>() {
               @Override
               public ImmutableList<TypeMirror> get() {
-                return factory.asTypeMirrors(getLast(type.classes()).targs());
+                return factory.asTypeMirrors(type.classes().getLast().targs());
               }
             });
 
@@ -236,7 +235,7 @@ public ClassTy type() {
 
     @Override
     protected ImmutableList<AnnoInfo> annos() {
-      return getLast(type.classes()).annos();
+      return type.classes().getLast().annos();
     }
   }
 
diff --git a/java/com/google/turbine/processing/TurbineTypes.java b/java/com/google/turbine/processing/TurbineTypes.java
@@ -205,7 +205,7 @@ private static boolean implicitObjectBound(ModelFactory factory, ImmutableList<T
     if (bounds.isEmpty()) {
       return true;
     }
-    Type bound = bounds.get(0);
+    Type bound = bounds.getFirst();
     return switch (bound.tyKind()) {
       case TY_VAR -> false;
       case CLASS_TY ->
@@ -441,7 +441,7 @@ private boolean isClassSubtype(ClassTy a, Type other, boolean strict) {
       }
       // perform repeated type substitution to get an instance of B with the type arguments
       // provided by A
-      a = path.get(0);
+      a = path.getFirst();
       for (ClassTy ty : path) {
         ImmutableMap<TyVarSymbol, Type> mapping = getMapping(ty);
         if (mapping == null) {
diff --git a/java/com/google/turbine/type/Type.java b/java/com/google/turbine/type/Type.java
@@ -16,7 +16,6 @@
 
 package com.google.turbine.type;
 
-import static com.google.common.collect.Iterables.getLast;
 import static java.lang.Math.max;
 import static java.util.Objects.requireNonNull;
 
@@ -25,7 +24,6 @@
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Iterables;
 import com.google.turbine.binder.sym.ClassSymbol;
 import com.google.turbine.binder.sym.TyVarSymbol;
 import com.google.turbine.model.TurbineConstantTypeKind;
@@ -137,7 +135,7 @@ public TyKind tyKind() {
 
     /** The class symbol. */
     public ClassSymbol sym() {
-      return getLast(classes()).sym();
+      return classes().getLast().sym();
     }
 
     @Override
@@ -199,7 +197,7 @@ public static SimpleClassTy create(
     @Memoized
     @Override
     public int hashCode() {
-      return Iterables.getLast(classes()).hashCode();
+      return classes().getLast().hashCode();
     }
 
     @Override
diff --git a/java/com/google/turbine/types/Canonicalize.java b/java/com/google/turbine/types/Canonicalize.java
@@ -118,7 +118,8 @@ private ClassTy canon(ClassSymbol base, ClassTy ty) {
     // if the first name is a simple name resolved inside a nested class, add explicit qualifiers
     // for the enclosing declarations
     Iterator<ClassTy.SimpleClassTy> it = ty.classes().iterator();
-    Collection<ClassTy.SimpleClassTy> lexicalBase = lexicalBase(ty.classes().get(0).sym(), base);
+    Collection<ClassTy.SimpleClassTy> lexicalBase =
+        lexicalBase(ty.classes().getFirst().sym(), base);
     ClassTy canon =
         !lexicalBase.isEmpty()
             ? ClassTy.create(lexicalBase)
diff --git a/java/com/google/turbine/types/Erasure.java b/java/com/google/turbine/types/Erasure.java
@@ -55,7 +55,7 @@ private static ImmutableList<Type> erase(
 
   private static Type eraseIntersectionTy(
       IntersectionTy ty, Function<TyVarSymbol, TyVarInfo> tenv) {
-    return ty.bounds().isEmpty() ? ClassTy.OBJECT : erase(ty.bounds().get(0), tenv);
+    return ty.bounds().isEmpty() ? ClassTy.OBJECT : erase(ty.bounds().getFirst(), tenv);
   }
 
   private static Type eraseTyVar(TyVar ty, Function<TyVarSymbol, TyVarInfo> tenv) {
diff --git a/javatests/com/google/turbine/binder/ClassPathBinderTest.java b/javatests/com/google/turbine/binder/ClassPathBinderTest.java
@@ -17,7 +17,6 @@
 package com.google.turbine.binder;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.common.collect.Iterables.getLast;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.truth.Truth.assertThat;
@@ -178,7 +177,7 @@ public void interfaces() {
             c.interfaceTypes().stream()
                 .filter(i -> ((ClassTy) i).sym().equals(new ClassSymbol("java/util/List")))
                 .collect(onlyElement());
-    assertThat(getLast(listInterface.classes()).targs()).hasSize(1);
+    assertThat(listInterface.classes().getLast().targs()).hasSize(1);
   }
 
   @Test
diff --git a/javatests/com/google/turbine/binder/bytecode/BytecodeBoundClassTest.java b/javatests/com/google/turbine/binder/bytecode/BytecodeBoundClassTest.java
@@ -16,14 +16,12 @@
 
 package com.google.turbine.binder.bytecode;
 
-import static com.google.common.collect.Iterables.getLast;
 import static com.google.common.collect.Iterables.getOnlyElement;
 import static com.google.common.collect.MoreCollectors.onlyElement;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.turbine.testing.TestClassPaths.TURBINE_BOOTCLASSPATH;
 import static java.util.Objects.requireNonNull;
 
-import com.google.common.collect.Iterables;
 import com.google.turbine.binder.bound.TurbineClassValue;
 import com.google.turbine.binder.bound.TypeBoundClass;
 import com.google.turbine.binder.bound.TypeBoundClass.FieldInfo;
@@ -64,21 +62,24 @@ public void interfaceTypes() {
     assertThat(noInterfaces.interfaceTypes()).isEmpty();
 
     assertThat(rawInterfaces.interfaceTypes()).hasSize(1);
-    assertThat(((ClassTy) rawInterfaces.interfaceTypes().get(0)).sym())
+    assertThat(((ClassTy) rawInterfaces.interfaceTypes().getFirst()).sym())
         .isEqualTo(new ClassSymbol("java/io/Serializable"));
-    assertThat(getLast(((ClassTy) rawInterfaces.interfaceTypes().get(0)).classes()).targs())
+    assertThat(((ClassTy) rawInterfaces.interfaceTypes().getFirst()).classes().getLast().targs())
         .isEmpty();
 
     assertThat(genericInterfaces.interfaceTypes()).hasSize(1);
-    assertThat(((ClassTy) genericInterfaces.interfaceTypes().get(0)).sym())
+    assertThat(((ClassTy) genericInterfaces.interfaceTypes().getFirst()).sym())
         .isEqualTo(new ClassSymbol("java/util/List"));
-    assertThat(getLast(((ClassTy) genericInterfaces.interfaceTypes().get(0)).classes()).targs())
+    assertThat(
+            ((ClassTy) genericInterfaces.interfaceTypes().getFirst()).classes().getLast().targs())
         .hasSize(1);
     assertThat(
             ((ClassTy)
-                    getLast(((ClassTy) genericInterfaces.interfaceTypes().get(0)).classes())
+                    ((ClassTy) genericInterfaces.interfaceTypes().getFirst())
+                        .classes()
+                        .getLast()
                         .targs()
-                        .get(0))
+                        .getFirst())
                 .sym())
         .isEqualTo(new ClassSymbol("java/lang/String"));
   }
@@ -104,8 +105,8 @@ public void methodTypes() {
             .collect(onlyElement());
 
     assertThat(m.tyParams()).hasSize(3);
-    assertThat(m.parameters().get(0).annotations()).hasSize(1);
-    assertThat(m.parameters().get(0).name()).isEqualTo("bar");
+    assertThat(m.parameters().getFirst().annotations()).hasSize(1);
+    assertThat(m.parameters().getFirst().name()).isEqualTo("bar");
     assertThat(m.exceptions()).hasSize(2);
 
     MethodInfo b =
@@ -126,7 +127,7 @@ public void voidAnno() {
     BytecodeBoundClass c = getBytecodeBoundClass(VoidAnno.class);
 
     assertThat(c.methods()).hasSize(2);
-    assertThat(((TurbineClassValue) c.methods().get(0).defaultValue()).type().tyKind())
+    assertThat(((TurbineClassValue) c.methods().getFirst().defaultValue()).type().tyKind())
         .isEqualTo(Type.TyKind.VOID_TY);
     assertThat(((TurbineClassValue) c.methods().get(1).defaultValue()).type().tyKind())
         .isEqualTo(Type.TyKind.ARRAY_TY);
@@ -143,7 +144,7 @@ public void fieldTypes() {
             .filter(x -> x.name().equals("foo"))
             .collect(onlyElement());
 
-    assertThat(Iterables.getLast(((ClassTy) f.type()).classes()).targs()).hasSize(1);
+    assertThat(((ClassTy) f.type()).classes().getLast().targs()).hasSize(1);
     assertThat(f.annotations()).hasSize(1);
   }
 
diff --git a/javatests/com/google/turbine/bytecode/ClassReaderTest.java b/javatests/com/google/turbine/bytecode/ClassReaderTest.java
diff --git a/javatests/com/google/turbine/parse/CommentParserTest.java b/javatests/com/google/turbine/parse/CommentParserTest.java
diff --git a/javatests/com/google/turbine/parse/ParserIntegrationTest.java b/javatests/com/google/turbine/parse/ParserIntegrationTest.java
diff --git a/javatests/com/google/turbine/processing/AbstractTurbineTypesTest.java b/javatests/com/google/turbine/processing/AbstractTurbineTypesTest.java
diff --git a/javatests/com/google/turbine/processing/ProcessingIntegrationTest.java b/javatests/com/google/turbine/processing/ProcessingIntegrationTest.java
diff --git a/javatests/com/google/turbine/processing/TurbineElementTest.java b/javatests/com/google/turbine/processing/TurbineElementTest.java
diff --git a/pom.xml b/pom.xml

Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ private static Type addAnnotationsToType(Type type, ImmutableList<AnnoInfo> extr`
`240`	`240`	`}`
`241`	`241`	`case CLASS_TY -> {`
`242`	`242`	`ClassTy classTy = (ClassTy) type;`
`243`		`- SimpleClassTy base = classTy.classes().get(0);`
	`243`	`+ SimpleClassTy base = classTy.classes().getFirst();`
`244`	`244`	`SimpleClassTy simple =`
`245`	`245`	`SimpleClassTy.create(base.sym(), base.targs(), appendAnnotations(base.annos(), extra));`
`246`	`246`	`yield Type.ClassTy.create(`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public LookupKey(ImmutableList<Ident> simpleNames) {`
`35`	`35`
`36`	`36`	`/** The first simple name in the qualified type name. */`
`37`	`37`	`public Ident first() {`
`38`		`- return simpleNames.get(0);`
	`38`	`+ return simpleNames.getFirst();`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`boolean hasNext() {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`package com.google.turbine.processing;`
`18`	`18`
`19`	`19`	`import static com.google.common.base.Preconditions.checkState;`
`20`		`-import static com.google.common.collect.Iterables.getLast;`
`21`	`20`	`import static java.util.Objects.requireNonNull;`
`22`	`21`
`23`	`22`	`import com.google.common.base.Joiner;`
`@@ -86,7 +85,7 @@ public DeclaredType get() {`
`86`	`85`	`if (anno.sym() == null) {`
`87`	`86`	`return (ErrorType)`
`88`	`87`	`factory.asTypeMirror(`
`89`		`- ErrorTy.create(getLast(anno.tree().name()).value(), ImmutableList.of()));`
	`88`	`+ ErrorTy.create(anno.tree().name().getLast().value(), ImmutableList.of()));`
`90`	`89`	`}`
`91`	`90`	`return (DeclaredType) factory.typeElement(anno.sym()).asType();`
`92`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`package com.google.turbine.processing;`
`18`	`18`
`19`		`-import static com.google.common.collect.Iterables.getLast;`
`20`	`19`	`import static java.util.Objects.requireNonNull;`
`21`	`20`
`22`	`21`	`import com.google.common.base.Joiner;`
`@@ -211,7 +210,7 @@ public TypeMirror getEnclosingType() {`
`211`	`210`	`new Supplier<ImmutableList<TypeMirror>>() {`
`212`	`211`	`@Override`
`213`	`212`	`public ImmutableList<TypeMirror> get() {`
`214`		`- return factory.asTypeMirrors(getLast(type.classes()).targs());`
	`213`	`+ return factory.asTypeMirrors(type.classes().getLast().targs());`
`215`	`214`	`}`
`216`	`215`	`});`
`217`	`216`
`@@ -236,7 +235,7 @@ public ClassTy type() {`
`236`	`235`
`237`	`236`	`@Override`
`238`	`237`	`protected ImmutableList<AnnoInfo> annos() {`
`239`		`- return getLast(type.classes()).annos();`
	`238`	`+ return type.classes().getLast().annos();`
`240`	`239`	`}`
`241`	`240`	`}`
`242`	`241`