source: code cleanup

- refactor code
- move builtin converter to enum

Author: jknack

jooby/src/main/java/io/jooby/BeanConverter.java

@@ -21,7 +21,7 @@ public interface BeanConverter extends ValueConverter<ValueNode> {
    * @param type Conversion type.
    * @return True if the converter applies for the given type.
    */
-  boolean supports(@NonNull Class type);
+  boolean supports(@NonNull Class<?> type);
 
   /**
    * Convert a node value into more specific type.
@@ -30,5 +30,5 @@ public interface BeanConverter extends ValueConverter<ValueNode> {
    * @param type Requested type.
    * @return Converted value.
    */
-  Object convert(@NonNull ValueNode node, @NonNull Class type);
+  Object convert(@NonNull ValueNode node, @NonNull Class<?> type);
 }

jooby/src/main/java/io/jooby/Cookie.java

@@ -174,7 +174,7 @@ private Cookie(@NonNull Cookie cookie) {
    * @return Cookie's domain..
    */
   public @NonNull String getDomain(@NonNull String domain) {
-    return this.domain == null ? domain : domain;
+    return this.domain == null ? domain : this.domain;
   }
 
   /**

jooby/src/main/java/io/jooby/Environment.java

@@ -135,8 +135,10 @@ public Environment(
   public @NonNull Map<String, String> getProperties(@NonNull String key, @Nullable String prefix) {
     if (hasPath(config, key)) {
       Map<String, String> settings = new HashMap<>();
-      String p = prefix == null || prefix.length() == 0 ? "" : prefix + ".";
-      config.getConfig(key).entrySet().stream()
+      String p = prefix == null || prefix.isEmpty() ? "" : prefix + ".";
+      config
+          .getConfig(key)
+          .entrySet()
           .forEach(
               e -> {
                 Object value = e.getValue().unwrapped();

jooby/src/main/java/io/jooby/Usage.java

@@ -7,7 +7,6 @@
 
 import java.lang.reflect.Executable;
 import java.lang.reflect.Parameter;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -58,7 +57,7 @@ public Usage(@NonNull String message, @NonNull String id) {
    */
   public static @NonNull Usage parameterNameNotPresent(@NonNull Parameter parameter) {
     Executable executable = parameter.getDeclaringExecutable();
-    int p = Stream.of(executable.getParameters()).collect(Collectors.toList()).indexOf(parameter);
+    int p = Stream.of(executable.getParameters()).toList().indexOf(parameter);
     String message =
         "Unable to provision parameter at position: '"
             + p

jooby/src/main/java/io/jooby/ValueConverter.java

@@ -23,7 +23,7 @@ public interface ValueConverter<V extends Value> {
    * @param type Conversion type.
    * @return True if the converter applies for the given type.
    */
-  boolean supports(@NonNull Class type);
+  boolean supports(@NonNull Class<?> type);
 
   /**
    * Convert simple to specific type.
@@ -32,14 +32,14 @@ public interface ValueConverter<V extends Value> {
    * @param type Requested type.
    * @return Converted value.
    */
-  Object convert(@NonNull V value, @NonNull Class type);
+  Object convert(@NonNull V value, @NonNull Class<?> type);
 
   /**
    * Immutable list of defaults/built-in {@link ValueConverter}.
    *
    * @return Immutable list of defaults/built-in {@link ValueConverter}.
    */
-  static List<ValueConverter> defaults() {
+  static List<ValueConverter<?>> defaults() {
     return ValueConverters.defaultConverters();
   }
 }

jooby/src/main/java/io/jooby/handler/AssetHandler.java

@@ -257,8 +257,8 @@ public AssetHandler notFound(@NonNull SneakyThrows.Consumer<Context> handler) {
   public void setRoute(Route route) {
     List<String> keys = route.getPathKeys();
     this.filekey = keys.isEmpty() ? route.getPattern().substring(1) : keys.get(0);
-    // NOTE: It send an inputstream we don't need a renderer
-    route.setReturnType(Context.class);
+    //    // NOTE: It send an inputstream we don't need a renderer
+    //    route.setReturnType(Context.class);
   }
 
   private static AssetSource[] checkSource(AssetSource[] sources) {

jooby/src/main/java/io/jooby/handler/Cors.java

@@ -14,7 +14,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
-import java.util.stream.Collectors;
 
 import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
@@ -43,28 +42,19 @@
  */
 public class Cors {
 
-  private static class Matcher<T> implements Predicate<T> {
-
-    private List<String> values;
-
-    private Predicate<T> predicate;
-
-    private boolean wild;
-
-    Matcher(final List<String> values, final Predicate<T> predicate) {
-      this.values = values;
-      this.predicate = predicate;
-      this.wild = values.contains("*");
+  private record Matcher<T>(List<String> values, Predicate<T> predicate) implements Predicate<T> {
+    boolean wild() {
+      return values.contains("*");
     }
 
     @Override
-    public boolean test(final T value) {
-      return predicate.test(value);
+    public String toString() {
+      return values.toString();
     }
 
     @Override
-    public String toString() {
-      return values.toString();
+    public boolean test(T value) {
+      return predicate.test(value);
     }
   }
 
@@ -127,7 +117,7 @@ public Cors setUseCredentials(boolean credentials) {
    * @return True if any origin is accepted.
    */
   public boolean anyOrigin() {
-    return origin.wild;
+    return origin.wild();
   }
 
   /**
@@ -215,7 +205,7 @@ public Cors setMethods(final List<String> methods) {
    * @return True if any header is allowed: <code>*</code>.
    */
   public boolean anyHeader() {
-    return headers.wild;
+    return headers.wild();
   }
 
   /**
@@ -368,13 +358,9 @@ private static Matcher<List<String>> allMatch(final List<String> values) {
   }
 
   private static Matcher<String> firstMatch(final List<String> values) {
-    List<Pattern> patterns = values.stream().map(Cors::rewrite).collect(Collectors.toList());
+    var patterns = values.stream().map(Cors::rewrite).toList();
     Predicate<String> predicate =
-        it ->
-            patterns.stream()
-                .filter(pattern -> pattern.matcher(it).matches())
-                .findFirst()
-                .isPresent();
+        it -> patterns.stream().anyMatch(pattern -> pattern.matcher(it).matches());
 
     return new Matcher<>(values, predicate);
   }

jooby/src/main/java/io/jooby/handler/CsrfHandler.java

@@ -75,7 +75,7 @@ public class CsrfHandler implements Route.Before {
   public static final Function<Context, String> DEFAULT_GENERATOR =
       ctx -> UUID.randomUUID().toString();
 
-  private String name;
+  private final String name;
 
   private Function<Context, String> generator = DEFAULT_GENERATOR;
 

jooby/src/main/java/io/jooby/internal/Chi.java

@@ -549,7 +549,7 @@ public void clear() {
   }
 
   private static class MultipleMethodMatcher implements MethodMatcher {
-    private Map<String, StaticRouterMatch> methods = new ConcurrentHashMap<>();
+    private final Map<String, StaticRouterMatch> methods = new ConcurrentHashMap<>();
 
     public MultipleMethodMatcher(SingleMethodMatcher matcher) {
       methods.put(matcher.method, matcher.route);
@@ -696,7 +696,7 @@ Node insertRoute(String method, String pattern, Route route) {
 
       while (true) {
         // Handle key exhaustion
-        if (search.length() == 0) {
+        if (search.isEmpty()) {
           // Insert or update the node's leaf handler
           n.setEndpoint(method, route);
           return n;
@@ -766,7 +766,7 @@ Node insertRoute(String method, String pattern, Route route) {
 
         // If the new key is a subset, set the method/handler on this node and finish.
         search = search.substring(commonPrefix);
-        if (search.length() == 0) {
+        if (search.isEmpty()) {
           child.setEndpoint(method, route);
           return child;
         }
@@ -940,7 +940,7 @@ Route findRoute(RouterMatch rctx, String method, Slice path) {
             case ntParam:
             case ntRegexp:
               // short-circuit and return no matching route for empty param values
-              if (xsearch.length() == 0) {
+              if (xsearch.isEmpty()) {
                 continue;
               }
               // serially loop through each node grouped by the tail delimiter
@@ -973,7 +973,7 @@ Route findRoute(RouterMatch rctx, String method, Slice path) {
                 rctx.value(xsearch.substring(0, p).toString());
                 xsearch = xsearch.substring(p);
 
-                if (xsearch.length() == 0) {
+                if (xsearch.isEmpty()) {
                   if (xn.isLeaf()) {
                     Route h = xn.endpoints.get(method);
                     if (h != null) {
@@ -998,7 +998,7 @@ Route findRoute(RouterMatch rctx, String method, Slice path) {
             default:
               // catch-all nodes
               // rctx.routeParams.Values = append(rctx.routeParams.Values, search)
-              if (xsearch.length() > 0) {
+              if (!xsearch.isEmpty()) {
                 rctx.value(xsearch.toString());
               }
               xn = nds[0];
@@ -1164,7 +1164,7 @@ Segment patNextSegment(String pattern) {
           //          key = key.substring(0, idx);
         }
 
-        if (rexpat.length() > 0) {
+        if (!rexpat.isEmpty()) {
           if (rexpat.charAt(0) != '^') {
             rexpat = "^" + rexpat;
           }

jooby/src/main/java/io/jooby/internal/ClassPathAssetSource.java

@@ -30,7 +30,7 @@ public class ClassPathAssetSource implements AssetSource {
   private final String prefix;
 
   public ClassPathAssetSource(ClassLoader loader, String source) {
-    if (source == null || source.trim().length() == 0 || source.trim().equals("/")) {
+    if (source == null || source.trim().isEmpty() || source.trim().equals("/")) {
       throw new IllegalArgumentException(
           "For security reasons root classpath access is not allowed: " + source);
     }