Added lombok and removed some unused classes

myRetailApi/pom.xml

@@ -83,7 +83,18 @@
       <artifactId>jersey-apache-client</artifactId>
       <version>1.19.1</version>
     </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.16.8</version>
+    </dependency>
   </dependencies>
+  <repositories>
+        <repository>
+            <id>projectlombok.org</id>
+            <url>http://projectlombok.org/mavenrepo</url>
+        </repository>
+  </repositories>
   <build>
     <finalName>myRetailApi</finalName>
     <plugins>

myRetailApi/src/main/java/com/myRetail/product/model/CatalogInfo.java

@@ -1,5 +1,7 @@
 package com.myRetail.product.model;
 
+import lombok.Data;
+
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -8,6 +10,7 @@
  * </p>
  */
 @XmlRootElement
+@Data
 public class CatalogInfo {
 
     @XmlElement
@@ -22,27 +25,4 @@ public CatalogInfo(String id, String name) {
         this.id = id;
         this.name = name;
     }
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return "CatalogInfo{" +
-                "id='" + id + '\'' +
-                ", name='" + name + '\'' +
-                '}';
-    }
 }

myRetailApi/src/main/java/com/myRetail/product/model/Error.java

@@ -1,5 +1,8 @@
 package com.myRetail.product.model;
 
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.Date;
 
 
@@ -8,29 +11,27 @@
  * in processing a valid or invalid request to the APIs</p>
  */
 public class Error {
+    @Getter
+    @Setter
     private Date date;
+
+    @Getter
+    @Setter
     private String message;
 
+
+    /**
+     * <p>
+     * Constructur - creates an instance of this class without initializing any message.
+     * </p>
+     * <i>needed for JAXB serialization</i>
+     */
     public Error() {}
 
     public Error(Date d, String message ) {
         this.date = d;
         this.message = message;
     }
 
-    public Date getDate() {
-        return date;
-    }
-
-    public void setDate(Date date) {
-        this.date = date;
-    }
-
-    public String getMessage() {
-        return message;
-    }
 
-    public void setMessage(String message) {
-        this.message = message;
-    }
 }

myRetailApi/src/main/java/com/myRetail/product/model/PriceInfo.java

@@ -1,5 +1,9 @@
 package com.myRetail.product.model;
 
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
@@ -10,16 +14,23 @@
  * returned by subclasses of <code>PricingDAO</code></p>
  */
 @XmlRootElement
+@ToString
 public class PriceInfo {
 
     @XmlElement(name="value")
+    @Getter
+    @Setter
     private float price;
 
 
 
     @XmlElement(name="currency_code")
+    @Getter
+    @Setter
     private String currencyCode;
 
+    @XmlTransient
+    @Setter
     private String productId;
 
     public PriceInfo() {}
@@ -30,37 +41,4 @@ public PriceInfo(String productId, float price, String currencyCode) {
         this.currencyCode = currencyCode;
     }
 
-    @XmlTransient
-    public String getProductId() {
-        return productId;
-    }
-
-    public void setProductId(String productId) {
-        this.productId = productId;
-    }
-
-    public float getPrice() {
-        return price;
-    }
-
-    public void setPrice(float price) {
-        this.price = price;
-    }
-
-    public String getCurrencyCode() {
-        return currencyCode;
-    }
-
-    public void setCurrencyCode(String currencyCode) {
-        this.currencyCode = currencyCode;
-    }
-
-    @Override
-    public String toString() {
-        return "PriceInfo{" +
-                "price=" + price +
-                ", currencyCode='" + currencyCode + '\'' +
-                ", productId='" + productId + '\'' +
-                '}';
-    }
 }

myRetailApi/src/main/java/com/myRetail/product/model/ProductInfo.java

@@ -1,5 +1,7 @@
 package com.myRetail.product.model;
 
+import lombok.Data;
+
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -9,6 +11,7 @@
  * the catalog information and the pricing information.
  */
 @XmlRootElement
+@Data
 public class ProductInfo {
     @XmlElement
     private String id;
@@ -29,36 +32,4 @@ public ProductInfo(String id, String name, PriceInfo priceInfo){
         this.priceInfo = priceInfo;
     }
 
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public PriceInfo getPriceInfo() {
-        return priceInfo;
-    }
-
-    public void setPriceInfo(PriceInfo priceInfo) {
-        this.priceInfo = priceInfo;
-    }
-
-    @Override
-    public String toString() {
-        return "ProductInfo{" +
-                "id='" + id + '\'' +
-                ", name='" + name + '\'' +
-                ", priceInfo=" + priceInfo +
-                '}';
-    }
 }

myRetailApi/src/main/java/com/myRetail/product/resources/ProductResource.java

@@ -99,7 +99,6 @@ public ProductInfo setProductPrice(@PathParam("id")String id, ProductInfo produc
         setupThreadContext(Optional.ofNullable(requestId));
         List<String> errors = findErrorsInRequest(id, productInfo);
         if(!errors.isEmpty()){
-//            String errorMessage = errors.stream().map(i -> i.toString()).collect(Collectors.joining(", "));
             String errorMessage = errors.stream().collect(Collectors.joining(", "));
             errorMessage = String.format("Errors found in the request :%s",errorMessage);
             throw new BadRequestException(errorMessage,logger);

myRetailBlackBoxTests/src/test/java/net/ak/myRetailBlackBoxTests/ProductApiTest.java

@@ -4,7 +4,6 @@
 import com.datastax.driver.core.Cluster;
 import com.datastax.driver.core.Session;
 import com.datastax.driver.core.policies.DefaultRetryPolicy;
-import org.json.simple.JSONArray;
 import org.json.simple.parser.JSONParser;
 import org.junit.After;
 import org.junit.Before;