From 3d82cce6c14838c54dd9852a8fdac20b01ad0925 Mon Sep 17 00:00:00 2001
From: ToineSiebelink <toine.siebelink@est.tech>
Date: Mon, 1 Jul 2024 11:24:49 +0100
Subject: Improve handling of Invalid Operation exception

- MOve to API package
- Handle in REST Controller to return BAD REQUEST

Issue-ID: CPS-2256
Change-Id: I4f96519aaf2e7f781729c8b8671ea02630a2e0a8
Signed-off-by: ToineSiebelink <toine.siebelink@est.tech>
---
 .../data/exceptions/InvalidOperationException.java | 32 ++++++++++++++++++++++
 .../cps/ncmp/api/data/models/OperationType.java    |  2 +-
 .../data/exceptions/InvalidOperationException.java | 32 ----------------------
 3 files changed, 33 insertions(+), 33 deletions(-)
 create mode 100644 cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/data/exceptions/InvalidOperationException.java
 delete mode 100644 cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/exceptions/InvalidOperationException.java

(limited to 'cps-ncmp-service/src/main/java')

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/data/exceptions/InvalidOperationException.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/data/exceptions/InvalidOperationException.java
new file mode 100644
index 0000000000..7669dd05f6
--- /dev/null
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/data/exceptions/InvalidOperationException.java
@@ -0,0 +1,32 @@
+/*
+ *  ============LICENSE_START=======================================================
+ *  Copyright (C) 2023 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.cps.ncmp.api.data.exceptions;
+
+public class InvalidOperationException extends RuntimeException {
+    /**
+     * Instantiates a new invalid operation exception.
+     *
+     * @param message the message
+     */
+    public InvalidOperationException(final String message) {
+        super(message);
+    }
+}
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/data/models/OperationType.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/data/models/OperationType.java
index da95fca714..870e24fac4 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/data/models/OperationType.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/data/models/OperationType.java
@@ -23,7 +23,7 @@ package org.onap.cps.ncmp.api.data.models;
 import com.fasterxml.jackson.annotation.JsonValue;
 import java.util.Locale;
 import lombok.Getter;
-import org.onap.cps.ncmp.impl.data.exceptions.InvalidOperationException;
+import org.onap.cps.ncmp.api.data.exceptions.InvalidOperationException;
 
 @Getter
 public enum OperationType {
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/exceptions/InvalidOperationException.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/exceptions/InvalidOperationException.java
deleted file mode 100644
index aea4e638f5..0000000000
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/impl/data/exceptions/InvalidOperationException.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  ============LICENSE_START=======================================================
- *  Copyright (C) 2023 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.cps.ncmp.impl.data.exceptions;
-
-public class InvalidOperationException extends RuntimeException {
-    /**
-     * Instantiates a new invalid operation exception.
-     *
-     * @param message the message
-     */
-    public InvalidOperationException(final String message) {
-        super(message);
-    }
-}
-- 
cgit