X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-rest-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Frest%2Fimpl%2FAbstractIdentifierAwareJaxRsProvider.java;h=3486d2265bb6bc17aad501d50cf338e01f9af0cf;hp=978ae0d9c5205e528a0bee6de31702251fd180f4;hb=f3db96e1a7b1e416bcbd75c06cbca2fba8a152eb;hpb=351a78c9840c5b98a478b91ffd50befad998eb0e 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 978ae0d9c5..3486d2265b 100644 --- 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 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()); + } }