Refactor: Move DiscreteResourceCodecs to impl package
Change-Id: I2ee85d9207615208ce88d04b5fbfaa153cab323a
(cherry picked from commit 74bd8a4f1bc6f81362e33a8cf389aa1048d81a49)
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/Codecs.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/Codecs.java
index 6b15e51..07ce9bf 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/Codecs.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/Codecs.java
@@ -19,8 +19,6 @@
import org.onlab.packet.VlanId;
import org.onosproject.net.resource.DiscreteResource;
import org.onosproject.net.resource.DiscreteResourceCodec;
-import org.onosproject.net.resource.MplsCodec;
-import org.onosproject.net.resource.VlanCodec;
import java.util.HashMap;
import java.util.Map;
diff --git a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
index f343994..da16485 100644
--- a/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/ConsistentResourceStore.java
@@ -78,6 +78,8 @@
.register(EmptyDiscreteResources.class)
.register(new EncodedResourcesSerializer(), EncodedDiscreteResources.class)
.register(ContinuousResourceAllocation.class)
+ .register(VlanCodec.class)
+ .register(MplsCodec.class)
.build());
// TODO: We should provide centralized values for this
diff --git a/core/api/src/main/java/org/onosproject/net/resource/MplsCodec.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/MplsCodec.java
similarity index 92%
rename from core/api/src/main/java/org/onosproject/net/resource/MplsCodec.java
rename to core/store/dist/src/main/java/org/onosproject/store/resource/impl/MplsCodec.java
index 4e651b5..bc741e5 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/MplsCodec.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/MplsCodec.java
@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.resource;
+package org.onosproject.store.resource.impl;
import com.google.common.annotations.Beta;
import org.onlab.packet.MplsLabel;
+import org.onosproject.net.resource.DiscreteResourceCodec;
/**
* Codec for MplsLabel.
diff --git a/core/api/src/main/java/org/onosproject/net/resource/VlanCodec.java b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/VlanCodec.java
similarity index 92%
rename from core/api/src/main/java/org/onosproject/net/resource/VlanCodec.java
rename to core/store/dist/src/main/java/org/onosproject/store/resource/impl/VlanCodec.java
index df4a2a2..270645a 100644
--- a/core/api/src/main/java/org/onosproject/net/resource/VlanCodec.java
+++ b/core/store/dist/src/main/java/org/onosproject/store/resource/impl/VlanCodec.java
@@ -13,10 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.net.resource;
+package org.onosproject.store.resource.impl;
import com.google.common.annotations.Beta;
import org.onlab.packet.VlanId;
+import org.onosproject.net.resource.DiscreteResourceCodec;
/**
* Codec for Vlan.
diff --git a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
index 51232a4..22e0aad 100644
--- a/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
+++ b/core/store/serializers/src/main/java/org/onosproject/store/serializers/KryoNamespaces.java
@@ -194,14 +194,12 @@
import org.onosproject.net.resource.DiscreteResource;
import org.onosproject.net.resource.DiscreteResourceCodec;
import org.onosproject.net.resource.DiscreteResourceId;
-import org.onosproject.net.resource.MplsCodec;
import org.onosproject.net.resource.ResourceAllocation;
import org.onosproject.net.resource.ResourceConsumerId;
import org.onosproject.net.packet.DefaultOutboundPacket;
import org.onosproject.net.packet.DefaultPacketRequest;
import org.onosproject.net.packet.PacketPriority;
import org.onosproject.net.provider.ProviderId;
-import org.onosproject.net.resource.VlanCodec;
import org.onosproject.security.Permission;
import org.onosproject.store.Timestamp;
import org.onosproject.store.primitives.MapUpdate;
@@ -535,8 +533,6 @@
)
.register(ClosedOpenRange.class)
.register(DiscreteResourceCodec.class)
- .register(VlanCodec.class)
- .register(MplsCodec.class)
.build("API");