Fix GenericAttributes for use with primitive types

Benjamin Rühl
1 parent f884f4b1
Showing 10 changed files with 147 additions and 67 deletions
services/Common/src/main/java/de/bht/beuthbot/model/entities/AppUser.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/AppUserImpl.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/GenericEntityAttribute.java
services/Common/src/main/java/de/bht/beuthbot/model/entities/GenericEntityAttributeValue.java
services/Common/src/main/java/de/bht/beuthbot/persistence/GenericEntityAccessFacade.java
services/Common/src/main/java/de/bht/beuthbot/persistence/GenericEntityAttributeDeserializer.java
services/Common/src/main/java/de/bht/beuthbot/persistence/GenericEntityAttributeValueDeserializer.java
services/Common/src/main/java/de/bht/beuthbot/persistence/GenericEntityDeserializer.java
services/Common/src/main/java/de/bht/beuthbot/persistence/GenericEntityJsonConverter.java
services/Common/src/main/resources/META-INF/persistence.xml
@@ -6,9 +6,18 @@ package de.bht.beuthbot.model.entities;
 public interface AppUser extends EntityBase {
     void setFacebookUserId(String facebookUserId);
+
     String getFacebookUserId();
+
     void setTelegramUserId(String telegramUserId);
+
     String getTelegramUserId();
+
+    GenericEntityAttribute getProperty(String propertyName);
+
     <T extends Object> T getProperty(String propertyName, Class<T> propertyType);
+
+    void setProperty(GenericEntityAttribute property);
+
     void setProperty(String propertyName, Object propertyValue);
 }
