[HippoCMS-scm] [Git][cms-community/hippo-addon-channel-manager][feature/visual-editing-psp1-CHANNELMGR-872] CHANNELMGR-872 Envelope the document type reference (best practice)

[Tobias Jeger]

Tobias Jeger pushed to branch feature/visual-editing-psp1-CHANNELMGR-872 at 
cms-community / hippo-addon-channel-manager


Commits:
3c1d07e7 by Tobias Jeger at 2016-09-19T13:11:17+02:00
CHANNELMGR-872 Envelope the document type reference (best practice)

- - - - -


2 changed files:

- 
visual-editing/src/main/java/org/onehippo/cms/channelmanager/visualediting/model/Document.java
- 
visual-editing/src/main/java/org/onehippo/cms/channelmanager/visualediting/util/MockResponse.java


Changes:

=====================================
visual-editing/src/main/java/org/onehippo/cms/channelmanager/visualediting/model/Document.java
=====================================
--- 
a/visual-editing/src/main/java/org/onehippo/cms/channelmanager/visualediting/model/Document.java
+++ 
b/visual-editing/src/main/java/org/onehippo/cms/channelmanager/visualediting/model/Document.java
@@ -25,8 +25,8 @@ import java.util.Map;
  * Its {@code type} attribute refers to the document's {@link 
DocumentTypeSpec} by id.
  */
 public class Document {
-    private String id;    // UUID
-    private String type;  // "namespace:typename"
+    private String id;                // UUID
+    private Type type; // enveloped reference to document type: { id: 
"namespace:typename" }
     private String displayName;
     private Map<String, Object> fields;
 
@@ -38,12 +38,12 @@ public class Document {
         this.id = id;
     }
 
-    public String getType() {
+    public Type getType() {
         return type;
     }
 
-    public void setType(final String type) {
-        this.type = type;
+    public void setTypeId(final String id) {
+        type = new Type(id);
     }
 
     public String getDisplayName() {
@@ -64,4 +64,16 @@ public class Document {
         }
         fields.put(id, field);
     }
+
+    private class Type {
+        private String id;
+
+        public Type(String id) {
+            this.id = id;
+        }
+
+        public String getId() {
+            return id;
+        }
+    }
 }


=====================================
visual-editing/src/main/java/org/onehippo/cms/channelmanager/visualediting/util/MockResponse.java
=====================================
--- 
a/visual-editing/src/main/java/org/onehippo/cms/channelmanager/visualediting/util/MockResponse.java
+++ 
b/visual-editing/src/main/java/org/onehippo/cms/channelmanager/visualediting/util/MockResponse.java
@@ -36,7 +36,7 @@ public class MockResponse {
         final Document doc = new Document();
 
         doc.setId(id);
-        doc.setType(DOCUMENT_TYPE);
+        doc.setTypeId(DOCUMENT_TYPE);
         doc.setDisplayName("Tobi's test document");
 
         // String



View it on GitLab: 
https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/3c1d07e7ec544ea5a0fd2cfb04bd0021e83177c0

_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn