bug:Refactor Exception handling

eclipse-tractusx · Dec 22, 2023 · 2b661c8 · 2b661c8
1 parent 543d63a
commit 2b661c8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 63 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## fixed
 - default value for registry authentication has been corrected to 'true' in the documentation
+- Refactored DuplicateKey Exception handling
 
 
+## 0.3.21
+### Added
+
+## fixed
+- Refactored DuplicateKeyException Exception handling
+
 ## 0.3.21
 ### Added
 

diff --git a/backend/src/main/java/org/eclipse/tractusx/semantics/ApiExceptionHandler.java b/backend/src/main/java/org/eclipse/tractusx/semantics/ApiExceptionHandler.java
@@ -22,13 +22,11 @@
 import java.net.URLDecoder;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.eclipse.tractusx.semantics.aas.registry.model.Message;
 import org.eclipse.tractusx.semantics.aas.registry.model.Result;
-import org.eclipse.tractusx.semantics.registry.model.support.DatabaseExceptionTranslation;
 import org.eclipse.tractusx.semantics.registry.service.EntityNotFoundException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.HttpHeaders;
@@ -97,9 +95,9 @@ public ResponseEntity<Object> handleMethodArgumentNotSupportedException( final H
 
    @ExceptionHandler( { DuplicateKeyException.class } )
    @ResponseStatus( HttpStatus.BAD_REQUEST )
-   public ResponseEntity<Object> handleDuplicateKeyException( DuplicateKeyException e ) {
+   public ResponseEntity<Object> handleDuplicateKeyException( DuplicateKeyException duplicateKeyException ) {
       return new ResponseEntity<>(
-            new Result().messages( List.of( new Message().messageType( Message.MessageTypeEnum.ERROR ).text( DatabaseExceptionTranslation.translate( e ) ) ) ),
+            new Result().messages( List.of( new Message().messageType( Message.MessageTypeEnum.ERROR ).text(duplicateKeyException.getMessage() ) ) ),
             HttpStatus.BAD_REQUEST );
    }
 

diff --git a/...a/org/eclipse/tractusx/semantics/registry/model/support/DatabaseExceptionTranslation.java b/...a/org/eclipse/tractusx/semantics/registry/model/support/DatabaseExceptionTranslation.java
diff --git a/backend/src/main/java/org/eclipse/tractusx/semantics/registry/service/ShellService.java b/backend/src/main/java/org/eclipse/tractusx/semantics/registry/service/ShellService.java
@@ -42,7 +42,6 @@
 import org.eclipse.tractusx.semantics.registry.model.ShellIdentifier;
 import org.eclipse.tractusx.semantics.registry.model.Submodel;
 import org.eclipse.tractusx.semantics.registry.model.projection.ShellMinimal;
-import org.eclipse.tractusx.semantics.registry.model.support.DatabaseExceptionTranslation;
 import org.eclipse.tractusx.semantics.registry.repository.ShellIdentifierRepository;
 import org.eclipse.tractusx.semantics.registry.repository.ShellRepository;
 import org.eclipse.tractusx.semantics.registry.repository.SubmodelRepository;
@@ -429,9 +428,8 @@ public List<BatchResultDto> saveBatch(List<Shell> shells) {
                 return new BatchResultDto("AssetAdministrationShell successfully created.",
                         shell.getIdExternal(), HttpStatus.OK.value());
             } catch (Exception e) {
-                if (e.getCause() instanceof DuplicateKeyException) {
-                    DuplicateKeyException duplicateKeyException = (DuplicateKeyException) e.getCause();
-                    return new BatchResultDto(DatabaseExceptionTranslation.translate(duplicateKeyException),
+                if ( e.getCause() instanceof DuplicateKeyException duplicateKeyException ) {
+                   return new BatchResultDto(duplicateKeyException.getMessage(),
                             shell.getIdExternal(),
                             HttpStatus.BAD_REQUEST.value());
                 }