From 91b1dd8ffa254b4aaf9b6ff1d78c75165a2158d5 Mon Sep 17 00:00:00 2001
From: kpoulakakis <kpoulakakis@ubitech.eu>
Date: Thu, 15 Feb 2024 11:58:28 +0200
Subject: [PATCH] refactor: remove test exception.
---
.../exception/GeneralExceptionHandler.java | 2 --
.../tfs/policy/policy/PolicyServiceImpl.java | 3 +--
src/policy/target/kubernetes/kubernetes.yml | 16 ++++++++--------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/exception/GeneralExceptionHandler.java b/src/policy/src/main/java/org/etsi/tfs/policy/exception/GeneralExceptionHandler.java
index 57842aaa6..35b05666e 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/exception/GeneralExceptionHandler.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/exception/GeneralExceptionHandler.java
@@ -36,8 +36,6 @@ public class GeneralExceptionHandler implements ExceptionHandlerProvider {
public Throwable transform(Throwable t) {
if (t instanceof ExternalServiceFailureException) {
return new StatusRuntimeException(Status.INTERNAL.withDescription(t.getMessage()));
- } else if (t instanceof NewException) {
- return new StatusRuntimeException(Status.UNIMPLEMENTED.withDescription(t.getMessage()));
} else {
return ExceptionHandlerProvider.toStatusException(t, true);
}
diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/policy/PolicyServiceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/policy/PolicyServiceImpl.java
index 984276f59..c756f8a2a 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/policy/PolicyServiceImpl.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/policy/PolicyServiceImpl.java
@@ -44,7 +44,6 @@ import org.etsi.tfs.policy.context.model.ServiceConfig;
import org.etsi.tfs.policy.context.model.ServiceId;
import org.etsi.tfs.policy.device.DeviceService;
import org.etsi.tfs.policy.exception.ExternalServiceFailureException;
-import org.etsi.tfs.policy.exception.NewException;
import org.etsi.tfs.policy.monitoring.MonitoringService;
import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor;
import org.etsi.tfs.policy.monitoring.model.AlarmResponse;
@@ -196,7 +195,7 @@ public class PolicyServiceImpl implements PolicyService {
return contextService
.setPolicyRule(policyRule)
.onFailure()
- .transform(failure -> new NewException(failure.getMessage()))
+ .transform(failure -> new ExternalServiceFailureException(failure.getMessage()))
.onItem()
.transform(
policyId -> {
diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml
index bdcfcad5f..634c15163 100644
--- a/src/policy/target/kubernetes/kubernetes.yml
+++ b/src/policy/target/kubernetes/kubernetes.yml
@@ -3,8 +3,8 @@ apiVersion: v1
kind: Service
metadata:
annotations:
- app.quarkus.io/commit-id: 5af252b6acd7e8bc36acbb668cc6f1f0405346f1
- app.quarkus.io/build-timestamp: 2024-02-14 - 13:13:25 +0000
+ app.quarkus.io/commit-id: aa8541cd42120ff91ef0573b05beb1e1d0861617
+ app.quarkus.io/build-timestamp: 2024-02-15 - 09:57:46 +0000
prometheus.io/scrape: "true"
prometheus.io/path: /q/metrics
prometheus.io/port: "8080"
@@ -37,8 +37,8 @@ apiVersion: apps/v1
kind: Deployment
metadata:
annotations:
- app.quarkus.io/commit-id: 5af252b6acd7e8bc36acbb668cc6f1f0405346f1
- app.quarkus.io/build-timestamp: 2024-02-14 - 13:13:25 +0000
+ app.quarkus.io/commit-id: aa8541cd42120ff91ef0573b05beb1e1d0861617
+ app.quarkus.io/build-timestamp: 2024-02-15 - 09:57:46 +0000
prometheus.io/scrape: "true"
prometheus.io/path: /q/metrics
prometheus.io/port: "8080"
@@ -46,8 +46,8 @@ metadata:
labels:
app: policyservice
app.kubernetes.io/managed-by: quarkus
- app.kubernetes.io/version: 0.1.0
app.kubernetes.io/name: policyservice
+ app.kubernetes.io/version: 0.1.0
name: policyservice
spec:
replicas: 1
@@ -57,8 +57,8 @@ spec:
template:
metadata:
annotations:
- app.quarkus.io/commit-id: 5af252b6acd7e8bc36acbb668cc6f1f0405346f1
- app.quarkus.io/build-timestamp: 2024-02-14 - 13:13:25 +0000
+ app.quarkus.io/commit-id: aa8541cd42120ff91ef0573b05beb1e1d0861617
+ app.quarkus.io/build-timestamp: 2024-02-15 - 09:57:46 +0000
prometheus.io/scrape: "true"
prometheus.io/path: /q/metrics
prometheus.io/port: "8080"
@@ -66,8 +66,8 @@ spec:
labels:
app: policyservice
app.kubernetes.io/managed-by: quarkus
- app.kubernetes.io/version: 0.1.0
app.kubernetes.io/name: policyservice
+ app.kubernetes.io/version: 0.1.0
spec:
containers:
- env:
--
GitLab