s

cryostatio · Feb 6, 2024 · 3697c51 · 3697c51
1 parent d6743d6
commit 3697c51
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/src/main/java/io/cryostat/ExceptionMappers.java b/src/main/java/io/cryostat/ExceptionMappers.java
@@ -18,7 +18,7 @@
 import org.openjdk.jmc.rjmx.ConnectionException;
 
 import io.cryostat.targets.TargetConnectionManager;
-
+import io.cryostat.util.EntityExistsException;
 import io.netty.handler.codec.http.HttpResponseStatus;
 import io.smallrye.mutiny.TimeoutException;
 import jakarta.inject.Inject;

diff --git a/src/main/java/io/cryostat/recordings/RecordingHelper.java b/src/main/java/io/cryostat/recordings/RecordingHelper.java
@@ -45,7 +45,6 @@
 import org.openjdk.jmc.rjmx.services.jfr.IRecordingDescriptor;
 
 import io.cryostat.ConfigProperties;
-import io.cryostat.EntityExistsException;
 import io.cryostat.Producers;
 import io.cryostat.core.EventOptionsBuilder;
 import io.cryostat.core.net.JFRConnection;
@@ -60,6 +59,7 @@
 import io.cryostat.recordings.Recordings.Metadata;
 import io.cryostat.targets.Target;
 import io.cryostat.targets.TargetConnectionManager;
+import io.cryostat.util.EntityExistsException;
 import io.cryostat.util.HttpMimeType;
 import io.cryostat.ws.MessagingServer;
 import io.cryostat.ws.Notification;

diff --git a/src/main/java/io/cryostat/rules/Rules.java b/src/main/java/io/cryostat/rules/Rules.java
@@ -15,9 +15,9 @@
  */
 package io.cryostat.rules;
 
-import io.cryostat.EntityExistsException;
 import io.cryostat.V2Response;
 import io.cryostat.expressions.MatchExpression;
+import io.cryostat.util.EntityExistsException;
 
 import io.vertx.core.json.JsonObject;
 import io.vertx.mutiny.core.eventbus.EventBus;
@@ -69,7 +69,7 @@ public RestResponse<V2Response> create(Rule rule) {
         }
         boolean ruleExists = Rule.getByName(rule.name) != null;
         if (ruleExists) {
-            throw new RuleExistsException(rule.name);
+            throw new EntityExistsException("Rule", rule.name);
         }
         if (rule.description == null) {
             rule.description = "";
@@ -146,10 +146,4 @@ public RestResponse<V2Response> delete(@RestPath String name, @RestQuery boolean
         rule.delete();
         return RestResponse.ok(V2Response.json(Response.Status.OK, null));
     }
-
-    public static class RuleExistsException extends EntityExistsException {
-        RuleExistsException(String name) {
-            super("Rule ", name);
-        }
-    }
 }
diff --git a/...va/io/cryostat/EntityExistsException.java → .../cryostat/util/EntityExistsException.java b/...va/io/cryostat/EntityExistsException.java → .../cryostat/util/EntityExistsException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.cryostat;
+package io.cryostat.util;
 
 import jakarta.ws.rs.ClientErrorException;
 import jakarta.ws.rs.core.Response;