diff options
author | rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2024-01-31 15:02:48 +0000 |
---|---|---|
committer | rameshiyer27 <ramesh.murugan.iyer@est.tech> | 2024-02-09 11:30:08 +0000 |
commit | 5e484ea73840e0b329be09730e009ae22c9962dc (patch) | |
tree | 0780e47714c8f00ba9c93ce4a6fcae57b2239dcd /plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main | |
parent | cec2a2c3b6ce4ee353ef0058801a1a2b3e81ae54 (diff) |
Remove Dmaap from apex-pdp
Issue-ID: POLICY-4402
Signed-off-by: rameshiyer27 <ramesh.murugan.iyer@est.tech>
Change-Id: I76c284b6ff7ec0ce77189f3f2bc93d5b91d4eb24
Diffstat (limited to 'plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main')
-rw-r--r-- | plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java | 54 |
1 files changed, 23 insertions, 31 deletions
diff --git a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java index bcf76aa51..2aec19d4d 100644 --- a/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java +++ b/plugins/plugins-event/plugins-event-carrier/plugins-event-carrier-restrequestor/src/main/java/org/onap/policy/apex/plugins/event/carrier/restrequestor/ApexRestRequestorConsumer.java @@ -1,7 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. - * Modifications Copyright (C) 2019-2020, 2023 Nordix Foundation. + * Modifications Copyright (C) 2019-2020, 2023-2024 Nordix Foundation. * Modifications Copyright (C) 2021 Bell Canada. All rights reserved. * Modifications Copyright (C) 2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ @@ -90,7 +90,7 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer { private final Map<ApexRestRequest, RestRequestRunner> ongoingRestRequestMap = new ConcurrentHashMap<>(); // The number of events received to date - private Object eventsReceivedLock = new Object(); + private final Object eventsReceivedLock = new Object(); @Getter private int eventsReceived = 0; @@ -303,18 +303,20 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer { NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, url, request.getEvent().toString()); } // Execute the REST request - final var response = sendEventAsRestRequest(url); - // Get the event we received - final var eventJsonString = response.readEntity(String.class); - NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, eventJsonString); - // Match the return code - var isPass = httpCodeFilterPattern.matcher(String.valueOf(response.getStatus())); - - // Check that the request worked - if (!isPass.matches()) { - final String errorMessage = "reception of event from URL \"" + restConsumerProperties.getUrl() - + "\" failed with status code " + response.getStatus(); - throw new ApexEventRuntimeException(errorMessage); + final String eventJsonString; + try (var response = sendEventAsRestRequest(url)) { + // Get the event we received + eventJsonString = response.readEntity(String.class); + NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, url, eventJsonString); + // Match the return code + var isPass = httpCodeFilterPattern.matcher(String.valueOf(response.getStatus())); + + // Check that the request worked + if (!isPass.matches()) { + final String errorMessage = "reception of event from URL \"" + restConsumerProperties.getUrl() + + "\" failed with status code " + response.getStatus(); + throw new ApexEventRuntimeException(errorMessage); + } } // Check there is content @@ -354,24 +356,14 @@ public class ApexRestRequestorConsumer extends ApexPluginsEventConsumer { public Response sendEventAsRestRequest(String url) { Builder headers = client.target(url).request(APPLICATION_JSON) .headers(restConsumerProperties.getHttpHeadersAsMultivaluedMap()); - switch (restConsumerProperties.getHttpMethod()) { - case GET: - return headers.get(); - - case PUT: - return headers.put(Entity.json(request.getEvent())); - - case POST: - return headers.post(Entity.json(request.getEvent())); - - case DELETE: - return headers.delete(); - - default: - break; - } + LOGGER.info("event from request: {}", request.getEvent()); + return switch (restConsumerProperties.getHttpMethod()) { + case GET -> headers.get(); + case PUT -> headers.put(Entity.json(request.getEvent())); + case POST -> headers.post(Entity.json(request.getEvent())); + case DELETE -> headers.delete(); + }; - return null; } } } |