X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FAsyncRestClient.java;h=0289db98eed83ae9f322ec00c2532bbd3c06e3d7;hb=643ba188e7c1d0c8ce097adfd94ced47b2da615e;hp=0d27bd6ccf4d75528bdbcde46a964122e99a2914;hpb=7c297ddb425a52dae965adc6a83629a14421ea05;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/AsyncRestClient.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/AsyncRestClient.java
index 0d27bd6c..0289db98 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/AsyncRestClient.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/AsyncRestClient.java
@@ -24,84 +24,99 @@ import java.lang.invoke.MethodHandles;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.reactive.function.client.WebClient.RequestHeadersSpec;
 import reactor.core.publisher.Mono;
 
+/**
+ * Generic reactive REST client.
+ */
 public class AsyncRestClient {
     private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     private final WebClient client;
     private final String baseUrl;
 
-    public class AsyncRestClientException extends Exception {
-
-        private static final long serialVersionUID = 1L;
-
-        public AsyncRestClientException(String message) {
-            super(message);
-        }
-    }
-
     public AsyncRestClient(String baseUrl) {
         this.client = WebClient.create(baseUrl);
         this.baseUrl = baseUrl;
     }
 
-    public Mono<String> post(String uri, String body) {
+    public Mono<ResponseEntity<String>> postForEntity(String uri, @Nullable String body) {
         logger.debug("POST uri = '{}{}''", baseUrl, uri);
-        return client.post() //
+        Mono<String> bodyProducer = body != null ? Mono.just(body) : Mono.empty();
+        RequestHeadersSpec<?> request = client.post() //
             .uri(uri) //
             .contentType(MediaType.APPLICATION_JSON) //
-            .bodyValue(body) //
-            .retrieve() //
-            .onStatus(HttpStatus::isError,
-                response -> Mono.error(new AsyncRestClientException(response.statusCode().toString()))) //
-            .bodyToMono(String.class);
+            .body(bodyProducer, String.class);
+        return retrieve(request);
+    }
+
+    public Mono<String> post(String uri, @Nullable String body) {
+        return postForEntity(uri, body) //
+            .flatMap(this::toBody);
     }
 
     public Mono<String> postWithAuthHeader(String uri, String body, String username, String password) {
         logger.debug("POST (auth) uri = '{}{}''", baseUrl, uri);
-        return client.post() //
+        RequestHeadersSpec<?> request = client.post() //
             .uri(uri) //
             .headers(headers -> headers.setBasicAuth(username, password)) //
             .contentType(MediaType.APPLICATION_JSON) //
-            .bodyValue(body) //
-            .retrieve() //
-            .onStatus(HttpStatus::isError,
-                response -> Mono.error(new AsyncRestClientException(response.statusCode().toString()))) //
-            .bodyToMono(String.class);
+            .bodyValue(body);
+        return retrieve(request) //
+            .flatMap(this::toBody);
     }
 
-    public Mono<String> put(String uri, String body) {
+    public Mono<ResponseEntity<String>> putForEntity(String uri, String body) {
         logger.debug("PUT uri = '{}{}''", baseUrl, uri);
-        return client.put() //
+        RequestHeadersSpec<?> request = client.put() //
             .uri(uri) //
             .contentType(MediaType.APPLICATION_JSON) //
-            .bodyValue(body) //
-            .retrieve() //
-            .onStatus(HttpStatus::isError,
-                response -> Mono.error(new AsyncRestClientException(response.statusCode().toString()))) //
-            .bodyToMono(String.class);
+            .bodyValue(body);
+        return retrieve(request);
     }
 
-    public Mono<String> get(String uri) {
+    public Mono<String> put(String uri, String body) {
+        return putForEntity(uri, body) //
+            .flatMap(this::toBody);
+    }
+
+    public Mono<ResponseEntity<String>> getForEntity(String uri) {
         logger.debug("GET uri = '{}{}''", baseUrl, uri);
-        return client.get() //
-            .uri(uri) //
-            .retrieve() //
-            .onStatus(HttpStatus::isError,
-                response -> Mono.error(new AsyncRestClientException(response.statusCode().toString()))) //
-            .bodyToMono(String.class);
+        RequestHeadersSpec<?> request = client.get().uri(uri);
+        return retrieve(request);
     }
 
-    public Mono<String> delete(String uri) {
+    public Mono<String> get(String uri) {
+        return getForEntity(uri) //
+            .flatMap(this::toBody);
+    }
+
+    public Mono<ResponseEntity<String>> deleteForEntity(String uri) {
         logger.debug("DELETE uri = '{}{}''", baseUrl, uri);
-        return client.delete() //
-            .uri(uri) //
-            .retrieve() //
-            .onStatus(HttpStatus::isError,
-                response -> Mono.error(new AsyncRestClientException(response.statusCode().toString()))) //
-            .bodyToMono(String.class);
+        RequestHeadersSpec<?> request = client.delete().uri(uri);
+        return retrieve(request);
+    }
+
+    public Mono<String> delete(String uri) {
+        return deleteForEntity(uri) //
+            .flatMap(this::toBody);
+    }
+
+    private Mono<ResponseEntity<String>> retrieve(RequestHeadersSpec<?> request) {
+        return request.retrieve() //
+            .toEntity(String.class);
     }
+
+    Mono<String> toBody(ResponseEntity<String> entity) {
+        if (entity.getBody() == null) {
+            return Mono.just("");
+        } else {
+            return Mono.just(entity.getBody());
+        }
+    }
+
 }