Merge "Cleanup: Remove passing around of DataPersistenceProvider"

[controller.git] / opendaylight / md-sal / sal-rest-connector / src / main / java / org / opendaylight / controller / sal / rest / impl / AbstractIdentifierAwareJaxRsProvider.java

diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java
index 978ae0d9c5205e528a0bee6de31702251fd180f4..3486d2265bb6bc17aad501d50cf338e01f9af0cf 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java
+++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/AbstractIdentifierAwareJaxRsProvider.java
@@ -1,7 +1,7 @@
 package org.opendaylight.controller.sal.rest.impl;
 
-import com.google.common.base.Optional;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Request;
 import javax.ws.rs.core.UriInfo;
 import org.opendaylight.controller.sal.rest.api.RestconfConstants;
 import org.opendaylight.controller.sal.restconf.impl.ControllerContext;
@@ -9,22 +9,27 @@ import org.opendaylight.controller.sal.restconf.impl.InstanceIdentifierContext;
 
 public class AbstractIdentifierAwareJaxRsProvider {
 
+    private static final String POST = "POST";
+
     @Context
     private UriInfo uriInfo;
 
-    protected final String getIdentifier() {
-        return uriInfo.getPathParameters().getFirst(RestconfConstants.IDENTIFIER);
-    }
+    @Context
+    private Request request;
 
-    protected final Optional<InstanceIdentifierContext> getIdentifierWithSchema() {
-        return Optional.of(getInstanceIdentifierContext());
+    protected final String getIdentifier() {
+        return uriInfo.getPathParameters(false).getFirst(RestconfConstants.IDENTIFIER);
     }
 
-    protected InstanceIdentifierContext getInstanceIdentifierContext() {
+    protected InstanceIdentifierContext<?> getInstanceIdentifierContext() {
         return ControllerContext.getInstance().toInstanceIdentifier(getIdentifier());
     }
 
     protected UriInfo getUriInfo() {
         return uriInfo;
     }
+
+    protected boolean isPost() {
+        return POST.equals(request.getMethod());
+    }
 }