summaryrefslogtreecommitdiffstats
path: root/models/src
diff options
context:
space:
mode:
authorFrancescoFioraEst <francesco.fiora@est.tech>2021-10-18 17:12:39 +0100
committerAjith Sreekumar <ajith.sreekumar@bell.ca>2021-10-19 15:43:21 +0000
commita9a5058eb33eda7d273bab5122736266980c99dc (patch)
treef7dc32772e18f8a9940145fdcf874722cf775b42 /models/src
parentabd179dcba2161fb5591c48d554b9a6637b37572 (diff)
Refactor GlobalControllerExceptionHandler
Issue-ID: POLICY-3530 Change-Id: Ib33daf8491c1bf96460b424e8b0da228d65e571a Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
Diffstat (limited to 'models/src')
-rw-r--r--models/src/main/java/org/onap/policy/clamp/controlloop/models/rest/RestUtils.java43
-rw-r--r--models/src/test/java/org/onap/policy/clamp/controlloop/models/rest/RestUtilsTest.java54
2 files changed, 97 insertions, 0 deletions
diff --git a/models/src/main/java/org/onap/policy/clamp/controlloop/models/rest/RestUtils.java b/models/src/main/java/org/onap/policy/clamp/controlloop/models/rest/RestUtils.java
new file mode 100644
index 000000000..6c12c2de7
--- /dev/null
+++ b/models/src/main/java/org/onap/policy/clamp/controlloop/models/rest/RestUtils.java
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.clamp.controlloop.models.rest;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.onap.policy.clamp.controlloop.models.messages.rest.SimpleResponse;
+import org.onap.policy.models.errors.concepts.ErrorResponseInfo;
+import org.springframework.http.ResponseEntity;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class RestUtils {
+
+ /**
+ * Convert an ErrorResponseInfo to a ResponseEntity.
+ *
+ * @param ex the ErrorResponseInfo
+ * @return the ResponseEntity
+ */
+ public static ResponseEntity<SimpleResponse> toSimpleResponse(ErrorResponseInfo ex) {
+ var resp = new SimpleResponse();
+ resp.setErrorDetails(ex.getErrorResponse().getErrorMessage());
+ return ResponseEntity.status(ex.getErrorResponse().getResponseCode().getStatusCode()).body(resp);
+ }
+}
diff --git a/models/src/test/java/org/onap/policy/clamp/controlloop/models/rest/RestUtilsTest.java b/models/src/test/java/org/onap/policy/clamp/controlloop/models/rest/RestUtilsTest.java
new file mode 100644
index 000000000..4dedae200
--- /dev/null
+++ b/models/src/test/java/org/onap/policy/clamp/controlloop/models/rest/RestUtilsTest.java
@@ -0,0 +1,54 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.clamp.controlloop.models.rest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import javax.ws.rs.core.Response.Status;
+import org.junit.jupiter.api.Test;
+import org.onap.policy.models.errors.concepts.ErrorResponse;
+import org.onap.policy.models.errors.concepts.ErrorResponseInfo;
+
+class RestUtilsTest {
+
+ private static final String MESSAGE_ERROR = "Erorr";
+ private static final Status STATUS_ERROR = Status.BAD_REQUEST;
+
+ @Test
+ void testToSimpleResponse() {
+ var ex = new ErrorResponseInfo() {
+
+ @Override
+ public ErrorResponse getErrorResponse() {
+ var er = new ErrorResponse();
+ er.setErrorMessage(MESSAGE_ERROR);
+ er.setResponseCode(STATUS_ERROR);
+ return er;
+ }
+ };
+
+ var response = RestUtils.toSimpleResponse(ex);
+
+ assertThat(response.getStatusCodeValue()).isEqualTo(STATUS_ERROR.getStatusCode());
+ assertThat(response.getBody()).isNotNull();
+ assertThat(response.getBody().getErrorDetails()).isEqualTo(MESSAGE_ERROR);
+ }
+}