Single out RestconfConstants.MOUNT

[netconf.git] / restconf / restconf-nb-rfc8040 / src / main / java / org / opendaylight / restconf / nb / rfc8040 / utils / parser / ParserIdentifier.java

diff --git a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java
index e8cbdde7b7cca5b0572b84569fdc2104a8df55a6..a913a5079fd4ccede7b32c928c8d9dfb0f2433bf 100644 (file)
--- a/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java
+++ b/restconf/restconf-nb-rfc8040/src/main/java/org/opendaylight/restconf/nb/rfc8040/utils/parser/ParserIdentifier.java
@@ -84,7 +84,7 @@ public final class ParserIdentifier {
         if (identifier == null || !identifier.contains(RestconfConstants.MOUNT)) {
             return createIIdContext(schemaContext, identifier, null);
         }
-        if (!mountPointService.isPresent()) {
+        if (mountPointService.isEmpty()) {
             throw new RestconfDocumentedException("Mount point service is not available");
         }
 
@@ -93,7 +93,7 @@ public final class ParserIdentifier {
         final YangInstanceIdentifier mountPath = IdentifierCodec.deserialize(mountPointId, schemaContext);
         final DOMMountPoint mountPoint = mountPointService.get().getMountPoint(mountPath)
                 .orElseThrow(() -> new RestconfDocumentedException("Mount point does not exist.",
-                    ErrorType.PROTOCOL, ErrorTag.DATA_MISSING));
+                    ErrorType.PROTOCOL, ErrorTag.RESOURCE_DENIED_TRANSPORT));
 
         final EffectiveModelContext mountSchemaContext = coerceModelContext(mountPoint);
         final String pathId = pathsIt.next().replaceFirst("/", "");
@@ -249,13 +249,12 @@ public final class ParserIdentifier {
                 final String current = componentIter.next();
 
                 if (RestconfConstants.MOUNT.equals(current)) {
-                    pathBuilder.append("/");
-                    pathBuilder.append(RestconfConstants.MOUNT);
+                    pathBuilder.append('/').append(RestconfConstants.MOUNT);
                     break;
                 }
 
                 if (pathBuilder.length() != 0) {
-                    pathBuilder.append("/");
+                    pathBuilder.append('/');
                 }
 
                 pathBuilder.append(current);