Jonathan Hart
Committed by Gerrit Code Review

Enforce stricter naming conventions for package names

Change-Id: I84a73a3a997ed25059fc3319db9f013db6e94a4c
Showing 17 changed files with 32 additions and 30 deletions
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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.vtnrsc.flowClassifier; 16 +package org.onosproject.vtnrsc.flowclassifier;
17 17
18 import org.onosproject.vtnrsc.FlowClassifier; 18 import org.onosproject.vtnrsc.FlowClassifier;
19 import org.onosproject.vtnrsc.FlowClassifierId; 19 import org.onosproject.vtnrsc.FlowClassifierId;
...@@ -69,4 +69,4 @@ public interface FlowClassifierService { ...@@ -69,4 +69,4 @@ public interface FlowClassifierService {
69 * @return true if Flow Classifier removal is success otherwise return false. 69 * @return true if Flow Classifier removal is success otherwise return false.
70 */ 70 */
71 boolean removeFlowClassifier(FlowClassifierId id); 71 boolean removeFlowClassifier(FlowClassifierId id);
72 -}
...\ No newline at end of file ...\ No newline at end of file
72 +}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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.vtnrsc.flowClassifier.impl; 16 +package org.onosproject.vtnrsc.flowclassifier.impl;
17 17
18 import org.apache.felix.scr.annotations.Activate; 18 import org.apache.felix.scr.annotations.Activate;
19 import org.apache.felix.scr.annotations.Component; 19 import org.apache.felix.scr.annotations.Component;
...@@ -29,7 +29,7 @@ import org.onosproject.store.service.StorageService; ...@@ -29,7 +29,7 @@ import org.onosproject.store.service.StorageService;
29 import org.onosproject.store.service.WallClockTimestamp; 29 import org.onosproject.store.service.WallClockTimestamp;
30 import org.onosproject.vtnrsc.FlowClassifierId; 30 import org.onosproject.vtnrsc.FlowClassifierId;
31 import org.onosproject.vtnrsc.FlowClassifier; 31 import org.onosproject.vtnrsc.FlowClassifier;
32 -import org.onosproject.vtnrsc.flowClassifier.FlowClassifierService; 32 +import org.onosproject.vtnrsc.flowclassifier.FlowClassifierService;
33 import org.slf4j.Logger; 33 import org.slf4j.Logger;
34 34
35 import static org.slf4j.LoggerFactory.getLogger; 35 import static org.slf4j.LoggerFactory.getLogger;
...@@ -121,4 +121,4 @@ public class FlowClassifierManager implements FlowClassifierService { ...@@ -121,4 +121,4 @@ public class FlowClassifierManager implements FlowClassifierService {
121 } 121 }
122 return true; 122 return true;
123 } 123 }
124 -}
...\ No newline at end of file ...\ No newline at end of file
124 +}
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Provides implementation of the flow Classifier service. 18 * Provides implementation of the flow Classifier service.
19 */ 19 */
20 -package org.onosproject.vtnrsc.flowClassifier.impl; 20 +package org.onosproject.vtnrsc.flowclassifier.impl;
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * Service for interacting with flow Classifier of SFC. 18 * Service for interacting with flow Classifier of SFC.
19 */ 19 */
20 -package org.onosproject.vtnrsc.flowClassifier; 20 +package org.onosproject.vtnrsc.flowclassifier;
......
...@@ -39,7 +39,7 @@ import javax.ws.rs.core.Response; ...@@ -39,7 +39,7 @@ import javax.ws.rs.core.Response;
39 import org.onosproject.vtnrsc.FlowClassifier; 39 import org.onosproject.vtnrsc.FlowClassifier;
40 import org.onosproject.vtnrsc.FlowClassifierId; 40 import org.onosproject.vtnrsc.FlowClassifierId;
41 import org.onosproject.rest.AbstractWebResource; 41 import org.onosproject.rest.AbstractWebResource;
42 -import org.onosproject.vtnrsc.flowClassifier.FlowClassifierService; 42 +import org.onosproject.vtnrsc.flowclassifier.FlowClassifierService;
43 import org.onosproject.vtnweb.web.FlowClassifierCodec; 43 import org.onosproject.vtnweb.web.FlowClassifierCodec;
44 44
45 import com.fasterxml.jackson.databind.ObjectMapper; 45 import com.fasterxml.jackson.databind.ObjectMapper;
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 package org.onosproject.bgpio.protocol; 16 package org.onosproject.bgpio.protocol;
17 17
18 import org.onosproject.bgpio.exceptions.BGPParseException; 18 import org.onosproject.bgpio.exceptions.BGPParseException;
19 -import org.onosproject.bgpio.protocol.link_state.BGPNodeLSNlriVer4.PROTOCOLTYPE; 19 +import org.onosproject.bgpio.protocol.linkstate.BGPNodeLSNlriVer4.PROTOCOLTYPE;
20 import org.onosproject.bgpio.types.RouteDistinguisher; 20 import org.onosproject.bgpio.types.RouteDistinguisher;
21 21
22 /** 22 /**
...@@ -51,4 +51,4 @@ public interface BGPLSNlri { ...@@ -51,4 +51,4 @@ public interface BGPLSNlri {
51 * @return Route distinguisher in Nlri 51 * @return Route distinguisher in Nlri
52 */ 52 */
53 RouteDistinguisher getRouteDistinguisher(); 53 RouteDistinguisher getRouteDistinguisher();
54 -}
...\ No newline at end of file ...\ No newline at end of file
54 +}
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
15 */ 15 */
16 package org.onosproject.bgpio.protocol; 16 package org.onosproject.bgpio.protocol;
17 17
18 -import org.onosproject.bgpio.protocol.link_state.BGPNodeLSIdentifier; 18 +import org.onosproject.bgpio.protocol.linkstate.BGPNodeLSIdentifier;
19 19
20 /** 20 /**
21 * Abstraction of an entity providing BGP-LS Node NLRI. 21 * Abstraction of an entity providing BGP-LS Node NLRI.
...@@ -27,4 +27,4 @@ public interface BGPNodeLSNlri extends BGPLSNlri { ...@@ -27,4 +27,4 @@ public interface BGPNodeLSNlri extends BGPLSNlri {
27 * @return local node descriptors 27 * @return local node descriptors
28 */ 28 */
29 BGPNodeLSIdentifier getLocalNodeDescriptors(); 29 BGPNodeLSIdentifier getLocalNodeDescriptors();
30 -}
...\ No newline at end of file ...\ No newline at end of file
30 +}
......
...@@ -18,7 +18,7 @@ package org.onosproject.bgpio.protocol; ...@@ -18,7 +18,7 @@ package org.onosproject.bgpio.protocol;
18 import java.util.LinkedList; 18 import java.util.LinkedList;
19 19
20 import org.onosproject.bgpio.types.BGPValueType; 20 import org.onosproject.bgpio.types.BGPValueType;
21 -import org.onosproject.bgpio.protocol.link_state.NodeDescriptors; 21 +import org.onosproject.bgpio.protocol.linkstate.NodeDescriptors;
22 22
23 /** 23 /**
24 * Abstraction of an entity providing BGP-LS Prefix NLRI. 24 * Abstraction of an entity providing BGP-LS Prefix NLRI.
...@@ -37,4 +37,4 @@ public interface BGPPrefixLSNlri extends BGPLSNlri { ...@@ -37,4 +37,4 @@ public interface BGPPrefixLSNlri extends BGPLSNlri {
37 * @return list of Prefix descriptor 37 * @return list of Prefix descriptor
38 */ 38 */
39 LinkedList<BGPValueType> getPrefixdescriptor(); 39 LinkedList<BGPValueType> getPrefixdescriptor();
40 -}
...\ No newline at end of file ...\ No newline at end of file
40 +}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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.bgpio.protocol.link_state; 16 +package org.onosproject.bgpio.protocol.linkstate;
17 17
18 import java.util.Iterator; 18 import java.util.Iterator;
19 import java.util.LinkedList; 19 import java.util.LinkedList;
...@@ -249,4 +249,4 @@ public class BGPLinkLSIdentifier { ...@@ -249,4 +249,4 @@ public class BGPLinkLSIdentifier {
249 .add("linkDescriptor", linkDescriptor) 249 .add("linkDescriptor", linkDescriptor)
250 .toString(); 250 .toString();
251 } 251 }
252 -}
...\ No newline at end of file ...\ No newline at end of file
252 +}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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.bgpio.protocol.link_state; 16 +package org.onosproject.bgpio.protocol.linkstate;
17 17
18 import java.util.Objects; 18 import java.util.Objects;
19 19
...@@ -110,4 +110,4 @@ public class BGPNodeLSIdentifier { ...@@ -110,4 +110,4 @@ public class BGPNodeLSIdentifier {
110 .add("NodeDescriptors", nodeDescriptors) 110 .add("NodeDescriptors", nodeDescriptors)
111 .toString(); 111 .toString();
112 } 112 }
113 -}
...\ No newline at end of file ...\ No newline at end of file
113 +}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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.bgpio.protocol.link_state; 16 +package org.onosproject.bgpio.protocol.linkstate;
17 17
18 import org.jboss.netty.buffer.ChannelBuffer; 18 import org.jboss.netty.buffer.ChannelBuffer;
19 import org.onosproject.bgpio.exceptions.BGPParseException; 19 import org.onosproject.bgpio.exceptions.BGPParseException;
...@@ -209,4 +209,4 @@ public class BGPNodeLSNlriVer4 implements BGPNodeLSNlri { ...@@ -209,4 +209,4 @@ public class BGPNodeLSNlriVer4 implements BGPNodeLSNlri {
209 .add("localNodeDescriptors", localNodeDescriptors) 209 .add("localNodeDescriptors", localNodeDescriptors)
210 .toString(); 210 .toString();
211 } 211 }
212 -}
...\ No newline at end of file ...\ No newline at end of file
212 +}
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
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.bgpio.protocol.link_state; 16 +package org.onosproject.bgpio.protocol.linkstate;
17 17
18 import java.util.LinkedList; 18 import java.util.LinkedList;
19 19
...@@ -21,7 +21,7 @@ import org.jboss.netty.buffer.ChannelBuffer; ...@@ -21,7 +21,7 @@ import org.jboss.netty.buffer.ChannelBuffer;
21 import org.onosproject.bgpio.exceptions.BGPParseException; 21 import org.onosproject.bgpio.exceptions.BGPParseException;
22 import org.onosproject.bgpio.protocol.BGPPrefixLSNlri; 22 import org.onosproject.bgpio.protocol.BGPPrefixLSNlri;
23 import org.onosproject.bgpio.protocol.NlriType; 23 import org.onosproject.bgpio.protocol.NlriType;
24 -import org.onosproject.bgpio.protocol.link_state.BGPNodeLSNlriVer4.PROTOCOLTYPE; 24 +import org.onosproject.bgpio.protocol.linkstate.BGPNodeLSNlriVer4.PROTOCOLTYPE;
25 import org.onosproject.bgpio.types.BGPValueType; 25 import org.onosproject.bgpio.types.BGPValueType;
26 import org.onosproject.bgpio.types.RouteDistinguisher; 26 import org.onosproject.bgpio.types.RouteDistinguisher;
27 import org.onosproject.bgpio.util.Constants; 27 import org.onosproject.bgpio.util.Constants;
...@@ -202,4 +202,4 @@ public class BGPPrefixIPv4LSNlriVer4 implements BGPPrefixLSNlri { ...@@ -202,4 +202,4 @@ public class BGPPrefixIPv4LSNlriVer4 implements BGPPrefixLSNlri {
202 .add("bgpPrefixLSIdentifier", bgpPrefixLSIdentifier) 202 .add("bgpPrefixLSIdentifier", bgpPrefixLSIdentifier)
203 .toString(); 203 .toString();
204 } 204 }
205 -}
...\ No newline at end of file ...\ No newline at end of file
205 +}
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.bgpio.protocol.link_state; 17 +package org.onosproject.bgpio.protocol.linkstate;
18 18
19 import java.util.Iterator; 19 import java.util.Iterator;
20 import java.util.LinkedList; 20 import java.util.LinkedList;
...@@ -225,4 +225,4 @@ public class BGPPrefixLSIdentifier { ...@@ -225,4 +225,4 @@ public class BGPPrefixLSIdentifier {
225 .add("prefixDescriptor", prefixDescriptor) 225 .add("prefixDescriptor", prefixDescriptor)
226 .toString(); 226 .toString();
227 } 227 }
228 -}
...\ No newline at end of file ...\ No newline at end of file
228 +}
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
14 * limitations under the License. 14 * limitations under the License.
15 */ 15 */
16 16
17 -package org.onosproject.bgpio.protocol.link_state; 17 +package org.onosproject.bgpio.protocol.linkstate;
18 18
19 import java.util.Iterator; 19 import java.util.Iterator;
20 import java.util.LinkedList; 20 import java.util.LinkedList;
...@@ -222,4 +222,4 @@ public class NodeDescriptors { ...@@ -222,4 +222,4 @@ public class NodeDescriptors {
222 .add("subTlvs", subTlvs) 222 .add("subTlvs", subTlvs)
223 .toString(); 223 .toString();
224 } 224 }
225 -}
...\ No newline at end of file ...\ No newline at end of file
225 +}
......
...@@ -17,4 +17,4 @@ ...@@ -17,4 +17,4 @@
17 /** 17 /**
18 * BGP Protocol specific link state details. 18 * BGP Protocol specific link state details.
19 */ 19 */
20 -package org.onosproject.bgpio.protocol.link_state;
...\ No newline at end of file ...\ No newline at end of file
20 +package org.onosproject.bgpio.protocol.linkstate;
......
...@@ -48,6 +48,7 @@ ...@@ -48,6 +48,7 @@
48 <module>ovsdb</module> 48 <module>ovsdb</module>
49 <module>netconf</module> 49 <module>netconf</module>
50 <module>pcep</module> 50 <module>pcep</module>
51 + <module>bgp</module>
51 52
52 <module>providers</module> 53 <module>providers</module>
53 <module>drivers</module> 54 <module>drivers</module>
...@@ -59,7 +60,6 @@ ...@@ -59,7 +60,6 @@
59 <module>tools/package/archetypes</module> 60 <module>tools/package/archetypes</module>
60 <module>tools/package/branding</module> 61 <module>tools/package/branding</module>
61 <module>tools/build/conf</module> 62 <module>tools/build/conf</module>
62 - <module>bgp</module>
63 </modules> 63 </modules>
64 64
65 <url>http://onosproject.org/</url> 65 <url>http://onosproject.org/</url>
......
...@@ -160,7 +160,9 @@ ...@@ -160,7 +160,9 @@
160 160
161 <module name="MemberName"/> 161 <module name="MemberName"/>
162 <module name="MethodName"/> 162 <module name="MethodName"/>
163 - <module name="PackageName"/> 163 + <module name="PackageName">
164 + <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
165 + </module>
164 <module name="ParameterName"/> 166 <module name="ParameterName"/>
165 <module name="StaticVariableName"/> 167 <module name="StaticVariableName"/>
166 <module name="TypeName"/> 168 <module name="TypeName"/>
......