diff options
10 files changed, 294 insertions, 18 deletions
@@ -5,3 +5,4 @@ ccsdk-app-overlay/ccsdk-app-overlay.iml .project .settings /target/ +ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/BlurprintParseExceptionTest.java diff --git a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ECDSingleSignOnController.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ECDSingleSignOnController.java index 9d28be7..49d5709 100644 --- a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ECDSingleSignOnController.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/controller/ECDSingleSignOnController.java @@ -26,6 +26,8 @@ package org.onap.ccsdk.dashboard.controller; * ECOMP Portal SDK * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property + * + * Modifications Copyright (C) 2019 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -271,14 +273,16 @@ public class ECDSingleSignOnController extends UnRestrictedBaseController { return request.getSession().getId(); } + @Override public String getViewName() { return viewName; } - + + @Override public void setViewName(String viewName) { this.viewName = viewName; } - + public String getWelcomeView() { return welcomeView; } diff --git a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java index e296565..a9bad02 100644 --- a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/model/CloudifyExecutionRequest.java @@ -3,6 +3,8 @@ * * ================================================================================= * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2019 IBM * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,6 +39,20 @@ public class CloudifyExecutionRequest extends ECTransportModel { public String tenant; /** Parameters: retrieve using the GET /deployments */ public Map<String, Object> parameters; + + @JsonCreator + public CloudifyExecutionRequest(@JsonProperty("deployment_id") String deployment_id, + @JsonProperty("workflow_id") String workflow_id, + @JsonProperty("allow_custom_parameters") Boolean allowCustomParameters, + @JsonProperty("force") Boolean force, @JsonProperty("tenant") String tenant, + @JsonProperty("parameters") Map<String, Object> parameters) { + this.deployment_id = deployment_id; + this.workflow_id = workflow_id; + this.allow_custom_parameters = allowCustomParameters; + this.force = force; + this.tenant = tenant; + this.parameters = parameters; + } public String getDeployment_id() { return deployment_id; @@ -86,18 +102,5 @@ public class CloudifyExecutionRequest extends ECTransportModel { this.parameters = parameters; } - @JsonCreator - public CloudifyExecutionRequest(@JsonProperty("deployment_id") String deployment_id, - @JsonProperty("workflow_id") String workflow_id, - @JsonProperty("allow_custom_parameters") Boolean allowCustomParameters, - @JsonProperty("force") Boolean force, @JsonProperty("tenant") String tenant, - @JsonProperty("parameters") Map<String, Object> parameters) { - this.deployment_id = deployment_id; - this.workflow_id = workflow_id; - this.allow_custom_parameters = allowCustomParameters; - this.force = force; - this.tenant = tenant; - this.parameters = parameters; - } } diff --git a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java index d167f9c..35d5d01 100644 --- a/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java +++ b/ccsdk-app-common/src/main/java/org/onap/ccsdk/dashboard/util/DashboardProperties.java @@ -3,6 +3,8 @@ * * ================================================================================= * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2019 IBM. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -178,8 +180,8 @@ public class DashboardProperties { String listVal = getProperty(key); if (listVal == null) return null; - String[] vals = listVal.split("\\s*,\\s*"); - return vals; + + return listVal.split("\\s*,\\s*"); } /** diff --git a/ccsdk-app-common/src/test/java/org/onap/ccsdk/dasboard/exceptions/DahboardControllerExceptionTest.java b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dasboard/exceptions/DahboardControllerExceptionTest.java new file mode 100644 index 0000000..ab98400 --- /dev/null +++ b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dasboard/exceptions/DahboardControllerExceptionTest.java @@ -0,0 +1,67 @@ +/******************************************************************************* + * =============LICENSE_START========================================================= + * + * ================================================================================= + * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2019 IBM. + * ================================================================================ + * 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.dasboard.exceptions; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.onap.ccsdk.dashboard.exceptions.DashboardControllerException; + +public class DahboardControllerExceptionTest { + + @Test + public void TestException1() { + + DashboardControllerException sta = new DashboardControllerException(); + assertEquals("org.onap.ccsdk.dashboard.exceptions.DashboardControllerException",sta.getClass().getName()); + + } + + @Test + public void TestException2() { + + DashboardControllerException sta= new DashboardControllerException("org.onap.ccsdk.dashboard.exceptions.DashboardControllerException"); + assertEquals(sta.getMessage(), "org.onap.ccsdk.dashboard.exceptions.DashboardControllerException"); + + } + + + @Test + public void TestException3() { + + DashboardControllerException sta= new DashboardControllerException(new Throwable()); + assertEquals("org.onap.ccsdk.dashboard.exceptions.DashboardControllerException", sta.getClass().getName()); + + } + + + + @Test + public void TestException4() { + + DashboardControllerException sta= new DashboardControllerException("org.onap.ccsdk.dashboard.exceptions.DashboardControllerException", new Throwable()); + assertEquals("org.onap.ccsdk.dashboard.exceptions.DashboardControllerException",sta.getClass().getName()); + + } +} diff --git a/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/BlueprintParseExceptionTest.java b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/BlueprintParseExceptionTest.java new file mode 100644 index 0000000..c28bc42 --- /dev/null +++ b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/BlueprintParseExceptionTest.java @@ -0,0 +1,43 @@ +/******************************************************************************* + * =============LICENSE_START========================================================= + * + * ================================================================================= + * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2019 IBM. + * ================================================================================ + * 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.exceptions.inventory; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class BlueprintParseExceptionTest { + + @Test + public void TestException3() { + + BlueprintParseException mae = new BlueprintParseException(new Throwable()); + assertEquals("org.onap.ccsdk.dashboard.exceptions.inventory.BlueprintParseException", mae.getClass().getName()); + + } + + +} diff --git a/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/ServiceTypeActiveExceptionTest.java b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/ServiceTypeActiveExceptionTest.java new file mode 100644 index 0000000..913c36c --- /dev/null +++ b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/ServiceTypeActiveExceptionTest.java @@ -0,0 +1,72 @@ +/******************************************************************************* + * =============LICENSE_START========================================================= + * + * ================================================================================= + * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2019 IBM. + * ================================================================================ + * 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.exceptions.inventory; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class ServiceTypeActiveExceptionTest { + + @Test + public void TestException1() { + + ServiceTypeActiveException sta = new ServiceTypeActiveException(); + assertEquals("org.onap.ccsdk.dashboard.exceptions.inventory.ServiceTypeActiveException", sta.getClass().getName()); + + } + + @Test + public void TestException2() { + + ServiceTypeActiveException sta= new ServiceTypeActiveException("org.onap.ccsdk.dashboard.exceptions.inventory.ServiceTypeActiveException"); + assertEquals(sta.getMessage(), "org.onap.ccsdk.dashboard.exceptions.inventory.ServiceTypeActiveException"); + + } + + + @Test + public void TestException3() { + + ServiceTypeActiveException sta= new ServiceTypeActiveException(new Throwable()); + assertEquals("org.onap.ccsdk.dashboard.exceptions.inventory.ServiceTypeActiveException", sta.getClass().getName()); + + } + + + + @Test + public void TestException4() { + + ServiceTypeActiveException sta= new ServiceTypeActiveException("org.onap.ccsdk.dashboard.exceptions.inventory.ServiceTypeActiveException", new Throwable()); + assertEquals("org.onap.ccsdk.dashboard.exceptions.inventory.ServiceTypeActiveException",sta.getClass().getName()); + + } + + +} + + + + diff --git a/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/ServiceTypeAlreadyDeactivatedExceptionTest.java b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/ServiceTypeAlreadyDeactivatedExceptionTest.java new file mode 100644 index 0000000..0ec2cb5 --- /dev/null +++ b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/exceptions/inventory/ServiceTypeAlreadyDeactivatedExceptionTest.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * =============LICENSE_START========================================================= + * + * ================================================================================= + * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2019 IBM. + * ================================================================================ + * 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.exceptions.inventory; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class ServiceTypeAlreadyDeactivatedExceptionTest { + + @Test + public void TestException3() { + + ServiceTypeAlreadyDeactivatedException mae = new ServiceTypeAlreadyDeactivatedException("org.onap.ccsdk.dashboard.exceptions.inventory.ServiceTypeAlreadyDeactivatedException"); + assertEquals("org.onap.ccsdk.dashboard.exceptions.inventory.ServiceTypeAlreadyDeactivatedException", mae.getClass().getName()); + + } + +} diff --git a/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/model/ControllerOpsToolsTest.java b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/model/ControllerOpsToolsTest.java new file mode 100644 index 0000000..001df8d --- /dev/null +++ b/ccsdk-app-common/src/test/java/org/onap/ccsdk/dashboard/model/ControllerOpsToolsTest.java @@ -0,0 +1,44 @@ +/******************************************************************************* + * =============LICENSE_START========================================================= + * + * ================================================================================= + * Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. + * + * Modifications Copyright (C) 2019 IBM. + * ================================================================================ + * 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 static org.junit.Assert.*; + +import org.junit.Test; + +public class ControllerOpsToolsTest { + + ControllerOpsTools co; + private String id="123"; + private String url="http//google.com"; + + @Test + public void testControllerOpsTools() { + ControllerOpsTools co= new ControllerOpsTools(); + ControllerOpsTools co1= new ControllerOpsTools(id,url); + assertEquals("123",co1.getId()); + assertEquals("http//google.com",co1.getUrl()); + } + +} diff --git a/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java b/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java index b3af63a..b628772 100644 --- a/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java +++ b/ccsdk-app-os/src/main/java/org/onap/portalapp/login/LoginStrategyImpl.java @@ -58,7 +58,7 @@ public class LoginStrategyImpl extends LoginStrategy { return userid; } - private static String getUserIdFromCookie(HttpServletRequest request) throws Exception { + private static String getUserIdFromCookie(HttpServletRequest request){ String userId = ""; Cookie[] cookies = request.getCookies(); Cookie userIdcookie = null; |