1 files changed, 6 insertions, 29 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/exception/DiscoveryException.java b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/exception/DiscoveryException.java
index 149efaa..0107672 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/exception/DiscoveryException.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/networkdiscovery/exception/DiscoveryException.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  * ============LICENSE_END=====================================================
  */
+
 package org.onap.pomba.contextbuilder.networkdiscovery.exception;
 
 import javax.ws.rs.core.Response.Status;
@@ -25,11 +26,11 @@ public class DiscoveryException extends Exception {
 
     private final Status httpStatus;
 
-    public DiscoveryException(String message) {
-        super(message);
-        this.httpStatus = matchErrorCode(message);
-    }
-
+    /**
+     * Internal Exception class with HTTP status.
+     * @param message Exception message
+     * @param httpStatus The http status code
+     */
     public DiscoveryException(String message, Status httpStatus) {
         super(message);
         if (httpStatus == null) {
@@ -38,32 +39,8 @@ public class DiscoveryException extends Exception {
         this.httpStatus = httpStatus;
     }
 
-    public DiscoveryException(String message, Exception cause) {
-        super(message, cause);
-        this.httpStatus = matchErrorCode(cause.getMessage());
-    }
-
     public Status getHttpStatus() {
         return this.httpStatus;
     }
 
-    private Status matchErrorCode(String errorMessage) {
-        if(null == errorMessage) {
-            return Status.INTERNAL_SERVER_ERROR;
-        }
-        if (errorMessage.toLowerCase().contains("auth")) {
-            return Status.UNAUTHORIZED;
-        }
-        if ((errorMessage.toLowerCase().contains("missing"))) {
-            return Status.BAD_REQUEST;
-        } else {
-            for (Status st : Status.values()) {
-
-                if (errorMessage.toLowerCase().contains(st.getReasonPhrase().toLowerCase())) {
-                    return st;
-                }
-            }
-        }
-        return Status.INTERNAL_SERVER_ERROR;
-    }
 }