source: cleanup nonnull warnings

Author: jknack

jooby/src/main/java/io/jooby/ForwardingContext.java

@@ -108,7 +108,7 @@ public long getSize() {
     }
 
     @Override
-    @NonNull public ValueNode get(@NonNull int index) {
+    @NonNull public ValueNode get(int index) {
       return delegate.get(index);
     }
 

jooby/src/main/java/io/jooby/ValueNode.java

@@ -40,7 +40,7 @@ public interface ValueNode extends Iterable<ValueNode>, Value {
    * @param index Position.
    * @return A value at the given position.
    */
-  @NonNull ValueNode get(@NonNull int index);
+  @NonNull ValueNode get(int index);
 
   /**
    * Get a value that matches the given name.

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

@@ -7,7 +7,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -56,7 +55,7 @@ public ArrayValue add(String value) {
   }
 
   @Override
-  public ValueNode get(@NonNull int index) {
+  public @NonNull ValueNode get(int index) {
     try {
       return list.get(index);
     } catch (IndexOutOfBoundsException x) {
@@ -65,7 +64,7 @@ public ValueNode get(@NonNull int index) {
   }
 
   @Override
-  public ValueNode get(@NonNull String name) {
+  public @NonNull ValueNode get(@NonNull String name) {
     return new MissingValue(this.name + "." + name);
   }
 
@@ -75,7 +74,7 @@ public int size() {
   }
 
   @Override
-  public String value() {
+  public @NonNull String value() {
     String name = name();
     throw new TypeMismatchException(name == null ? getClass().getSimpleName() : name, String.class);
   }
@@ -86,7 +85,7 @@ public String toString() {
   }
 
   @Override
-  public Iterator<ValueNode> iterator() {
+  public @NonNull Iterator<ValueNode> iterator() {
     return list.iterator();
   }
 
@@ -120,24 +119,24 @@ public <T> Set<T> toSet(@NonNull Class<T> type) {
   }
 
   @Override
-  public Map<String, List<String>> toMultimap() {
+  public @NonNull Map<String, List<String>> toMultimap() {
     List<String> values = new ArrayList<>();
-    list.stream().forEach(it -> it.toMultimap().values().forEach(values::addAll));
-    return Collections.singletonMap(name, values);
+    list.forEach(it -> it.toMultimap().values().forEach(values::addAll));
+    return Map.of(name, values);
   }
 
   @Override
-  public List<String> toList() {
+  public @NonNull List<String> toList() {
     return collect(new ArrayList<>(), String.class);
   }
 
   @Override
-  public Set<String> toSet() {
+  public @NonNull Set<String> toSet() {
     return collect(new LinkedHashSet<>(), String.class);
   }
 
   private <T, C extends Collection<T>> C collect(C collection, Class<T> type) {
-    for (ValueNode node : list) {
+    for (var node : list) {
       collection.add(node.to(type));
     }
     return collection;

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

@@ -40,12 +40,12 @@ public long getSize() {
   }
 
   @Override
-  public byte[] bytes() {
+  public @NonNull byte[] bytes() {
     return bytes;
   }
 
   @Override
-  public ReadableByteChannel channel() {
+  public @NonNull ReadableByteChannel channel() {
     return Channels.newChannel(stream());
   }
 
@@ -55,7 +55,7 @@ public boolean isInMemory() {
   }
 
   @Override
-  public InputStream stream() {
+  public @NonNull InputStream stream() {
     return new ByteArrayInputStream(bytes);
   }
 
@@ -70,7 +70,7 @@ public List<String> toList() {
   }
 
   @NonNull @Override
-  public ValueNode get(@NonNull int index) {
+  public ValueNode get(int index) {
     return index == 0 ? this : get(Integer.toString(index));
   }
 
@@ -95,8 +95,8 @@ public <T> T toNullable(@NonNull Type type) {
   }
 
   @Override
-  public Map<String, List<String>> toMultimap() {
-    return Collections.emptyMap();
+  public @NonNull Map<String, List<String>> toMultimap() {
+    return Map.of();
   }
 
   public static Body empty(Context ctx) {

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

@@ -48,7 +48,7 @@ public boolean isInMemory() {
   }
 
   @Override
-  public ReadableByteChannel channel() {
+  public @NonNull ReadableByteChannel channel() {
     try {
       return Files.newByteChannel(file);
     } catch (IOException x) {
@@ -57,7 +57,7 @@ public ReadableByteChannel channel() {
   }
 
   @Override
-  public InputStream stream() {
+  public @NonNull InputStream stream() {
     try {
       return Files.newInputStream(file);
     } catch (IOException x) {
@@ -66,7 +66,7 @@ public InputStream stream() {
   }
 
   @Override
-  public byte[] bytes() {
+  public @NonNull byte[] bytes() {
     try {
       return Files.readAllBytes(file);
     } catch (IOException x) {
@@ -84,8 +84,8 @@ public List<String> toList() {
     return Collections.singletonList(value());
   }
 
-  @NonNull @Override
-  public ValueNode get(@NonNull int index) {
+  @Override
+  public @NonNull ValueNode get(int index) {
     return index == 0 ? this : get(Integer.toString(index));
   }
 
@@ -110,7 +110,7 @@ public <T> T toNullable(@NonNull Type type) {
   }
 
   @Override
-  public Map<String, List<String>> toMultimap() {
-    return Collections.emptyMap();
+  public @NonNull Map<String, List<String>> toMultimap() {
+    return Map.of();
   }
 }

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

@@ -168,7 +168,7 @@ protected Map<String, ValueNode> hash() {
     return (HashValue) hash().computeIfAbsent(name, k -> new HashValue(ctx, k));
   }
 
-  public ValueNode get(@NonNull String name) {
+  public @NonNull ValueNode get(@NonNull String name) {
     ValueNode value = hash.get(name);
     if (value == null) {
       return new MissingValue(scope(name));
@@ -181,7 +181,7 @@ private String scope(String name) {
   }
 
   @Override
-  public ValueNode get(@NonNull int index) {
+  public @NonNull ValueNode get(int index) {
     return get(Integer.toString(index));
   }
 

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

@@ -77,7 +77,7 @@ public String value() {
   }
 
   @NonNull @Override
-  public ValueNode get(@NonNull int index) {
+  public ValueNode get(int index) {
     return index == 0 ? this : get(Integer.toString(index));
   }
 

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

@@ -30,12 +30,12 @@ public String name() {
   }
 
   @Override
-  public ValueNode get(@NonNull String name) {
+  public @NonNull ValueNode get(@NonNull String name) {
     return this.name.equals(name) ? this : new MissingValue(this.name + "." + name);
   }
 
   @Override
-  public ValueNode get(@NonNull int index) {
+  public @NonNull ValueNode get(int index) {
     return new MissingValue(this.name + "[" + index + "]");
   }
 

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

@@ -41,12 +41,12 @@ public String name() {
   }
 
   @Override
-  public ValueNode get(@NonNull int index) {
+  public @NonNull ValueNode get(int index) {
     return index == 0 ? this : get(Integer.toString(index));
   }
 
   @Override
-  public ValueNode get(@NonNull String name) {
+  public @NonNull ValueNode get(@NonNull String name) {
     return new MissingValue(this.name + "." + name);
   }
 

modules/jooby-netty/src/main/java/io/jooby/internal/netty/NettyBody.java

@@ -84,7 +84,7 @@ public String value() {
   }
 
   @NonNull @Override
-  public ValueNode get(@NonNull int index) {
+  public ValueNode get(int index) {
     return index == 0 ? this : get(Integer.toString(index));
   }