Refactor: Use lambda expressions and Character.valueOf.

PiperOrigin-RevId: 862378286
Change-Id: I140e95ffda132265f442bc1d222c587331e367d6

Author: ludoch

api/src/main/java/com/google/appengine/api/datastore/BaseQueryResultsSource.java

@@ -129,13 +129,7 @@ public BaseQueryResultsSource(
     this.offset = fetchOptions.getOffset() != null ? fetchOptions.getOffset() : 0;
     this.txn = txn;
     this.query = query;
-    this.currentTransactionProvider =
-        new CurrentTransactionProvider() {
-          @Override
-          public Transaction getCurrentTransaction(Transaction defaultValue) {
-            return txn;
-          }
-        };
+    this.currentTransactionProvider = defaultValue -> txn;
     this.initialQueryResultFuture = initialQueryResultFuture;
     this.skippedResults = 0;
   }

api/src/main/java/com/google/appengine/api/datastore/DatastoreCallbacksImpl.java

@@ -336,22 +336,19 @@ private static Object newInstance(Class<?> cls) {
   }
 
   private Callback allocateCallback(final Object callbackImplementor, final Method callbackMethod) {
-    return new Callback() {
-      @Override
-      public void run(CallbackContext<?> context) {
-        try {
-          callbackMethod.invoke(callbackImplementor, context);
-        } catch (IllegalAccessException e) {
-          // shouldn't happen since we made the method accessible
-          throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-          // TODO: Check whether it is possible for this to be null
-          if (e.getCause() != null) {
-            throwIfUnchecked(e.getCause());
-          }
-          // Should not happen since we don't allow checked exceptions.
-          throw new RuntimeException("Callback method threw a checked exception.", e.getCause());
+    return context -> {
+      try {
+        callbackMethod.invoke(callbackImplementor, context);
+      } catch (IllegalAccessException e) {
+        // shouldn't happen since we made the method accessible
+        throw new RuntimeException(e);
+      } catch (InvocationTargetException e) {
+        // TODO: Check whether it is possible for this to be null
+        if (e.getCause() != null) {
+          throwIfUnchecked(e.getCause());
         }
+        // Should not happen since we don't allow checked exceptions.
+        throw new RuntimeException("Callback method threw a checked exception.", e.getCause());
       }
     };
   }

api/src/main/java/com/google/appengine/api/datastore/DatastoreConfig.java

@@ -39,10 +39,5 @@ public interface DatastoreConfig {
    */
   @Deprecated
   DatastoreConfig DEFAULT =
-      new DatastoreConfig() {
-        @Override
-        public ImplicitTransactionManagementPolicy getImplicitTransactionManagementPolicy() {
-          return ImplicitTransactionManagementPolicy.NONE;
-        }
-      };
+      () -> ImplicitTransactionManagementPolicy.NONE;
 }

api/src/main/java/com/google/appengine/api/memcache/AsyncMemcacheServiceImpl.java

@@ -234,35 +234,15 @@ public int hashCode() {
   private static class DefaultValueProviders {
 
     @SuppressWarnings("rawtypes")
-    private static final Provider NULL_PROVIDER = new Provider() {
-          @Override public Object get() {
-            return null;
-          }
-        };
+    private static final Provider NULL_PROVIDER = () -> null;
 
-    private static final Provider<Boolean> FALSE_PROVIDER = new Provider<Boolean>() {
-          @Override public Boolean get() {
-            return Boolean.FALSE;
-          }
-        };
+    private static final Provider<Boolean> FALSE_PROVIDER = () -> Boolean.FALSE;
 
     @SuppressWarnings("rawtypes")
-    private static final Provider SET_PROVIDER =
-        new Provider<Set<?>>() {
-          @Override
-          public Set<?> get() {
-            return new HashSet<>(0, 1);
-          }
-        };
+    private static final Provider SET_PROVIDER = () -> new HashSet<>(0, 1);
 
     @SuppressWarnings("rawtypes")
-    private static final Provider MAP_PROVIDER =
-        new Provider<Map<?, ?>>() {
-          @Override
-          public Map<?, ?> get() {
-            return new HashMap<>(0, 1);
-          }
-        };
+    private static final Provider MAP_PROVIDER = () -> new HashMap<>(0, 1);
 
     private static final Provider<Stats> STATS_PROVIDER = new Provider<Stats>() {
           final Stats emptyStats =  new AsyncMemcacheServiceImpl.StatsImpl(null);

api/src/main/java/com/google/appengine/api/utils/SystemProperty.java

@@ -42,6 +42,7 @@ public class SystemProperty {
    * {@code "com.google.appengine.runtime.environment"}.
    * Has the values {@code "Production"} and {@code "Development"}.
    */
+  @SuppressWarnings("ClassInitializationDeadlock")
   public static final Environment environment = new Environment();
 
   /**

api/src/main/java/com/google/appengine/setup/RequestThreadFactory.java

@@ -61,17 +61,14 @@ public RequestThreadFactory(Environment requestEnvironment) {
     public Thread newThread(final Runnable runnable) {
         checkState(requestEnvironment != null,
                 "Request threads can only be created within the context of a running request.");
-        Thread thread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                if (runnable == null) {
-                    return;
-                }
-                checkState(allowNewRequestThreadCreation,
-                        "Cannot start new threads after the request thread stops.");
-                ApiProxy.setEnvironmentForCurrentThread(requestEnvironment);
-                runnable.run();
+        Thread thread = new Thread(() -> {
+            if (runnable == null) {
+                return;
             }
+            checkState(allowNewRequestThreadCreation,
+                    "Cannot start new threads after the request thread stops.");
+            ApiProxy.setEnvironmentForCurrentThread(requestEnvironment);
+            runnable.run();
         });
         checkState(
                 allowNewRequestThreadCreation, "Cannot create new threads after the request thread stops.");

api_dev/src/main/java/com/google/appengine/api/search/dev/PrefixFieldAnalyzerUtil.java

@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Locale;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.apache.lucene.analysis.LetterTokenizer;
@@ -43,7 +44,9 @@ final class PrefixFieldAnalyzerUtil {
 
   static String normalizePrefixField(String value) {
     String normalizedString = Normalizer.normalize(value, Normalizer.Form.NFKC);
-    return CharMatcher.whitespace().trimAndCollapseFrom(normalizedString, ' ').toLowerCase();
+    return CharMatcher.whitespace()
+        .trimAndCollapseFrom(normalizedString, ' ')
+        .toLowerCase(Locale.ROOT);
   }
 
   static List<String> createUntokenizedPrefixes(String value) {
@@ -83,7 +86,7 @@ protected char normalize(char c) {
      */
     @Override
     protected boolean isTokenChar(char c) {
-      return !LuceneUtils.WORD_SEPARATORS.contains(new Character(c));
+      return !LuceneUtils.WORD_SEPARATORS.contains(Character.valueOf(c));
     }
   }
 

api_dev/src/main/java/com/google/appengine/tools/development/AbstractContainerService.java

@@ -36,7 +36,6 @@
 import java.net.UnknownHostException;
 import java.security.Permissions;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.logging.Level;
@@ -118,13 +117,7 @@ public abstract class AbstractContainerService implements ContainerService {
   // mapping is available. The advantage to this approach is that it avoids changing
   // the public ContainerService interface and hence avoids exposing our management
   // of port mappings to users.
-  protected PortMappingProvider portMappingProvider =
-      new PortMappingProvider() {
-        @Override
-        public Map<String, String> getPortMapping() {
-          return Collections.emptyMap();
-        }
-      };
+  protected PortMappingProvider portMappingProvider = () -> ImmutableMap.of();
 
   /**
    * Latch that will open once the module instance is fully initialized. TODO: This is used by some

api_dev/src/main/java/com/google/appengine/tools/development/Modules.java

@@ -227,12 +227,7 @@ public String getScalingType(final String moduleName) throws ApplicationExceptio
   @Override
   public void startModule(final String moduleName, final String version)
       throws ApplicationException {
-    doDynamicConfiguration("startServing", new Runnable(){
-      @Override
-      public void run() {
-        doStartModule(moduleName, version);
-      }
-    });
+    doDynamicConfiguration("startServing", () -> doStartModule(moduleName, version));
   }
 
   private void doStartModule(String moduleName, String version) {
@@ -251,12 +246,7 @@ private void doStartModule(String moduleName, String version) {
   @Override
   public void stopModule(final String moduleName, final String version)
       throws ApplicationException {
-    doDynamicConfiguration("stopServing", new Runnable(){
-      @Override
-      public void run() {
-        doStopModule(moduleName, version);
-      }
-    });
+    doDynamicConfiguration("stopServing", () -> doStopModule(moduleName, version));
   }
 
   /**

api_dev/src/main/java/com/google/appengine/tools/development/RequestThreadFactory.java

@@ -65,43 +65,42 @@ public synchronized void start() {
             super.start();
             final Thread thread = this; // Thread.this doesn't work from an anon subclass
             RequestEndListenerHelper.register(
-                new RequestEndListener() {
-                  @Override
-                  public void onRequestEnd(ApiProxy.Environment environment) {
+                env -> {
+                  if (thread.isAlive()) {
+                    logger.info("Interrupting request thread: " + thread);
+                    // This is one of the few places where it's okay to call thread.interrupt().
+                    @SuppressWarnings("Interruption")
+                    boolean unused1 = true;
+                    thread.interrupt();
+                    logger.info("Waiting up to 100ms for thread to complete: " + thread);
+                    try {
+                      thread.join(100);
+                    } catch (InterruptedException ex) {
+                      logger.info("Interrupted while waiting.");
+                    }
                     if (thread.isAlive()) {
-                      logger.info("Interrupting request thread: " + thread);
+                      logger.info("Interrupting request thread again: " + thread);
+                      @SuppressWarnings("Interruption")
+                      boolean unused2 = true;
                       thread.interrupt();
-                      logger.info("Waiting up to 100ms for thread to complete: " + thread);
+                      long remaining = getRemainingDeadlineMillis(env);
+                      logger.info(
+                          "Waiting up to " + remaining + " ms for thread to complete: " + thread);
                       try {
-                        thread.join(100);
+                        thread.join(remaining);
                       } catch (InterruptedException ex) {
                         logger.info("Interrupted while waiting.");
                       }
                       if (thread.isAlive()) {
-                        logger.info("Interrupting request thread again: " + thread);
-                        thread.interrupt();
-                        long remaining = getRemainingDeadlineMillis(environment);
-                        logger.info(
-                            "Waiting up to "
-                                + remaining
-                                + " ms for thread to complete: "
-                                + thread);
-                        try {
-                          thread.join(remaining);
-                        } catch (InterruptedException ex) {
-                          logger.info("Interrupted while waiting.");
-                        }
-                        if (thread.isAlive()) {
-                          Throwable stack = new Throwable();
-                          stack.setStackTrace(thread.getStackTrace());
-                          logger.log(
-                              Level.SEVERE,
-                              "Thread left running: "
-                                  + thread
-                                  + ".  "
-                                  + "In production this will cause the request to fail.",
-                              stack);
-                        }
+                        Throwable stack = new Throwable();
+                        stack.setStackTrace(thread.getStackTrace());
+                        logger.log(
+                            Level.SEVERE,
+                            "Thread left running: "
+                                + thread
+                                + ".  "
+                                + "In production this will cause the request to fail.",
+                            stack);
                       }
                     }
                   }