commit f59d36b054e580b34b8b7d9cadaa79500b752c40
author Simon Hunt <simon@onlab.us> Tue Oct 04 19:05:53 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Oct 13 21:23:57 2016 +0000
tree 6077590f94eedd6d74aa91705be68c925ab5ecfa
parent 6c60389e14440949cd266597c60a48bc69b1323a

ONOS-5411: Introduce basic region config.

Change-Id: I3f58e5758d0b350a9e8a03093a1475dbbacfc446

core/api/src/main/java/org/onosproject/net/config/basics/SubjectFactories.java

diff --git a/core/api/src/main/java/org/onosproject/net/config/basics/SubjectFactories.java b/core/api/src/main/java/org/onosproject/net/config/basics/SubjectFactories.java
index da075d4..104dfe5 100644
--- a/core/api/src/main/java/org/onosproject/net/config/basics/SubjectFactories.java
+++ b/core/api/src/main/java/org/onosproject/net/config/basics/SubjectFactories.java
@@ -22,6 +22,7 @@
 import org.onosproject.net.HostId;
 import org.onosproject.net.LinkKey;
 import org.onosproject.net.config.SubjectFactory;
+import org.onosproject.net.region.RegionId;
 
 import static com.google.common.base.Preconditions.checkArgument;
 
@@ -37,18 +38,25 @@
     // Required for resolving application identifiers
     private static CoreService coreService;
 
+    /**
+     * Application ID subject factory.
+     */
     public static final SubjectFactory<ApplicationId> APP_SUBJECT_FACTORY =
             new SubjectFactory<ApplicationId>(ApplicationId.class, "apps") {
                 @Override
                 public ApplicationId createSubject(String key) {
                     return coreService.registerApplication(key);
                 }
+
                 @Override
                 public String subjectKey(ApplicationId subject) {
                     return subject.name();
                 }
             };
 
+    /**
+     * Device ID subject factory.
+     */
     public static final SubjectFactory<DeviceId> DEVICE_SUBJECT_FACTORY =
             new SubjectFactory<DeviceId>(DeviceId.class, "devices") {
                 @Override
@@ -57,18 +65,25 @@
                 }
             };
 
+    /**
+     * Connect point subject factory.
+     */
     public static final SubjectFactory<ConnectPoint> CONNECT_POINT_SUBJECT_FACTORY =
             new SubjectFactory<ConnectPoint>(ConnectPoint.class, "ports") {
                 @Override
                 public ConnectPoint createSubject(String key) {
                     return ConnectPoint.deviceConnectPoint(key);
                 }
+
                 @Override
                 public String subjectKey(ConnectPoint subject) {
                     return key(subject);
                 }
             };
 
+    /**
+     * Host ID subject factory.
+     */
     public static final SubjectFactory<HostId> HOST_SUBJECT_FACTORY =
             new SubjectFactory<HostId>(HostId.class, "hosts") {
                 @Override
@@ -77,6 +92,9 @@
                 }
             };
 
+    /**
+     * Link key subject factory.
+     */
     public static final SubjectFactory<LinkKey> LINK_SUBJECT_FACTORY =
             new SubjectFactory<LinkKey>(LinkKey.class, "links") {
                 @Override
@@ -84,8 +102,9 @@
                     String[] cps = key.split("-");
                     checkArgument(cps.length == 2, "Incorrect link key format: %s", key);
                     return LinkKey.linkKey(ConnectPoint.deviceConnectPoint(cps[0]),
-                                           ConnectPoint.deviceConnectPoint(cps[1]));
+                            ConnectPoint.deviceConnectPoint(cps[1]));
                 }
+
                 @Override
                 public String subjectKey(LinkKey subject) {
                     return key(subject.src()) + "-" + key(subject.dst());
@@ -93,6 +112,17 @@
             };
 
     /**
+     * Region ID subject factory.
+     */
+    public static final SubjectFactory<RegionId> REGION_SUBJECT_FACTORY =
+            new SubjectFactory<RegionId>(RegionId.class, "regions") {
+                @Override
+                public RegionId createSubject(String key) {
+                    return RegionId.regionId(key);
+                }
+            };
+
+    /**
      * Provides reference to the core service, which is required for
      * application subject factory.
      *