From b1d2017031a5ed827d1420442212e6aaa59bf662 Mon Sep 17 00:00:00 2001
From: grabinsk <maciej.grabinski@nokia.com>
Date: Fri, 7 Jun 2019 12:21:44 +0200
Subject: handle 404 from aai

(parsing response body from aai should not be attempted if there is no 2xx response)

Change-Id: Iedc9daa65895600d826ac808784b3c6803a6dab4
Issue-ID: DCAEGEN2-1601
Signed-off-by: grabinsk <maciej.grabinski@nokia.com>
---
 .../services/prh/configuration/AaiHttpClientConfig.java    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'prh-app-server')

diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java
index 8548ffe8..e09322d3 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/configuration/AaiHttpClientConfig.java
@@ -55,16 +55,22 @@ public class AaiHttpClientConfig {
     public AaiHttpClient<AaiServiceInstanceQueryModel, AaiServiceInstanceResultModel> getServiceInstanceClient() {
         return createLazyConfigClient(
                 (config, client) -> new AaiGetServiceInstanceClient(config, client)
-                        .map(httpResponse -> httpResponse.bodyAsJson(StandardCharsets.UTF_8,
-                                PrhModelAwareGsonBuilder.createGson(), AaiServiceInstanceResultModel.class)));
+                        .map(httpResponse -> {
+                            httpResponse.throwIfUnsuccessful();
+                            return httpResponse.bodyAsJson(StandardCharsets.UTF_8,
+                                    PrhModelAwareGsonBuilder.createGson(), AaiServiceInstanceResultModel.class);
+                        }));
     }
 
     @Bean
     public AaiHttpClient<AaiModel, AaiPnfResultModel> getGetClient() {
         return createLazyConfigClient(
                 (config, client) -> new AaiHttpGetClient(config, client)
-                        .map(httpResponse -> httpResponse.bodyAsJson(StandardCharsets.UTF_8,
-                                PrhModelAwareGsonBuilder.createGson(), AaiPnfResultModel.class)));
+                        .map(httpResponse -> {
+                            httpResponse.throwIfUnsuccessful();
+                            return httpResponse.bodyAsJson(StandardCharsets.UTF_8,
+                                    PrhModelAwareGsonBuilder.createGson(), AaiPnfResultModel.class);
+                        }));
     }
 
     private <T, U> AaiHttpClient<T, U> createLazyConfigClient(
-- 
cgit 1.2.3-korg