refactor: code cleanup

Author: jknack

jooby/src/main/java/io/jooby/SessionStore.java

@@ -167,7 +167,7 @@ public void touchSession(@NonNull Context ctx, @NonNull Session session) {
     }
 
     @Override
-    public void saveSession(Context ctx, @NonNull Session session) {
+    public void saveSession(@NonNull Context ctx, @NonNull Session session) {
       String sessionId = session.getId();
       put(sessionId, new Data(session.getCreationTime(), Instant.now(), session.toMap()));
     }

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

@@ -467,9 +467,9 @@ private Route newRoute(
     pathBuilder.append(pattern);
 
     /** Filter: */
-    List<Route.Filter> decoratorList = stack.stream().flatMap(Stack::toFilter).toList();
-    Route.Filter decorator =
-        decoratorList.stream().reduce(null, (it, next) -> it == null ? next : it.then(next));
+    List<Route.Filter> filters = stack.stream().flatMap(Stack::toFilter).toList();
+    Route.Filter filter =
+        filters.stream().reduce(null, (it, next) -> it == null ? next : it.then(next));
 
     /** After: */
     Route.After after =
@@ -481,15 +481,17 @@ private Route newRoute(
     String safePattern = pathBuilder.toString();
     Route route = new Route(method, safePattern, handler);
     route.setPathKeys(Router.pathKeys(safePattern));
-    route.setAfter(after);
-    route.setFilter(decorator);
+    if (after != null) {
+      route.setAfter(after);
+    }
+    route.setFilter(filter);
     route.setEncoder(encoder);
     route.setDecoders(decoders);
 
-    decoratorList.forEach(it -> it.setRoute(route));
+    filters.forEach(it -> it.setRoute(route));
     handler.setRoute(route);
 
-    Stack stack = this.stack.peekLast();
+    var stack = this.stack.peekLast();
     if (stack.executor != null) {
       routeExecutor.put(route, stack.executor);
     }
@@ -507,10 +509,8 @@ private Route newRoute(
           for (String routePattern : Router.expandOptionalVariables(asciiPattern)) {
             if (route.getMethod().equals(WS)) {
               tree.insert(GET, routePattern, route);
-              // route.setReturnType(Context.class);
             } else if (route.getMethod().equals(SSE)) {
               tree.insert(GET, routePattern, route);
-              // route.setReturnType(Context.class);
             } else {
               tree.insert(route.getMethod(), routePattern, route);
 

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

@@ -81,17 +81,23 @@ public Session setId(@Nullable String id) {
   }
 
   @Override
-  public @NonNull Session put(@NonNull String name, String value) {
+  public @NonNull Session put(@NonNull String name, @NonNull String value) {
     attributes.put(name, value);
     updateState();
     return this;
   }
 
+  public @NonNull Session put(@NonNull String name, Object value) {
+    attributes.put(name, value.toString());
+    return this;
+  }
+
   @Override
   public @NonNull Value remove(@NonNull String name) {
-    String value = attributes.remove(name);
+    var value = get(name);
+    attributes.remove(name);
     updateState();
-    return value == null ? Value.missing(name) : Value.value(ctx.getValueFactory(), name, value);
+    return value;
   }
 
   @Override
@@ -105,7 +111,7 @@ public Session setId(@Nullable String id) {
   }
 
   @NonNull @Override
-  public Session setCreationTime(Instant creationTime) {
+  public Session setCreationTime(@NonNull Instant creationTime) {
     this.creationTime = creationTime;
     return this;
   }
@@ -121,7 +127,7 @@ public Session setCreationTime(Instant creationTime) {
     return this;
   }
 
-  @Override
+  @NonNull @Override
   public Session clear() {
     attributes.clear();
     updateState();
@@ -135,7 +141,7 @@ public void destroy() {
     store(ctx).deleteSession(ctx, this);
   }
 
-  @Override
+  @NonNull @Override
   public Session renewId() {
     store(ctx).renewSessionId(ctx, this);
     updateState();