diff options
| author |   Daniel Silverthorn <daniel.silverthorn@amdocs.com> | 2018-03-26 13:58:14 -0400 |
|---|---|---|
| committer | Daniel Silverthorn <daniel.silverthorn@amdocs.com> | 2018-03-28 09:16:45 -0400 |
| commit | 7c449cf6a2596db7d0cd8a57145b5198be551559 (patch) | |
| tree | b92f0caa235b808f88fe95033c73448545b45c8a | |
| parent | 84cdd4d4e354e856bf265c36d4953367cb9a1bd7 (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>
| -rw-r--r-- | champ-lib/pom.xml | 2 | ||||
| -rw-r--r-- | champ-service/pom.xml | 2 | ||||
| -rw-r--r-- | champ-service/src/main/java/org/onap/champ/ChampRESTAPI.java | 8 |
3 files changed, 10 insertions, 2 deletions
diff --git a/champ-lib/pom.xml b/champ-lib/pom.xml index 7f98c25..5e441e0 100644 --- a/champ-lib/pom.xml +++ b/champ-lib/pom.xml @@ -15,7 +15,7 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <event.client.version>1.2.0</event.client.version> + <event.client.version>1.2.1</event.client.version> <!--<absoluteDistFilesRoot>/appl/${project.artifactId}</absoluteDistFilesRoot>--> diff --git a/champ-service/pom.xml b/champ-service/pom.xml index 25500c3..c5c90f4 100644 --- a/champ-service/pom.xml +++ b/champ-service/pom.xml @@ -28,7 +28,7 @@ <distFilesRoot>/appl/${project.artifactId}/${project.version}</distFilesRoot> <common.logging.groupid>org.onap.aai.logging-service</common.logging.groupid> - <common.logging.version>1.2.0</common.logging.version> + <common.logging.version>1.2.2</common.logging.version> <org.apache.httpcomponents.httpclient.version>4.5.2</org.apache.httpcomponents.httpclient.version> </properties> 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); |