Enhancements for the aai-common library

[aai/aai-common.git] / aai-aaf-auth / src / main / java / org / onap / aai / aaf / filters / FilterPriority.java

diff --git a/aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/FilterPriority.java
similarity index 64%
rename from aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java
rename to aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/FilterPriority.java
index 8f01541..17b9f0e 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/logging/EcompStartTime.java
+++ b/aai-aaf-auth/src/main/java/org/onap/aai/aaf/filters/FilterPriority.java
@@ -17,23 +17,23 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+package org.onap.aai.aaf.filters;
 
-package org.onap.aai.logging;
+import org.springframework.core.Ordered;
 
-import ch.qos.logback.classic.pattern.ClassicConverter;
-import ch.qos.logback.classic.spi.ILoggingEvent;
+public enum FilterPriority {
 
-import org.onap.aai.logging.LoggingContext.LoggingField;
+    AAF_AUTHENTICATION(Ordered.HIGHEST_PRECEDENCE),
+    AAF_AUTHORIZATION(Ordered.HIGHEST_PRECEDENCE + 1), //higher number = lower priority
+    AAF_CERT_AUTHENTICATION(Ordered.HIGHEST_PRECEDENCE + 2 ),
+    AAF_CERT_AUTHORIZATION(Ordered.HIGHEST_PRECEDENCE + 3),
+    TWO_WAY_SSL_AUTH(Ordered.HIGHEST_PRECEDENCE + 4);
 
-public class EcompStartTime extends ClassicConverter {
+    private final int priority;
 
-    @Override
-    public String convert(ILoggingEvent event) {
-
-        if (!event.getMDCPropertyMap().containsKey(LoggingField.START_TIME.toString())) {
-            return LogFormatTools.toDate(event.getTimeStamp());
-        }
-
-        return event.getMDCPropertyMap().get(LoggingField.START_TIME.toString());
+    FilterPriority(final int p) {
+        priority = p;
     }
+
+    public int getPriority() { return priority; }
 }