홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
74bd8a4f 1 parent fd18ded0

Refactor: Move DiscreteResourceCodecs to impl package 

Change-Id: I2ee85d9207615208ce88d04b5fbfaa153cab323a
Inline Side-by-side
Showing 5 changed files with 6 additions and 8 deletions
...@@ -19,8 +19,6 @@ import org.onlab.packet.MplsLabel; ...@@ -19,8 +19,6 @@ import org.onlab.packet.MplsLabel;
19 import org.onlab.packet.VlanId; 19 import org.onlab.packet.VlanId;
20 import org.onosproject.net.resource.DiscreteResource; 20 import org.onosproject.net.resource.DiscreteResource;
21 import org.onosproject.net.resource.DiscreteResourceCodec; 21 import org.onosproject.net.resource.DiscreteResourceCodec;
22 -import org.onosproject.net.resource.MplsCodec;
23 -import org.onosproject.net.resource.VlanCodec;
24 22
25 import java.util.HashMap; 23 import java.util.HashMap;
26 import java.util.Map; 24 import java.util.Map;
......
...@@ -78,6 +78,8 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour ...@@ -78,6 +78,8 @@ public class ConsistentResourceStore extends AbstractStore<ResourceEvent, Resour
78 .register(EmptyDiscreteResources.class) 78 .register(EmptyDiscreteResources.class)
79 .register(new EncodedResourcesSerializer(), EncodedDiscreteResources.class) 79 .register(new EncodedResourcesSerializer(), EncodedDiscreteResources.class)
80 .register(ContinuousResourceAllocation.class) 80 .register(ContinuousResourceAllocation.class)
81 + .register(VlanCodec.class)
82 + .register(MplsCodec.class)
81 .build()); 83 .build());
82 84
83 // TODO: We should provide centralized values for this 85 // TODO: We should provide centralized values for this
......
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.resource; 16 +package org.onosproject.store.resource.impl;
17 17
18 import com.google.common.annotations.Beta; 18 import com.google.common.annotations.Beta;
19 import org.onlab.packet.MplsLabel; 19 import org.onlab.packet.MplsLabel;
20 +import org.onosproject.net.resource.DiscreteResourceCodec;
20 21
21 /** 22 /**
22 * Codec for MplsLabel. 23 * Codec for MplsLabel.
......
...@@ -13,10 +13,11 @@ ...@@ -13,10 +13,11 @@
13 * See the License for the specific language governing permissions and 13 * See the License for the specific language governing permissions and
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 -package org.onosproject.net.resource; 16 +package org.onosproject.store.resource.impl;
17 17
18 import com.google.common.annotations.Beta; 18 import com.google.common.annotations.Beta;
19 import org.onlab.packet.VlanId; 19 import org.onlab.packet.VlanId;
20 +import org.onosproject.net.resource.DiscreteResourceCodec;
20 21
21 /** 22 /**
22 * Codec for Vlan. 23 * Codec for Vlan.
......
...@@ -195,14 +195,12 @@ import org.onosproject.net.resource.ContinuousResourceId; ...@@ -195,14 +195,12 @@ import org.onosproject.net.resource.ContinuousResourceId;
195 import org.onosproject.net.resource.DiscreteResource; 195 import org.onosproject.net.resource.DiscreteResource;
196 import org.onosproject.net.resource.DiscreteResourceCodec; 196 import org.onosproject.net.resource.DiscreteResourceCodec;
197 import org.onosproject.net.resource.DiscreteResourceId; 197 import org.onosproject.net.resource.DiscreteResourceId;
198 -import org.onosproject.net.resource.MplsCodec;
199 import org.onosproject.net.resource.ResourceAllocation; 198 import org.onosproject.net.resource.ResourceAllocation;
200 import org.onosproject.net.resource.ResourceConsumerId; 199 import org.onosproject.net.resource.ResourceConsumerId;
201 import org.onosproject.net.packet.DefaultOutboundPacket; 200 import org.onosproject.net.packet.DefaultOutboundPacket;
202 import org.onosproject.net.packet.DefaultPacketRequest; 201 import org.onosproject.net.packet.DefaultPacketRequest;
203 import org.onosproject.net.packet.PacketPriority; 202 import org.onosproject.net.packet.PacketPriority;
204 import org.onosproject.net.provider.ProviderId; 203 import org.onosproject.net.provider.ProviderId;
205 -import org.onosproject.net.resource.VlanCodec;
206 import org.onosproject.security.Permission; 204 import org.onosproject.security.Permission;
207 import org.onosproject.store.Timestamp; 205 import org.onosproject.store.Timestamp;
208 import org.onosproject.store.primitives.MapUpdate; 206 import org.onosproject.store.primitives.MapUpdate;
...@@ -536,8 +534,6 @@ public final class KryoNamespaces { ...@@ -536,8 +534,6 @@ public final class KryoNamespaces {
536 ) 534 )
537 .register(ClosedOpenRange.class) 535 .register(ClosedOpenRange.class)
538 .register(DiscreteResourceCodec.class) 536 .register(DiscreteResourceCodec.class)
539 - .register(VlanCodec.class)
540 - .register(MplsCodec.class)
541 .register(ImmutableByteSequence.class) 537 .register(ImmutableByteSequence.class)
542 .build("API"); 538 .build("API");
543 539
......