aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-04-26 17:15:29 +0200
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-04-26 17:15:29 +0200
commite63280ff44773d68d4c542187864415fbf6b0547 (patch)
treeb2e1ad8d46aaac4f39ae0542b8e39d1a8f9f0cce /src
parent8ac4d430c6e5eb6f7a468cf7c8a83a4905bff4ba (diff)
Upgrade spring-boot to 2.7.X in model-loader
- upgrade spring-boot from 2.4.13 to 2.7.18 Issue-ID: AAI-3838 Change-Id: Ia43df48e049ae1e3d05aaa0ed85c245db7df004c Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/aai/modelloader/service/ModelController.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/org/onap/aai/modelloader/service/ModelController.java b/src/main/java/org/onap/aai/modelloader/service/ModelController.java
index 343fdca..4e883aa 100644
--- a/src/main/java/org/onap/aai/modelloader/service/ModelController.java
+++ b/src/main/java/org/onap/aai/modelloader/service/ModelController.java
@@ -34,6 +34,7 @@ import org.onap.aai.modelloader.notification.NotificationDataImpl;
import org.onap.aai.modelloader.notification.NotificationPublisher;
import org.onap.sdc.api.IDistributionClient;
import org.onap.sdc.api.notification.IArtifactInfo;
+import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@@ -83,7 +84,7 @@ public class ModelController {
response = processTestArtifact(modelName, modelVersion, payload);
} else {
logger.debug("Simulation interface disabled");
- response = ResponseEntity.internalServerError().build();
+ response = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
}
return response;
@@ -116,7 +117,7 @@ public class ModelController {
boolean success =
artifactDeploymentManager.deploy(notificationData, modelArtifacts, catalogArtifacts);
logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, "Deployment success was " + success);
- response = success ? ResponseEntity.ok().build() : ResponseEntity.internalServerError().build();
+ response = success ? ResponseEntity.ok().build() : ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
} catch (Exception e) {
String responseMessage = e.getMessage();
logger.info(ModelLoaderMsgs.DISTRIBUTION_EVENT, "Exception handled: " + responseMessage);
@@ -126,7 +127,7 @@ public class ModelController {
} else {
responseMessage += "\nSDC publishing is enabled but has been bypassed";
}
- response = ResponseEntity.internalServerError().body(responseMessage);
+ response = ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(responseMessage);
}
return response;
}