JsonFormatter.allFrom should not expose manager

speedment · Jul 16, 2015 · ec96e2d · ec96e2d
1 parent 16080bd
commit ec96e2d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/src/main/java/com/speedment/core/manager/AbstractManager.java b/src/main/java/com/speedment/core/manager/AbstractManager.java
@@ -22,7 +22,6 @@
 import com.speedment.core.core.Buildable;
 import com.speedment.core.platform.Platform;
 import com.speedment.core.platform.component.ManagerComponent;
-import com.speedment.util.json.JsonFormatter;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -110,29 +109,6 @@ public Optional<Object> find(ENTITY entity, Column column) {
             }).filter(o -> o.isPresent()).map(i -> i.get()).findAny();
     }
 
-    @Override
-    @SuppressWarnings("unchecked")
-    public String toJson(ENTITY entity) {
-        return JsonFormatter.allFrom(this).apply(entity);
-//        return "{ " + getTable().streamOf(Column.class).map(c -> {
-//            final StringBuilder sb = new StringBuilder();
-//            sb.append("\"").append(JavaLanguage.javaVariableName(c.getName())).append("\" : ");
-//
-//			Object val = get(entity, c);
-//			if (val == null) {
-//				sb.append("null");
-//			} else if (val instanceof Number) {
-//				sb.append(val.toString());
-//			} else if (val instanceof Boolean) {
-//				sb.append(val.toString());
-//			} else {
-//				sb.append("\"").append(val.toString()).append("\"");
-//			}
-//			
-//            return sb.toString();
-//        }).collect(Collectors.joining(", ")) + " }";
-    }
-
     @Override
     public void onInsert(Consumer<ENTITY> listener) {
         insertListeners.add(listener);

diff --git a/src/main/java/com/speedment/core/manager/Manager.java b/src/main/java/com/speedment/core/manager/Manager.java
@@ -72,10 +72,12 @@ public interface Manager<PK, ENTITY, BUILDER extends Buildable<ENTITY>> extends
     BUILDER toBuilder(ENTITY entity);
 
 	default JsonFormatter<ENTITY> toJson() {
-		return JsonFormatter.allFrom(this);
+		return JsonFormatter.allFrom(getEntityClass());
 	}
 
-    String toJson(ENTITY entity);
+    default String toJson(ENTITY entity) {
+        return toJson().apply(entity);
+    }
 
     default ENTITY toInternal(ENTITY entity) {
         return entity;

diff --git a/src/main/java/com/speedment/util/json/JsonFormatter.java b/src/main/java/com/speedment/util/json/JsonFormatter.java
@@ -17,6 +17,7 @@
 package com.speedment.util.json;
 
 import com.speedment.core.config.model.Column;
+import com.speedment.core.config.model.Table;
 import com.speedment.core.core.Buildable;
 import com.speedment.core.manager.Manager;
 import com.speedment.core.field.Field;
@@ -27,6 +28,8 @@
 import com.speedment.core.field.reference.ReferenceField;
 import com.speedment.core.field.reference.ReferenceForeignKeyField;
 import com.speedment.core.field.reference.string.StringReferenceForeignKeyField;
+import com.speedment.core.platform.Platform;
+import com.speedment.core.platform.component.ManagerComponent;
 import static com.speedment.util.java.JavaLanguage.javaVariableName;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -169,11 +172,17 @@ private static String jsonValue(Object in) {
         return value;
 	}
 
-	public static <PK, ENTITY, BUILDER extends Buildable<ENTITY>, MANAGER extends Manager<PK, ENTITY, BUILDER>> JsonFormatter<ENTITY> allFrom(MANAGER manager) {
+	public static <PK, ENTITY, BUILDER extends Buildable<ENTITY>> JsonFormatter<ENTITY> allFrom(Class<ENTITY> entityType) {
 
 		final JsonFormatter<ENTITY> json = new JsonFormatter<>();
+
+        final Manager<PK, ENTITY, BUILDER> manager = Platform.get()
+            .get(ManagerComponent.class)
+            .managerOf(entityType);
+
+        final Table table = manager.getTable();
 
-		manager.getTable()
+		table
 			.streamOf(Column.class)
 			.forEachOrdered(c -> {