1 files changed, 37 insertions, 6 deletions
diff --git a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java
index c054a1b..fb09cf8 100644
--- a/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java
+++ b/ms/gra/gra-app/src/main/java/org/onap/sdnc/apps/ms/gra/FilterConfiguration.java
@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.util.Properties;
 
 import org.onap.aaf.cadi.filter.CadiFilter;
+import org.onap.ccsdk.apps.filters.AuditLogFilter;
+import org.onap.ccsdk.apps.filters.PayloadLoggingFilter;
 import org.onap.ccsdk.sli.core.utils.common.EnvProperties;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,23 +19,50 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 
 @Configuration
-@ConditionalOnProperty("cadi.properties.path")
 public class FilterConfiguration {
 
-    private static final Logger log = LoggerFactory.getLogger(FilterConfiguration.class);
+	private static final Logger log = LoggerFactory.getLogger(FilterConfiguration.class);
 
-	@Value( "${cadi.properties.path:none}" )
+	// Explicitly add CadiFilter to filter chain. Note: autowiring already
+	// adds the filters defined in org.onap.ccsdk.apps.filters package, so do
+	// not need to explicitly insert them here.
+	@Value("${cadi.properties.path:none}")
 	private String cadiPropFile;
 
 	@Bean
 	@Order(1)
+	public FilterRegistrationBean<PayloadLoggingFilter> loggingFilter() {
+		FilterRegistrationBean<PayloadLoggingFilter> registrationBean = new FilterRegistrationBean<>();
+
+		registrationBean.setFilter(new PayloadLoggingFilter());
+		registrationBean.addUrlPatterns("/config/*", "/operational/*", "/operations/*");
+
+		return registrationBean;
+	}
+
+	
+	@Bean
+	@Order(2)
+	public FilterRegistrationBean<AuditLogFilter> auditFilter() {
+		FilterRegistrationBean<AuditLogFilter> registrationBean = new FilterRegistrationBean<>();
+
+		registrationBean.setFilter(new AuditLogFilter());
+		registrationBean.addUrlPatterns("/config/*", "/operational/*", "/operations/*");
+
+		return registrationBean;
+	}
+
+
+	@Bean
+	@Order(3)
 	public FilterRegistrationBean<CadiFilter> cadiFilter() {
-		CadiFilter filter = new CadiFilter();
 		
+		CadiFilter filter = new CadiFilter();
+
 		FilterRegistrationBean<CadiFilter> registrationBean = new FilterRegistrationBean<>();
 		registrationBean.setFilter(filter);
-		if ("none".equals(cadiPropFile)) {
-            log.info("cadi.properties.path undefined, AAF CADI disabled");
+		if ("none".equals(cadiPropFile)){
+			log.info(" AAF CADI disabled");
 			registrationBean.setEnabled(false);
 			registrationBean.addUrlPatterns("/xxxx/*");
 		} else {
@@ -64,4 +93,6 @@ public class FilterConfiguration {
 		return registrationBean;
 	}
 
+
+
 }