diff options
19 files changed, 263 insertions, 59 deletions
diff --git a/ecomp-sdk/epsdk-aaf/pom.xml b/ecomp-sdk/epsdk-aaf/pom.xml index a8c254e1..0ad8ac69 100644 --- a/ecomp-sdk/epsdk-aaf/pom.xml +++ b/ecomp-sdk/epsdk-aaf/pom.xml @@ -7,12 +7,12 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-aaf</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> <packaging>jar</packaging> <name>ONAP Portal SDK AAF Authorization</name> diff --git a/ecomp-sdk/epsdk-analytics/pom.xml b/ecomp-sdk/epsdk-analytics/pom.xml index 55fb6bfb..8832dc63 100644 --- a/ecomp-sdk/epsdk-analytics/pom.xml +++ b/ecomp-sdk/epsdk-analytics/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <!-- GroupId is inherited from parent --> diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java index bb04c335..60e7a166 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/Node.java @@ -3,6 +3,7 @@ * ONAP Portal SDK * =================================================================== * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -62,20 +63,19 @@ public class Node { selectionList = new ArrayList<String>(); } - public NodeInfo addNode(double longitude, double latitude, String nodeType, String nodeID, - String nodeAttributes, int state, boolean moveable, boolean deleteable) { - NodeInfo nodeInfo = new NodeInfo(nodeID); - nodeInfo.geoCoordinate.longitude = longitude; - nodeInfo.geoCoordinate.latitude = latitude; - nodeInfo.setNodeType(nodeType); - nodeInfo.setState(state); - nodeInfo.setMoveable(moveable); - nodeInfo.setDeleteable(deleteable); - nodeInfo.initializeAttributes(nodeAttributes); + public NodeInfo addNode(NodeParam nodeParam) { + NodeInfo nodeInfo = new NodeInfo(nodeParam.getNodeID()); + nodeInfo.geoCoordinate.longitude = nodeParam.getLongitude(); + nodeInfo.geoCoordinate.latitude = nodeParam.getLatitude(); + nodeInfo.setNodeType(nodeParam.getNodeType()); + nodeInfo.setState(nodeParam.getState()); + nodeInfo.setMoveable(nodeParam.isMoveable()); + nodeInfo.setDeleteable(nodeParam.isDeleteable()); + nodeInfo.initializeAttributes(nodeParam.getNodeAttributes()); - //if (nodeCollection.getNode(nodeInfo.getNodeID()+""+nodeInfo.getNodeType()) == null) { - nodeCollection.addNode(nodeInfo); - nodeIDSet.add(nodeID); + //if (nodeCollection.getNode(nodeInfo.getNodeID()+""+nodeInfo.getNodeType()) == null) { + nodeCollection.addNode(nodeInfo); + nodeIDSet.add(nodeParam.getNodeID()); /* } else { return nodeCollection.getNode(nodeType); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeParam.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeParam.java new file mode 100644 index 00000000..cdb4aca0 --- /dev/null +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/gmap/node/NodeParam.java @@ -0,0 +1,122 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal SDK + * =================================================================== + * Copyright (C) 2018 Samsung Electronics Co., Ltd. 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============================================ + * + * + */ +package org.onap.portalsdk.analytics.gmap.node; + +public class NodeParam { + + private double longitude; + private double latitude; + private String nodeType; + private String nodeID; + private String nodeAttributes; + private int state; + private boolean moveable; + private boolean deleteable; + + public double getLongitude() { + return longitude; + } + + public double getLatitude() { + return latitude; + } + + public String getNodeType() { + return nodeType; + } + + public String getNodeID() { + return nodeID; + } + + public String getNodeAttributes() { + return nodeAttributes; + } + + public int getState() { + return state; + } + + public boolean isMoveable() { + return moveable; + } + + public boolean isDeleteable() { + return deleteable; + } + + public NodeParam setLongitude(double longitude) { + this.longitude = longitude; + return this; + } + + public NodeParam setLatitude(double latitude) { + this.latitude = latitude; + return this; + } + + public NodeParam setNodeType(String nodeType) { + this.nodeType = nodeType; + return this; + } + + public NodeParam setNodeID(String nodeID) { + this.nodeID = nodeID; + return this; + } + + public NodeParam setNodeAttributes(String nodeAttributes) { + this.nodeAttributes = nodeAttributes; + return this; + } + + public NodeParam setState(int state) { + this.state = state; + return this; + } + + public NodeParam setMoveable(boolean moveable) { + this.moveable = moveable; + return this; + } + + public NodeParam setDeleteable(boolean deleteable) { + this.deleteable = deleteable; + return this; + } +}
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/layer/SwingLayerTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/layer/SwingLayerTest.java index e52d01b6..100525bc 100644 --- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/layer/SwingLayerTest.java +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/map/layer/SwingLayerTest.java @@ -3,6 +3,7 @@ * ONAP Portal SDK * =================================================================== * Copyright © 2018 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -52,6 +53,7 @@ import org.onap.portalsdk.analytics.gmap.line.Line; import org.onap.portalsdk.analytics.gmap.map.ColorProperties; import org.onap.portalsdk.analytics.gmap.map.NovaMap; import org.onap.portalsdk.analytics.gmap.node.Node; +import org.onap.portalsdk.analytics.gmap.node.NodeParam; import org.onap.portalsdk.analytics.xmlobj.MockitoTestSuite; import org.springframework.test.util.ReflectionTestUtils; @@ -81,9 +83,18 @@ public class SwingLayerTest { novaMap.setShowLegend(true); ReflectionTestUtils.setField(novaMap, "transform", new AffineTransform()); Node nodeObj = new Node(new NovaMap()); - nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true); - nodeObj.addNode(13.14d, 10.11d, "nodeType", "nodeID", "type=international|year=2017", 13, true, true); - nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true); + nodeObj.addNode( + new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true) + .setDeleteable(true)); + nodeObj.addNode( + new NodeParam().setLongitude(13.14d).setLatitude(10.11d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=international|year=2017").setState(13).setMoveable(true) + .setDeleteable(true)); + nodeObj.addNode( + new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true) + .setDeleteable(true)); novaMap.setNode(nodeObj); swingLayer = new SwingLayer(novaMap); BufferedImage image = new BufferedImage(novaMap.getBoundingBox().width, novaMap.getBoundingBox().height, BufferedImage.TYPE_INT_ARGB); diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/node/NodeTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/node/NodeTest.java index a6cd2933..bd46e25a 100644 --- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/node/NodeTest.java +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/gmap/node/NodeTest.java @@ -3,6 +3,7 @@ * ONAP Portal SDK * =================================================================== * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2018 Samsung Electronics Co., Ltd. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -51,6 +52,7 @@ import org.mockito.Mockito; import org.onap.portalsdk.analytics.gmap.map.ColorProperties; import org.onap.portalsdk.analytics.gmap.map.NovaMap; import org.onap.portalsdk.analytics.gmap.node.Node; +import org.onap.portalsdk.analytics.gmap.node.NodeParam; import org.springframework.test.util.ReflectionTestUtils; public class NodeTest { @@ -72,9 +74,12 @@ public class NodeTest { Node nodeObj = new Node(new NovaMap()); Double longitude = 13.13d; Double latitude =28.28d; - NodeInfo nodeINfo = nodeObj.addNode(longitude, latitude, "nodeType", "nodeID", "nodeAttributes", 13, true, true); + NodeInfo nodeINfo = nodeObj.addNode( + new NodeParam().setLongitude(longitude).setLatitude(latitude).setNodeType("nodeType") + .setNodeID("nodeID").setNodeAttributes("nodeAttributes").setState(13).setMoveable(true) + .setDeleteable(true)); + assertNotNull(nodeINfo); assertNotNull(nodeINfo); - assertEquals((Double)longitude,(Double)nodeINfo.geoCoordinate.longitude); assertEquals((Double)latitude,(Double)nodeINfo.geoCoordinate.latitude); assertEquals("nodeType",nodeINfo.getNodeType()); @@ -87,11 +92,19 @@ public class NodeTest { public void testUpdateNumberCase1() { Node nodeObj = new Node(new NovaMap()); - - nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2018", 13, true, true); - nodeObj.addNode(13.14d, 10.11d, "nodeType", "nodeID", "type=international|year=2018", 13, true, true); - nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true); + nodeObj.addNode( + new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=domestic|year=2018").setState(13).setMoveable(true) + .setDeleteable(true)); + nodeObj.addNode( + new NodeParam().setLongitude(13.14d).setLatitude(10.11d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=international|year=2018").setState(13).setMoveable(true) + .setDeleteable(true)); + nodeObj.addNode( + new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true) + .setDeleteable(true)); nodeObj.updateNumberT1("year"); HashMap<String,NodeInfo> hashMap = nodeObj.getNodeCollection().getNodeCollection(); @@ -169,10 +182,18 @@ public class NodeTest { novaMap.setColorProperties(new ColorProperties(novaMap)); ReflectionTestUtils.setField(novaMap, "transform", new AffineTransform()); Node nodeObj = new Node(novaMap); - nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true); - nodeObj.addNode(13.14d, 10.11d, "nodeType", "nodeID", "type=international|year=2017", 13, true, true); - nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true); - + nodeObj.addNode( + new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true) + .setDeleteable(true)); + nodeObj.addNode( + new NodeParam().setLongitude(13.14d).setLatitude(10.11d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=international|year=2017").setState(13).setMoveable(true) + .setDeleteable(true)); + nodeObj.addNode( + new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true) + .setDeleteable(true)); Point pointObj= new Point(3,3); nodeObj.nodeExist(pointObj); // assertNotNull(existNodeInfo); @@ -185,9 +206,14 @@ public class NodeTest { @Test public void testGetNodeCollection() { Node nodeObj = new Node(new NovaMap()); - nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true); - nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true); - + nodeObj.addNode( + new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true) + .setDeleteable(true)); + nodeObj.addNode( + new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true) + .setDeleteable(true)); nodeObj.getNodeCollection(); assertNotNull(nodeObj.getNodeCollection()); } @@ -195,8 +221,14 @@ public class NodeTest { @Test public void testClearNodeIDSet() { Node nodeObj = new Node(new NovaMap()); - nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true); - nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true); + nodeObj.addNode( + new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true) + .setDeleteable(true)); + nodeObj.addNode( + new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true) + .setDeleteable(true)); nodeObj.clearNodeIDSet(); } @@ -204,10 +236,15 @@ public class NodeTest { public void testClearSelectionList() { Node nodeObj = new Node(new NovaMap()); - nodeObj.addNode(13.13d, 10.10d, "nodeType", "nodeID", "type=domestic|year=2016", 13, true, true); - nodeObj.addNode(13.15d, 10.12d, "nodeType", "nodeID", "type=local|year=2018", 13, true, true); + nodeObj.addNode( + new NodeParam().setLongitude(13.13d).setLatitude(10.10d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=domestic|year=2016").setState(13).setMoveable(true) + .setDeleteable(true)); + nodeObj.addNode( + new NodeParam().setLongitude(13.15d).setLatitude(10.12d).setNodeType("nodeType").setNodeID("nodeID") + .setNodeAttributes("type=local|year=2018").setState(13).setMoveable(true) + .setDeleteable(true)); nodeObj.clearSelectionList(); - } @Test @@ -216,5 +253,4 @@ public class NodeTest { nodeObj.clearSelectionList(); } - } diff --git a/ecomp-sdk/epsdk-app-common/pom.xml b/ecomp-sdk/epsdk-app-common/pom.xml index 7b266e78..07962283 100644 --- a/ecomp-sdk/epsdk-app-common/pom.xml +++ b/ecomp-sdk/epsdk-app-common/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <!-- GroupId is inherited from parent --> diff --git a/ecomp-sdk/epsdk-app-os/pom.xml b/ecomp-sdk/epsdk-app-os/pom.xml index 9ca8604b..e16b78d2 100644 --- a/ecomp-sdk/epsdk-app-os/pom.xml +++ b/ecomp-sdk/epsdk-app-os/pom.xml @@ -9,7 +9,7 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <!-- GroupId is inherited from parent --> diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml index a87e478d..56a6edba 100644 --- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml +++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/web.xml @@ -56,5 +56,28 @@ <error-page> <location>/WEB-INF/jsp/error.jsp</location> </error-page> - + <filter> + <filter-name>CadiAuthFilter</filter-name> + <filter-class>org.onap.portalsdk.core.onboarding.crossapi.CadiAuthFilter</filter-class> + <init-param> + <param-name>cadi_prop_files</param-name> + <!-- Add Absolute path of cadi.properties --> + <param-value>{path}/cadi.properties + </param-value> + </init-param> + <!--Add param values with comma delimited values --> + <!-- for example /api/v3/*,/auxapi/*--> + <init-param> + <param-name>include_url_endpoints</param-name> + <param-value>/api/v3/*</param-value> + </init-param> + <init-param> + <param-name>exclude_url_endpoints</param-name> + <param-value>/api/v3/analytics,/api/v3/storeAnalytics</param-value> + </init-param> + </filter> + <filter-mapping> + <filter-name>CadiAuthFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> </web-app> diff --git a/ecomp-sdk/epsdk-app-overlay/pom.xml b/ecomp-sdk/epsdk-app-overlay/pom.xml index 98143b71..a031711e 100644 --- a/ecomp-sdk/epsdk-app-overlay/pom.xml +++ b/ecomp-sdk/epsdk-app-overlay/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <!-- GroupId is inherited from parent --> diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml index d75ecbdb..da320242 100644 --- a/ecomp-sdk/epsdk-core/pom.xml +++ b/ecomp-sdk/epsdk-core/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <!-- GroupId is inherited from parent --> diff --git a/ecomp-sdk/epsdk-domain/pom.xml b/ecomp-sdk/epsdk-domain/pom.xml index f0cb1181..e3c1e97a 100644 --- a/ecomp-sdk/epsdk-domain/pom.xml +++ b/ecomp-sdk/epsdk-domain/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-domain</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> <packaging>jar</packaging> <name>ONAP Portal SDK Domain</name> diff --git a/ecomp-sdk/epsdk-fw/pom.xml b/ecomp-sdk/epsdk-fw/pom.xml index aaf02147..151a01ef 100644 --- a/ecomp-sdk/epsdk-fw/pom.xml +++ b/ecomp-sdk/epsdk-fw/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <!-- GroupId is inherited from parent --> @@ -72,7 +72,7 @@ <dependency> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-logger</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </dependency> <dependency> <groupId>org.onap.aaf.authz</groupId> diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java index 0fdc14d2..143eb0fb 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java @@ -2,7 +2,7 @@ * ============LICENSE_START========================================== * ONAP Portal SDK * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2018 AT&T Intellectual Property. All rights reserved. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -52,6 +52,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.onap.aaf.cadi.filter.CadiFilter; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.onboarding.util.AuthUtil; import org.onap.portalsdk.core.onboarding.util.PortalApiConstants; import org.onap.portalsdk.core.onboarding.util.PortalApiProperties; @@ -61,11 +62,14 @@ public class CadiAuthFilter extends CadiFilter { private static String include_url_endpoints =""; private static String exclude_url_endpoints = ""; public static final String AUTHORIZATION = "Authorization"; + private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(CadiAuthFilter.class); public void init(FilterConfig filterConfig) throws ServletException { super.init(filterConfig); include_url_endpoints = filterConfig.getInitParameter("include_url_endpoints"); exclude_url_endpoints = filterConfig.getInitParameter("exclude_url_endpoints"); + logger.debug(EELFLoggerDelegate.debugLogger, "inculde_url_endpoints values: "+ include_url_endpoints); + logger.debug(EELFLoggerDelegate.debugLogger, "exculde_url_endpoints values: "+ exclude_url_endpoints); } public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) @@ -83,11 +87,13 @@ public class CadiAuthFilter extends CadiFilter { Arrays.asList(excludeUrlEndPointString.split(","))); ArrayList<String> includeUrlEndPointList = new ArrayList<String>( Arrays.asList(includeUrlEndPointString.split(","))); - if (excludeFilter(request, excludeUrlEndPointList)) + if (excludeFilter(request, excludeUrlEndPointList)){ + logger.debug(EELFLoggerDelegate.debugLogger, "Request excluded from cadifilter"); chain.doFilter(request, response); - else if (includeFilter(request, includeUrlEndPointList)) + }else if (includeFilter(request, includeUrlEndPointList)){ + logger.debug(EELFLoggerDelegate.debugLogger, "Request is entering cadifilter"); super.doFilter(request, response, chain); - else + }else chain.doFilter(request, response); } } diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java index a7aa6765..14ad234f 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java @@ -2,7 +2,7 @@ * ============LICENSE_START========================================== * ONAP Portal SDK * =================================================================== - * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2018 AT&T Intellectual Property. All rights reserved. * =================================================================== * * Unless otherwise specified, all software contained herein is licensed @@ -142,6 +142,7 @@ public class AuthUtil { str = decodeFunctionCode(instance); finalInstanceList.add(str); } + logger.debug(EELFLoggerDelegate.debugLogger, "List of AllInstances: "+ finalInstanceList); return finalInstanceList; } @@ -185,6 +186,11 @@ public class AuthUtil { if (!isauthorized) isauthorized = matchPattern(requestUri, str); } + logger.debug(EELFLoggerDelegate.debugLogger, "isAccessAllowed for the request uri: "+requestUri + "is"+ isauthorized); + if (isauthorized) { + logger.debug(EELFLoggerDelegate.debugLogger, + "Request is Authorized"); + } return isauthorized; } }
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-logger/pom.xml b/ecomp-sdk/epsdk-logger/pom.xml index 2d3237c6..4d07982c 100644 --- a/ecomp-sdk/epsdk-logger/pom.xml +++ b/ecomp-sdk/epsdk-logger/pom.xml @@ -1,15 +1,15 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - + <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-logger</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> <dependencies> <dependency> diff --git a/ecomp-sdk/epsdk-music/pom.xml b/ecomp-sdk/epsdk-music/pom.xml index dd30cd7e..6dc20dcd 100644 --- a/ecomp-sdk/epsdk-music/pom.xml +++ b/ecomp-sdk/epsdk-music/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-music</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> <packaging>jar</packaging> <name>ONAP Portal SDK Music</name> diff --git a/ecomp-sdk/epsdk-workflow/pom.xml b/ecomp-sdk/epsdk-workflow/pom.xml index 24d6b650..300ed92d 100644 --- a/ecomp-sdk/epsdk-workflow/pom.xml +++ b/ecomp-sdk/epsdk-workflow/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> </parent> <!-- GroupId is inherited from parent --> diff --git a/ecomp-sdk/pom.xml b/ecomp-sdk/pom.xml index bae3090f..178e7894 100644 --- a/ecomp-sdk/pom.xml +++ b/ecomp-sdk/pom.xml @@ -13,7 +13,7 @@ <!-- Portal SDK Maven parent project --> <groupId>org.onap.portal.sdk</groupId> <artifactId>epsdk-project</artifactId> - <version>2.5.0-SNAPSHOT</version> + <version>2.5.0</version> <packaging>pom</packaging> <name>portal-sdk</name> <url>https://wiki.onap.org/display/DW/Portal</url> |