Security/ Package Name changes

[portal.git] / ecomp-portal-BE-os / src / main / java / org / onap / portalapp / portal / logging / aop / EPEELFLoggerAspect.java

diff --git a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAspect.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/logging/aop/EPEELFLoggerAspect.java
similarity index 84%
rename from ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAspect.java
rename to ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/logging/aop/EPEELFLoggerAspect.java
index 0970ec4..ab235ca 100644 (file)
--- a/ecomp-portal-BE-os/src/main/java/org/openecomp/portalapp/portal/logging/aop/EPEELFLoggerAspect.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/logging/aop/EPEELFLoggerAspect.java
@@ -2,11 +2,11 @@
  * ============LICENSE_START==========================================
  * ONAP Portal
  * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the “License”);
+ * 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
  *
@@ -19,7 +19,7 @@
  * limitations under the License.
  *
  * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ * 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
  *
@@ -35,16 +35,19 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.openecomp.portalapp.portal.logging.aop;
+package org.onap.portalapp.portal.logging.aop;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
-import org.openecomp.portalapp.portal.transport.FieldsValidator;
-import org.openecomp.portalapp.portal.utils.EcompPortalUtils;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum;
+import org.onap.portalapp.portal.logging.aop.EPAuditLog;
+import org.onap.portalapp.portal.logging.aop.EPEELFLoggerAdvice;
+import org.onap.portalapp.portal.logging.aop.EPMetricsLog;
+import org.onap.portalapp.portal.transport.FieldsValidator;
+import org.onap.portalapp.portal.utils.EcompPortalUtils;
+import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 
 @Aspect
@@ -59,56 +62,56 @@ public class EPEELFLoggerAspect {
        /*
         * Point-cut expression to handle all INCOMING_REST_MESSAGES
         */
-       @Pointcut("execution(public * org.openecomp.portalapp.portal.controller.*.*(..))")
+       @Pointcut("execution(public * org.onap.portalapp.portal.controller.*.*(..))")
        public void incomingAuditMessages() {}
        
        /*
         * Handles all INCOMING_REST_MESSAGES from kpiDashboard
         */
-       @Pointcut("execution(public * org.openecomp.portalapp.kpidash.controller.*.*(..))")
+       @Pointcut("execution(public * org.onap.portalapp.kpidash.controller.*.*(..))")
        public void kpiDashboardAuditMessages() {}
 
        /*
         * Point-cut expression to handle all session management INCOMING_REST_MESSAGES
         */
-       @Pointcut("execution(public * org.openecomp.portalapp.controller.sessionmgt.*.*(..))")
+       @Pointcut("execution(public * org.onap.portalapp.controller.sessionmgt.*.*(..))")
        public void sessionMgtIncomingAuditMessages() {}
        
        /*
         * Point-cut expression to handle UserProfileController INCOMING_REST_MESSAGES
         */
-       @Pointcut("execution(public * org.openecomp.portalapp.controller.core.UserProfileController.*(..))")
+       @Pointcut("execution(public * org.onap.portalapp.controller.core.UserProfileController.*(..))")
        public void userProfileIncomingAuditMessages() {}
        
        /*
         * Point-cut expression to handle UserProfileController INCOMING_REST_MESSAGES
         */
-       @Pointcut("execution(public * org.openecomp.portalapp.controller.ONAPWelcomeController.*(..))")
+       @Pointcut("execution(public * org.onap.portalapp.controller.ONAPWelcomeController.*(..))")
        public void welcomeIncomingAuditMessages() {}
        
        /*
         * Point-cut expression to handle INCOMING Logout Rest Messages
         */
-       @Pointcut("execution(public * org.openecomp.portalapp.controller.ECOMPLogoutController.*(..))")
+       @Pointcut("execution(public * org.onap.portalapp.controller.ECOMPLogoutController.*(..))")
        public void logoutAuditMessages() {}
 
        
        /*
         * Point-cut expression which handles all the OUTGOING_REST_MESSAGES.
         */
-       @Pointcut("execution(public * org.openecomp.portalapp.portal.service.ApplicationsRestClientServiceImpl.*(..))")
+       @Pointcut("execution(public * org.onap.portalapp.portal.service.ApplicationsRestClientServiceImpl.*(..))")
        public void outgoingAuditMessages() {}
        
        /*
         * Point-cut expression to handle all the session management OUTGOING_REST_MESSAGES.
         */
-       @Pointcut("execution(public * org.openecomp.portalapp.service.sessionmgt.SessionCommunication.*(..))")
+       @Pointcut("execution(public * org.onap.portalapp.service.sessionmgt.SessionCommunication.*(..))")
        public void sessionMgtOutgoingAuditMessages() {}
        
        /*
         * Point-cut expression which handles all the LDAP_PHONEBOOK_USER_SEARCH calls.
         */
-       @Pointcut("execution(public * org.openecomp.portalapp.portal.service.EPLdapServiceImpl.*(..))")
+       @Pointcut("execution(public * org.onap.portalapp.portal.service.EPLdapServiceImpl.*(..))")
        public void phoneBookSearchAuditMessages() {}
        
        /*