@@ -23,9 +23,6 @@ public class AppUserImpl extends EntityBaseImpl implements AppUser {
     @OneToOne(cascade = CascadeType.ALL)
     private GenericEntity additionalData;
-    //@Type(type = "JsonMapType")
-    //private Map<String, String> additionalData = new HashMap<>();
-
     public AppUserImpl() {
         additionalData = new GenericEntity();
         additionalData.setName("User");
@@ -42,31 +39,25 @@ public class AppUserImpl extends EntityBaseImpl implements AppUser {
     }
     @Override
+    public GenericEntityAttribute getProperty(String propertyName) {
+        return additionalData.getAttributes().stream().filter(attr -> attr.getName().equals(propertyName)).findFirst().orElse(null);
+    }
+
+    @Override
     public <T> T getProperty(String propertyName, Class<T> propertyType) {
         return GenericEntityAccessFacade.getAttribute(additionalData, propertyName, propertyType);
     }
     @Override
+    public void setProperty(GenericEntityAttribute property) {
+        additionalData.setAttribute(property);
+    }
+
+    @Override
     public void setProperty(String propertyName, Object propertyValue) {
         GenericEntityAccessFacade.setAttribute(additionalData, propertyName, propertyValue);
     }
-    //@Override
-    /*public <T extends Object> T getProperty(String propertyName, Class<T> propertyType) {
-        String propertyValue = additionalData.getOrDefault(propertyName, null);
-
-        if (propertyValue == null)
-            return null;
-
-        return (T) JsonHelper.fromJson(propertyValue, propertyType);
-    }*/
-
-    //@Override
-    /*public void setProperty(String propertyName, Object propertyValue) {
-        String valueAsJson = JsonHelper.toJson(propertyValue, propertyValue.getClass());
-        additionalData.put(propertyName, valueAsJson);
-    }*/
-
     public void setFacebookUserId(String facebookUserId) {
         this.facebookUserId = facebookUserId;
     }
@@ -4,7 +4,9 @@ import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 /**
  * Created by Benjamin Rühl on 22.12.2017.
@@ -18,7 +20,7 @@ public class GenericEntityAttribute extends EntityBaseImpl {
     private String name;
     @OneToMany(cascade = CascadeType.ALL)
-    private List<GenericEntityAttributeValue> values;
+    private List<GenericEntityAttributeValue> values = new ArrayList<>();
     public String getName() {
         return name;
@@ -29,10 +31,18 @@ public class GenericEntityAttribute extends EntityBaseImpl {
     }
     public List<GenericEntityAttributeValue> getValues() {
-        return values;
+        return new ArrayList<>(values);
+    }
+
+    public GenericEntityAttributeValue getFirstValueOrNull() {
+        return values.size() > 0 ? values.get(0) : null;
     }
     public void addValue(GenericEntityAttributeValue value) {
         this.values.add(value);
     }
+
+    public void removeValue(GenericEntityAttributeValue value) {
+        this.values.remove(value);
+    }
 }
@@ -25,6 +25,14 @@ public class GenericEntityAttributeValue extends EntityBaseImpl {
     @OneToOne(cascade = CascadeType.ALL)
     private GenericEntity valueAsEntity;
+    public boolean hasValue() {
+        return getValueAsBool() != null
+                || getValueAsDouble() != null
+                || getValueAsLong() != null
+                || getValueAsString() != null
+                || getValueAsEntity() != null;
+    }
+
     public Boolean getValueAsBool() {
         return valueAsBool;
     }
@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
 import de.bht.beuthbot.model.entities.GenericEntity;
 import de.bht.beuthbot.model.entities.GenericEntityAttribute;
+import de.bht.beuthbot.model.entities.GenericEntityAttributeValue;
 import java.io.IOException;
 import java.util.List;
@@ -25,7 +26,14 @@ public class GenericEntityAccessFacade {
         GenericEntityAttribute property = propertiesWithName.get(0);
         try {
-            String propertyAsJson = GenericEntityJsonConverter.toJson(property);
+            String propertyAsJson;
+
+            if (isPrimitiveOrWrapperAttributeType(attributeType)) {
+                propertyAsJson = GenericEntityJsonConverter.toJson(property.getFirstValueOrNull());
+            } else {
+                propertyAsJson = GenericEntityJsonConverter.toJson(property);
+            }
+
             return (T) JsonHelper.fromJson(propertyAsJson, attributeType);
         } catch (IOException e) {
             e.printStackTrace();
@@ -34,13 +42,32 @@ public class GenericEntityAccessFacade {
         return null;
     }
+    private static boolean isPrimitiveOrWrapperAttributeType(Class type) {
+        return Boolean.class.isAssignableFrom(type)
+                || Integer.class.isAssignableFrom(type)
+                || Long.class.isAssignableFrom(type)
+                || Double.class.isAssignableFrom(type)
+                || Float.class.isAssignableFrom(type)
+                || Character.class.isAssignableFrom(type)
+                || String.class.isAssignableFrom(type)
+                || Byte.class.isAssignableFrom(type)
+                || Short.class.isAssignableFrom(type);
+    }
+
     public static void setAttribute(GenericEntity contextEntity, String attributeName, Object attributeValue) {
         String attributeValueAsJson = JsonHelper.toJson(attributeValue, attributeValue.getClass());
         GenericEntityAttribute deserializedGenericAttribute = null;
         try {
-            deserializedGenericAttribute = createGenericEntityAttributeFromJson(attributeValueAsJson);
+            GenericEntityAttributeValue deserializedGenericAttributeValue = createGenericHierarchyFromJson(GenericEntityAttributeValue.class, attributeValueAsJson);
+
+            if (deserializedGenericAttributeValue != null && deserializedGenericAttributeValue.hasValue()) {
+                deserializedGenericAttribute = new GenericEntityAttribute();
+                deserializedGenericAttribute.addValue(deserializedGenericAttributeValue);
+            } else {
+                deserializedGenericAttribute = createGenericHierarchyFromJson(GenericEntityAttribute.class, attributeValueAsJson);
+            }
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -53,13 +80,14 @@ public class GenericEntityAccessFacade {
         contextEntity.setAttribute(deserializedGenericAttribute);
     }
-    private static GenericEntityAttribute createGenericEntityAttributeFromJson(String json) throws IOException {
+    private static <T> T createGenericHierarchyFromJson(Class<T> type, String json) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         SimpleModule module = new SimpleModule();
         module.addDeserializer(GenericEntity.class, new GenericEntityDeserializer());
         module.addDeserializer(GenericEntityAttribute.class, new GenericEntityAttributeDeserializer());
+        module.addDeserializer(GenericEntityAttributeValue.class, new GenericEntityAttributeValueDeserializer());
         mapper.registerModule(module);
-        return mapper.readValue(json, GenericEntityAttribute.class);
+        return mapper.readValue(json, type);
     }
 }
@@ -20,6 +20,8 @@ import java.util.List;
  */
 public class GenericEntityAttributeDeserializer extends StdDeserializer<GenericEntityAttribute> {
+    private GenericEntityAttributeValueDeserializer attributeValueDeserializer = new GenericEntityAttributeValueDeserializer();
+
     public GenericEntityAttributeDeserializer() {
         this(GenericEntityAttribute.class);
     }
@@ -52,7 +54,7 @@ public class GenericEntityAttributeDeserializer extends StdDeserializer&lt;GenericE
                     e.printStackTrace();
                 }
             } else {
-                deserializedAttribute.addValue(readAttributeValueFromCurrentToken(jp, ctxt));
+                deserializedAttribute.addValue(attributeValueDeserializer.deserialize(jp, ctxt));
             }
         }
