refactor: remove compilation warning + use var keyword

jknack · jknack · commit 9d944227ddf4 · 2025-05-17T11:16:36.000-03:00
diff --git a/modules/jooby-avaje-jsonb/src/main/java/io/jooby/internal/avaje/jsonb/DataBufferJsonOutput.java b/modules/jooby-avaje-jsonb/src/main/java/io/jooby/internal/avaje/jsonb/DataBufferJsonOutput.java
@@ -12,7 +12,7 @@
 import io.jooby.buffer.DataBuffer;
 
 public class DataBufferJsonOutput implements JsonOutput {
-  private DataBuffer buffer;
+  private final DataBuffer buffer;
 
   public DataBufferJsonOutput(DataBuffer buffer) {
     this.buffer = buffer;
diff --git a/modules/jooby-caffeine/src/main/java/io/jooby/caffeine/CaffeineSessionStore.java b/modules/jooby-caffeine/src/main/java/io/jooby/caffeine/CaffeineSessionStore.java
@@ -11,6 +11,7 @@
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import edu.umd.cs.findbugs.annotations.NonNull;
+import edu.umd.cs.findbugs.annotations.Nullable;
 import io.jooby.SessionStore;
 import io.jooby.SessionToken;
 
@@ -60,24 +61,24 @@ public CaffeineSessionStore() {
   }
 
   @Override
-  protected Data getOrCreate(String sessionId, Function<String, Data> factory) {
+  protected Data getOrCreate(@NonNull String sessionId, @NonNull Function<String, Data> factory) {
     return (Data) cache.get(sessionId, factory);
   }
 
   @Override
-  protected Data getOrNull(String sessionId) {
+  protected @Nullable Data getOrNull(@NonNull String sessionId) {
     return (Data) cache.getIfPresent(sessionId);
   }
 
   @Override
-  protected Data remove(String sessionId) {
+  protected @Nullable Data remove(@NonNull String sessionId) {
     Data data = (Data) cache.getIfPresent(sessionId);
     cache.invalidate(sessionId);
     return data;
   }
 
   @Override
-  protected void put(String sessionId, Data data) {
+  protected void put(@NonNull String sessionId, @NonNull Data data) {
     cache.put(sessionId, data);
   }
 }
diff --git a/modules/jooby-camel/src/main/java/io/jooby/internal/camel/CamelBeans.java b/modules/jooby-camel/src/main/java/io/jooby/internal/camel/CamelBeans.java
@@ -6,7 +6,7 @@
 package io.jooby.internal.camel;
 
 public class CamelBeans {
-  public static String camelBeanId(Class type) {
+  public static String camelBeanId(Class<?> type) {
     String beanId = type.getSimpleName();
     return Character.toLowerCase(beanId.charAt(0)) + beanId.substring(1);
   }
diff --git a/modules/jooby-camel/src/main/java/io/jooby/internal/camel/JoobyBeanRepository.java b/modules/jooby-camel/src/main/java/io/jooby/internal/camel/JoobyBeanRepository.java
@@ -24,15 +24,15 @@
 /** Look into {@link Jooby#getServices()} it doesn't extend lookup into DI. */
 public class JoobyBeanRepository implements BeanRepository {
 
-  private ServiceRegistry registry;
+  private final ServiceRegistry registry;
 
   public JoobyBeanRepository(ServiceRegistry registry) {
     this.registry = registry;
   }
 
   @Override
   public Object lookupByName(String name) {
-    Provider provider = beanByName(name);
+    var provider = beanByName(name);
     return provider == null ? null : provider.get();
   }
 
@@ -43,7 +43,7 @@ public <T> T lookupByNameAndType(String name, Class<T> type) {
 
   @Override
   public <T> Map<String, T> findByTypeWithName(Class<T> type) {
-    Object bean = getBean(ServiceKey.key(type));
+    var bean = getBean(ServiceKey.key(type));
     String beanName = null;
     if (bean == null) {
       // Look if there is named bean:
@@ -69,7 +69,7 @@ private <T> Object getBean(ServiceKey<T> key) {
     return registry.getOrNull(key);
   }
 
-  private Provider beanByName(String beanId) {
+  private Provider<?> beanByName(String beanId) {
     var entry =
         findBean(
             key ->
diff --git a/modules/jooby-camel/src/main/java/io/jooby/internal/camel/JoobyCamelContext.java b/modules/jooby-camel/src/main/java/io/jooby/internal/camel/JoobyCamelContext.java
@@ -21,7 +21,7 @@
 
 public class JoobyCamelContext extends DefaultCamelContext {
 
-  private Jooby application;
+  private final Jooby application;
 
   public JoobyCamelContext(Jooby application) {
     super(false);
diff --git a/modules/jooby-camel/src/main/java/io/jooby/internal/camel/JoobyPropertiesSource.java b/modules/jooby-camel/src/main/java/io/jooby/internal/camel/JoobyPropertiesSource.java
@@ -10,7 +10,7 @@
 import com.typesafe.config.Config;
 
 public class JoobyPropertiesSource implements PropertiesSource {
-  private Config config;
+  private final Config config;
 
   public JoobyPropertiesSource(Config config) {
     this.config = config;
diff --git a/modules/jooby-camel/src/main/java/io/jooby/internal/camel/SingletonProvider.java b/modules/jooby-camel/src/main/java/io/jooby/internal/camel/SingletonProvider.java
@@ -16,9 +16,9 @@ public class SingletonProvider<T> implements Provider<T> {
 
   protected T instance;
 
-  private Supplier<T> factory;
+  private final Supplier<T> factory;
 
-  private SneakyThrows.Consumer<T> close;
+  private final SneakyThrows.Consumer<T> close;
 
   public SingletonProvider(Supplier<T> factory, SneakyThrows.Consumer<T> close) {
     this.factory = factory;
diff --git a/modules/jooby-ebean/src/main/java/io/jooby/ebean/EbeanModule.java b/modules/jooby-ebean/src/main/java/io/jooby/ebean/EbeanModule.java
@@ -17,7 +17,6 @@
 import io.ebean.Database;
 import io.ebean.DatabaseFactory;
 import io.ebean.config.DatabaseConfig;
-import io.jooby.Environment;
 import io.jooby.Extension;
 import io.jooby.Jooby;
 import io.jooby.ServiceKey;
@@ -111,13 +110,13 @@ public void install(@NonNull Jooby application) throws Exception {
    * @return Database configuration.
    */
   public static @NonNull DatabaseConfig create(@NonNull Jooby application, @NonNull String name) {
-    Environment environment = application.getEnvironment();
-    ServiceRegistry registry = application.getServices();
-    DatabaseConfig databaseConfig = new DatabaseConfig();
-    Properties properties = new Properties();
+    var environment = application.getEnvironment();
+    var registry = application.getServices();
+    var databaseConfig = new DatabaseConfig();
+    var properties = new Properties();
 
-    Config config = environment.getConfig();
-    Config ebean = config(config, "ebean." + name).withFallback(config(config, "ebean"));
+    var config = environment.getConfig();
+    var ebean = config(config, "ebean." + name).withFallback(config(config, "ebean"));
 
     ebean.entrySet().forEach(e -> properties.put(e.getKey(), e.getValue().unwrapped().toString()));
     databaseConfig.loadFromProperties(properties);
diff --git a/modules/jooby-ebean/src/main/java/io/jooby/ebean/TransactionalRequest.java b/modules/jooby-ebean/src/main/java/io/jooby/ebean/TransactionalRequest.java
@@ -7,7 +7,6 @@
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import io.ebean.Database;
-import io.ebean.Transaction;
 import io.jooby.Route;
 import io.jooby.ServiceKey;
 import io.jooby.annotation.Transactional;
@@ -20,7 +19,7 @@
  */
 public class TransactionalRequest implements Route.Filter {
 
-  private ServiceKey<Database> key;
+  private final ServiceKey<Database> key;
 
   private boolean enabledByDefault = true;
 
@@ -59,9 +58,9 @@ public TransactionalRequest enabledByDefault(boolean enabledByDefault) {
   public Route.Handler apply(@NonNull Route.Handler next) {
     return ctx -> {
       if (ctx.getRoute().isTransactional(enabledByDefault)) {
-        Database db = ctx.require(key);
-        try (Transaction transaction = db.beginTransaction()) {
-          Object result = next.apply(ctx);
+        var db = ctx.require(key);
+        try (var transaction = db.beginTransaction()) {
+          var result = next.apply(ctx);
           transaction.commit();
           return result;
         }
diff --git a/modules/jooby-flyway/src/main/java/io/jooby/flyway/FlywayModule.java b/modules/jooby-flyway/src/main/java/io/jooby/flyway/FlywayModule.java
@@ -15,11 +15,9 @@
 import org.flywaydb.core.api.configuration.FluentConfiguration;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
-import io.jooby.Environment;
 import io.jooby.Extension;
 import io.jooby.Jooby;
 import io.jooby.ServiceKey;
-import io.jooby.ServiceRegistry;
 
 /**
  * Flyway database migration module: https://jooby.io/modules/flyway.
@@ -70,31 +68,31 @@ public FlywayModule() {
 
   @Override
   public void install(@NonNull Jooby application) throws Exception {
-    Environment environment = application.getEnvironment();
-    ServiceRegistry registry = application.getServices();
-    DataSource dataSource = registry.getOrNull(ServiceKey.key(DataSource.class, name));
+    var environment = application.getEnvironment();
+    var registry = application.getServices();
+    var dataSource = registry.getOrNull(ServiceKey.key(DataSource.class, name));
     if (dataSource == null) {
       // TODO: replace with usage exception
       dataSource = registry.require(DataSource.class);
     }
-    FluentConfiguration configuration = new FluentConfiguration(environment.getClassLoader());
+    var configuration = new FluentConfiguration(environment.getClassLoader());
 
-    Map<String, String> defaults = environment.getProperties("flyway");
-    Map<String, String> overrides = environment.getProperties(name + ".flyway", "flyway");
+    var defaults = environment.getProperties("flyway");
+    var overrides = environment.getProperties(name + ".flyway", "flyway");
 
     Map<String, String> properties = new HashMap<>();
     properties.putAll(defaults);
     properties.putAll(overrides);
 
-    String[] commandString =
+    var commandString =
         Optional.ofNullable(properties.remove("flyway.run")).orElse("migrate").split("\\s*,\\s*");
 
     configuration.configuration(properties);
     configuration.dataSource(dataSource);
 
-    Flyway flyway = new Flyway(configuration);
+    var flyway = new Flyway(configuration);
 
-    for (String command : commandString) {
+    for (var command : commandString) {
       runCommand(command.toLowerCase(), flyway);
     }
 
diff --git a/modules/jooby-freemarker/src/main/java/io/jooby/freemarker/FreemarkerModule.java b/modules/jooby-freemarker/src/main/java/io/jooby/freemarker/FreemarkerModule.java
@@ -16,7 +16,6 @@
 import java.util.Optional;
 import java.util.Properties;
 
-import com.typesafe.config.Config;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import freemarker.cache.ClassTemplateLoader;
 import freemarker.cache.FileTemplateLoader;
@@ -29,7 +28,6 @@
 import io.jooby.Environment;
 import io.jooby.Extension;
 import io.jooby.Jooby;
-import io.jooby.ServiceRegistry;
 import io.jooby.SneakyThrows;
 import io.jooby.TemplateEngine;
 
@@ -164,12 +162,11 @@ public static class Builder {
      */
     public @NonNull Configuration build(@NonNull Environment env) {
       try {
-        Configuration freemarker =
-            new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
+        var freemarker = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS);
         freemarker.setOutputFormat(outputFormat);
 
         /** Settings: */
-        Config conf = env.getConfig();
+        var conf = env.getConfig();
         if (conf.hasPath("freemarker")) {
           conf.getConfig("freemarker")
               .root()
@@ -179,15 +176,15 @@ public static class Builder {
 
         settings.putIfAbsent("defaultEncoding", "UTF-8");
         /** Cache storage: */
-        String defaultCacheStorage =
+        var defaultCacheStorage =
             env.isActive("dev", "test") ? "freemarker.cache.NullCacheStorage" : "soft";
         settings.putIfAbsent(Configuration.CACHE_STORAGE_KEY_CAMEL_CASE, defaultCacheStorage);
 
         freemarker.setSettings(settings);
 
         /** Template loader: */
         if (templateLoader == null) {
-          String templatesPathString =
+          var templatesPathString =
               normalizePath(
                   env.getProperty(
                       TEMPLATE_PATH,
@@ -197,8 +194,7 @@ public static class Builder {
         freemarker.setTemplateLoader(templateLoader);
 
         /** Object wrapper: */
-        DefaultObjectWrapperBuilder dowb =
-            new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_22);
+        var dowb = new DefaultObjectWrapperBuilder(Configuration.VERSION_2_3_22);
         dowb.setExposeFields(true);
         freemarker.setObjectWrapper(dowb.build());
 
@@ -215,7 +211,7 @@ public static class Builder {
     private TemplateLoader defaultTemplateLoader(
         Environment env, String templatesPathString, Path templatesPath) {
       try {
-        Path templateDir =
+        var templateDir =
             Optional.ofNullable(templatesPath)
                 .orElse(Paths.get(System.getProperty("user.dir"), templatesPathString));
         if (Files.exists(templateDir)) {
@@ -256,7 +252,7 @@ public FreemarkerModule(@NonNull String templatesPath) {
   }
 
   /**
-   * Freemarker module which look at the given path.
+   * Freemarker module that looks at the given path.
    *
    * @param templatesPath Template path.
    */
@@ -280,7 +276,7 @@ public void install(@NonNull Jooby application) {
     }
     application.encoder(new FreemarkerTemplateEngine(freemarker, EXT));
 
-    ServiceRegistry services = application.getServices();
+    var services = application.getServices();
     services.put(Configuration.class, freemarker);
   }
 
diff --git a/modules/jooby-graphql/src/main/java/io/jooby/graphql/GraphQLModule.java b/modules/jooby-graphql/src/main/java/io/jooby/graphql/GraphQLModule.java
@@ -12,8 +12,6 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
 
 import edu.umd.cs.findbugs.annotations.NonNull;
 import graphql.GraphQL;
@@ -24,8 +22,6 @@
 import graphql.schema.idl.TypeDefinitionRegistry;
 import io.jooby.Extension;
 import io.jooby.Jooby;
-import io.jooby.Route;
-import io.jooby.ServiceRegistry;
 import io.jooby.SneakyThrows;
 import io.jooby.internal.graphql.BlockingGraphQLHandler;
 import io.jooby.internal.graphql.GraphQLHandler;
@@ -49,7 +45,7 @@
  */
 public class GraphQLModule implements Extension {
 
-  private GraphQL graphQL;
+  private final GraphQL graphQL;
 
   private boolean async = true;
 
@@ -105,18 +101,17 @@ public GraphQLModule(@NonNull RuntimeWiring wiring) {
 
   @Override
   public void install(@NonNull Jooby application) throws Exception {
-    String graphqlPath = application.getEnvironment().getProperty("graphql.path", "/graphql");
+    var graphqlPath = application.getEnvironment().getProperty("graphql.path", "/graphql");
 
-    GraphQLHandler handler =
-        async ? new GraphQLHandler(graphQL) : new BlockingGraphQLHandler(graphQL);
+    var handler = async ? new GraphQLHandler(graphQL) : new BlockingGraphQLHandler(graphQL);
 
     if (supportGetRequest) {
-      executionMode(application.get(graphqlPath, handler), async);
+      application.get(graphqlPath, handler);
     }
 
-    executionMode(application.post(graphqlPath, handler), async);
+    application.post(graphqlPath, handler);
 
-    ServiceRegistry services = application.getServices();
+    var services = application.getServices();
     services.put(GraphQL.class, graphQL);
   }
 
@@ -142,14 +137,6 @@ public GraphQLModule setSupportGetRequest(boolean supportGetRequest) {
     return this;
   }
 
-  private void executionMode(Route route, boolean async) {
-    if (async) {
-      route.setReturnType(CompletableFuture.class);
-    } else {
-      route.setReturnType(Map.class);
-    }
-  }
-
   private static Reader fileReader(Path path) {
     try {
       return Files.newBufferedReader(path);
diff --git a/modules/jooby-gson/src/main/java/io/jooby/gson/GsonModule.java b/modules/jooby-gson/src/main/java/io/jooby/gson/GsonModule.java
diff --git a/modules/jooby-guice/src/main/java/io/jooby/guice/GuiceModule.java b/modules/jooby-guice/src/main/java/io/jooby/guice/GuiceModule.java
diff --git a/modules/jooby-guice/src/main/java/io/jooby/guice/JoobyModule.java b/modules/jooby-guice/src/main/java/io/jooby/guice/JoobyModule.java
diff --git a/modules/jooby-handlebars/src/main/java/io/jooby/handlebars/HandlebarsModule.java b/modules/jooby-handlebars/src/main/java/io/jooby/handlebars/HandlebarsModule.java
diff --git a/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/HibernateModule.java b/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/HibernateModule.java
diff --git a/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/SessionRequest.java b/modules/jooby-hibernate/src/main/java/io/jooby/hibernate/SessionRequest.java

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`import com.github.benmanes.caffeine.cache.Cache;`
`12`	`12`	`import com.github.benmanes.caffeine.cache.Caffeine;`
`13`	`13`	`import edu.umd.cs.findbugs.annotations.NonNull;`
	`14`	`+import edu.umd.cs.findbugs.annotations.Nullable;`
`14`	`15`	`import io.jooby.SessionStore;`
`15`	`16`	`import io.jooby.SessionToken;`
`16`	`17`
`@@ -60,24 +61,24 @@ public CaffeineSessionStore() {`
`60`	`61`	`}`
`61`	`62`
`62`	`63`	`@Override`
`63`		`- protected Data getOrCreate(String sessionId, Function<String, Data> factory) {`
	`64`	`+ protected Data getOrCreate(@NonNull String sessionId, @NonNull Function<String, Data> factory) {`
`64`	`65`	`return (Data) cache.get(sessionId, factory);`
`65`	`66`	`}`
`66`	`67`
`67`	`68`	`@Override`
`68`		`- protected Data getOrNull(String sessionId) {`
	`69`	`+ protected @Nullable Data getOrNull(@NonNull String sessionId) {`
`69`	`70`	`return (Data) cache.getIfPresent(sessionId);`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`@Override`
`73`		`- protected Data remove(String sessionId) {`
	`74`	`+ protected @Nullable Data remove(@NonNull String sessionId) {`
`74`	`75`	`Data data = (Data) cache.getIfPresent(sessionId);`
`75`	`76`	`cache.invalidate(sessionId);`
`76`	`77`	`return data;`
`77`	`78`	`}`
`78`	`79`
`79`	`80`	`@Override`
`80`		`- protected void put(String sessionId, Data data) {`
	`81`	`+ protected void put(@NonNull String sessionId, @NonNull Data data) {`
`81`	`82`	`cache.put(sessionId, data);`
`82`	`83`	`}`
`83`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`package io.jooby.internal.camel;`
`7`	`7`
`8`	`8`	`public class CamelBeans {`
`9`		`- public static String camelBeanId(Class type) {`
	`9`	`+ public static String camelBeanId(Class<?> type) {`
`10`	`10`	`String beanId = type.getSimpleName();`
`11`	`11`	`return Character.toLowerCase(beanId.charAt(0)) + beanId.substring(1);`
`12`	`12`	`}`