Merge "AAFcli.java -Declare "value" on a separate line"

[aaf/authz.git] / cadi / core / src / main / java / org / onap / aaf / cadi / config / GetAccess.java

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java
index 05ee90c..65501a6 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/GetAccess.java
@@ -7,9 +7,9 @@
  * 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.
@@ -24,39 +24,34 @@ package org.onap.aaf.cadi.config;
 import org.onap.aaf.cadi.PropAccess;
 
 public class GetAccess extends PropAccess {
-       private final Get getter;
-       
-       public GetAccess(Get getter) {
-               super(new String[]{"cadi_prop_files="+getter.get("cadi_prop_files", null, true)});
-               this.getter = getter;
-       }
-       
-       /* (non-Javadoc)
-        * @see org.onap.aaf.cadi.PropAccess#getProperty(java.lang.String, java.lang.String)
-        */
-       @Override
-       public String getProperty(String tag, String def) {
-               String rv;
-               rv = super.getProperty(tag, null);
-               if(rv==null && getter!=null) {
-                       rv = getter.get(tag, null, true);
-               }
-               return rv==null?def:rv;
-       }
-       /* (non-Javadoc)
-        * @see org.onap.aaf.cadi.PropAccess#getProperty(java.lang.String)
-        */
-       @Override
-       public String getProperty(String tag) {
-               String rv;
-               rv = super.getProperty(tag, null);
-               if(rv==null && getter!=null) {
-                       rv = getter.get(tag, null, true);
-               }
-               return rv;
-       }
+    private final Get getter;
+
+    public GetAccess(Get getter) {
+        super(new String[]{"cadi_prop_files="+getter.get("cadi_prop_files", null, true)});
+        this.getter = getter;
+    }
+
+    /* (non-Javadoc)
+     * @see org.onap.aaf.cadi.PropAccess#getProperty(java.lang.String, java.lang.String)
+     */
+    @Override
+    public String getProperty(String tag, String def) {
+        String rv;
+        rv = super.getProperty(tag, null);
+        if (rv==null && getter!=null) {
+            rv = getter.get(tag, null, true);
+        }
+        return rv==null?def:rv;
+    }
+    /* (non-Javadoc)
+     * @see org.onap.aaf.cadi.PropAccess#getProperty(java.lang.String)
+     */
+    @Override
+    public String getProperty(String tag) {
+        return getProperty(tag, null);
+    }
 
-       public Get get() {
-               return getter;
-       }
+    public Get get() {
+        return getter;
+    }
 }