Improved model binding system to allow custom queries

Author: JanHolger

src/main/java/org/javawebstack/framework/WebApplication.java

@@ -2,6 +2,7 @@
 
 import com.github.javafaker.Faker;
 import org.javawebstack.framework.bind.ModelBindParamTransformer;
+import org.javawebstack.framework.bind.ModelBindTransformer;
 import org.javawebstack.framework.config.Config;
 import org.javawebstack.framework.module.Module;
 import org.javawebstack.framework.util.CORSPolicy;
@@ -28,6 +29,7 @@ public abstract class WebApplication {
     private final Config config = new Config();
     private final Crypt crypt;
     private final List<Module> modules = new ArrayList<>();
+    private final ModelBindParamTransformer modelBindParamTransformer = new ModelBindParamTransformer();
 
     public WebApplication(){
         injector = new SimpleInjector();
@@ -75,7 +77,7 @@ public WebApplication(){
         if(config.isEnabled("http.server.json", true))
             server.responseTransformer(new JsonResponseTransformer().ignoreStrings());
         if(sql != null)
-            server.routeParamTransformer(new ModelBindParamTransformer());
+            server.routeParamTransformer(modelBindParamTransformer);
         modules.forEach(m -> m.beforeSetupServer(this, server));
         setupServer(server);
         modules.forEach(m -> m.setupServer(this, server));
@@ -86,6 +88,11 @@ public WebApplication addModule(Module module){
         return this;
     }
 
+    public WebApplication setModelBindTransformer(ModelBindTransformer transformer){
+        modelBindParamTransformer.setTransformer(transformer);
+        return this;
+    }
+
     public Logger getLogger(){
         return logger;
     }
@@ -110,6 +117,10 @@ public Config getConfig() {
         return config;
     }
 
+    public Crypt getCrypt(){
+        return crypt;
+    }
+
     public abstract void setupModules();
     public abstract void setupConfig(Config config);
     public abstract void setupInjection(SimpleInjector injector);

src/main/java/org/javawebstack/framework/bind/ModelBind.java

@@ -9,4 +9,5 @@
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ModelBind {
     String value();
+    String field() default "";
 }

src/main/java/org/javawebstack/framework/bind/ModelBindParamTransformer.java

@@ -9,24 +9,32 @@
 
 public class ModelBindParamTransformer extends RouteParamTransformer {
 
+    private ModelBindTransformer transformer;
+
     public ModelBindParamTransformer(){
+        this.transformer = (repo, fieldName, source) -> repo.where(fieldName, source).get();
         for(Class<? extends Model> model : ORM.getModels()){
             ModelBind[] binds = model.getDeclaredAnnotationsByType(ModelBind.class);
             if(binds.length == 0)
                 continue;
             Repo<?> repo = Repo.get(model);
-            Class<?> idType = repo.getInfo().getIdType();
-            if(idType.equals(String.class))
+            String fieldName = binds[0].field().length() > 0 ? binds[0].field() : repo.getInfo().getIdField();
+            Class<?> fieldType = repo.getInfo().getField(fieldName).getType();
+            String parent = "string";
+            if(fieldType.equals(String.class))
                 extend("string", binds[0].value(), repo::get);
-            if(idType.equals(UUID.class))
-                extend("uuid", binds[0].value(), repo::get);
-            if(idType.equals(Integer.class))
-                extend("i+", binds[0].value(), repo::get);
-            if(idType.equals(Long.class))
-                extend("l+", binds[0].value(), repo::get);
+            if(fieldType.equals(UUID.class))
+                parent = "uuid";
+            if(fieldType.equals(Integer.class))
+                parent = "i+";
+            if(fieldType.equals(Long.class))
+                parent = "l+";
+            extend(parent, binds[0].value(), source -> transformer.transform(repo, fieldName, source));
         }
     }
 
-
+    public void setTransformer(ModelBindTransformer transformer){
+        this.transformer = transformer;
+    }
 
 }

src/main/java/org/javawebstack/framework/bind/ModelBindTransformer.java

@@ -0,0 +1,7 @@
+package org.javawebstack.framework.bind;
+
+import org.javawebstack.orm.Repo;
+
+public interface ModelBindTransformer {
+    Object transform(Repo<?> repo, String fieldName, Object source);
+}