Sho SHIMIZU
Committed by Gerrit Code Review

Refactor: Move DiscreteResourceCodecs to impl package

Change-Id: I2ee85d9207615208ce88d04b5fbfaa153cab323a
(cherry picked from commit 74bd8a4f)
......@@ -19,8 +19,6 @@ import org.onlab.packet.MplsLabel;
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;
......
......@@ -78,6 +78,8 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
.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
......
......@@ -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.
......
......@@ -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.
......
......@@ -194,14 +194,12 @@ import org.onosproject.net.resource.ContinuousResourceId;
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 @@ public final class KryoNamespaces {
)
.register(ClosedOpenRange.class)
.register(DiscreteResourceCodec.class)
.register(VlanCodec.class)
.register(MplsCodec.class)
.build("API");
......