Adopt java 11 in guice builds

Use `var` in a few places to prove it out.

PiperOrigin-RevId: 715002121

BUILD

@@ -33,7 +33,7 @@ javadoc_library(
     ],
     doctitle = "Guice Dependency Injection API",
     external_javadoc_links = [
-        "https://docs.oracle.com/javase/8/docs/api/",
+        "https://docs.oracle.com/javase/11/docs/api/",
         "https://guava.dev/releases/snapshot-jre/api/docs/",
         "https://google.github.io/truth/api/latest/",
         "http://errorprone.info/api/latest/",

build_defs.bzl

@@ -16,9 +16,9 @@
 JAVAC_OPTS = [
     "-Xdoclint:html,syntax",
     "-source",
-    "1.8",
+    "11",
     "-target",
-    "1.8",
+    "11",
 ]
 
 POM_VERSION = "${project.version}"

core/src/com/google/inject/internal/InjectorImpl.java

@@ -150,7 +150,7 @@ enum JitLimitation {
   @Override
   public <T> List<Binding<T>> findBindingsByType(TypeLiteral<T> type) {
     @SuppressWarnings("unchecked") // safe because we only put matching entries into the map
-    List<Binding<T>> list =
+    var list =
         (List<Binding<T>>)
             (List) bindingData.getIndexedExplicitBindings().get(checkNotNull(type, "type"));
     return Collections.unmodifiableList(list);
@@ -161,7 +161,7 @@ public <T> List<Binding<T>> findBindingsByType(TypeLiteral<T> type) {
   public <T> BindingImpl<T> getBinding(Key<T> key) {
     Errors errors = new Errors(checkNotNull(key, "key"));
     try {
-      BindingImpl<T> result = getBindingOrThrow(key, errors, JitLimitation.EXISTING_JIT);
+      var result = getBindingOrThrow(key, errors, JitLimitation.EXISTING_JIT);
       errors.throwConfigurationExceptionIfErrorsExist();
       return result;
     } catch (ErrorsException e) {
@@ -175,15 +175,14 @@ public <T> BindingImpl<T> getBinding(Key<T> key) {
   @Override
   public <T> BindingImpl<T> getExistingBinding(Key<T> key) {
     // Check explicit bindings, i.e. bindings created by modules.
-    BindingImpl<T> explicitBinding = bindingData.getExplicitBinding(checkNotNull(key, "key"));
+    var explicitBinding = bindingData.getExplicitBinding(checkNotNull(key, "key"));
     if (explicitBinding != null) {
       return explicitBinding;
     }
     synchronized (jitBindingData.lock()) {
       // See if any jit bindings have been created for this key.
       for (InjectorImpl injector = this; injector != null; injector = injector.parent) {
-        @SuppressWarnings("unchecked")
-        BindingImpl<T> jitBinding = (BindingImpl<T>) injector.jitBindingData.getJitBinding(key);
+        var jitBinding = injector.jitBindingData.getJitBinding(key);
         if (jitBinding != null) {
           return jitBinding;
         }
@@ -196,7 +195,7 @@ public <T> BindingImpl<T> getExistingBinding(Key<T> key) {
       try {
         // This is safe because isProvider above ensures that T is a Provider<?>
         @SuppressWarnings("unchecked")
-        Key<?> providedKey = (Key<?>) getProvidedKey((Key) key, new Errors());
+        var providedKey = (Key<?>) getProvidedKey((Key) key, new Errors());
         if (getExistingBinding(providedKey) != null) {
           return getBinding(key);
         }
@@ -268,8 +267,8 @@ private <T> BindingImpl<T> getJustInTimeBinding(Key<T> key, Errors errors, JitLi
     synchronized (jitBindingData.lock()) {
       // first try to find a JIT binding that we've already created
       for (InjectorImpl injector = this; injector != null; injector = injector.parent) {
-        @SuppressWarnings("unchecked") // we only store bindings that match their key
-        BindingImpl<T> binding = (BindingImpl<T>) injector.jitBindingData.getJitBinding(key);
+
+        var binding = injector.jitBindingData.getJitBinding(key);
 
         if (binding != null) {
           // If we found a JIT binding and we don't allow them,
@@ -634,7 +633,7 @@ private boolean cleanup(BindingImpl<?> binding, Set<Key<?>> encountered) {
       Key<?> depKey = dep.getKey();
       InjectionPoint ip = dep.getInjectionPoint();
       if (encountered.add(depKey)) { // only check if we haven't looked at this key yet
-        BindingImpl<?> depBinding = jitBindingData.getJitBinding(depKey);
+        var depBinding = jitBindingData.getJitBinding(depKey);
         if (depBinding != null) { // if the binding still exists, validate
           boolean failed = cleanup(depBinding, encountered); // if children fail, we fail
           if (depBinding instanceof ConstructorBindingImpl) {

core/src/com/google/inject/internal/InjectorJitBindingData.java

@@ -45,11 +45,13 @@ Map<Key<?>, BindingImpl<?>> getJitBindings() {
     return Collections.unmodifiableMap(jitBindings);
   }
 
-  BindingImpl<?> getJitBinding(Key<?> key) {
-    return jitBindings.get(key);
+  <T> BindingImpl<T> getJitBinding(Key<T> key) {
+    @SuppressWarnings("unchecked") // safe because putJitBinding maintains this relationship
+    BindingImpl<T> binding = (BindingImpl<T>) jitBindings.get(key);
+    return binding;
   }
 
-  void putJitBinding(Key<?> key, BindingImpl<?> binding) {
+  <T> void putJitBinding(Key<T> key, BindingImpl<T> binding) {
     jitBindings.put(key, binding);
   }
 

core/src/com/google/inject/internal/aop/AbstractGlueGenerator.java

@@ -142,8 +142,11 @@ private static Function<String, BiFunction<Object, Object[], Object>> bindSignat
       return signature -> {
         try {
           // pass this signature's index into the table function to retrieve the invoker
-          return (BiFunction<Object, Object[], Object>)
-              invokerTable.invokeExact(signatureTable.applyAsInt(signature));
+          @SuppressWarnings("unchecked")
+          var invoker =
+              (BiFunction<Object, Object[], Object>)
+                  invokerTable.invokeExact(signatureTable.applyAsInt(signature));
+          return invoker;
         } catch (Throwable e) {
           throw asIfUnchecked(e);
         }

core/src/com/google/inject/internal/aop/AnonymousClassDefiner.java

@@ -23,6 +23,7 @@
  *
  * @author [email protected] (Stuart McCulloch)
  */
+@SuppressWarnings("SunApi")
 final class AnonymousClassDefiner implements ClassDefiner {
 
   private static final sun.misc.Unsafe THE_UNSAFE;

core/src/com/google/inject/internal/aop/HiddenClassDefiner.java

@@ -26,6 +26,7 @@
  *
  * @author [email protected] (Stuart McCulloch)
  */
+@SuppressWarnings("SunApi")
 final class HiddenClassDefiner implements ClassDefiner {
 
   private static final sun.misc.Unsafe THE_UNSAFE;

core/src/com/google/inject/internal/aop/UnsafeGetter.java

@@ -16,6 +16,7 @@
 
 package com.google.inject.internal.aop;
 
+@SuppressWarnings("SunApi")
 final class UnsafeGetter {
 
   private UnsafeGetter() {}

examples/guice-demo/pom.xml

@@ -14,8 +14,8 @@
   <properties>
     <guice.version>5.1.0</guice.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <dependencies>

pom-template.xml

@@ -30,7 +30,7 @@ See the Apache License Version 2.0 for the specific language governing permissio
 
 
   <description>
-    Guice is a lightweight dependency injection framework for Java 8 and above
+    Guice is a lightweight dependency injection framework for Java 11 and above
   </description>
 
   <url>https://github.com/google/guice</url>

tools/OsgiWrapper.java

@@ -33,7 +33,7 @@ public final class OsgiWrapper implements Callable<Integer> {
           .collect(Collectors.joining(","));
 
   private static final String DESCRIPTION =
-      "Guice is a lightweight dependency injection framework for Java 8 and above";
+      "Guice is a lightweight dependency injection framework for Java 11 and above";
 
   private static final String COPYRIGHT = "Copyright (C) 2022 Google Inc.";