Refactoring

samples/petstore/pages.xml

@@ -17,7 +17,7 @@
             <resource method="GET">/pets</resource>
             <result>
                 <component type="CardSection" id="petsContainerCardSection">
-                    <data key="id" title="name" description="description" image="imageURL"/>
+                    <assign key="id" title="name" description="description" image="imageURL"/>
                     <route>/pets/{id}</route>
                 </component>
             </result>
@@ -33,11 +33,11 @@
             <resource method="GET">/pets/{id}</resource>
             <result>
                 <component type="Card" id="petContainerCard">
-                    <data key="id" title="name" description="description" image="imageURL"/>
+                    <assign key="id" title="name" description="description" image="imageURL"/>
                     <component type="Button" id="petAddToCartButton">
                         <text>Add to Cart</text>
                         <save type="localStorage">
-                            <data key="cart"/>
+                            <assign key="cart"/>
                         </save>
                     </component>
                 </component>
@@ -50,7 +50,7 @@
             <resource method="GET">/pets</resource>
             <result>
                 <component type="Table" id="adminPetsContainerTable">
-                    <data key="id"/>
+                    <assign key="id"/>
                     <component type="Button" id="updatePetButton">
                         <text>Update</text>
                         <route>/updatePet/{id}</route>

src/main/java/com/ravijar/model/xml/Data.java → src/main/java/com/ravijar/model/xml/Assign.java

@@ -8,7 +8,7 @@
 @Getter
 @Setter
 @ToString
-public class Data {
+public class Assign {
     @JacksonXmlProperty(isAttribute = true)
     private String key;
 

src/main/java/com/ravijar/model/xml/Save.java

@@ -12,6 +12,6 @@ public class Save {
     @JacksonXmlProperty(isAttribute = true)
     private String type;
 
-    @JacksonXmlProperty(localName = "data")
-    private Data data;
+    @JacksonXmlProperty(localName = "assign")
+    private Assign assign;
 }

src/main/java/com/ravijar/model/xml/component/Card.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ravijar.model.xml.Data;
+import com.ravijar.model.xml.Assign;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -13,8 +13,8 @@
 @Setter
 @ToString
 public class Card extends Component {
-    @JacksonXmlProperty(localName = "data")
-    private Data data;
+    @JacksonXmlProperty(localName = "assign")
+    private Assign assign;
 
     @JacksonXmlProperty(localName = "component")
     @JacksonXmlElementWrapper(useWrapping = false)

src/main/java/com/ravijar/model/xml/component/CardSection.java

@@ -1,7 +1,7 @@
 package com.ravijar.model.xml.component;
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ravijar.model.xml.Data;
+import com.ravijar.model.xml.Assign;
 import com.ravijar.model.xml.Route;
 import lombok.Getter;
 import lombok.Setter;
@@ -11,8 +11,8 @@
 @Setter
 @ToString
 public class CardSection extends Component {
-    @JacksonXmlProperty(localName = "data")
-    private Data data;
+    @JacksonXmlProperty(localName = "assign")
+    private Assign assign;
 
     @JacksonXmlProperty(localName = "route")
     private Route route;

src/main/java/com/ravijar/model/xml/component/Table.java

@@ -2,7 +2,7 @@
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-import com.ravijar.model.xml.Data;
+import com.ravijar.model.xml.Assign;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -13,8 +13,8 @@
 @Setter
 @ToString
 public class Table extends Component{
-    @JacksonXmlProperty(localName = "data")
-    private Data data;
+    @JacksonXmlProperty(localName = "assign")
+    private Assign assign;
 
     @JacksonXmlProperty(localName = "component")
     @JacksonXmlElementWrapper(useWrapping = false)

src/main/java/com/ravijar/populator/ButtonPopulator.java

@@ -24,7 +24,7 @@ public void populate(Button source, FreeMarkerButton target) {
         if (source.getSave() != null) {
             target.setAction("save");
             target.setSaveType(source.getSave().getType());
-            target.setSaveKey(source.getSave().getData().getKey());
+            target.setSaveKey(source.getSave().getAssign().getKey());
         }
     }
 }

src/main/java/com/ravijar/populator/CardPopulator.java

@@ -17,10 +17,10 @@ public CardPopulator(OpenAPIParser openAPIParser) {
 
     public void populate(Card source, FreeMarkerCard target) {
         populateComponent(source, target);
-        target.setCardKey(source.getData().getKey());
-        target.setCardTitle(source.getData().getTitle());
-        target.setCardDescription(source.getData().getDescription());
-        target.setCardImage(source.getData().getImage());
+        target.setCardKey(source.getAssign().getKey());
+        target.setCardTitle(source.getAssign().getTitle());
+        target.setCardDescription(source.getAssign().getDescription());
+        target.setCardImage(source.getAssign().getImage());
 
         List<FreeMarkerComponent> freeMarkerComponents = new ArrayList<>();
 

src/main/java/com/ravijar/populator/CardSectionPopulator.java

@@ -12,10 +12,10 @@ public CardSectionPopulator(OpenAPIParser openAPIParser) {
 
     public void populate(CardSection source, FreeMarkerCardSection target) {
         populateComponent(source, target);
-        target.setCardKey(source.getData().getKey());
-        target.setCardTitle(source.getData().getTitle());
-        target.setCardDescription(source.getData().getDescription());
-        target.setCardImage(source.getData().getImage());
+        target.setCardKey(source.getAssign().getKey());
+        target.setCardTitle(source.getAssign().getTitle());
+        target.setCardDescription(source.getAssign().getDescription());
+        target.setCardImage(source.getAssign().getImage());
         target.setRoute(source.getRoute().getUrl());
         target.setTemplateLiteralRoute(StringHelper.toTemplateLiteralRoute(source.getRoute().getUrl()));
         target.setUrlParameter(StringHelper.extractUrlParameter(source.getRoute().getUrl()));

src/main/java/com/ravijar/populator/TablePopulator.java

@@ -15,7 +15,7 @@ public class TablePopulator extends ComponentPopulator{
 
     public void populate(Table source, FreeMarkerTable target) {
         populateComponent(source, target);
-        target.setRowKey(source.getData().getKey());
+        target.setRowKey(source.getAssign().getKey());
 
         List<FreeMarkerComponent> freeMarkerComponents = new ArrayList<>();