@@ -68,29 +70,9 @@ public class GenericEntityAttributeDeserializer extends StdDeserializer&lt;GenericE
         while (!jp.isClosed() || jsonToken.equals(JsonToken.END_ARRAY)) {
             jsonToken = jp.nextToken();
-            attributes.add(readAttributeValueFromCurrentToken(jp, ctxt));
+            attributes.add(attributeValueDeserializer.deserialize(jp, ctxt));
         }
         return attributes;
     }
-
-    private GenericEntityAttributeValue readAttributeValueFromCurrentToken(JsonParser jp, DeserializationContext ctxt) throws IOException {
-        GenericEntityAttributeValue attributeValue = new GenericEntityAttributeValue();
-        JsonToken jsonToken = jp.getCurrentToken();
-
-        if (jsonToken.equals(JsonToken.VALUE_FALSE) || jsonToken.equals(JsonToken.VALUE_TRUE)) {
-            attributeValue.setValueAsBool(jp.getBooleanValue());
-        } else if (jsonToken.equals(JsonToken.VALUE_NUMBER_INT)) {
-            attributeValue.setValueAsLong(jp.getLongValue());
-        } else if (jsonToken.equals(JsonToken.VALUE_NUMBER_FLOAT)) {
-            attributeValue.setValueAsDouble(jp.getFloatValue());
-        } else if (jsonToken.equals(JsonToken.VALUE_STRING)) {
-            attributeValue.setValueAsString(jp.getText());
-        } else if (jsonToken.equals(JsonToken.START_OBJECT)) {
-            GenericEntity embeddedEntity = new GenericEntityDeserializer().deserialize(jp, ctxt);
-            attributeValue.setValueAsEntity(embeddedEntity);
-        }
-
-        return attributeValue;
-    }
 }
