[code quality] Sonar bug fixing

Author: jknack

build/sonar.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+mvn -DdryRun=true -Dsonar.organization=jooby -Dsonar.host.url=https://sonarcloud.io -Dsonar.jacoco.reportPaths=modules/coverage-report/target/jacoco.exec -Dsonar.login=$SONAR_TOKEN -Dsonar.branch=master clean install coveralls:report sonar:sonar -P coverage

jooby/src/main/java/org/jooby/Asset.java

@@ -206,10 +206,12 @@
 import static java.util.Objects.requireNonNull;
 
 import java.io.InputStream;
+import java.net.URISyntaxException;
 import java.net.URL;
 
 import com.google.common.io.BaseEncoding;
 import com.google.common.primitives.Longs;
+import org.jooby.funzy.Throwing;
 
 import javax.annotation.Nonnull;
 
@@ -320,16 +322,20 @@ default String name() {
    */
   @Nonnull
   default String etag() {
-    StringBuilder b = new StringBuilder(32);
-    b.append("W/\"");
+    try {
+      StringBuilder b = new StringBuilder(32);
+      b.append("W/\"");
 
-    BaseEncoding b64 = BaseEncoding.base64();
-    int lhash = resource().hashCode();
+      BaseEncoding b64 = BaseEncoding.base64();
+      int lhash = resource().toURI().hashCode();
 
-    b.append(b64.encode(Longs.toByteArray(lastModified() ^ lhash)));
-    b.append(b64.encode(Longs.toByteArray(length() ^ lhash)));
-    b.append('"');
-    return b.toString();
+      b.append(b64.encode(Longs.toByteArray(lastModified() ^ lhash)));
+      b.append(b64.encode(Longs.toByteArray(length() ^ lhash)));
+      b.append('"');
+      return b.toString();
+    } catch (URISyntaxException x) {
+      throw Throwing.sneakyThrow(x);
+    }
   }
 
   /**

jooby/src/main/java/org/jooby/Deferred.java

@@ -206,6 +206,7 @@
 import static java.util.Objects.requireNonNull;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executor;
@@ -368,7 +369,7 @@ public interface Initializer {
    * @since 0.10.0
    */
   public interface Handler {
-    void handle(Result result, Throwable exception);
+    void handle(@Nullable Result result, Throwable exception);
   }
 
   /** Deferred initializer. Optional. */
@@ -415,7 +416,7 @@ public Deferred(final Initializer initializer) {
    * @param executor Executor to use.
    * @param initializer An initializer.
    */
-  public Deferred(final String executor, final Initializer initializer) {
+  public Deferred(@Nullable final String executor, final Initializer initializer) {
     this.executor = executor;
     this.initializer = requireNonNull(initializer, "Initializer is required.");
     this.callerThread = Thread.currentThread().getName();
@@ -470,8 +471,7 @@ public String callerThread() {
    *
    * @param value A value for this deferred.
    */
-  @Nonnull
-  public void resolve(final Object value) {
+  public void resolve(@Nullable final Object value) {
     if (value == null) {
       handler.handle(null, null);
     } else {

jooby/src/main/java/org/jooby/Env.java

@@ -493,6 +493,7 @@ interface Builder {
      * @param config A config instance.
      * @return A new environment.
      */
+    @Nonnull
     default Env build(final Config config) {
       return build(config, null, Locale.getDefault());
     }
@@ -507,7 +508,8 @@ default Env build(final Config config) {
      * @param locale App locale.
      * @return A new environment.
      */
-    Env build(Config config, Router router, Locale locale);
+    @Nonnull
+    Env build(Config config, @Nullable Router router, Locale locale);
   }
 
   /**

jooby/src/main/java/org/jooby/Err.java

@@ -214,6 +214,8 @@
 
 import com.google.common.base.Throwables;
 
+import javax.annotation.Nullable;
+
 /**
  * An exception that carry a {@link Status}. The status field will be set in the HTTP
  * response.
@@ -484,7 +486,7 @@ public Map<String, Object> toMap(boolean stacktrace) {
    * @param tail A message to append.
    * @return An error message.
    */
-  private static String message(final Status status, final String tail) {
+  private static String message(final Status status, @Nullable final String tail) {
     return message(status.reason(), status.value(), tail);
   }
 
@@ -496,7 +498,7 @@ private static String message(final Status status, final String tail) {
    * @param tail A message to append.
    * @return An error message.
    */
-  private static String message(final String reason, final int status, final String tail) {
+  private static String message(final String reason, final int status, @Nullable  final String tail) {
     return reason + "(" + status + ")" + (tail == null ? "" : ": " + tail);
   }
 

jooby/src/main/java/org/jooby/Jooby.java

@@ -288,6 +288,7 @@
 import org.slf4j.LoggerFactory;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.inject.Singleton;
 import javax.net.ssl.SSLContext;
 import java.io.File;
@@ -925,7 +926,7 @@ public Jooby use(final Jooby app) {
     return use(prefixPath(null), app);
   }
 
-  private Optional<String> prefixPath(String tail) {
+  private Optional<String> prefixPath(@Nullable String tail) {
     return path.size() == 0
         ? tail == null ? Optional.empty() : Optional.of(Route.normalize(tail))
         : Optional.of(path.stream()
@@ -2196,7 +2197,7 @@ private void start(final String[] args, final Consumer<List<Route.Definition>> r
     this.injector = bootstrap(args(args), routes);
 
     // shutdown hook
-    Runtime.getRuntime().addShutdownHook(new Thread(() -> stop()));
+    Runtime.getRuntime().addShutdownHook(new Thread(this::stop));
 
     Config conf = injector.getInstance(Config.class);
 
@@ -3395,11 +3396,10 @@ private Config defaultConfig(final Config conf, final String cpath) {
       defs = defs.withValue("application.charset", fromAnyRef(charset.name()));
     }
     if (port != null) {
-      defs = defs.withValue("application.port", fromAnyRef(port.intValue()));
+      defs = defs.withValue("application.port", fromAnyRef(port));
     }
     if (securePort != null) {
-      defs = defs.withValue("application.securePort",
-          fromAnyRef(securePort.intValue()));
+      defs = defs.withValue("application.securePort", fromAnyRef(securePort));
     }
     if (dateFormat != null) {
       defs = defs.withValue("application.dateFormat", fromAnyRef(dateFormat));
@@ -3495,8 +3495,8 @@ static String logback(final Config conf) {
       files.add(new File(confdir, "logback.xml"));
       logback = files.build()
           .stream()
-          .filter(f -> f.exists())
-          .map(f -> f.getAbsolutePath())
+          .filter(File::exists)
+          .map(File::getAbsolutePath)
           .findFirst()
           .orElseGet(() -> {
             return Optional.ofNullable(Jooby.class.getResource("/logback." + env + ".xml"))

jooby/src/main/java/org/jooby/MediaType.java

@@ -438,19 +438,19 @@ private Optional<MediaType> doFirst(final List<MediaType> candidates) {
   public static final List<MediaType> ALL = ImmutableList.of(MediaType.all);
 
   /** Form multipart-data media type. */
-  public static MediaType multipart = new MediaType("multipart", "form-data");
+  public static final MediaType multipart = new MediaType("multipart", "form-data");
 
   /** Form url encoded. */
-  public static MediaType form = new MediaType("application", "x-www-form-urlencoded");
+  public static final MediaType form = new MediaType("application", "x-www-form-urlencoded");
 
   /** Xml media type. */
-  public static MediaType xml = new MediaType("application", "xml");
+  public static final MediaType xml = new MediaType("application", "xml");
 
   /** Server sent event type. */
-  public static MediaType sse = new MediaType("text", "event-stream");
+  public static final MediaType sse = new MediaType("text", "event-stream");
 
   /** Xml like media type. */
-  private static MediaType xmlLike = new MediaType("application", "*+xml");
+  private static final MediaType xmlLike = new MediaType("application", "*+xml");
 
   /**
    * Track the type of this media type.

jooby/src/main/java/org/jooby/Request.java

@@ -212,6 +212,7 @@
 import org.jooby.scope.RequestScoped;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.List;
@@ -397,7 +398,7 @@ public boolean is(final String... types) {
     @Override
     public boolean isSet(final String name) {
       return req.isSet(name);
-    };
+    }
 
     @Override
     public Mutant params() {
@@ -1338,7 +1339,7 @@ default Flash flash() throws Err {
    * @return This request.
    */
   @Nonnull
-  default Request flash(final String name, final Object value) {
+  default Request flash(final String name, @Nullable final Object value) {
     requireNonNull(name, "Attribute's name is required.");
     Map<String, String> flash = flash();
     if (value == null) {

jooby/src/main/java/org/jooby/Response.java

@@ -216,6 +216,7 @@
 import com.google.common.collect.ImmutableList;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 /**
  * Give you access to the actual HTTP response. You can read/write headers and write HTTP body.
@@ -635,7 +636,7 @@ default Response type(final String type) {
    * @param result The HTTP body.
    * @throws Exception If the response write fails.
    */
-  default void send(final Object result) throws Throwable {
+  default void send(final @Nullable Object result) throws Throwable {
     if (result instanceof Result) {
       send((Result) result);
     } else if (result != null) {

jooby/src/main/java/org/jooby/Result.java

@@ -497,8 +497,7 @@ public <T> T get(final List<MediaType> types) {
   public Result header(final String name, final Object value) {
     requireNonNull(name, "Header's name is required.");
     requireNonNull(value, "Header's value is required.");
-
-    put(name, value);
+    setHeader(name, value);
     return this;
   }
 
@@ -530,8 +529,7 @@ public Result header(final String name, final Object... values) {
   public Result header(final String name, final Iterable<Object> values) {
     requireNonNull(name, "Header's name is required.");
     requireNonNull(values, "Header's values are required.");
-
-    put(name, values);
+    setHeader(name, values);
     return this;
   }
 
@@ -545,7 +543,7 @@ protected Result clone() {
     return result;
   }
 
-  private void put(final String name, final Object val) {
+  private void setHeader(final String name, final Object val) {
     headers = ImmutableMap.<String, Object> builder()
         .putAll(headers)
         .put(name, val)