X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=PolicyEngineUtils%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Futils%2FPolicyAccess.java;h=950103c867051a22681ebddaed14de2867ac70aa;hb=e9b8aa0223e6f042c0533176ae8222fb061852de;hp=a6481aaeb472b56c1e91cf66964267d08181b99d;hpb=6d3cc4662712bb636b83f8a4da9938afe192a64a;p=policy%2Fengine.git

diff --git a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyAccess.java b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyAccess.java
index a6481aaeb..950103c86 100644
--- a/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyAccess.java
+++ b/PolicyEngineUtils/src/main/java/org/onap/policy/utils/PolicyAccess.java
@@ -2,14 +2,14 @@
  * ============LICENSE_START=======================================================
  * PolicyEngineUtils
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,87 +20,17 @@
 
 package org.onap.policy.utils;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Date;
 import java.util.Properties;
 
-import org.apache.log4j.Logger;
-
-import com.att.cadi.Access;
+import org.onap.aaf.cadi.PropAccess;
 
 /**
- * PolicyAccess used by AAF for logging purposes. 
- *  
+ * PolicyAccess used by AAF for logging purposes.
+ *
  */
-public class PolicyAccess implements Access {
-	private static final Logger logger = Logger.getLogger(PolicyAccess.class.getName());
-	
-	private Properties properties = new Properties(); 
-	private Access.Level logLevel = Access.Level.INFO;
-	
-	public PolicyAccess(Properties properties, Level level) {
-		this.properties = properties;
-		if(level!=null){
-			logLevel = level;
-		}
-	}
-	
-	@Override
-	public ClassLoader classLoader() {
-		return getClass().getClassLoader();
-	}
-
-	@Override
-	public String decrypt(String enc, boolean arg1) throws IOException {
-		return enc;
-	}
-
-	@Override
-	public String getProperty(String prop, String def) {
-		return properties.getProperty(prop, def);
-	}
-
-	@Override
-	public void load(InputStream in) throws IOException {
-		properties.load(in);
-	}
-
-	@Override
-	public void log(Level level, Object... args) {
-		if (logLevel.compareTo(level) > 0) {
-            return;
-        }
-		StringBuilder sb = new StringBuilder();
-        sb.append(new Date()).append(' ').append(level);
-        logtail(sb, args);
-	}
-
-	@Override
-	public void log(Exception e, Object... args) {
-		StringBuilder sb = new StringBuilder();
-        sb.append(new Date()).append(" EXCEPTION ").append(e.getMessage());
-        logtail(sb, args);
-        logger.error(e.getMessage() + e);
-	}
-
-	@Override
-	public void setLogLevel(Level level) {
-		logLevel = level;
-	}
-	
-	private void logtail(StringBuilder sb, Object[] args) {
-        for (Object o: args) {
-            String s = o.toString();
-            if (s.length() > 0) {
-                sb.append(' ').append(s);
-            }
-        }
-        logger.info(sb.toString());
+public class PolicyAccess extends PropAccess {
+    public PolicyAccess(Properties props, Level level) {
+        super(props);
+        this.setLogLevel(level);
     }
-
-	@Override
-	public boolean willLog(Level arg0) {
-		return false;
-	}
 }