diff options
| author |   Zlatko Murgoski <zlatko.murgoski@nokia.com> | 2018-07-13 15:56:21 +0200 |
|---|---|---|
| committer | Zlatko Murgoski <zlatko.murgoski@nokia.com> | 2018-07-18 11:12:09 +0200 |
| commit | 129240ca4c0f10cf4916882f99e91072db048a4c (patch) | |
| tree | 15c0f78fdd11743ce46b3ceec6a12efcf683b795 /src/main/java/org/onap/dcae/restapi | |
| parent | cd66181b35300f020f197bb411d6bdf6ad2514fb (diff) | |
VES collector application settings provider
Extract application settings to diferent class
First step to remove nsaServerLibrary
Change-Id: Ib4fb236ac4683d241c7841ba66f1afbcfb10c92a
Signed-off-by: ZlatkoMurgoski <zlatko.murgoski@nokia.com>
Issue-ID: DCAEGEN2-566
Diffstat (limited to 'src/main/java/org/onap/dcae/restapi')
| -rw-r--r-- | src/main/java/org/onap/dcae/restapi/RestfulCollectorServlet.java | 9 | ||||
| -rw-r--r-- | src/main/java/org/onap/dcae/restapi/endpoints/EventReceipt.java | 6 |
2 files changed, 8 insertions, 7 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);
diff --git a/src/main/java/org/onap/dcae/restapi/endpoints/EventReceipt.java b/src/main/java/org/onap/dcae/restapi/endpoints/EventReceipt.java index d028a957..d60e2a11 100644 --- a/src/main/java/org/onap/dcae/restapi/endpoints/EventReceipt.java +++ b/src/main/java/org/onap/dcae/restapi/endpoints/EventReceipt.java @@ -100,7 +100,7 @@ public class EventReceipt extends NsaBaseEndpoint { }
try {
- if (CommonStartup.authflag == 1) {
+ if (CommonStartup.authflag) {
userId = getUser (ctx);
retkey = NsaBaseEndpoint.getAuthenticatedUser(ctx);
}
@@ -160,8 +160,8 @@ public class EventReceipt extends NsaBaseEndpoint { JSONArray jsonArrayMod = new JSONArray();
JSONObject event;
FileReader fr;
- if (retkey != null || CommonStartup.authflag == 0) {
- if (CommonStartup.schemaValidatorflag > 0) {
+ if (retkey != null || !CommonStartup.authflag) {
+ if (CommonStartup.schemaValidatorflag) {
if ((arrayFlag == 1) && (jsonObject.has("eventList") && (!jsonObject.has("event")))
|| ((arrayFlag == 0) && (!jsonObject.has("eventList") && (jsonObject.has("event"))))) {
fr = new FileReader(schemaFileVersion(vesVersion));
|