AAI-1523 Batch reformat aai-core

[aai/aai-common.git] / aai-core / src / main / java / org / onap / aai / util / Request.java

diff --git a/aai-core/src/main/java/org/onap/aai/util/Request.java b/aai-core/src/main/java/org/onap/aai/util/Request.java
index fb695b2..890398d 100644 (file)
--- a/aai-core/src/main/java/org/onap/aai/util/Request.java
+++ b/aai-core/src/main/java/org/onap/aai/util/Request.java
@@ -17,6 +17,7 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.aai.util;
 
 import java.io.UnsupportedEncodingException;
@@ -31,126 +32,123 @@ import org.onap.aai.exceptions.AAIException;
 
 public class Request<T> {
 
-       public static final String V14 = "v14";
-       public final String fromAppId;
-       public final String transactionId;
-       public final String path;
-       public final RestObject<T> restObj;
-       public final boolean oldServer;
-       public final String apiVersion;
-       
-       
-       /**
-        * Instantiates a new request.
-        *
-        * @param builder the builder
-        */
-       public Request(RequestBuilder<T> builder) {
-               
-               fromAppId = builder.fromAppId;
-               transactionId = builder.transactionId;
-               restObj = builder.restObj;
-               oldServer = builder.oldServer;
-               apiVersion = builder.apiVersion;
-               
-               if (!oldServer) {
-                       path = apiVersion + "/" + builder.path;
-               } else {
-                       path = builder.path;
-               }
-               
-               
-       }
-       
-       public static class RequestBuilder<T> {
-               private String fromAppId;
-               private String transactionId;
-               private String path;
-               private RestObject<T> restObj;
-               private boolean oldServer;
-               private String apiVersion = Request.V14;
-               
-
-               /**
-                * Sets the from app id.
-                *
-                * @param fromAppId the from app id
-                * @return the request builder
-                */
-               public RequestBuilder<T> setFromAppId(String fromAppId) {
-                       this.fromAppId = fromAppId;
-                       return this;
-               }
-               
-               /**
-                * Sets the transaction id.
-                *
-                * @param transactionId the transaction id
-                * @return the request builder
-                */
-               public RequestBuilder<T> setTransactionId(String transactionId) {
-                       this.transactionId = transactionId;
-                       return this;
-
-               }
-               
-               /**
-                * Sets the path.
-                *
-                * @param path the path
-                * @return the request builder
-                */
-               public RequestBuilder<T> setPath(String path) {
-                       
-                       this.path = path;
-                       return this;
-
-               }
-               
-               /**
-                * Sets the restcore obj.
-                *
-                * @param restObj the restcore obj
-                * @return the request builder
-                */
-               public RequestBuilder<T> setRestObj(RestObject<T> restObj) {
-                       this.restObj = restObj;
-                       return this;
-
-               }
-               
-               /**
-                * Sets the old server.
-                *
-                * @param oldServer the old server
-                * @return the request builder
-                */
-               public RequestBuilder<T> setOldServer(boolean oldServer) {
-                       this.oldServer = oldServer;
-                       return this;
-
-               }
-               
-               /**
-                * Sets the api version.
-                *
-                * @param apiVersion the api version
-                * @return the request builder
-                */
-               public RequestBuilder<T> setApiVersion(String apiVersion) {
-                       this.apiVersion = apiVersion;
-                       return this;
-               }
-               
-               /**
-                * Builds the.
-                *
-                * @return the request
-                */
-               public Request<T> build() {
-                       return new Request<T>(this);
-               }
-               
-       }
-       
+    public static final String V14 = "v14";
+    public final String fromAppId;
+    public final String transactionId;
+    public final String path;
+    public final RestObject<T> restObj;
+    public final boolean oldServer;
+    public final String apiVersion;
+
+    /**
+     * Instantiates a new request.
+     *
+     * @param builder the builder
+     */
+    public Request(RequestBuilder<T> builder) {
+
+        fromAppId = builder.fromAppId;
+        transactionId = builder.transactionId;
+        restObj = builder.restObj;
+        oldServer = builder.oldServer;
+        apiVersion = builder.apiVersion;
+
+        if (!oldServer) {
+            path = apiVersion + "/" + builder.path;
+        } else {
+            path = builder.path;
+        }
+
+    }
+
+    public static class RequestBuilder<T> {
+        private String fromAppId;
+        private String transactionId;
+        private String path;
+        private RestObject<T> restObj;
+        private boolean oldServer;
+        private String apiVersion = Request.V14;
+
+        /**
+         * Sets the from app id.
+         *
+         * @param fromAppId the from app id
+         * @return the request builder
+         */
+        public RequestBuilder<T> setFromAppId(String fromAppId) {
+            this.fromAppId = fromAppId;
+            return this;
+        }
+
+        /**
+         * Sets the transaction id.
+         *
+         * @param transactionId the transaction id
+         * @return the request builder
+         */
+        public RequestBuilder<T> setTransactionId(String transactionId) {
+            this.transactionId = transactionId;
+            return this;
+
+        }
+
+        /**
+         * Sets the path.
+         *
+         * @param path the path
+         * @return the request builder
+         */
+        public RequestBuilder<T> setPath(String path) {
+
+            this.path = path;
+            return this;
+
+        }
+
+        /**
+         * Sets the restcore obj.
+         *
+         * @param restObj the restcore obj
+         * @return the request builder
+         */
+        public RequestBuilder<T> setRestObj(RestObject<T> restObj) {
+            this.restObj = restObj;
+            return this;
+
+        }
+
+        /**
+         * Sets the old server.
+         *
+         * @param oldServer the old server
+         * @return the request builder
+         */
+        public RequestBuilder<T> setOldServer(boolean oldServer) {
+            this.oldServer = oldServer;
+            return this;
+
+        }
+
+        /**
+         * Sets the api version.
+         *
+         * @param apiVersion the api version
+         * @return the request builder
+         */
+        public RequestBuilder<T> setApiVersion(String apiVersion) {
+            this.apiVersion = apiVersion;
+            return this;
+        }
+
+        /**
+         * Builds the.
+         *
+         * @return the request
+         */
+        public Request<T> build() {
+            return new Request<T>(this);
+        }
+
+    }
+
 }