Skip to content

Commit 7423567

Browse files
committed
Fixes ARE
1 parent 986288e commit 7423567

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

basyx.common/basyx.http/src/main/java/org/eclipse/digitaltwin/basyx/http/BaSyxExceptionHandler.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,16 @@ public ResponseEntity<Object> handleFeatureNotSupportedException(FeatureNotSuppo
103103
public ResponseEntity<Object> handleNotInvokableException(NotInvokableException exception) {
104104
return buildResponse(exception.getMessage(), HttpStatus.METHOD_NOT_ALLOWED, exception);
105105
}
106-
106+
107107
@ExceptionHandler(ElementNotAFileException.class)
108108
public ResponseEntity<Object> handleElementNotAFileException(ElementNotAFileException exception) {
109109
return buildResponse(exception.getMessage(), HttpStatus.PRECONDITION_FAILED, exception);
110110
}
111+
112+
@ExceptionHandler(SubmodelElementNotADataElementException.class)
113+
public ResponseEntity<Object> handleSubmodelElementNotADataElementException(SubmodelElementNotADataElementException exception) {
114+
return buildResponse(exception.getMessage(), HttpStatus.BAD_REQUEST, exception);
115+
}
111116

112117
@ExceptionHandler(InsufficientPermissionException.class)
113118
public ResponseEntity<Object> handleInsufficientPermissionException(InsufficientPermissionException exception) {

basyx.submodelservice/basyx.submodelservice-client/src/main/java/org/eclipse/digitaltwin/basyx/submodelservice/client/ConnectedSubmodelService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,7 @@
3838
import org.eclipse.digitaltwin.aas4j.v3.model.SubmodelElement;
3939
import org.eclipse.digitaltwin.aas4j.v3.model.impl.DefaultOperationRequest;
4040
import org.eclipse.digitaltwin.basyx.client.internal.ApiException;
41-
import org.eclipse.digitaltwin.basyx.core.exceptions.ElementDoesNotExistException;
42-
import org.eclipse.digitaltwin.basyx.core.exceptions.ElementNotAFileException;
43-
import org.eclipse.digitaltwin.basyx.core.exceptions.FileDoesNotExistException;
44-
import org.eclipse.digitaltwin.basyx.core.exceptions.NotInvokableException;
45-
import org.eclipse.digitaltwin.basyx.core.exceptions.OperationDelegationException;
41+
import org.eclipse.digitaltwin.basyx.core.exceptions.*;
4642
import org.eclipse.digitaltwin.basyx.core.pagination.CursorResult;
4743
import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;
4844
import org.eclipse.digitaltwin.basyx.http.Base64UrlEncoder;
@@ -226,6 +222,10 @@ private RuntimeException mapExceptionSubmodelElementAccess(String idShortPath, A
226222
if (e.getCode() == HttpStatus.NOT_FOUND.value()) {
227223
return new ElementDoesNotExistException(idShortPath);
228224
}
225+
System.out.println(e.getMessage());
226+
if (e.getCode() == HttpStatus.BAD_REQUEST.value() && e.getMessage().contains("is not a Data Element")) {
227+
return new SubmodelElementNotADataElementException(idShortPath);
228+
}
229229

230230
return e;
231231
}

0 commit comments

Comments
 (0)