Committed by
Gerrit Code Review
Enforce stricter naming conventions for package names
Change-Id: I84a73a3a997ed25059fc3319db9f013db6e94a4c
Showing
17 changed files
with
21 additions
and
19 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; | ... | ... |
... | @@ -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; | ... | ... |
... | @@ -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; | ... | ... |
... | @@ -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 | /** | ... | ... |
... | @@ -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. | ... | ... |
... | @@ -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. | ... | ... |
... | @@ -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; | ... | ... |
... | @@ -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 | ... | ... |
... | @@ -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; | ... | ... |
... | @@ -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; | ... | ... |
... | @@ -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; | ... | ... |
... | @@ -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; | ... | ... |
... | @@ -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"/> | ... | ... |
-
Please register or login to post a comment