diff options
author | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-12-01 11:48:20 -0800 |
---|---|---|
committer | Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-12-01 11:48:20 -0800 |
commit | 32fb53c13342d5ad353c839b7ffd0ca85d14bd48 (patch) | |
tree | f1b92068cf7b79d29e96243899e12495abb4795a /filters/provider | |
parent | 53eacd8519a535f96d8b4231e48925324f1086dd (diff) |
Migrate sli-core files
Migrate sli-core repo files into new
directory "core".
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Diffstat (limited to 'filters/provider')
4 files changed, 0 insertions, 99 deletions
diff --git a/filters/provider/pom.xml b/filters/provider/pom.xml deleted file mode 100755 index ea7f9962e..000000000 --- a/filters/provider/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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.ccsdk.parent</groupId> - <artifactId>binding-parent</artifactId> - <version>2.1.0-SNAPSHOT</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>filters-provider</artifactId> - <version>1.1.1-SNAPSHOT</version> - <packaging>bundle</packaging> - - <name>ccsdk-sli-core :: filters :: ${project.artifactId}</name> - - <dependencies> - <dependency> - <groupId>org.onap.logging-analytics</groupId> - <artifactId>logging-filter-base</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>javax.servlet-api</artifactId> - </dependency> - </dependencies> -</project> diff --git a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilter.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilter.java deleted file mode 100644 index 7805e365d..000000000 --- a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilter.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.onap.ccsdk.sli.core.filters; - -import javax.servlet.http.HttpServletRequest; -import org.onap.logging.filter.base.AuditLogServletFilter; -import org.onap.logging.ref.slf4j.ONAPLogConstants; -import org.slf4j.MDC; - -public class ControllerAuditLogFilter extends AuditLogServletFilter { - private static final String MDC_HTTP_METHOD_KEY = "HttpMethod"; - - @Override - protected void additionalPreHandling(HttpServletRequest httpServletRequest) { - // Don't overwrite service instance id if it was set outside of this automated method - if (MDC.get(ONAPLogConstants.MDCs.SERVICE_INSTANCE_ID) == null) { - String serviceInstanceId = getServiceInstanceId(httpServletRequest.getPathInfo()); - if (serviceInstanceId != null) { - MDC.put(ONAPLogConstants.MDCs.SERVICE_INSTANCE_ID, serviceInstanceId); - } - } - MDC.put(MDC_HTTP_METHOD_KEY, httpServletRequest.getMethod()); - } - - // restconf URLs follow a pattern, this method attempts to extract the service instance id according to that pattern - protected String getServiceInstanceId(String path) { - int idx = path.indexOf("service-list"); - if (idx != -1) { - // chomp off service-list/ - String str = path.substring(idx + 13); - idx = str.indexOf("/"); - //if there is another forward slash with more information chomp it off - if (idx != -1) { - return str.substring(0, idx); - } else { - return str; - } - } - return null; - } - -} diff --git a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerPayloadLoggingFilter.java b/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerPayloadLoggingFilter.java deleted file mode 100644 index 3f9f93fc5..000000000 --- a/filters/provider/src/main/java/org/onap/ccsdk/sli/core/filters/ControllerPayloadLoggingFilter.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.onap.ccsdk.sli.core.filters; - -import org.onap.logging.filter.base.PayloadLoggingServletFilter; - -public class ControllerPayloadLoggingFilter extends PayloadLoggingServletFilter { - -} diff --git a/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilterTest.java b/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilterTest.java deleted file mode 100644 index 9d0357a96..000000000 --- a/filters/provider/src/test/java/org/onap/ccsdk/sli/core/filters/ControllerAuditLogFilterTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.onap.ccsdk.sli.core.filters; - -import static org.junit.Assert.assertEquals; -import org.junit.Test; - -public class ControllerAuditLogFilterTest { - - @Test - public void getSimpleSiid() throws Exception { - ControllerAuditLogFilter filter = new ControllerAuditLogFilter(); - String siid = filter.getServiceInstanceId("/restconf/config/Layer3API:services/service-list/100"); - assertEquals("100", siid); - } - - @Test - public void getSimpleComplexSiid() throws Exception { - ControllerAuditLogFilter filter = new ControllerAuditLogFilter(); - String siid = filter.getServiceInstanceId( - "/restconf/config/Layer3API:services/service-list/1337/service-data/oper-status"); - assertEquals("1337", siid); - } - -} |