From 928d0b286b586c76658449480291b9445a52b74b Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Mon, 5 Sep 2016 12:10:26 +0200 Subject: Cleanup TODOs and FIXMEs - Fix minor ones - Report bigger and include issue number in comment - Pull common dependencies into dependency management of common/parents Change-Id: I06a6ac37c52b603fd73ed42023d6b2e7fa18010f Signed-off-by: Maros Marsalek --- lisp/api/pom.xml | 12 -------- lisp/api/src/main/java/lisp/Ipv4Matcher.java | 35 ---------------------- lisp/api/src/main/java/lisp/Ipv6Matcher.java | 34 --------------------- lisp/api/src/main/java/lisp/MacMatcher.java | 34 --------------------- .../lisp/address/types/rev151105/Ipv4Matcher.java | 35 ++++++++++++++++++++++ .../lisp/address/types/rev151105/Ipv6Matcher.java | 34 +++++++++++++++++++++ .../lisp/address/types/rev151105/MacMatcher.java | 34 +++++++++++++++++++++ .../types/rev151105/SimpleAddressBuilder.java | 9 ++---- 8 files changed, 105 insertions(+), 122 deletions(-) delete mode 100755 lisp/api/src/main/java/lisp/Ipv4Matcher.java delete mode 100755 lisp/api/src/main/java/lisp/Ipv6Matcher.java delete mode 100755 lisp/api/src/main/java/lisp/MacMatcher.java create mode 100755 lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/Ipv4Matcher.java create mode 100755 lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/Ipv6Matcher.java create mode 100755 lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/MacMatcher.java (limited to 'lisp/api') diff --git a/lisp/api/pom.xml b/lisp/api/pom.xml index eb02e9325..960f88bc0 100755 --- a/lisp/api/pom.xml +++ b/lisp/api/pom.xml @@ -32,18 +32,6 @@ io.fd.honeycomb - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.8.2-Beryllium-SR2 - pom - import - - - - org.opendaylight.mdsal.model diff --git a/lisp/api/src/main/java/lisp/Ipv4Matcher.java b/lisp/api/src/main/java/lisp/Ipv4Matcher.java deleted file mode 100755 index 546d40460..000000000 --- a/lisp/api/src/main/java/lisp/Ipv4Matcher.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2015 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package lisp; - -import java.util.List; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; - - -/** - * Class that checks whether {@link String} can represent Ipv4Address - */ -public final class Ipv4Matcher { - - private static final List PATTERNS = - Ipv4Address.PATTERN_CONSTANTS.stream().map(a -> Pattern.compile(a)).collect(Collectors.toList()); - - public static boolean matches(String candidate) { - return PATTERNS.stream().anyMatch(pattern -> pattern.matcher(candidate).matches()); - } -} diff --git a/lisp/api/src/main/java/lisp/Ipv6Matcher.java b/lisp/api/src/main/java/lisp/Ipv6Matcher.java deleted file mode 100755 index 209868ec8..000000000 --- a/lisp/api/src/main/java/lisp/Ipv6Matcher.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2015 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package lisp; - -import java.util.List; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; - -/** - * Class that checks whether {@link String} can represent Ipv6Address - */ -public final class Ipv6Matcher { - - private static final List PATTERNS = - Ipv6Address.PATTERN_CONSTANTS.stream().map(a -> Pattern.compile(a)).collect(Collectors.toList()); - - public static boolean matches(String candidate) { - return PATTERNS.stream().anyMatch(pattern -> pattern.matcher(candidate).matches()); - } -} diff --git a/lisp/api/src/main/java/lisp/MacMatcher.java b/lisp/api/src/main/java/lisp/MacMatcher.java deleted file mode 100755 index 611c92e1e..000000000 --- a/lisp/api/src/main/java/lisp/MacMatcher.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2015 Cisco and/or its affiliates. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at: - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package lisp; - -import java.util.List; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; - -/** - * Class that checks whether {@link String} can represent MacAddress - */ -public class MacMatcher { - - private static final List PATTERNS = - MacAddress.PATTERN_CONSTANTS.stream().map(a -> Pattern.compile(a)).collect(Collectors.toList()); - - public static boolean matches(String candidate) { - return PATTERNS.stream().anyMatch(pattern -> pattern.matcher(candidate).matches()); - } -} diff --git a/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/Ipv4Matcher.java b/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/Ipv4Matcher.java new file mode 100755 index 000000000..55f0ec907 --- /dev/null +++ b/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/Ipv4Matcher.java @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105; + +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; + + +/** + * Class that checks whether {@link String} can represent Ipv4Address. + */ +public final class Ipv4Matcher { + + private static final List PATTERNS = + Ipv4Address.PATTERN_CONSTANTS.stream().map(a -> Pattern.compile(a)).collect(Collectors.toList()); + + public static boolean matches(String candidate) { + return PATTERNS.stream().anyMatch(pattern -> pattern.matcher(candidate).matches()); + } +} diff --git a/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/Ipv6Matcher.java b/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/Ipv6Matcher.java new file mode 100755 index 000000000..947088f8f --- /dev/null +++ b/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/Ipv6Matcher.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105; + +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; + +/** + * Class that checks whether {@link String} can represent Ipv6Address + */ +public final class Ipv6Matcher { + + private static final List PATTERNS = + Ipv6Address.PATTERN_CONSTANTS.stream().map(a -> Pattern.compile(a)).collect(Collectors.toList()); + + public static boolean matches(String candidate) { + return PATTERNS.stream().anyMatch(pattern -> pattern.matcher(candidate).matches()); + } +} diff --git a/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/MacMatcher.java b/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/MacMatcher.java new file mode 100755 index 000000000..663f4ff22 --- /dev/null +++ b/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/MacMatcher.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105; + +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; + +/** + * Class that checks whether {@link String} can represent MacAddress + */ +public class MacMatcher { + + private static final List PATTERNS = + MacAddress.PATTERN_CONSTANTS.stream().map(a -> Pattern.compile(a)).collect(Collectors.toList()); + + public static boolean matches(String candidate) { + return PATTERNS.stream().anyMatch(pattern -> pattern.matcher(candidate).matches()); + } +} diff --git a/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/SimpleAddressBuilder.java b/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/SimpleAddressBuilder.java index 3d340855e..681e87277 100644 --- a/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/SimpleAddressBuilder.java +++ b/lisp/api/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/lisp/address/types/rev151105/SimpleAddressBuilder.java @@ -18,9 +18,6 @@ package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.addre import static com.google.common.base.Preconditions.checkNotNull; -import lisp.Ipv4Matcher; -import lisp.Ipv6Matcher; -import lisp.MacMatcher; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; @@ -29,13 +26,12 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types. /** * The purpose of generated class in src/main/java for Union types is to create new instances of unions from a string representation. * In some cases it is very difficult to automate it since there can be unions such as (uint32 - uint16), or (string - uint32). - * + *

* The reason behind putting it under src/main/java is: * This class is generated in form of a stub and needs to be finished by the user. This class is generated only once to prevent * loss of user code. - * */ -public class SimpleAddressBuilder { +public final class SimpleAddressBuilder { public static SimpleAddress getDefaultInstance(String defaultValue) { checkNotNull(defaultValue, "Cannot convert null address"); @@ -47,7 +43,6 @@ public class SimpleAddressBuilder { } else if (MacMatcher.matches(defaultValue)) { return new SimpleAddress(new MacAddress(defaultValue)); } else { - //TODO - implement other conversions throw new IllegalArgumentException("Unknown type"); } } -- cgit 1.2.3-korg