Merged for javadoc

Author: fluentfuture

mug-guava/src/main/java/com/google/mu/safesql/ResultMapper.java

@@ -19,11 +19,6 @@
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
-import java.time.Instant;
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -46,17 +41,14 @@
  * {@link SqlName @SqlName}.
  */
 abstract class ResultMapper<T> {
-  private static final ImmutableSet<Class<?>> SQL_PRIMITIVE_TYPES =
-      ImmutableSet.of(
-          ZonedDateTime.class, OffsetDateTime.class, Instant.class,
-          LocalDate.class, LocalTime.class, String.class);
-
   static <T> ResultMapper<T> toResultOf(Class<T> resultType) {
     checkArgument(
-        !Primitives.allPrimitiveTypes().contains(resultType), "resultType cannot be primitive: %s",
-        resultType);
+        !Primitives.allPrimitiveTypes().contains(resultType),
+        "resultType cannot be primitive: %s", resultType);
     checkArgument(resultType != Void.class, "resultType cannot be Void");
-    if (SQL_PRIMITIVE_TYPES.contains(resultType) || Primitives.isWrapperType(resultType)) {
+    if (resultType.getName().startsWith("java.")
+        || resultType.getName().startsWith("javax.")
+        || resultType.isArray()) {
       return new ResultMapper<T>() {
         @Override T from(ResultSet row) throws SQLException {
           return row.getObject(1, resultType);

mug-guava/src/main/java/com/google/mu/safesql/SafeSql.java

@@ -757,7 +757,7 @@ public SafeSql orElse(Supplier<SafeSql> fallback) {
    * @throws UncheckedSqlException wraps {@link SQLException} if failed
    * @since 8.7
    */
-  public <T> List<T> query(Connection connection, Class<T> resultType) {
+  public <T> List<T> query(Connection connection, Class<? extends T> resultType) {
     return query(connection, ResultMapper.toResultOf(resultType)::from);
   }
 
@@ -837,7 +837,7 @@ public <T> List<T> query(
    */
   @MustBeClosed
   @SuppressWarnings("MustBeClosedChecker")
-  public <T> Stream<T> queryLazily(Connection connection, Class<T> resultType) {
+  public <T> Stream<T> queryLazily(Connection connection, Class<? extends T> resultType) {
     return queryLazily(connection, ResultMapper.toResultOf(resultType)::from);
   }
 
@@ -912,7 +912,7 @@ public <T> Stream<T> queryLazily(
    */
   @MustBeClosed
   @SuppressWarnings("MustBeClosedChecker")
-  public <T> Stream<T> queryLazily(Connection connection, int fetchSize, Class<T> resultType) {
+  public <T> Stream<T> queryLazily(Connection connection, int fetchSize, Class<? extends T> resultType) {
     return queryLazily(connection, fetchSize, ResultMapper.toResultOf(resultType)::from);
   }
 
@@ -1055,7 +1055,7 @@ public PreparedStatement prepareStatement(Connection connection) {
    * @since 8.7
    */
   public static <T> Template<List<T>> prepareToQuery(
-      Connection connection, @CompileTimeConstant String template, Class<T> resultType) {
+      Connection connection, @CompileTimeConstant String template, Class<? extends T> resultType) {
     return prepareToQuery(connection, template, ResultMapper.toResultOf(resultType)::from);
   }
 

mug/src/main/java/com/google/mu/util/Substring.java

@@ -327,7 +327,7 @@
  * }</pre></td>
  *   <td><pre>{@code
  * // Explicitly filter out empty matches
- * List<String> parts = consecutive(is('-'))
+ * List<String> parts = consecutive('-')
  *     .repeatedly()
  *     .split("a--b-c-")
  *     .filter(Match::isNotEmpty)
@@ -344,7 +344,7 @@
  *     // => ["a", ""]
  * }</pre></td>
  *   <td><pre>{@code
- * List<String> parts = consecutive(is('-'))
+ * List<String> parts = consecutive('-')
  *     .repeatedly()
  *     .split("a--")
  *     .map(Match::toString)
@@ -660,6 +660,16 @@ public static Pattern trailing(CharPredicate matcher) {
     };
   }
 
+  /**
+   * Returns a {@code Pattern} that matches the first non-empty sequence of consecutive {@code ch}
+   * characters.
+   *
+   * @since 8.7
+   */
+  public static Pattern consecutive(char ch) {
+    return consecutive(CharPredicate.is(ch));
+  }
+
   /**
    * Returns a {@code Pattern} that matches the first non-empty sequence of consecutive characters
    * identified by {@code matcher}.

mug/src/main/java/com/google/mu/util/concurrent/Completion.java

@@ -481,18 +481,16 @@ Scope add(Runnable... tasks) {
     }
 
     void run() throws StructuredConcurrencyInterruptedException {
-      try (Completion completion = new Completion()) {
-        withUnlimitedConcurrency().parallelize(runnables.stream().map(completion::toRun));
+      try {
+        withUnlimitedConcurrency().parallelize(runnables.stream());
       } catch (InterruptedException e) {
         throw new StructuredConcurrencyInterruptedException(e);
       }
     }
 
     @Deprecated
     void runUninterruptibly() {
-      try (Completion completion = new Completion()) {
-        withUnlimitedConcurrency().parallelizeUninterruptibly(runnables.stream().map(completion::toRun));
-      }
+      withUnlimitedConcurrency().parallelizeUninterruptibly(runnables.stream());
     }
   }
 

mug/src/main/java/com/google/mu/util/concurrent/Fanout.java

@@ -439,10 +439,10 @@ public void parallelizeUninterruptibly(Stream<? extends Runnable> tasks) {
         inputs -> {
           List<O> outputs = new ArrayList<>(inputs.size());
           outputs.addAll(Collections.nCopies(inputs.size(), null));
-          try (Completion completion = new Completion()){
+          try {
             parallelize(
                 IntStream.range(0, inputs.size()).boxed(),
-                i -> completion.run(() -> outputs.set(i, concurrentFunction.apply(inputs.get(i)))));
+                i -> outputs.set(i, concurrentFunction.apply(inputs.get(i))));
           } catch (InterruptedException e) {
             throw new StructuredConcurrencyInterruptedException(e);
           }