diff options
| author |   Instrumental <jonathan.gathman@att.com> | 2019-12-20 11:01:29 -0600 |
|---|---|---|
| committer | Instrumental <jonathan.gathman@att.com> | 2019-12-20 11:03:55 -0600 |
| commit | 3ca2e6964bf2aab93394cf542b6354ca735703c0 (patch) | |
| tree | 08efdf55451ac3be0171e5b98d8d7e33981a10e1 /cadi/core | |
| parent | 97b7c2435bf2fb9f2e27593c06b9b85fc4dc70aa (diff) | |
Minor changes for Organization needs
Issue-ID: AAF-1058
Change-Id: I446f630b197657f9d20222a69101437af3ae33e6
Signed-off-by: Instrumental <jonathan.gathman@att.com>
Diffstat (limited to 'cadi/core')
| -rw-r--r-- | cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java | 1 | ||||
| -rw-r--r-- | cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java b/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java index 0cebaa77..df2c0764 100644 --- a/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java @@ -30,7 +30,6 @@ import java.io.IOException; import java.io.InputStream; import java.io.PrintStream; import java.io.PrintWriter; -import java.io.StringBufferInputStream; import java.io.StringWriter; import java.text.DateFormat; import java.text.SimpleDateFormat; diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java index a231b393..2bea195e 100644 --- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java @@ -73,6 +73,8 @@ public class Config { private static final String AAF_V2_0 = "org.onap.aaf.cadi.aaf.v2_0"; private static final String AAF_V2_0_AAFCON = AAF_V2_0+".AAFCon"; private static final String AAF_V2_0_AAF_LUR_PERM = AAF_V2_0+".AAFLurPerm"; + public static final String AAF_V2_0_AAF_CON_HTTP = AAF_V2_0+".AAFConHttp"; + private static final String OAUTH = "org.onap.auth.oauth"; private static final String OAUTH_TOKEN_MGR = OAUTH+".TokenMgr"; private static final String OAUTH_HTTP_TAF = OAUTH+".OAuth2HttpTaf"; @@ -256,7 +258,6 @@ public class Config { public static final String AAF_ALT_CLIENT_SECRET = "aaf_alt_oauth2_client_secret"; public static final String AAF_OAUTH2_HELLO_URL = "aaf_oauth2_hello_url"; - private static final String AAF_V2_0_AAF_CON_HTTP = "org.onap.aaf.cadi.aaf.v2_0.AAFConHttp"; public static void setDefaultRealm(Access access) { @@ -782,7 +783,8 @@ public class Config { return false; } - public static Object loadAAFConnector(SecurityInfoC<HttpURLConnection> si, String aafURL) { + @SuppressWarnings("unchecked") + public static Object loadAAFConnector(SecurityInfoC<?> si, String aafURL) { Access access = si.access; Object aafcon = null; Class<?> aafConClass = null; @@ -799,7 +801,7 @@ public class Config { if (pc.equals(Access.class)) { lo.add(access); } else if (pc.equals(Locator.class)) { - lo.add(loadLocator(si, aafURL)); + lo.add(loadLocator((SecurityInfoC<HttpURLConnection>)si, aafURL)); } } if (c.getParameterTypes().length != lo.size()) { |