1 files changed, 102 insertions, 115 deletions
diff --git a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointCredentials.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointCredentials.java
index 7af9e49..abbfd52 100644
--- a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointCredentials.java
+++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/ControllerEndpointCredentials.java
@@ -1,116 +1,103 @@
-/*******************************************************************************
- * =============LICENSE_START=========================================================
- *
- * =================================================================================
- *  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file 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.
- * ============LICENSE_END=========================================================
- *
- *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
- *******************************************************************************/
-package org.onap.ccsdk.dashboard.model;
-
-import org.onap.ccsdk.dashboard.exception.DashboardControllerException;
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.onap.portalsdk.core.onboarding.util.CipherUtil;
-
-/**
- * Model with Controller username and password for use only within the back end;
- * never serialized as JSON.
- */
-public class ControllerEndpointCredentials extends ControllerEndpointTransport {
-
-	private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ControllerEndpointCredentials.class);
-
-	public String username;
-	public String password;
-	public boolean isEncryptedPass;
-
-	public ControllerEndpointCredentials(boolean selected, String name, String url, String username, String password,
-			boolean isEncryptedPass) {
-		super(selected, name, url);
-		this.username = username;
-		this.password = password;
-		this.isEncryptedPass = isEncryptedPass;
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public boolean getEncryptedPassword() {
-		return isEncryptedPass;
-	}
-
-	public void setEncryptedPassword(boolean isEncryptedPass) {
-		this.isEncryptedPass = isEncryptedPass;
-	}
-
-	/**
-	 * Convenience method to yield a ControllerEndpointTransport object.
-	 * 
-	 * @return ControllerEndpoint with copy of the non-privileged data
-	 */
-	public ControllerEndpointTransport toControllerEndpointTransport() {
-		return new ControllerEndpointTransport(getSelected(), getName(), getUrl());
-	}
-
-	/**
-	 * Accepts clear text and stores an encrypted value; as a side effect, sets the
-	 * encrypted flag to true.
-	 * 
-	 * @param plainText
-	 *            Clear-text password
-	 * @throws DashboardControllerException
-	 *             If encryption fails
-	 */
-	public void encryptPassword(final String plainText) throws DashboardControllerException {
-		try {
-			this.password = CipherUtil.encrypt(plainText);
-			this.isEncryptedPass = true;
-		} catch (Exception ex) {
-			logger.error("encryptPassword failed", ex);
-			throw new DashboardControllerException(ex);
-		}
-	}
-
-	/**
-	 * Client should call this method if {@link #getEncryptedPassword()} returns
-	 * true.
-	 * 
-	 * @return Clear-text password.
-	 * @throws DashboardControllerException
-	 *             If decryption fails
-	 */
-	public String decryptPassword() throws DashboardControllerException {
-		try {
-			return CipherUtil.decrypt(password);
-		} catch (Exception ex) {
-			logger.error("decryptPassword failed", ex);
-			throw new DashboardControllerException(ex);
-		}
-	}
+/*******************************************************************************
+ * =============LICENSE_START=========================================================
+ *
+ * =================================================================================
+ *  Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file 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.
+ * ============LICENSE_END=========================================================
+ *
+ *  ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ *******************************************************************************/
+package org.onap.ccsdk.dashboard.model;
+
+import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+
+/**
+ * Model with Controller username and password for use only within the back end;
+ * never serialized as JSON.
+ */
+public class ControllerEndpointCredentials extends ControllerEndpointTransport {
+
+	public String username;
+	public String password;
+	public boolean isEncryptedPass;
+
+	public ControllerEndpointCredentials(boolean selected, String name, String url, String inventoryUrl, String dhandlerUrl,
+			String consulUrl, String username, String password, boolean isEncryptedPass) {
+		super(selected, name, url, inventoryUrl, dhandlerUrl, consulUrl);
+		this.username = username;
+		this.password = password;
+		this.isEncryptedPass = isEncryptedPass;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public boolean getEncryptedPassword() {
+		return isEncryptedPass;
+	}
+
+	public void setEncryptedPassword(boolean isEncryptedPass) {
+		this.isEncryptedPass = isEncryptedPass;
+	}
+
+	/**
+	 * Convenience method to yield a ControllerEndpointTransport object.
+	 * 
+	 * @return ControllerEndpoint with copy of the non-privileged data
+	 */
+	public ControllerEndpointTransport toControllerEndpointTransport() {
+		return new ControllerEndpointTransport(getSelected(), getName(), getUrl(), 
+				getInventoryUrl(), getDhandlerUrl(), getConsulUrl());
+	}
+
+	/**
+	 * Accepts clear text and stores an encrypted value; as a side effect, sets
+	 * the encrypted flag to true.
+	 * 
+	 * @param plainText
+	 *            Clear-text password
+	 * @throws Exception
+	 *             If encryption fails
+	 */
+	public void encryptPassword(final String plainText) throws Exception {
+		this.password = CipherUtil.encrypt(plainText);
+		this.isEncryptedPass = true;
+	}
+
+	/**
+	 * Client should call this method if {@link #getEncryptedPassword()} returns
+	 * true.
+	 * 
+	 * @return Clear-text password.
+	 * @throws Exception
+	 *             If decryption fails
+	 */
+	public String decryptPassword() throws Exception {
+		return CipherUtil.decrypt(password);
+	}
 }
 \ No newline at end of file