+package de.bht.beuthbot.persistence;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
+import de.bht.beuthbot.model.entities.GenericEntity;
+import de.bht.beuthbot.model.entities.GenericEntityAttributeValue;
+
+import java.io.IOException;
+
+/**
+ * Created by Benjamin Rühl on 14.01.2018.
+ */
+public class GenericEntityAttributeValueDeserializer extends StdDeserializer<GenericEntityAttributeValue> {
+
+    public GenericEntityAttributeValueDeserializer() {
+        this(GenericEntityAttributeValue.class);
+    }
+
+    public GenericEntityAttributeValueDeserializer(Class<? extends GenericEntityAttributeValue> t) {
+        super(t);
+    }
+
+    @Override
+    public GenericEntityAttributeValue deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
+        if (jp.isClosed())
+            return null;
+
+        GenericEntityAttributeValue attributeValue = new GenericEntityAttributeValue();
+        JsonToken jsonToken = jp.getCurrentToken();
+
+        if (jsonToken.equals(JsonToken.VALUE_FALSE) || jsonToken.equals(JsonToken.VALUE_TRUE)) {
+            attributeValue.setValueAsBool(jp.getBooleanValue());
+        } else if (jsonToken.equals(JsonToken.VALUE_NUMBER_INT)) {
+            attributeValue.setValueAsLong(jp.getLongValue());
+        } else if (jsonToken.equals(JsonToken.VALUE_NUMBER_FLOAT)) {
+            attributeValue.setValueAsDouble(jp.getFloatValue());
+        } else if (jsonToken.equals(JsonToken.VALUE_STRING)) {
+            attributeValue.setValueAsString(jp.getText());
+        } else if (jsonToken.equals(JsonToken.START_OBJECT)) {
+            GenericEntity embeddedEntity = new GenericEntityDeserializer().deserialize(jp, ctxt);
+            attributeValue.setValueAsEntity(embeddedEntity);
+        }
+
+        return attributeValue;
+    }
+}
@@ -16,6 +16,8 @@ import java.io.IOException;
  */
 public class GenericEntityDeserializer extends StdDeserializer<GenericEntity> {
+    private GenericEntityAttributeDeserializer attributeDeserializer = new GenericEntityAttributeDeserializer();
+
     public GenericEntityDeserializer() {
         this(GenericEntity.class);
     }
@@ -27,7 +29,6 @@ public class GenericEntityDeserializer extends StdDeserializer&lt;GenericEntity&gt; {
     @Override
     public GenericEntity deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException {
         GenericEntity deserializedEntity = new GenericEntity();
-        GenericEntityAttributeDeserializer attributeDeserializer = new GenericEntityAttributeDeserializer();
         while (!jp.isClosed()) {
             JsonToken jsonToken = jp.nextToken();
@@ -57,6 +57,17 @@ public class GenericEntityJsonConverter {
         return writer.toString();
     }
+    public static String toJson(GenericEntityAttributeValue genericAttributeValue) throws IOException {
+        JsonFactory jFactory = new JsonFactory();
+        StringWriter writer = new StringWriter();
+        JsonGenerator jsonGenerator = jFactory.createJsonGenerator(writer);
+
+        writeGenericAttributeValue(jsonGenerator, genericAttributeValue);
+
+        jsonGenerator.close();
+        return writer.toString();
+    }
+
     /**
      * Uses a JsonGenerator to append a GenericEntity and its content to json.
      * Does not open the json object because this part depends on whether the object stands for itself or is the value of a field.
@@ -78,41 +89,31 @@ public class GenericEntityJsonConverter {
     private static void writeGenericAttribute(JsonGenerator jsonGenerator, GenericEntityAttribute genericAttribute) throws IOException {
         List<GenericEntityAttributeValue> attributeValues = genericAttribute.getValues();
+        jsonGenerator.writeStartObject();
+        jsonGenerator.writeFieldName(genericAttribute.getName());
+
         if (attributeValues == null || attributeValues.isEmpty()) {
             jsonGenerator.writeNullField(genericAttribute.getName());
         } else if (attributeValues.size() == 1) {
-            writeGenericAttributeValue(jsonGenerator, genericAttribute.getValues().get(0), genericAttribute.getName());
+            writeGenericAttributeValue(jsonGenerator, genericAttribute.getValues().get(0));
         } else {
             writeGenericAttributeMultiValue(jsonGenerator, genericAttribute);
         }
+
+        jsonGenerator.writeEndObject();
     }
     private static void writeGenericAttributeMultiValue(JsonGenerator jsonGenerator, GenericEntityAttribute genericAttribute) throws IOException {
         jsonGenerator.writeArrayFieldStart(genericAttribute.getName());
         for (GenericEntityAttributeValue genericValue : genericAttribute.getValues()) {
-            writeGenericAttributeValueInArray(jsonGenerator, genericValue);
+            writeGenericAttributeValue(jsonGenerator, genericValue);
         }
         jsonGenerator.writeEndArray();
     }
-    private static void writeGenericAttributeValue(JsonGenerator jsonGenerator, GenericEntityAttributeValue genericAttributeValue, String attributeName) throws IOException {
-        if (genericAttributeValue.getValueAsBool() != null) {
-            jsonGenerator.writeBooleanField(attributeName, genericAttributeValue.getValueAsBool());
-        } else if (genericAttributeValue.getValueAsLong() != null) {
-            jsonGenerator.writeNumberField(attributeName, genericAttributeValue.getValueAsLong());
-        } else if (genericAttributeValue.getValueAsDouble() != null) {
-            jsonGenerator.writeNumberField(attributeName, genericAttributeValue.getValueAsDouble());
-        } else if (genericAttributeValue.getValueAsString() != null) {
-            jsonGenerator.writeStringField(attributeName, genericAttributeValue.getValueAsString());
-        } else if (genericAttributeValue.getValueAsEntity() != null) {
-            jsonGenerator.writeObjectFieldStart(attributeName);
-            writeGenericEntityWithoutStart(jsonGenerator, genericAttributeValue.getValueAsEntity());
-        }
-    }
-
-    private static void writeGenericAttributeValueInArray(JsonGenerator jsonGenerator, GenericEntityAttributeValue genericAttributeValue) throws IOException {
+    private static void writeGenericAttributeValue(JsonGenerator jsonGenerator, GenericEntityAttributeValue genericAttributeValue) throws IOException {
         if (genericAttributeValue.getValueAsBool() != null) {
             jsonGenerator.writeBoolean(genericAttributeValue.getValueAsBool());
         } else if (genericAttributeValue.getValueAsLong() != null) {
@@ -16,7 +16,8 @@
             <property name="hibernate.dialect" value="de.bht.beuthbot.persistence.ExtendedPostgreSQLDialect"/>
             <!--<property name="hibernate.ejb.naming_strategy" value="org.hibernate.cfg.ImprovedNamingStrategy"/>-->
             <property name="hibernate.hbm2ddl.auto" value="create-drop" /> <!-- create / create-drop / update / none -->
-            <property name="hibernate.archive.autodetection" value="class"/>
+            <property name="hibernate.archive.autodetection" value="class"/> <!-- searches for classes with @Entity annotation -->
+            <property name="hibernate.enable_lazy_load_no_trans" value="true"/> <!-- solves hibernate's LazyInitializationExceptions when trying to access properties of queried entities -->
             <property name="hibernate.show_sql" value="true" /> <!-- Show SQL in console -->
             <property name="hibernate.format_sql" value="true" /> <!-- Show SQL formatted -->