diff options
author | Vijay Venkatesh Kumar <vv770d@att.com> | 2018-07-19 22:02:53 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-07-19 22:02:53 +0000 |
commit | d12cd3525284cc41414d8fdae09e2ffbc03a1fbb (patch) | |
tree | db38e32b03abddef146f7d02772c4baa3b1ae673 /src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java | |
parent | b343343f1efd0df9196b27e9e65b783e5e954112 (diff) | |
parent | 129240ca4c0f10cf4916882f99e91072db048a4c (diff) |
Merge "VES collector application settings provider"
Diffstat (limited to 'src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java')
-rw-r--r-- | src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java b/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java index 0d9df155..e5a29e9f 100644 --- a/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java +++ b/src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java @@ -27,6 +27,7 @@ import java.net.URL; import javax.servlet.ServletException;
import org.apache.tomcat.util.codec.binary.Base64;
+import org.onap.dcae.ApplicationSettings;
import org.onap.dcae.commonFunction.CommonStartup;
import org.onap.dcae.commonFunction.VESLogger;
import org.slf4j.Logger;
@@ -53,10 +54,10 @@ public class RestfulCollectorServlet extends CommonServlet private static String authCredentialsList;
- public RestfulCollectorServlet ( rrNvReadable settings ) throws loadException, missingReqdSetting
+ public RestfulCollectorServlet ( ApplicationSettings settings ) throws loadException, missingReqdSetting
{
- super ( settings, "collector", false );
- authCredentialsList = settings.getString(CommonStartup.KSETTING_AUTHLIST, null);
+ super ( settings.torrNvReadable(), "collector", false );
+ authCredentialsList = settings.validAuthorizationCredentials();
}
@@ -91,7 +92,7 @@ public class RestfulCollectorServlet extends CommonServlet final DrumlinPlayishRoutingFileSource drs = new DrumlinPlayishRoutingFileSource ( routes );
drr.addRouteSource ( drs );
- if (CommonStartup.authflag > 0) {
+ if (CommonStartup.authflag) {
NsaAuthenticator<NsaSimpleApiKey> NsaAuth;
NsaAuth = createAuthenticator(authCredentialsList);
|