refactor: Context: replace call to getRouter.getValueFactory by getValueFactory

Author: jknack

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

@@ -77,7 +77,7 @@ public Session setId(@Nullable String id) {
 
   @Override
   public @NonNull Value get(@NonNull String name) {
-    return Value.create(ctx.getRouter().getValueFactory(), name, attributes.get(name));
+    return Value.create(ctx.getValueFactory(), name, attributes.get(name));
   }
 
   @Override
@@ -91,9 +91,7 @@ public Session setId(@Nullable String id) {
   public @NonNull Value remove(@NonNull String name) {
     String value = attributes.remove(name);
     updateState();
-    return value == null
-        ? Value.missing(name)
-        : Value.value(ctx.getRouter().getValueFactory(), name, value);
+    return value == null ? Value.missing(name) : Value.value(ctx.getValueFactory(), name, value);
   }
 
   @Override

modules/jooby-jetty/src/main/java/io/jooby/internal/jetty/JettyContext.java

@@ -202,15 +202,15 @@ public Context setPathMap(Map<String, String> pathMap) {
   @NonNull @Override
   public QueryString query() {
     if (query == null) {
-      query = QueryString.create(getRouter().getValueFactory(), request.getHttpURI().getQuery());
+      query = QueryString.create(getValueFactory(), request.getHttpURI().getQuery());
     }
     return query;
   }
 
   @NonNull @Override
   public Formdata form() {
     if (formdata == null) {
-      formdata = Formdata.create(getRouter().getValueFactory());
+      formdata = Formdata.create(getValueFactory());
 
       formParam(request, formdata);
 
@@ -251,8 +251,7 @@ public Formdata form() {
 
   @NonNull @Override
   public Value header(@NonNull String name) {
-    return Value.create(
-        getRouter().getValueFactory(), name, request.getHeaders().getValuesList(name));
+    return Value.create(getValueFactory(), name, request.getHeaders().getValuesList(name));
   }
 
   @NonNull @Override
@@ -262,7 +261,7 @@ public Value header() {
       for (HttpField header : request.getHeaders()) {
         headerMap.put(header.getName(), header.getValueList());
       }
-      headers = Value.headers(getRouter().getValueFactory(), headerMap);
+      headers = Value.headers(getValueFactory(), headerMap);
     }
     return headers;
   }

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

@@ -222,24 +222,23 @@ public QueryString query() {
     if (query == null) {
       String uri = req.uri();
       int q = uri.indexOf('?');
-      query =
-          QueryString.create(getRouter().getValueFactory(), q >= 0 ? uri.substring(q + 1) : null);
+      query = QueryString.create(getValueFactory(), q >= 0 ? uri.substring(q + 1) : null);
     }
     return query;
   }
 
   @NonNull @Override
   public Formdata form() {
     if (formdata == null) {
-      formdata = Formdata.create(getRouter().getValueFactory());
+      formdata = Formdata.create(getValueFactory());
       decodeForm(formdata);
     }
     return formdata;
   }
 
   @NonNull @Override
   public Value header(@NonNull String name) {
-    return Value.create(getRouter().getValueFactory(), name, req.headers().getAll(name));
+    return Value.create(getValueFactory(), name, req.headers().getAll(name));
   }
 
   @NonNull @Override
@@ -330,7 +329,7 @@ public Value header() {
       for (String name : names) {
         headerMap.put(name, headers.getAll(name));
       }
-      this.headers = Value.headers(getRouter().getValueFactory(), headerMap);
+      this.headers = Value.headers(getValueFactory(), headerMap);
     }
     return headers;
   }

modules/jooby-undertow/src/main/java/io/jooby/internal/undertow/UndertowContext.java

@@ -255,8 +255,7 @@ public Context setPort(int port) {
 
   @NonNull @Override
   public Value header(@NonNull String name) {
-    return Value.create(
-        getRouter().getValueFactory(), name, exchange.getRequestHeaders().get(name));
+    return Value.create(getValueFactory(), name, exchange.getRequestHeaders().get(name));
   }
 
   @NonNull @Override
@@ -269,23 +268,23 @@ public Value header() {
         HeaderValues values = map.get(name);
         headerMap.put(name.toString(), values);
       }
-      headers = Value.headers(getRouter().getValueFactory(), headerMap);
+      headers = Value.headers(getValueFactory(), headerMap);
     }
     return headers;
   }
 
   @NonNull @Override
   public QueryString query() {
     if (query == null) {
-      query = QueryString.create(getRouter().getValueFactory(), exchange.getQueryString());
+      query = QueryString.create(getValueFactory(), exchange.getQueryString());
     }
     return query;
   }
 
   @NonNull @Override
   public Formdata form() {
     if (formdata == null) {
-      formdata = Formdata.create(getRouter().getValueFactory());
+      formdata = Formdata.create(getValueFactory());
       formData(formdata, exchange.getAttachment(FORM_DATA));
     }
     return formdata;