Refactor ErrorLogHelper

[aai/aai-common.git] / aai-els-onap-logging / src / main / java / org / onap / aai / exceptions / AAIException.java

diff --git a/aai-els-onap-logging/src/main/java/org/onap/aai/exceptions/AAIException.java b/aai-els-onap-logging/src/main/java/org/onap/aai/exceptions/AAIException.java
index 320d563..e302cd5 100644 (file)
--- a/aai-els-onap-logging/src/main/java/org/onap/aai/exceptions/AAIException.java
+++ b/aai-els-onap-logging/src/main/java/org/onap/aai/exceptions/AAIException.java
@@ -5,6 +5,7 @@
  * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  *  Modifications Copyright © 2018 IBM.
+ *  Modifications Copyright (C) 2023 Deutsche Telekom SA.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,10 +32,6 @@ import org.onap.aai.logging.ErrorObjectNotFoundException;
 
 public class AAIException extends Exception {
 
-    private static final String UPDATE_ERROR_PROPERTIES_BEFORE_USING_THIS_EXCEPTION_CODE =
-            " - update error.properties before using this exception code";
-    private static final String FAILED_TO_INSTANTIATE_AAI_EXCEPTION_WITH_CODE =
-            "Failed to instantiate AAIException with code=";
     public static final String DEFAULT_EXCEPTION_CODE = "AAI_4000";
     private static final long serialVersionUID = 1L;
 
@@ -50,12 +47,7 @@ public class AAIException extends Exception {
         this.code = DEFAULT_EXCEPTION_CODE;
         this.templateVars = new LinkedList<>();
 
-        try {
-            this.errorObject = ErrorLogHelper.getErrorObject(getCode());
-        } catch (ErrorObjectNotFoundException e) {
-            throw new RuntimeException(FAILED_TO_INSTANTIATE_AAI_EXCEPTION_WITH_CODE + getCode()
-                    + UPDATE_ERROR_PROPERTIES_BEFORE_USING_THIS_EXCEPTION_CODE);
-        }
+        this.errorObject = ErrorLogHelper.getErrorObject(getCode());
     }
 
     /**
@@ -68,13 +60,7 @@ public class AAIException extends Exception {
 
         this.code = code;
         this.templateVars = new LinkedList<>();
-
-        try {
-            this.errorObject = ErrorLogHelper.getErrorObject(getCode());
-        } catch (ErrorObjectNotFoundException e) {
-            throw new RuntimeException(FAILED_TO_INSTANTIATE_AAI_EXCEPTION_WITH_CODE + getCode()
-                    + UPDATE_ERROR_PROPERTIES_BEFORE_USING_THIS_EXCEPTION_CODE);
-        }
+        this.errorObject = ErrorLogHelper.getErrorObject(getCode());
     }
 
     /**
@@ -88,14 +74,8 @@ public class AAIException extends Exception {
 
         this.code = code;
         this.templateVars = new LinkedList<>();
-
-        try {
-            this.errorObject = ErrorLogHelper.getErrorObject(getCode());
-            errorObject.setDetails(details);
-        } catch (ErrorObjectNotFoundException e) {
-            throw new RuntimeException(FAILED_TO_INSTANTIATE_AAI_EXCEPTION_WITH_CODE + getCode()
-                    + UPDATE_ERROR_PROPERTIES_BEFORE_USING_THIS_EXCEPTION_CODE);
-        }
+        this.errorObject = ErrorLogHelper.getErrorObject(getCode());
+        errorObject.setDetails(details);
     }
 
     /**
@@ -109,13 +89,7 @@ public class AAIException extends Exception {
 
         this.code = code;
         this.templateVars = new LinkedList<>();
-
-        try {
-            this.errorObject = ErrorLogHelper.getErrorObject(getCode());
-        } catch (ErrorObjectNotFoundException e) {
-            throw new RuntimeException(FAILED_TO_INSTANTIATE_AAI_EXCEPTION_WITH_CODE + getCode()
-                    + UPDATE_ERROR_PROPERTIES_BEFORE_USING_THIS_EXCEPTION_CODE);
-        }
+        this.errorObject = ErrorLogHelper.getErrorObject(getCode());
     }
 
     /**
@@ -130,13 +104,7 @@ public class AAIException extends Exception {
 
         this.code = code;
         this.templateVars = new LinkedList<>();
-
-        try {
-            this.errorObject = ErrorLogHelper.getErrorObject(getCode());
-        } catch (ErrorObjectNotFoundException e) {
-            throw new RuntimeException(FAILED_TO_INSTANTIATE_AAI_EXCEPTION_WITH_CODE + getCode()
-                    + UPDATE_ERROR_PROPERTIES_BEFORE_USING_THIS_EXCEPTION_CODE);
-        }
+        this.errorObject = ErrorLogHelper.getErrorObject(getCode());
     }
 
     public String getCode() {