Added Junits

Issue-ID: PORTAL-136, PORTAL-188

Includes FW mode central changes

Change-Id: Iba6c0d48ed768e32d1fe4700d0044eb7f3fdc482
Signed-off-by: Hima Elisetty <hbindu@research.att.com>

1 files changed, 17 insertions, 23 deletions

diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPIProxy.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPIProxy.java
index 2ceb8e7c..810771bd 100644
--- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPIProxy.java
+++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/PortalRestAPIProxy.java
@@ -126,7 +126,11 @@ public class PortalRestAPIProxy extends HttpServlet implements IPortalRestAPISer
 		try {
 			logger.debug("init: creating instance of class " + className);
 			Class<?> implClass = Class.forName(className);
-			portalRestApiServiceImpl = (IPortalRestAPIService) (implClass.getConstructor().newInstance());
+			if (!isCentralized.equals(isAccessCentralized))
+				portalRestApiServiceImpl = (IPortalRestAPIService) (implClass.getConstructor().newInstance());
+			else {
+				portalRestApiServiceImpl = new PortalRestAPICentralServiceImpl();				
+			}
 		} catch (Exception ex) {
 			throw new ServletException("init: Failed to find or instantiate class " + className, ex);
 		}
@@ -243,17 +247,12 @@ public class PortalRestAPIProxy extends HttpServlet implements IPortalRestAPISer
 			// Example: /user <-- create user
 			if (requestUri.endsWith(PortalApiConstants.API_PREFIX + "/user")) {
 				try {
-					if (isCentralized.equals(isAccessCentralized)) {
-						responseJson = buildJsonResponse(true, errorMessage);
-						response.setStatus(HttpServletResponse.SC_OK);
-					} else {
-						EcompUser user = mapper.readValue(requestBody, EcompUser.class);
-						pushUser(user);
-						if (logger.isDebugEnabled())
-							logger.debug("doPost: pushUser: success");
-						responseJson = buildJsonResponse(true, null);
-						response.setStatus(HttpServletResponse.SC_OK);
-					}
+					EcompUser user = mapper.readValue(requestBody, EcompUser.class);
+					pushUser(user);
+					if (logger.isDebugEnabled())
+						logger.debug("doPost: pushUser: success");
+					responseJson = buildJsonResponse(true, null);
+					response.setStatus(HttpServletResponse.SC_OK);
 				} catch (Exception ex) {
 					responseJson = buildJsonResponse(ex);
 					response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
@@ -264,17 +263,12 @@ public class PortalRestAPIProxy extends HttpServlet implements IPortalRestAPISer
 			if (requestUri.contains(PortalApiConstants.API_PREFIX + "/user/") && !(requestUri.endsWith("/roles"))) {
 				String loginId = requestUri.substring(requestUri.lastIndexOf('/') + 1);
 				try {
-					if (isCentralized.equals(isAccessCentralized)) {
-						responseJson = buildJsonResponse(true, errorMessage);
-						response.setStatus(HttpServletResponse.SC_OK);
-					} else {
-						EcompUser user = mapper.readValue(requestBody, EcompUser.class);
-						editUser(loginId, user);
-						if (logger.isDebugEnabled())
-							logger.debug("doPost: editUser: success");
-						responseJson = buildJsonResponse(true, null);
-						response.setStatus(HttpServletResponse.SC_OK);
-					}
+					EcompUser user = mapper.readValue(requestBody, EcompUser.class);
+					editUser(loginId, user);
+					if (logger.isDebugEnabled())
+						logger.debug("doPost: editUser: success");
+					responseJson = buildJsonResponse(true, null);
+					response.setStatus(HttpServletResponse.SC_OK);
 				} catch (Exception ex) {
 					responseJson = buildJsonResponse(ex);
 					response.setStatus(HttpServletResponse.SC_BAD_REQUEST);