Merge "changes in metrics logs"

1 files changed, 0 insertions, 18 deletions

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java
index 0963ef01..b0a2e099 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/logging/aspect/EELFLoggerAspect.java
@@ -69,24 +69,6 @@ public class EELFLoggerAspect {
 		return this.logAroundMethod(joinPoint, SecurityEventTypeEnum.INCOMING_REST_MESSAGE);
 	}
 
-	/*
-	 * Point cut expression to capture metrics logging
-	 */
-	@Pointcut("execution(public * *(..))")
-	public void publicMethod() {
-		// By default do nothing
-	}
-
-	@Around("publicMethod() && @within(metricsLog)")
-	public Object logMetricsClassAround(ProceedingJoinPoint joinPoint, MetricsLog metricsLog) throws Throwable {
-		return this.logAroundMethod(joinPoint, null);
-	}
-
-	@Around("publicMethod() && @annotation(metricsLog)")
-	public Object logMetricsMethodAround(ProceedingJoinPoint joinPoint, MetricsLog metricsLog) throws Throwable {
-		return this.logAroundMethod(joinPoint, null);
-	}
-
 	private Object logAroundMethod(ProceedingJoinPoint joinPoint, SecurityEventTypeEnum securityEventType)
 			throws Throwable {
 		// Before