event schema metadata changes

kaaproject · Jul 11, 2016 · 66fdf4c · 66fdf4c
1 parent 706acc1
commit 66fdf4c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/...on/dao/src/main/java/org/kaaproject/kaa/server/common/dao/schema/EventSchemaMetadata.java b/...on/dao/src/main/java/org/kaaproject/kaa/server/common/dao/schema/EventSchemaMetadata.java
@@ -22,7 +22,15 @@ public class EventSchemaMetadata {
 
     private String fqn;
     private EventClassType type;
-    private String schema;
+    private String ctlSchemaId;
+
+    public String getCtlSchemaId() {
+        return ctlSchemaId;
+    }
+
+    public void setCtlSchemaId(String ctlSchemaId) {
+        this.ctlSchemaId = ctlSchemaId;
+    }
 
     public String getFqn() {
         return fqn;
@@ -40,21 +48,13 @@ public void setType(EventClassType type) {
         this.type = type;
     }
 
-    public String getSchema() {
-        return schema;
-    }
-
-    public void setSchema(String schema) {
-        this.schema = schema;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((fqn == null) ? 0 : fqn.hashCode());
-        result = prime * result + ((schema == null) ? 0 : schema.hashCode());
         result = prime * result + ((type == null) ? 0 : type.hashCode());
+        result = prime * result + ((ctlSchemaId == null) ? 0 : ctlSchemaId.hashCode());
         return result;
     }
 
@@ -77,14 +77,14 @@ public boolean equals(Object obj) {
         } else if (!fqn.equals(other.fqn)) {
             return false;
         }
-        if (schema == null) {
+        if (type != other.type) {
-            if (other.schema != null) {
-                return false;
-            }
-        } else if (!schema.equals(other.schema)) {
             return false;
         }
-        if (type != other.type) {
+        if (ctlSchemaId == null) {
+            if (other.ctlSchemaId != null) {
+                return false;
+            }
+        } else if (!ctlSchemaId.equals(other.ctlSchemaId)) {
             return false;
         }
         return true;

diff --git a/...o/src/main/java/org/kaaproject/kaa/server/common/dao/schema/EventSchemaProcessorImpl.java b/...o/src/main/java/org/kaaproject/kaa/server/common/dao/schema/EventSchemaProcessorImpl.java
@@ -31,6 +31,7 @@ public class EventSchemaProcessorImpl implements EventSchemaProcessor {
     private static final Logger LOG = LoggerFactory.getLogger(EventSchemaProcessorImpl.class);
 
     private static final String CLASS_TYPE = "classType";
+    private static final String CTL_SCHEMA_ID = "ctlSchemaId";
 
     @Override
     public List<EventSchemaMetadata> processSchema(String schema)
@@ -58,8 +59,9 @@ public List<EventSchemaMetadata> processSchema(String schema)
                     LOG.error("Can't process provided event class family schema. Invalid classType [{}]. Exception catched: {}", strClassType, e);
                     throw new EventSchemaException("Can't process provided event class family schema. Invalid classType: " + strClassType);
                 }
+                String ctlSchemaId = parsedEventClassSchema.getProp(CTL_SCHEMA_ID);
+                eventClassSchema.setCtlSchemaId(ctlSchemaId);
                 eventClassSchema.setType(classType);
-                eventClassSchema.setSchema(parsedEventClassSchema.toString());
                 eventClassSchemas.add(eventClassSchema);
             }
         } catch (Exception e) {