Update rest-client with additional operations

[aai/rest-client.git] / src / main / java / org / openecomp / restclient / rest / HttpUtil.java

diff --git a/src/main/java/org/openecomp/restclient/rest/HttpUtil.java b/src/main/java/org/openecomp/restclient/rest/HttpUtil.java
index 89af684..4ea8928 100644 (file)
--- a/src/main/java/org/openecomp/restclient/rest/HttpUtil.java
+++ b/src/main/java/org/openecomp/restclient/rest/HttpUtil.java
@@ -50,7 +50,7 @@ public class HttpUtil {
    * @return true if the response is of the informational class and false otherwise\r
    */\r
   public static boolean isHttpResponseClassInformational(int response) {\r
-    return isExpectedHttpResponseClass(response, '1');\r
+    return ( response >= 100 && response <= 199);\r
   }\r
 \r
   /**\r
@@ -60,7 +60,8 @@ public class HttpUtil {
    * @return true if the response is of the success class and false otherwise\r
    */\r
   public static boolean isHttpResponseClassSuccess(int response) {\r
-    return isExpectedHttpResponseClass(response, '2');\r
+    return ( response >= 200 && response <= 299);\r
+\r
   }\r
 \r
   /**\r
@@ -70,7 +71,7 @@ public class HttpUtil {
    * @return true if the response is of the redirection class and false otherwise\r
    */\r
   public static boolean isHttpResponseClassRedirection(int response) {\r
-    return isExpectedHttpResponseClass(response, '3');\r
+    return ( response >= 300 && response <= 399);\r
   }\r
 \r
   /**\r
@@ -80,7 +81,7 @@ public class HttpUtil {
    * @return true if the response is of the client error class and false otherwise\r
    */\r
   public static boolean isHttpResponseClassClientError(int response) {\r
-    return isExpectedHttpResponseClass(response, '4');\r
+    return ( response >= 400 && response <= 499);\r
   }\r
 \r
   /**\r
@@ -90,26 +91,7 @@ public class HttpUtil {
    * @return true if the response is of the server error class and false otherwise\r
    */\r
   public static boolean isHttpResponseClassServerError(int response) {\r
-    return isExpectedHttpResponseClass(response, '5');\r
+    return ( response >= 500 && response <= 599);\r
   }\r
 \r
-  /**\r
-   * Helper method to determine if we have received the response class we are expecting.\r
-   *\r
-   * @param response the http response we got from our request\r
-   * @param expectedClass the expected http response class ie: 1, 2, 3, 4, 5 which maps to 1xx, 2xx,\r
-   *        3xx, 4xx, 5xx respectively\r
-   * @return true if the response if of our expected class and false if not\r
-   */\r
-  private static boolean isExpectedHttpResponseClass(int response, char expectedClass) {\r
-    if (response < 100 || response >= 600) {\r
-      return false;\r
-    }\r
-\r
-    if (Integer.toString(response).charAt(0) == expectedClass) {\r
-      return true;\r
-    }\r
-\r
-    return false;\r
-  }\r
 }\r