diff options
author | Norm Traxler <normant@amdocs.com> | 2019-03-08 17:05:05 +0000 |
---|---|---|
committer | Norm Traxler <normant@amdocs.com> | 2019-03-08 17:05:22 +0000 |
commit | 716a57bba582e045986de3bdd354baefcf567b21 (patch) | |
tree | 9bfc050a58b1d7248003a2d81997f7cbb438faa6 /src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs | |
parent | 6e2b5a9df11eb5a1ae455ff3c7a17ff1ad855b2e (diff) |
Use direct GET to get service instance
Issue-ID: LOG-999
Change-Id: I2530de89628465055c9464e912cfe4764cb10f3a
Signed-off-by: Norm Traxler <normant@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs')
-rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java index b3d21bf..3822a58 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/rs/RestServiceImpl.java @@ -39,19 +39,15 @@ public class RestServiceImpl implements RestService { @Autowired private SpringService service; - - public RestServiceImpl() { - } - @Override public Response getContext(HttpServletRequest request, HttpHeaders headers, String serviceInstanceId) { Response response = null; - ModelContext sdncContext= null; + ModelContext sdncContext = null; Gson gson = new GsonBuilder().create(); try { // Validate URL parameters - RestUtil.validateURL(serviceInstanceId); + RestUtil.validateUrl(serviceInstanceId); // Validate Headers and extract Partner Name String partnerName = RestUtil.validateHeader(headers, service.getSdncAuthoriztion()); @@ -61,17 +57,18 @@ public class RestServiceImpl implements RestService { sdncContext = service.getContext(request, serviceInstanceId, transactionId, partnerName); - if (sdncContext==null) { + if (sdncContext == null) { // Return empty JSON response = Response.ok().entity(EMPTY_JSON_STRING).build(); - }else { + } else { response = Response.ok().entity(gson.toJson(sdncContext)).build(); } } catch (AuditException ce) { - if (ce.getHttpStatus() !=null) { + if (ce.getHttpStatus() != null) { response = Response.status(ce.getHttpStatus()).entity(ce.getMessage()).build(); - }else { - // No response received, could be the cases of network issue: i.e. unreachable host + } else { + // No response received, could be the cases of network issue: i.e. unreachable + // host response = Response.status(Status.INTERNAL_SERVER_ERROR).entity(ce.getMessage()).build(); } } catch (Exception e) { |