Cynja deployment

src/main/java/biz/neustar/pc/ui/constants/UIRestPathConstants.java

@@ -42,6 +42,7 @@ public class UIRestPathConstants {
     public static final String CSP_CLOUD_NAME = "cspCloudName";
     public static final String CLOUD_NAME = "cloudName";
     public static final String PRODUCT_NAME = "productName";
+    public static final String EMAIL = "email";
 
     public static final String BASE_URI_NAME_AVAILABILITY_API = PATH_WITH_CURRENT_API_VERSION
             + "/clouds/personalClouds/{cloudName}/available";
@@ -76,7 +77,8 @@ public class UIRestPathConstants {
 
     public static final String PERSONAL_CLOUD_CHANGE_PASSWORD_URI = REGISTER_PERSONAL_CLOUD_URI
             + "/{cloudName}/changePassword";
-
+    public static final String PERSONAL_CLOUD_PROV_FEEDBACK_URI = PATH_WITH_CURRENT_API_VERSION
+            + "/feedback";
     public static final String GET_DEPENDENTS_URI = REGISTER_PERSONAL_CLOUD_URI + "/{cloudName}/dependents";
 
     public static final String NAME_AVAILABILITY_API = PATH_WITH_CURRENT_API_VERSION
@@ -89,10 +91,10 @@ public class UIRestPathConstants {
     public static final String GET_DEPENDENTS_API = PATH_WITH_CURRENT_API_VERSION
             + "/csp/{0}/clouds/personalClouds/{1}/dependents";
     public static final String PERSONAL_CLOUD_FORGOT_PASSWORD_API = PATH_WITH_CURRENT_API_VERSION
-            + "/csp/{0}/clouds/personalCloud/{1}/forgotPassword";
+            + "/csp/{0}/clouds/personalClouds/{1}/forgotPassword";
 
     public static final String PERSONAL_CLOUD_RESET_PASSWORD_API = PATH_WITH_CURRENT_API_VERSION
-            + "/csp/{0}/clouds/personalCloud/{1}/resetPassword";
+            + "/csp/{0}/clouds/personalClouds/{1}/resetPassword";
     public static final String PERSONAL_CLOUD_AUTH_API = PATH_WITH_CURRENT_API_VERSION
             + "/csp/{0}/clouds/personalClouds/{1}/authenticate";
     public static final String PAYMENT_API = PATH_WITH_CURRENT_API_VERSION + "/products/{0}/payments";

src/main/java/biz/neustar/pc/ui/controller/PersonalCloudRegistrationController.java

@@ -24,12 +24,12 @@ of this software and associated documentation files (the "Software"), to deal
 package biz.neustar.pc.ui.controller;
 
 import java.io.IOException;
-import java.io.PrintWriter;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.ws.rs.FormParam;
 
+import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,16 +40,20 @@ of this software and associated documentation files (the "Software"), to deal
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import biz.neustar.pc.ui.constants.UIRestPathConstants;
+import biz.neustar.pc.ui.exception.PCloudErrorsUIException;
 import biz.neustar.pc.ui.exception.PCloudUIException;
 import biz.neustar.pc.ui.manager.impl.PCloudResponse;
 import biz.neustar.pc.ui.manager.impl.PersonalCloudManager;
 import biz.neustar.pcloud.rest.constants.ProductNames;
 import biz.neustar.pcloud.rest.dto.CloudInfo;
 import biz.neustar.pcloud.rest.dto.CloudValidation;
 import biz.neustar.pcloud.rest.dto.DependentList;
+import biz.neustar.pcloud.rest.dto.FeedbackInfo;
+import biz.neustar.pcloud.rest.dto.PCloudError;
 import biz.neustar.pcloud.rest.dto.PaymentInfo;
 import biz.neustar.pcloud.rest.dto.PaymentResponse;
 import biz.neustar.pcloud.rest.dto.Synonym;
@@ -164,15 +168,43 @@ PCloudResponse processChangePassword(
         return personalCloudManagerImpl.changePassword(cspCloudName, cloudName, cloudValidation);
 
     }
+
+    @RequestMapping(value = UIRestPathConstants.PERSONAL_CLOUD_PROV_FEEDBACK_URI, method = RequestMethod.POST)
+    public @ResponseBody
+    PCloudResponse processFeedback(@RequestBody final FeedbackInfo feedbackInfo) {
+        return personalCloudManagerImpl.processFeedback(feedbackInfo);
+
+    }
+
     @SuppressWarnings("unchecked")
     @ExceptionHandler(PCloudUIException.class)
-    public @ResponseBody String handleUltraException(PCloudUIException exception, HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public @ResponseBody
+    String handleException(PCloudUIException exception, HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
         response.setStatus(exception.getStatusCode());
-
+        JSONArray errors = new JSONArray();
         JSONObject error = new JSONObject();
-        error.put("errorCode", exception.getErrorCode()); 
-        error.put("errorMessage", exception.getErrorMessage()); 
-        LOGGER.error("Error : {}", exception.getLocalizedMessage(), exception);
-        return error.toJSONString();
+        error.put("errorCode", exception.getErrorCode());
+        error.put("errorMessage", exception.getErrorMessage());
+        errors.add(error);
+        LOGGER.debug("Errors : {}", exception.getLocalizedMessage(), exception);
+        return errors.toJSONString();
+    }
+
+    @SuppressWarnings("unchecked")
+    @ExceptionHandler(PCloudErrorsUIException.class)
+    public @ResponseBody
+    String handleUIException(PCloudErrorsUIException exception, HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
+        response.setStatus(exception.getStatusCode());
+        JSONArray errors = new JSONArray();
+        for (PCloudError pCloudError : exception.getErrors()) {
+            JSONObject jsonObject = new JSONObject();
+            jsonObject.put("errorCode", pCloudError.getErrorCode());
+            jsonObject.put("errorMessage", pCloudError.getErrorMessage());
+            errors.add(jsonObject);
+        }
+        LOGGER.debug("Errors : {}", errors, exception);
+        return errors.toJSONString();
     }
 }

src/main/java/biz/neustar/pc/ui/exception/PCloudErrorsUIException.java

@@ -0,0 +1,50 @@
+package biz.neustar.pc.ui.exception;
+
+import java.util.List;
+
+import biz.neustar.pc.ui.utils.PCloudErrorUtil;
+import biz.neustar.pcloud.rest.dto.PCloudError;
+
+public class PCloudErrorsUIException extends RuntimeException {
+
+    /**
+	 * 
+	 */
+    private static final long serialVersionUID = 1L;
+
+    private List<PCloudError> errors;
+    private int statusCode;
+
+    public List<PCloudError> getErrors() {
+        if (errors != null) {
+            for (PCloudError pCloudError : errors) {
+                pCloudError.setErrorMessage(PCloudErrorUtil.getProperty(Integer.toString(pCloudError.getErrorCode())));
+            }
+        }
+        return errors;
+    }
+
+    public void setErrors(List<PCloudError> errors) {
+        this.errors = errors;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public void setStatusCode(int statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public PCloudErrorsUIException(List<PCloudError> errors, int statusCode) {
+        super();
+        this.errors = errors;
+        this.statusCode = statusCode;
+    }
+
+    @Override
+    public String toString() {
+        return "PCloudErrorsUIException [errors=" + errors + ", statusCode=" + statusCode + "]";
+    }
+
+}

src/main/java/biz/neustar/pc/ui/exception/PCloudUIException.java

@@ -1,53 +1,65 @@
 package biz.neustar.pc.ui.exception;
 
-public class PCloudUIException extends RuntimeException{
+import biz.neustar.pc.ui.utils.PCloudErrorUtil;
 
-	/**
+public class PCloudUIException extends RuntimeException {
+
+    /**
      * 
      */
     private static final long serialVersionUID = 1L;
     int errorCode;
     String errorMessage;
-	int statusCode;
-	
-	/**
+    int statusCode;
+
+    /**
      * @return the errorCode
      */
     public int getErrorCode() {
         return errorCode;
     }
+
     /**
-     * @param errorCode the errorCode to set
+     * @param errorCode
+     *            the errorCode to set
      */
     public void setErrorCode(int errorCode) {
         this.errorCode = errorCode;
     }
+
     public String getErrorMessage() {
-		return errorMessage;
-	}
-	public void setErrorMessage(String errorMessage) {
-		this.errorMessage = errorMessage;
-	}
-	public int getStatusCode() {
-		return statusCode;
-	}
-	public void setStatusCode(int statusCode) {
-		this.statusCode = statusCode;
-	}
-	public PCloudUIException(int errorCode, String errorMessage, int statusCode) {
-		super();
-		this.errorCode = errorCode;
-		this.errorMessage = errorMessage;
-		this.statusCode = statusCode;
-	}
-	public PCloudUIException(String errorMessage) {
-		super();
-		this.errorMessage = errorMessage;
-	}
-	@Override
-	public String toString() {
-		return "PCloudUIException [errorCode="+errorCode+",errorMessage=" + errorMessage
-				+ ", statusCode=" + statusCode + "]";
-	}
-
+        return PCloudErrorUtil.getProperty(Integer.toString(errorCode));
+
+    }
+
+    public void setErrorMessage(String errorMessage) {
+        this.errorMessage = errorMessage;
+    }
+
+    public int getStatusCode() {
+        return statusCode;
+    }
+
+    public void setStatusCode(int statusCode) {
+        this.statusCode = statusCode;
+    }
+
+    public PCloudUIException(int errorCode, String errorMessage, int statusCode) {
+        super();
+        this.errorCode = errorCode;
+        this.errorMessage = errorMessage;
+        this.statusCode = statusCode;
+    }
+
+    public PCloudUIException(String errorMessage) {
+        super();
+        this.errorMessage = errorMessage;
+    }
+
+    @Override
+    public String toString() {
+        return "PCloudUIException [errorCode=" + errorCode + ",errorMessage=" + errorMessage + ", statusCode="
+                + statusCode + "]";
+    }
+
 }

src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManager.java

@@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
 import biz.neustar.pcloud.rest.dto.CloudInfo;
 import biz.neustar.pcloud.rest.dto.CloudValidation;
 import biz.neustar.pcloud.rest.dto.DependentList;
+import biz.neustar.pcloud.rest.dto.FeedbackInfo;
 import biz.neustar.pcloud.rest.dto.PaymentInfo;
 import biz.neustar.pcloud.rest.dto.PaymentResponse;
 import biz.neustar.pcloud.rest.dto.Synonym;
@@ -58,4 +59,6 @@ public interface PersonalCloudManager {
     public abstract PaymentResponse processPayment(ProductNames productName, PaymentInfo paymentInfo);
 
     public abstract PCloudResponse changePassword(String cspCloudName, String cloudName, CloudValidation cloudValidation);
+
+    public abstract PCloudResponse processFeedback(FeedbackInfo feedbackInfo);
 }

src/main/java/biz/neustar/pc/ui/manager/impl/PersonalCloudManagerImpl.java

@@ -25,26 +25,30 @@ of this software and associated documentation files (the "Software"), to deal
 
 import java.io.IOException;
 import java.text.MessageFormat;
+import java.util.List;
 
 import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import biz.neustar.pc.ui.constants.UIRestPathConstants;
+import biz.neustar.pc.ui.exception.PCloudErrorsUIException;
 import biz.neustar.pc.ui.exception.PCloudUIException;
 import biz.neustar.pcloud.PCRestClient;
 import biz.neustar.pcloud.ResponseData;
 import biz.neustar.pcloud.rest.constants.ProductNames;
 import biz.neustar.pcloud.rest.dto.CloudInfo;
 import biz.neustar.pcloud.rest.dto.CloudValidation;
 import biz.neustar.pcloud.rest.dto.DependentList;
+import biz.neustar.pcloud.rest.dto.FeedbackInfo;
 import biz.neustar.pcloud.rest.dto.PCloudError;
 import biz.neustar.pcloud.rest.dto.PaymentInfo;
 import biz.neustar.pcloud.rest.dto.PaymentResponse;
 import biz.neustar.pcloud.rest.dto.Synonym;
 import biz.neustar.pcloud.rest.dto.SynonymInfo;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.type.TypeFactory;
 import com.sun.jersey.api.representation.Form;
 
 /**
@@ -56,9 +60,10 @@ public class PersonalCloudManagerImpl implements PersonalCloudManager {
      * 
      */
     private PCRestClient pcRestClient;
-
-    public PersonalCloudManagerImpl(PCRestClient pcRestClient) {
+    private String feedbackEmail;
+    public PersonalCloudManagerImpl(PCRestClient pcRestClient, String feedbackEmail) {
         this.pcRestClient = pcRestClient;
+        this.feedbackEmail = feedbackEmail;
     }
 
     /*
@@ -212,23 +217,30 @@ public <Entity> Entity handleException(ResponseData responsedata, Class<Entity>
                 error = new ObjectMapper().readValue(responsedata.getBody(), PCloudError.class);
                 throw new PCloudUIException(error.getErrorCode(), error.getErrorMessage(), responsedata.getStatus());
             } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
+                LOGGER.error("Might be list of errors :");
+                List<PCloudError> errors;
+                try {
+                    errors = new ObjectMapper().readValue(responsedata.getBody(), TypeFactory.defaultInstance()
+                            .constructCollectionType(List.class, PCloudError.class));
+                    throw new PCloudErrorsUIException(errors, responsedata.getStatus());
+                } catch (IOException e1) {
+                    LOGGER.error("Error while parsing response data for error condition", e1);
+                }
             }
-
         } else {
-
             try {
-
                 entity = entityType.cast(new ObjectMapper().readValue(responsedata.getBody(), entityType));
-
             } catch (Exception e) {
-                LOGGER.info("inside exception");
-                e.printStackTrace();
+                LOGGER.error("Error while parsing response data for success", e);
             }
-
         }
         return entity;
+    }
 
+    @Override
+    public PCloudResponse processFeedback(FeedbackInfo feedbackInfo) {
+        feedbackInfo.setToEmail(feedbackEmail);
+        return handleException(pcRestClient.post(UIRestPathConstants.PERSONAL_CLOUD_PROV_FEEDBACK_URI, feedbackInfo),
+                PCloudResponse.class);
     }
 }