Repair widget-ms problem; adjust sonar in poms

Using OParent again; override some Sonar configuration and tasks.
Repair display & fetch of users from remote apps.
Use EPSDK version 1710 database scripts.

Issue: PORTAL-50, PORTAL-59, PORTAL-86
Change-Id: I05eaea3680b0422236cc86cdd0ad5847c2731e54
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>

6 files changed, 12 insertions, 377 deletions

diff --git a/ecomp-portal-BE-os/README.md b/ecomp-portal-BE-os/README.md
index 45b0a791..33d968ab 100644
--- a/ecomp-portal-BE-os/README.md
+++ b/ecomp-portal-BE-os/README.md
@@ -42,6 +42,8 @@ Version 1.1.0 (Amsterdam), November 2017
 - [Portal-86] Remove internal att.com usages from tests and other files
 - [Portal-102] Fixed the page refresh issue on App Account Management page
 - [Portal-104] replace mysql DB connector with mariaDB connector
+- [Portal-116] Empty Widgets on Home page - widget uploaded with a wrong format in db 
+- [Portal-59] Fix to to display Portal users on User page
 
 Version 1.0.0, February 2017
 - Initial release
diff --git a/ecomp-portal-BE-os/pom.xml b/ecomp-portal-BE-os/pom.xml
index 901f6841..473d0eeb 100644
--- a/ecomp-portal-BE-os/pom.xml
+++ b/ecomp-portal-BE-os/pom.xml
@@ -287,7 +287,6 @@
 			<artifactId>jstl</artifactId>
 			<version>1.2</version>
 		</dependency>
-
 		<!-- Apache Tiles -->
 		<dependency>
 			<groupId>org.apache.tiles</groupId>
@@ -608,6 +607,13 @@
 			<artifactId>aspectjweaver</artifactId>
 			<version>1.8.9</version>
 		</dependency>
+		<!-- Jacoco for offline instrumentation -->
+		<dependency>
+			<groupId>org.jacoco</groupId>
+			<artifactId>org.jacoco.agent</artifactId>
+			<version>${jacocoVersion}</version>
+			<classifier>runtime</classifier>
+		</dependency>
 	</dependencies>
 
 	<reporting>
diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientService.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientService.java
deleted file mode 100644
index fd0974b0..00000000
--- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal
- * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
- * you may not use this software except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *             https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ============LICENSE_END============================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-package org.openecomp.portalapp.portal.service;
-
-import org.apache.cxf.transport.http.HTTPException;
-
-public interface ApplicationsRestClientService {
-	public <T> T get(Class<T> clazz, long app, String restPath) throws HTTPException;
-	public <T> T post(Class<T> clazz, long appId, Object payload, String restPath) throws HTTPException ;
-	public <T> T put(Class<T> clazz, long appId, Object payload, String restPath) throws HTTPException ;
-}
diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
deleted file mode 100644
index 55479a20..00000000
--- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/ApplicationsRestClientServiceImpl.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal
- * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
- * you may not use this software except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *             http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *             https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * ============LICENSE_END============================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- */
-package org.openecomp.portalapp.portal.service;
-
-import static com.att.eelf.configuration.Configuration.MDC_KEY_REQUEST_ID;
-
-import java.lang.reflect.Type;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Date;
-
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.apache.cxf.transport.http.HTTPException;
-import org.openecomp.portalapp.portal.domain.EPApp;
-import org.openecomp.portalapp.portal.logging.aop.EPAuditLog;
-import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
-import org.openecomp.portalapp.portal.logging.format.EPAppMessagesEnum;
-import org.openecomp.portalapp.portal.logging.logic.EPLogUtil;
-import org.openecomp.portalapp.portal.utils.EPSystemProperties;
-import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.onboarding.util.CipherUtil;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.slf4j.MDC;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.EnableAspectJAutoProxy;
-import org.springframework.stereotype.Service;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-
-@Service("applicationsRestClientService")
-@org.springframework.context.annotation.Configuration
-@EnableAspectJAutoProxy
-@EPAuditLog
-public class ApplicationsRestClientServiceImpl implements ApplicationsRestClientService {
-
-	private static final String PASSWORD_HEADER = "password";
-
-	private static final String APP_USERNAME_HEADER = "username";
-
-	private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ApplicationsRestClientServiceImpl.class);
-
-	@Autowired
-	private AppsCacheService appsCacheService;
-	Gson gson = null;
-
-	private final ObjectMapper mapper = new ObjectMapper();
-
-	@PostConstruct
-	private void init() {
-		logger.debug(EELFLoggerDelegate.debugLogger, "initializing");
-		GsonBuilder builder = new GsonBuilder();
-
-		// Register an adapter to manage the date types as long values
-		builder.registerTypeAdapter(Date.class, new JsonDeserializer<Date>() {
-			public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
-					throws JsonParseException {
-				return new Date(json.getAsJsonPrimitive().getAsLong());
-			}
-		});
-
-		gson = builder.create();
-	}
-
-	// TODO: do we need to do additional logging for remote API calls?
-	private static WebClient createClientForPath(String baseUri, String path) {
-		logger.info(EELFLoggerDelegate.debugLogger, "Creating web client for " + baseUri + "   +   " + path);
-		WebClient client = WebClient.create(baseUri);
-		client.type(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON);
-		client.path(path);
-		return client;
-	}
-
-	@EPMetricsLog
-	private void verifyResponse(Response response) throws HTTPException {
-		int status = response.getStatus();
-		logger.debug(EELFLoggerDelegate.debugLogger, "http response status=" + status);
-		MDC.put(EPSystemProperties.EXTERNAL_API_RESPONSE_CODE, Integer.toString(status));
-		if (!isHttpSuccess(status)) {
-			String errMsg = "Failed. Status=" + status + "; [" + response.getStatusInfo().getReasonPhrase().toString()
-					+ "]";
-			URL url = null;
-			try {
-				// must not be null to avoid NPE in HTTPException constructor
-				url = new URL("http://null");
-				if (response.getLocation() != null)
-					url = response.getLocation().toURL();
-			} catch (MalformedURLException e) {
-				// never mind. it is only for the debug message.
-				logger.warn(EELFLoggerDelegate.errorLogger, "Failed to build URL", e);
-			}
-			logger.error(EELFLoggerDelegate.errorLogger, "http response failed. " + errMsg + "; url=" + url);
-			EPLogUtil.logEcompError(EPAppMessagesEnum.BeIncorrectHttpStatusError);
-			throw new HTTPException(status, errMsg, url);
-		}
-	}
-
-	private static boolean isHttpSuccess(int status) {
-		return status / 100 == 2;
-	}
-
-	@EPMetricsLog
-	private WebClient createClientForApp(long appId, String restPath) {
-		logger.debug(EELFLoggerDelegate.debugLogger, "creating client for appId=" + appId + "; restPath=" + restPath);
-		EPApp externalApp = appsCacheService.getApp(appId);
-		if (externalApp != null) {
-			String appBaseUri = externalApp.getAppRestEndpoint();
-			String username = externalApp.getUsername();
-			String encriptedPwd = externalApp.getAppPassword();
-			String decreptedAppPwd = "";
-
-			// Set local context
-			MDC.put(EPSystemProperties.PROTOCOL, EPSystemProperties.HTTP);
-			if (appBaseUri != null && appBaseUri.contains("https")) {
-				MDC.put(EPSystemProperties.PROTOCOL, EPSystemProperties.HTTPS);
-			}
-			MDC.put(EPSystemProperties.FULL_URL, appBaseUri + restPath);
-			MDC.put(EPSystemProperties.TARGET_ENTITY, externalApp.getName());
-			MDC.put(EPSystemProperties.TARGET_SERVICE_NAME, restPath);
-
-			try {
-				decreptedAppPwd = CipherUtil.decrypt(encriptedPwd,
-						SystemProperties.getProperty(SystemProperties.Decryption_Key));
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger, "createClientForApp failed to decrypt", e);
-			}
-			logger.debug(EELFLoggerDelegate.debugLogger,
-					String.format("App %d found, baseUri=[%s], Headers: [%s=%s, %s=%s]", appId, appBaseUri,
-							APP_USERNAME_HEADER, username, PASSWORD_HEADER, encriptedPwd));
-			WebClient client = createClientForPath(appBaseUri, restPath);
-			client.header(APP_USERNAME_HEADER, username);
-			client.header(PASSWORD_HEADER, decreptedAppPwd);
-			client.header(SystemProperties.ECOMP_REQUEST_ID, MDC.get(MDC_KEY_REQUEST_ID));
-			client.header(SystemProperties.USERAGENT_NAME, EPSystemProperties.ECOMP_PORTAL_BE);
-
-			return client;
-		}
-		return null;
-	}
-
-	@Override
-	public <T> T get(Class<T> clazz, long appId, String restPath) throws HTTPException {
-
-		WebClient webClient = null;
-		Response response = null;
-		T t = null;
-
-		webClient = createClientForApp(appId, restPath);
-		EcompPortalUtils.logAndSerializeObject(restPath, "GET request =", "no-payload");
-
-		try {
-			if (webClient != null) {
-				response = webClient.get();
-			} else {
-				logger.error(EELFLoggerDelegate.errorLogger,
-						"Unable to create the Webclient to make the '" + restPath + "' API call.");
-			}
-		} catch (Exception e) {
-			MDC.put(EPSystemProperties.EXTERNAL_API_RESPONSE_CODE,
-					Integer.toString(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
-			EPLogUtil.logEcompError(EPAppMessagesEnum.BeRestApiGeneralError);
-			logger.error(EELFLoggerDelegate.errorLogger, "get 1 failed", e);
-		}
-
-		if (response != null) {
-			verifyResponse(response);
-			String str = response.readEntity(String.class);
-			EcompPortalUtils.logAndSerializeObject(restPath, "GET result =", str);
-			try {
-				t = mapper.readValue(str, clazz);
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger, "get 2 failed", e);
-				EPLogUtil.logEcompError(EPAppMessagesEnum.BeInvalidJsonInput);
-			}
-		}
-
-		return t;
-	}
-
-	@Override
-	public <T> T post(Class<T> clazz, long appId, Object payload, String restPath) throws HTTPException {
-		WebClient client = null;
-		Response response = null;
-		T t = null;
-
-		client = createClientForApp(appId, restPath);
-		EcompPortalUtils.logAndSerializeObject(restPath, "POST request =", payload);
-
-		try {
-			if (client != null) {
-				response = client.post(payload);
-			} else {
-				logger.error(EELFLoggerDelegate.errorLogger,
-						"Unable to create the Webclient to make the {} API call", restPath);
-			}
-		} catch (Exception e) {
-			MDC.put(EPSystemProperties.EXTERNAL_API_RESPONSE_CODE,
-					Integer.toString(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
-			EPLogUtil.logEcompError(EPAppMessagesEnum.BeRestApiGeneralError);
-			logger.error(EELFLoggerDelegate.errorLogger, "post 1 failed", e);
-		}
-
-		if (response != null) {
-			verifyResponse(response);
-
-			// String contentType = response.getHeaderString("Content-Type");
-			if (clazz != null) {
-				String str = response.readEntity(String.class);
-				EcompPortalUtils.logAndSerializeObject(restPath, "POST result =", str);
-				try {
-					t = gson.fromJson(str, clazz);
-				} catch (Exception e) {
-					logger.error(EELFLoggerDelegate.errorLogger, "post 2 failed", e);
-					EPLogUtil.logEcompError(EPAppMessagesEnum.BeInvalidJsonInput);
-				}
-			}
-		}
-		return t;
-	}
-
-	@Override
-	public <T> T put(Class<T> clazz, long appId, Object payload, String restPath) throws HTTPException {
-		WebClient client = null;
-		Response response = null;
-		T t = null;
-
-		client = createClientForApp(appId, restPath);
-		EcompPortalUtils.logAndSerializeObject(restPath, "PUT request =", payload);
-
-		try {
-			if (client != null) {
-				response = client.put(payload);
-			} else {
-				logger.error(EELFLoggerDelegate.errorLogger,
-						"Unable to create the Webclient to make the '" + restPath + "' API call.");
-			}
-		} catch (Exception e) {
-			MDC.put(EPSystemProperties.EXTERNAL_API_RESPONSE_CODE,
-					Integer.toString(HttpServletResponse.SC_INTERNAL_SERVER_ERROR));
-			EPLogUtil.logEcompError(EPAppMessagesEnum.BeRestApiGeneralError);
-			logger.error(EELFLoggerDelegate.errorLogger, "put 1 failed", e);
-		}
-
-		if (response != null) {
-			verifyResponse(response);
-			String str = response.readEntity(String.class);
-			EcompPortalUtils.logAndSerializeObject(restPath, "PUT result =", str);
-			try {
-				t = gson.fromJson(str, clazz);
-			} catch (Exception e) {
-				logger.error(EELFLoggerDelegate.errorLogger, "put 2 failed", e);
-				EPLogUtil.logEcompError(EPAppMessagesEnum.BeInvalidJsonInput);
-			}
-		}
-		return t;
-	}
-}
diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/UserRolesServiceImpl.java b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/UserRolesServiceImpl.java
index c38fc6ae..41b320c2 100644
--- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/UserRolesServiceImpl.java
+++ b/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/service/UserRolesServiceImpl.java
@@ -37,7 +37,6 @@
  */
 package org.openecomp.portalapp.portal.service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.cxf.transport.http.HTTPException;
@@ -46,8 +45,6 @@ import org.openecomp.portalapp.portal.domain.EPRole;
 import org.openecomp.portalapp.portal.domain.EPUser;
 import org.openecomp.portalapp.portal.domain.EPUserApp;
 import org.openecomp.portalapp.portal.logging.aop.EPMetricsLog;
-import org.openecomp.portalapp.portal.transport.RemoteUserWithRoles;
-import org.openecomp.portalapp.portal.transport.UserApplicationRoles;
 import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.openecomp.portalsdk.core.service.DataAccessService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,9 +66,7 @@ public class UserRolesServiceImpl extends UserRolesCommonServiceImpl implements
 
 	@Autowired
 	private DataAccessService dataAccessService;
-	@Autowired
-	private ApplicationsRestClientService applicationsRestClientService;
-
+	
 	private EPUser getUserFromRemoteApp(String orgUserId, EPApp app,
 			ApplicationsRestClientService applicationsRestClientService) throws HTTPException {
 		EPUser user = applicationsRestClientService.get(EPUser.class, app.getId(),
@@ -100,25 +95,6 @@ public class UserRolesServiceImpl extends UserRolesCommonServiceImpl implements
 		applicationsRestClientService.post(EPUser.class, app.getId(), userAsString, String.format("/user", orgUserId));
 	}
 
-	@Override
-	public List<UserApplicationRoles> getUsersFromAppEndpoint(Long appId) throws HTTPException {
-		RemoteUserWithRoles[] remoteUsers = applicationsRestClientService.get(RemoteUserWithRoles[].class, appId,
-				"/users");
-		ArrayList<UserApplicationRoles> userApplicationRoles = new ArrayList<UserApplicationRoles>();
-		for (RemoteUserWithRoles remoteUser : remoteUsers) {
-			UserApplicationRoles userWithRemoteAppRoles = convertToUserApplicationRoles(appId, remoteUser);
-			if (userWithRemoteAppRoles.getRoles() != null && userWithRemoteAppRoles.getRoles().size() > 0) {
-				userApplicationRoles.add(userWithRemoteAppRoles);
-			} else {
-				logger.debug(EELFLoggerDelegate.debugLogger, "User " + userWithRemoteAppRoles.getOrgUserId()
-						+ " doesn't have any roles assigned to any app.");
-
-			}
-		}
-
-		return userApplicationRoles;
-	}
-
 	public static void persistExternalRoleInEcompDb(EPRole externalAppRole, Long appId, EPRoleService roleService) {
 		externalAppRole.setAppId(appId);
 		externalAppRole.setAppRoleId(externalAppRole.getId());
diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/raptor_pdf.properties b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
index 38e05235..484f205c 100644
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
+++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/raptor_pdf.properties
@@ -50,8 +50,8 @@ pdf_data_table_header_background_hex_code=#8A9BB3
 #footer header
 pdf_footer_font_size=9
 pdf_footer_font_family=Arial
-pdf_att_proprietary=xxxx
-pdf_att_proprierary_font_size=7
+pdf_proprietary=xxxx
+pdf_proprierary_font_size=7
 pdf_date_timezone=GMT
 pdf_date_pattern=MM/dd/yyyy hh:mm:ss a
 ##page number position at 1 - footer middle, 0 -- header right, 2 - both