Swap Optional.isPresent with functional expression

Change-Id: Id4b724b189f98c89e3e038b154990a95733e0624
Issue-ID: SO-437
Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/RestClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/RestClient.java
index 74b1c3f..1436d83 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/RestClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/policy/RestClient.java
@@ -157,14 +157,9 @@ public abstract class RestClient {
                }
                client.register(this.getMapper());
                Optional<ClientResponseFilter> responseFilter = this.addResponseFilter();
-               if (responseFilter.isPresent()) {
-                       client.register(responseFilter.get());
-               }
-               if (!path.isPresent()) {
-                       webTarget = client.target(host.toString());
-               } else {
-                       webTarget = client.target(UriBuilder.fromUri(host + path.get().toString()));
-               }
+               responseFilter.ifPresent(clientResponseFilter -> client.register(clientResponseFilter));
+               webTarget = path.<WebTarget>map(uri -> client.target(UriBuilder.fromUri(host + uri.toString())))
+                       .orElseGet(() -> client.target(host.toString()));
                this.accept = MediaType.APPLICATION_JSON;
                this.contentType = MediaType.APPLICATION_JSON;
        }