Replaced all tabs with spaces in java and pom.xml

[so.git] / common / src / main / java / org / onap / so / client / RestRequest.java

diff --git a/common/src/main/java/org/onap/so/client/RestRequest.java b/common/src/main/java/org/onap/so/client/RestRequest.java
index 3864f2e..9d2fa42 100644 (file)
--- a/common/src/main/java/org/onap/so/client/RestRequest.java
+++ b/common/src/main/java/org/onap/so/client/RestRequest.java
@@ -24,67 +24,68 @@ package org.onap.so.client;
 
 import java.util.Optional;
 import java.util.concurrent.Callable;
-
 import javax.ws.rs.HttpMethod;
 import javax.ws.rs.NotFoundException;
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.core.Response;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class RestRequest implements Callable<Response> {
 
-       private static final Logger logger = LoggerFactory.getLogger(RestRequest.class);
+    private static final Logger logger = LoggerFactory.getLogger(RestRequest.class);
+
+    private final RestClient client;
+    private final String method;
+    private final Object entity;
+
+    public RestRequest(RestClient client, String method, Object entity) {
+        this.client = client;
+        this.method = method;
+        this.entity = entity;
+    }
+
+    @Override
+    public Response call() throws Exception {
+        final Response response;
+        if ("GET".equals(method)) {
+            response = this.client.getBuilder().accept(this.client.getAccept()).get();
+        } else if ("POST".equals(method)) {
+            response = this.client.getBuilder().accept(this.client.getAccept())
+                    .post(Entity.entity(entity, this.client.getContentType()));
+        } else if ("PATCH".equals(method)) {
+            response = this.client.getBuilder().header("X-HTTP-Method-Override", "PATCH")
+                    .accept(this.client.getAccept()).post(Entity.entity(entity, this.client.getMergeContentType()));
+        } else if ("DELETE".equals(method)) {
+            if (entity == null) {
+                response = this.client.getBuilder().accept(this.client.getAccept()).delete();
 
-       private final RestClient client;
-       private final String method;
-       private final Object entity;
-       
-       public RestRequest(RestClient client, String method, Object entity) {
-               this.client = client;
-               this.method = method;
-               this.entity = entity;
-       }
-       @Override
-       public Response call() throws Exception {
-               final Response response;
-               if ("GET".equals(method)) {
-                       response = this.client.getBuilder().accept(this.client.getAccept()).get();
-               } else if ("POST".equals(method)) {
-                       response = this.client.getBuilder().accept(this.client.getAccept()).post(Entity.entity(entity, this.client.getContentType()));
-               } else if ("PATCH".equals(method)) {
-                       response = this.client.getBuilder().header("X-HTTP-Method-Override", "PATCH").accept(this.client.getAccept())
-                                       .post(Entity.entity(entity, this.client.getMergeContentType()));
-               } else if ("DELETE".equals(method)) {
-                       if (entity == null) {
-                               response = this.client.getBuilder().accept(this.client.getAccept()).delete();
+            } else {
+                response = this.client.getBuilder().accept(this.client.getAccept())
+                        .build(HttpMethod.DELETE, Entity.entity(entity, this.client.getContentType())).invoke();
+            }
+        } else if ("PUT".equals(method)) {
+            response = this.client.getBuilder().accept(this.client.getAccept())
+                    .put(Entity.entity(entity, this.client.getContentType()));
+        } else {
+            response = Response.serverError().entity(method + " not valid").build();
+        }
 
-                       } else {
-                               response = this.client.getBuilder().accept(this.client.getAccept())
-                                               .build(HttpMethod.DELETE, Entity.entity(entity, this.client.getContentType())).invoke();
-                       }
-               } else if ("PUT".equals(method)) {
-                       response = this.client.getBuilder().accept(this.client.getAccept()).put(Entity.entity(entity, this.client.getContentType()));
-               } else {
-                       response = Response.serverError().entity(method + " not valid").build();
-               }
-               
-               Optional<ResponseExceptionMapper> mapper = this.client.addResponseExceptionMapper();
-               if (mapper.isPresent()) {
-                       try {
-                               mapper.get().map(response);
-                       } catch (NotFoundException e) {
-                               if (this.client.props.mapNotFoundToEmpty() && "GET".equals(method)) {
-                                       logger.debug("RestClient recieved not found on URL: {}", this.client.getWebTarget().getUri());
-                                       return response;
-                               } else {
-                                       throw e;
-                               }
-                       }
-               }
+        Optional<ResponseExceptionMapper> mapper = this.client.addResponseExceptionMapper();
+        if (mapper.isPresent()) {
+            try {
+                mapper.get().map(response);
+            } catch (NotFoundException e) {
+                if (this.client.props.mapNotFoundToEmpty() && "GET".equals(method)) {
+                    logger.debug("RestClient recieved not found on URL: {}", this.client.getWebTarget().getUri());
+                    return response;
+                } else {
+                    throw e;
+                }
+            }
+        }
 
-               return response;
-       }
+        return response;
+    }
 
 }