Convert Model Exception to Runtime Exception

Sometimes the exception thrown by the database providers has to be
converted to a runtime exception, especiall if the database provider is
running in a thread (called by the rum() method that does not return
exceptions). It is convenient to have a constructor on the
PfModelRuntimeException class that takes a PfModelException class as its
argument, thus creating the runtime exception.

Also the mapMap method in pfUtils is updated to allow the key of the map
to be templated. By doing this, the utility can be used for maps that
are keyed with types other than String (such as UUID).

Issue-ID: POLICY-2971
Change-Id: Ib0b3678de531fd383753a1cd0ce47a06f4079ec0
Signed-off-by: liamfallon <liam.fallon@est.tech>

diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java b/models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java
index 5c317d1..cd0562f 100644 (file)
--- a/models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfModelRuntimeException.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
+ * Copyright (C) 2019, 2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,6 +76,18 @@ public class PfModelRuntimeException extends RuntimeException implements ErrorRe
         this(statusCode, message, exception, null);
     }
 
+    /**
+     * Instantiates a new model runtime exception from a PfModelException instance.
+     *
+     * @param exception the exception that caused this model exception
+     */
+    public PfModelRuntimeException(final PfModelException exception) {
+        super(exception.getMessage(), exception);
+        this.object = exception.getObject();
+        errorResponse.setResponseCode(exception.getErrorResponse().getResponseCode());
+        ErrorResponseUtils.getExceptionMessages(errorResponse, this);
+    }
+
     /**
      * Instantiates a new model runtime exception.
      *

diff --git a/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java b/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java
index 57d2345..6a119d6 100644 (file)
--- a/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java
+++ b/models-base/src/main/java/org/onap/policy/models/base/PfUtils.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019-2020 Nordix Foundation.
+ *  Copyright (C) 2019-2021 Nordix Foundation.
  *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -137,14 +137,14 @@ public final class PfUtils {
      * @param defaultValue value to be returned if source is {@code null}
      * @return a new map, containing mappings of all of the items in the original map
      */
-    public static <T, R> Map<String, R> mapMap(Map<String, T> source, Function<T, R> mapFunc,
-            Map<String, R> defaultValue) {
+    public static <K, T, R> Map<K, R> mapMap(Map<K, T> source, Function<T, R> mapFunc,
+            Map<K, R> defaultValue) {
         if (source == null) {
             return defaultValue;
         }
 
-        Map<String, R> map = new LinkedHashMap<>();
-        for (Entry<String, T> ent : source.entrySet()) {
+        Map<K, R> map = new LinkedHashMap<>();
+        for (Entry<K, T> ent : source.entrySet()) {
             map.put(ent.getKey(), mapFunc.apply(ent.getValue()));
         }
 
@@ -159,7 +159,7 @@ public final class PfUtils {
      * @return a new map, containing mappings of all of the items in the original map, or {@code null} if the source is
      *         {@code null}
      */
-    public static <T, R> Map<String, R> mapMap(Map<String, T> source, Function<T, R> mapFunc) {
+    public static <K, T, R> Map<K, R> mapMap(Map<K, T> source, Function<T, R> mapFunc) {
         return mapMap(source, mapFunc, null);
     }
 

diff --git a/models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java b/models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java
index 112f6a2..52d17e7 100644 (file)
--- a/models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java
+++ b/models-base/src/test/java/org/onap/policy/models/base/ExceptionsTest.java
@@ -1,7 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
- *  Copyright (C) 2019 Nordix Foundation.
- *  Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2019, 2021 Nordix Foundation.
+ * Modifications Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
 import org.junit.Test;
 import org.onap.policy.models.errors.concepts.ErrorResponse;
 
@@ -60,5 +61,21 @@ public class ExceptionsTest {
         assertEquals("Runtime Message\nIO runtime exception message",
                 String.join("\n", errorResponse.getErrorDetails()));
         assertEquals(key, re.getObject());
+
+        PfModelRuntimeException pfre = new PfModelRuntimeException(ae);
+        assertEquals(ae.getErrorResponse().getResponseCode(), pfre.getErrorResponse().getResponseCode());
+        assertEquals(ae.getMessage(), pfre.getMessage());
+
+        try {
+            try {
+                throw new PfModelException(Status.BAD_GATEWAY, "An Exception");
+            } catch (PfModelException pfme) {
+                throw new PfModelRuntimeException(pfme);
+            }
+        } catch (PfModelRuntimeException pfmre) {
+            assertEquals(Status.BAD_GATEWAY, pfmre.getErrorResponse().getResponseCode());
+            assertEquals("An Exception", pfmre.getMessage());
+            assertEquals(PfModelException.class.getName(), pfmre.getCause().getClass().getName());
+        }
     }
 }