Deprecate restconf.common.util.MultivaluedHashMap

This is a custom-coded class, which has a direct competitor in
javax.ws.rs.core. Deprecate it in favor of the standard class.

Change-Id: I2397c4a3b72d410a39806c1b147d9816b95eb875
Signed-off-by: Robert Varga <[email protected]>

diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/MultivaluedHashMap.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/MultivaluedHashMap.java
index d272d06d9404dd5e6946f8cf140835ec3fbc89a2..52d47a3d7e3871bdb81b922fdc5b8a23b2a73579 100644 (file)
--- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/MultivaluedHashMap.java
+++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/MultivaluedHashMap.java
@@ -20,8 +20,11 @@ import javax.ws.rs.core.MultivaluedMap;
 /**
  * A hash table based implementation of {@link MultivaluedMap} interface.
  *
+ * @deprecated Use {@link javax.ws.rs.core.MultivaluedHashMap} instead.
  * @author Thomas Pantelis
  */
+@Deprecated(since = "2.0.1", forRemoval = true)
+// FIXME: 3.0.0: remove this class
 public class MultivaluedHashMap<K, V> implements MultivaluedMap<K, V> {
     private final Map<K, List<V>> store = new HashMap<>();
 

diff --git a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/SimpleUriInfo.java b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/SimpleUriInfo.java
index 88da262573b64db4bcee304432457eec142aa889..b964b4ce657f20803a8ebeb5cd5d40d82c78469c 100644 (file)
--- a/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/SimpleUriInfo.java
+++ b/restconf/restconf-common/src/main/java/org/opendaylight/restconf/common/util/SimpleUriInfo.java
@@ -8,8 +8,8 @@
 package org.opendaylight.restconf.common.util;
 
 import java.net.URI;
-import java.util.Collections;
 import java.util.List;
+import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.PathSegment;
 import javax.ws.rs.core.UriBuilder;
@@ -105,7 +105,7 @@ public class SimpleUriInfo implements UriInfo {
 
     @Override
     public List<String> getMatchedURIs() {
-        return Collections.emptyList();
+        return List.of();
     }
 
     @Override
@@ -115,7 +115,7 @@ public class SimpleUriInfo implements UriInfo {
 
     @Override
     public List<Object> getMatchedResources() {
-        return Collections.emptyList();
+        return List.of();
     }
 
     @Override

diff --git a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java
index 74d39bf4a403a72c71da736624152f240887017e..588bb808947838e03b8512fe7c088a1bf90dec6b 100644 (file)
--- a/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java
+++ b/restconf/restconf-nb-bierman02/src/main/java/org/opendaylight/netconf/sal/restconf/impl/JSONRestconfServiceImpl.java
@@ -21,6 +21,7 @@ import java.util.Optional;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.UriInfo;
 import org.apache.aries.blueprint.annotation.service.Service;
@@ -37,7 +38,6 @@ import org.opendaylight.restconf.common.errors.RestconfError;
 import org.opendaylight.restconf.common.errors.RestconfError.ErrorTag;
 import org.opendaylight.restconf.common.patch.PatchContext;
 import org.opendaylight.restconf.common.patch.PatchStatusContext;
-import org.opendaylight.restconf.common.util.MultivaluedHashMap;
 import org.opendaylight.restconf.common.util.SimpleUriInfo;
 import org.opendaylight.yangtools.yang.common.OperationFailedException;
 import org.opendaylight.yangtools.yang.common.RpcError;