summaryrefslogtreecommitdiffstats
path: root/ms/neng/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'ms/neng/src/main')
-rw-r--r--ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java2
-rw-r--r--ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicySequence.java16
-rw-r--r--ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/service/rs/RestServiceImpl.java10
3 files changed, 18 insertions, 10 deletions
diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java
index 1287a273..561273bf 100644
--- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java
+++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/Application.java
@@ -3,6 +3,7 @@
* ONAP : CCSDK.apps
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,7 +71,6 @@ public class Application extends SpringBootServletInitializer {
String[] beanNames = ctx.getBeanDefinitionNames();
Arrays.sort(beanNames);
for (String beanName : beanNames) {
- System.out.println(beanName);
log.info(beanName);
}
log.info("################################");
diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicySequence.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicySequence.java
index 526f67c1..f70b0633 100644
--- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicySequence.java
+++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/policy/PolicySequence.java
@@ -3,13 +3,14 @@
* ONAP : CCSDK.apps
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 IBM.
* ================================================================================
* 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,15 +21,17 @@
package org.onap.ccsdk.apps.ms.neng.core.policy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Represents a sequence object in the policy, as a POJO.
*/
public class PolicySequence {
/**
- * The type of the policy sequence.
+ * The type of the policy sequence.
*/
- public enum Type {
- ALPHA, NUMERIC
+ public enum Type {
+ ALPHA, NUMERIC
}
private long startValue;
@@ -41,6 +44,8 @@ public class PolicySequence {
private String key;
private String value;
private Long lastReleaseSeqNumTried;
+ private Logger logger = LoggerFactory.getLogger(PolicySequence.class);
+
public long getStartValue() {
return startValue;
@@ -79,6 +84,7 @@ public class PolicySequence {
try {
this.maxValue = Long.valueOf(this.maxValueString, base);
} catch (Exception e) {
+ logger.error("Exception",e);
this.maxValue = null;
}
}
diff --git a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/service/rs/RestServiceImpl.java b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/service/rs/RestServiceImpl.java
index 3746756e..95afea21 100644
--- a/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/service/rs/RestServiceImpl.java
+++ b/ms/neng/src/main/java/org/onap/ccsdk/apps/ms/neng/core/service/rs/RestServiceImpl.java
@@ -4,6 +4,8 @@
* ================================================================================
* Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
* ================================================================================
+ * Modifications Copyright (C) 2018 IBM.
+ * ================================================================================
* 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
@@ -43,7 +45,7 @@ public class RestServiceImpl implements RestService {
private static Logger log = Logger.getLogger(RestServiceImpl.class.getName());
private static final String INTERNAL_ERROR_MSG = "Internal error occured while processing the request.";
private static final String ERROR="error";
-
+ private static final String ERROR_500="err-0500";
@Autowired SpringService service;
@@ -73,7 +75,7 @@ public class RestServiceImpl implements RestService {
return buildErrorResponse(response);
} catch (Exception e) {
log.warning(e.getMessage());
- response.put(ERROR, buildErrorResponse("err-0500", INTERNAL_ERROR_MSG));
+ response.put(ERROR, buildErrorResponse(ERROR_500, INTERNAL_ERROR_MSG));
return buildErrorResponse(response);
}
}
@@ -94,7 +96,7 @@ public class RestServiceImpl implements RestService {
return buildErrorResponse(response);
} catch (Exception e) {
log.warning(e.getMessage());
- response.put(ERROR, buildErrorResponse("err-0500", INTERNAL_ERROR_MSG));
+ response.put(ERROR, buildErrorResponse(ERROR_500, INTERNAL_ERROR_MSG));
return buildErrorResponse(response);
}
}
@@ -122,7 +124,7 @@ public class RestServiceImpl implements RestService {
return buildResponse(response);
} catch (Exception e) {
log.warning(e.getMessage());
- response.put(ERROR, buildErrorResponse("err-0500", e.getMessage()));
+ response.put(ERROR, buildErrorResponse(ERROR_500, e.getMessage()));
return buildErrorResponse(response);
}
}