aboutsummaryrefslogtreecommitdiffstats
path: root/champ-service/src/main
diff options
context:
space:
mode:
authorDaniel Silverthorn <daniel.silverthorn@amdocs.com>2018-03-26 13:58:14 -0400
committerDaniel Silverthorn <daniel.silverthorn@amdocs.com>2018-03-28 09:16:45 -0400
commit7c449cf6a2596db7d0cd8a57145b5198be551559 (patch)
treeb92f0caa235b808f88fe95033c73448545b45c8a /champ-service/src/main
parent84cdd4d4e354e856bf265c36d4953367cb9a1bd7 (diff)
Catch IllegalArgumentException for error message
Also had to upversion event client library Change-Id: I4dbbf8f35630d93cca9e5d8971e7fde8a65b0811 Issue-ID: AAI-945 Signed-off-by: Daniel Silverthorn <daniel.silverthorn@amdocs.com>
Diffstat (limited to 'champ-service/src/main')
-rw-r--r--champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java b/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java
index e9a2830..577dbc9 100644
--- a/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java
+++ b/champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java
@@ -205,6 +205,8 @@ public class ChampRESTAPI {
response = Response.status(Status.BAD_REQUEST).entity("Unable to parse the payload").build();
} catch (ChampServiceException ce) {
response = Response.status(ce.getHttpStatus()).entity(ce.getMessage()).build();
+ } catch (IllegalArgumentException e) {
+ response = Response.status(Status.BAD_REQUEST).entity(e.getMessage()).build();
} catch (Exception e) {
response = Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
LoggingUtil.logInternalError(logger, e);
@@ -243,6 +245,8 @@ public class ChampRESTAPI {
response = Response.status(Status.BAD_REQUEST).entity("Unable to parse the payload").build();
} catch (ChampServiceException ce) {
response = Response.status(ce.getHttpStatus()).entity(ce.getMessage()).build();
+ } catch (IllegalArgumentException e) {
+ response = Response.status(Status.BAD_REQUEST).entity(e.getMessage()).build();
} catch (Exception e) {
response = Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
LoggingUtil.logInternalError(logger, e);
@@ -387,6 +391,8 @@ public class ChampRESTAPI {
response = Response.status(Status.BAD_REQUEST).entity("Unable to parse the payload").build();
} catch (ChampServiceException ce) {
response = Response.status(ce.getHttpStatus()).entity(ce.getMessage()).build();
+ } catch (IllegalArgumentException e) {
+ response = Response.status(Status.BAD_REQUEST).entity(e.getMessage()).build();
} catch (Exception e) {
response = Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
LoggingUtil.logInternalError(logger, e);
@@ -423,6 +429,8 @@ public class ChampRESTAPI {
response = Response.status(Status.BAD_REQUEST).entity("Unable to parse the payload").build();
} catch (ChampServiceException ce) {
response = Response.status(ce.getHttpStatus()).entity(ce.getMessage()).build();
+ } catch (IllegalArgumentException e) {
+ response = Response.status(Status.BAD_REQUEST).entity(e.getMessage()).build();
} catch (Exception e) {
response = Response.status(Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build();
LoggingUtil.logInternalError(logger, e);