Report ServerException from ApiPathNormalizer

[netconf.git] / restconf / restconf-nb / src / main / java / org / opendaylight / restconf / server / api / ServerException.java

diff --git a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ServerException.java b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ServerException.java
index 7e434128c12d9559d4188a63715f7a59d5717ed3..f6d0751eb2efbd99c36b609d4b8ed3fed82ea770 100644 (file)
--- a/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ServerException.java
+++ b/restconf/restconf-nb/src/main/java/org/opendaylight/restconf/server/api/ServerException.java
@@ -17,6 +17,8 @@ import java.io.ObjectStreamException;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.restconf.api.ErrorMessage;
+import org.opendaylight.restconf.common.errors.RestconfDocumentedException;
+import org.opendaylight.restconf.common.errors.RestconfError;
 import org.opendaylight.yangtools.yang.common.ErrorTag;
 import org.opendaylight.yangtools.yang.common.ErrorType;
 
@@ -63,7 +65,8 @@ public final class ServerException extends Exception {
 
     public ServerException(final ErrorType type, final ErrorTag tag, final String message,
             final @Nullable Throwable cause) {
-        this(requireNonNull(message), new ServerError(type, tag, message), cause);
+        this(requireNonNull(message),
+            new ServerError(type, tag, new ErrorMessage(message), null, null, errorInfoOf(cause)), cause);
     }
 
     public ServerException(final ErrorType type, final ErrorTag tag, final String format,
@@ -71,6 +74,10 @@ public final class ServerException extends Exception {
         this(type, tag, format.formatted(args));
     }
 
+    public ServerException(final ErrorType type, final ErrorTag tag, final ServerErrorPath path, final String message) {
+        this(message, new ServerError(type, tag, new ErrorMessage(message), null, requireNonNull(path), null), null);
+    }
+
     /**
      * Return the reported {@link ServerError}.
      *
@@ -80,6 +87,23 @@ public final class ServerException extends Exception {
         return error;
     }
 
+    @Deprecated
+    public RestconfDocumentedException toLegacy() {
+        final var message = error.message();
+        final var info = error.info();
+        final var path = error.path();
+        if (path != null) {
+            return new RestconfDocumentedException(this,
+                new RestconfError(error.type(), error.tag(), message != null ? message.elementBody() : null,
+                    error.appTag(), info != null ? info.elementBody() : null, path.path()),
+                path.databind().modelContext());
+        } else {
+            return new RestconfDocumentedException(this,
+                new RestconfError(error.type(), error.tag(), message != null ? message.elementBody() : null,
+                    error.appTag(), info != null ? info.elementBody() : null, null));
+        }
+    }
+
     @java.io.Serial
     private void readObjectNoData() throws ObjectStreamException {
         throw new NotSerializableException();
@@ -95,6 +119,16 @@ public final class ServerException extends Exception {
         throw new NotSerializableException();
     }
 
+    private static @Nullable ServerErrorInfo errorInfoOf(final @Nullable Throwable cause) {
+        if (cause != null) {
+            final var message = cause.getMessage();
+            if (message != null) {
+                return new ServerErrorInfo(message);
+            }
+        }
+        return null;
+    }
+
     private static ErrorTag errorTagOf(final @Nullable Throwable cause) {
         if (cause instanceof UnsupportedOperationException) {
             return ErrorTag.OPERATION_NOT_SUPPORTED;