홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
Committed by Gerrit Code Review
eeef6f4c 1 parent 04b1fe9a

Refactor: Move DiscreteResourceCodecs to impl package 

Change-Id: I2ee85d9207615208ce88d04b5fbfaa153cab323a
(cherry picked from commit 74bd8a4f)
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.
......
...@@ -194,14 +194,12 @@ import org.onosproject.net.resource.ContinuousResourceId; ...@@ -194,14 +194,12 @@ import org.onosproject.net.resource.ContinuousResourceId;
194 import org.onosproject.net.resource.DiscreteResource; 194 import org.onosproject.net.resource.DiscreteResource;
195 import org.onosproject.net.resource.DiscreteResourceCodec; 195 import org.onosproject.net.resource.DiscreteResourceCodec;
196 import org.onosproject.net.resource.DiscreteResourceId; 196 import org.onosproject.net.resource.DiscreteResourceId;
197 -import org.onosproject.net.resource.MplsCodec;
198 import org.onosproject.net.resource.ResourceAllocation; 197 import org.onosproject.net.resource.ResourceAllocation;
199 import org.onosproject.net.resource.ResourceConsumerId; 198 import org.onosproject.net.resource.ResourceConsumerId;
200 import org.onosproject.net.packet.DefaultOutboundPacket; 199 import org.onosproject.net.packet.DefaultOutboundPacket;
201 import org.onosproject.net.packet.DefaultPacketRequest; 200 import org.onosproject.net.packet.DefaultPacketRequest;
202 import org.onosproject.net.packet.PacketPriority; 201 import org.onosproject.net.packet.PacketPriority;
203 import org.onosproject.net.provider.ProviderId; 202 import org.onosproject.net.provider.ProviderId;
204 -import org.onosproject.net.resource.VlanCodec;
205 import org.onosproject.security.Permission; 203 import org.onosproject.security.Permission;
206 import org.onosproject.store.Timestamp; 204 import org.onosproject.store.Timestamp;
207 import org.onosproject.store.primitives.MapUpdate; 205 import org.onosproject.store.primitives.MapUpdate;
...@@ -535,8 +533,6 @@ public final class KryoNamespaces { ...@@ -535,8 +533,6 @@ public final class KryoNamespaces {
535 ) 533 )
536 .register(ClosedOpenRange.class) 534 .register(ClosedOpenRange.class)
537 .register(DiscreteResourceCodec.class) 535 .register(DiscreteResourceCodec.class)
538 - .register(VlanCodec.class)
539 - .register(MplsCodec.class)
540 .build("API"); 536 .build("API");
541 537
542 538
......