From: Tony Tkacik Date: Mon, 28 Jul 2014 15:03:00 +0000 (+0000) Subject: Merge "Degrade DataNodeContainer.getChildNodes() from Set to Collection" X-Git-Tag: release/helium~280 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c7331d3441a3364dcaa841dc6a34b9d178263b8c;hp=5feac31a11a337a0c840f73c5c4612a6c997fa2a;p=yangtools.git Merge "Degrade DataNodeContainer.getChildNodes() from Set to Collection" --- diff --git a/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/HostBuilder.java b/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/HostBuilder.java index ee92e8051e..96f32fcba2 100644 --- a/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/HostBuilder.java +++ b/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/HostBuilder.java @@ -9,29 +9,38 @@ package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types import java.util.ArrayList; import java.util.List; +import java.util.regex.Matcher; import java.util.regex.Pattern; /** -**/ -public class HostBuilder { - private static final Pattern ipv4Pattern = Pattern.compile("(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(%[\\p{N}\\p{L}]+)?"); - private static final Pattern ipv6Pattern1 = Pattern.compile("((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(%[\\p{N}\\p{L}]+)?"); - private static final Pattern ipv6Pattern2 = Pattern.compile("(([^:]+:){6}(([^:]+:[^:]+)|(.*\\..*)))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)(%.+)?"); - private static final Pattern domainPattern = Pattern.compile("((([a-zA-Z0-9_]([a-zA-Z0-9\\-_]){0,61})?[a-zA-Z0-9]\\.)*([a-zA-Z0-9_]([a-zA-Z0-9\\-_]){0,61})?[a-zA-Z0-9]\\.?)|\\."); + **/ +public final class HostBuilder { + private static final Pattern IPV4_PATTERN = Pattern.compile("(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(%[\\p{N}\\p{L}]+)?"); + private static final Pattern IPV6_PATTERN1 = Pattern.compile("((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(%[\\p{N}\\p{L}]+)?"); + private static final Pattern IPV6_PATTERN2 = Pattern.compile("(([^:]+:){6}(([^:]+:[^:]+)|(.*\\..*)))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)(%.+)?"); + private static final Pattern DOMAIN_PATTERN = Pattern.compile("((([a-zA-Z0-9_]([a-zA-Z0-9\\-_]){0,61})?[a-zA-Z0-9]\\.)*([a-zA-Z0-9_]([a-zA-Z0-9\\-_]){0,61})?[a-zA-Z0-9]\\.?)|\\."); - public static Host getDefaultInstance(String defaultValue) { + private HostBuilder() { - List matchers = new ArrayList<>(); - if (ipv6Pattern1.matcher(defaultValue).matches() || ipv6Pattern2.matcher(defaultValue).matches()) { + } + + public static Host getDefaultInstance(final String defaultValue) { + final Matcher ipv4Matcher = IPV4_PATTERN.matcher(defaultValue); + final Matcher ipv6Matcher1 = IPV6_PATTERN1.matcher(defaultValue); + final Matcher ipv6Matcher2 = IPV6_PATTERN2.matcher(defaultValue); + final Matcher domainMatcher = DOMAIN_PATTERN.matcher(defaultValue); + + List matchers = new ArrayList<>(3); + if (ipv6Matcher1.matches() || ipv6Matcher2.matches()) { matchers.add(Ipv6Address.class.getSimpleName()); } // Ipv4 and Domain Name patterns are not exclusive // Address 127.0.0.1 matches both patterns // This way Ipv4 address is preferred to domain name - if (ipv4Pattern.matcher(defaultValue).matches()) { + if (ipv4Matcher.matches()) { matchers.add(Ipv4Address.class.getSimpleName()); - } else if (domainPattern.matcher(defaultValue).matches()) { + } else if (domainMatcher.matches()) { matchers.add(DomainName.class.getSimpleName()); } @@ -40,17 +49,17 @@ public class HostBuilder { + matchers); } - if (ipv4Pattern.matcher(defaultValue).matches()) { + if (ipv4Matcher.matches()) { Ipv4Address ipv4 = new Ipv4Address(defaultValue); IpAddress ipAddress = new IpAddress(ipv4); return new Host(ipAddress); } - if (ipv6Pattern1.matcher(defaultValue).matches() || ipv6Pattern2.matcher(defaultValue).matches()) { + if (ipv6Matcher1.matches() || ipv6Matcher2.matches()) { Ipv6Address ipv6 = new Ipv6Address(defaultValue); IpAddress ipAddress = new IpAddress(ipv6); return new Host(ipAddress); } - if (domainPattern.matcher(defaultValue).matches()) { + if (domainMatcher.matches()) { DomainName domainName = new DomainName(defaultValue); return new Host(domainName); } diff --git a/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/IpAddressBuilder.java b/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/IpAddressBuilder.java index a90deeb754..26bfa2d981 100644 --- a/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/IpAddressBuilder.java +++ b/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/IpAddressBuilder.java @@ -7,39 +7,39 @@ */ package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924; -import java.util.ArrayList; -import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** -**/ -public class IpAddressBuilder { + **/ +public final class IpAddressBuilder { + private static final Pattern IPV4_PATTERN = + Pattern.compile("(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(%[\\p{N}\\p{L}]+)?"); + private static final Pattern IPV6_PATTERN1 = + Pattern.compile("((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(%[\\p{N}\\p{L}]+)?"); + private static final Pattern IPV6_PATTERN2 = + Pattern.compile("(([^:]+:){6}(([^:]+:[^:]+)|(.*\\..*)))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)(%.+)?"); - public static IpAddress getDefaultInstance(String defaultValue) { - String ipv4Pattern = "(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])(%[\\p{N}\\p{L}]+)?"; - String ipv6Pattern1 = "((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(%[\\p{N}\\p{L}]+)?"; - String ipv6Pattern2 = "(([^:]+:){6}(([^:]+:[^:]+)|(.*\\..*)))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)(%.+)?"; + private IpAddressBuilder() { - List matchers = new ArrayList<>(); - if (defaultValue.matches(ipv4Pattern)) { - matchers.add(Ipv4Address.class.getSimpleName()); - } - if (defaultValue.matches(ipv6Pattern1) && defaultValue.matches(ipv6Pattern2)) { - matchers.add(Ipv6Address.class.getSimpleName()); - } - if (matchers.size() > 1) { - throw new IllegalArgumentException("Cannot create IpAddress from " + defaultValue - + ". Value is ambigious for " + matchers); - } + } - if (defaultValue.matches(ipv4Pattern)) { - Ipv4Address ipv4 = new Ipv4Address(defaultValue); - return new IpAddress(ipv4); - } - if (defaultValue.matches(ipv6Pattern1) && defaultValue.matches(ipv6Pattern2)) { - Ipv6Address ipv6 = new Ipv6Address(defaultValue); - return new IpAddress(ipv6); + public static IpAddress getDefaultInstance(final String defaultValue) { + final Matcher ipv4Matcher = IPV4_PATTERN.matcher(defaultValue); + + if (ipv4Matcher.matches()) { + if (IPV6_PATTERN1.matcher(defaultValue).matches() && IPV6_PATTERN2.matcher(defaultValue).matches()) { + throw new IllegalArgumentException( + String.format("Cannot create IpAddress from \"%s\", matches both %s and %s", + defaultValue, Ipv4Address.class.getSimpleName(), Ipv6Address.class.getSimpleName())); + + } + return new IpAddress(new Ipv4Address(defaultValue)); + } else if (IPV6_PATTERN1.matcher(defaultValue).matches() && IPV6_PATTERN2.matcher(defaultValue).matches()) { + return new IpAddress(new Ipv6Address(defaultValue)); + } else { + throw new IllegalArgumentException("Cannot create IpAddress from " + defaultValue); } - throw new IllegalArgumentException("Cannot create IpAddress from " + defaultValue); } } diff --git a/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/IpPrefixBuilder.java b/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/IpPrefixBuilder.java index 70e9520129..4d151165f1 100644 --- a/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/IpPrefixBuilder.java +++ b/model/ietf/ietf-inet-types/src/main/java/org/opendaylight/yang/gen/v1/urn/ietf/params/xml/ns/yang/ietf/inet/types/rev100924/IpPrefixBuilder.java @@ -7,39 +7,36 @@ */ package org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924; -import java.util.ArrayList; -import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** -**/ -public class IpPrefixBuilder { + **/ +public final class IpPrefixBuilder { + private static final Pattern IPV4_PATTERN = Pattern.compile("(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))"); + private static final Pattern IPV6_PATTERN1 = Pattern.compile("((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))"); + private static final Pattern IPV6_PATTERN2 = Pattern.compile("(([^:]+:){6}(([^:]+:[^:]+)|(.*\\..*)))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)(/.+)"); - public static IpPrefix getDefaultInstance(String defaultValue) { - String ipv4Pattern = "(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))"; - String ipv6Pattern1 = "((:|[0-9a-fA-F]{0,4}):)([0-9a-fA-F]{0,4}:){0,5}((([0-9a-fA-F]{0,4}:)?(:|[0-9a-fA-F]{0,4}))|(((25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9]?[0-9])))(/(([0-9])|([0-9]{2})|(1[0-1][0-9])|(12[0-8])))"; - String ipv6Pattern2 = "(([^:]+:){6}(([^:]+:[^:]+)|(.*\\..*)))|((([^:]+:)*[^:]+)?::(([^:]+:)*[^:]+)?)(/.+)"; + private IpPrefixBuilder() { - List matchers = new ArrayList<>(); - if (defaultValue.matches(ipv4Pattern)) { - matchers.add(Ipv4Address.class.getSimpleName()); - } - if (defaultValue.matches(ipv6Pattern1) && defaultValue.matches(ipv6Pattern2)) { - matchers.add(Ipv6Address.class.getSimpleName()); - } - if (matchers.size() > 1) { - throw new IllegalArgumentException("Cannot create IpPrefix from " + defaultValue - + ". Value is ambigious for " + matchers); - } + } - if (defaultValue.matches(ipv4Pattern)) { - Ipv4Prefix ipv4 = new Ipv4Prefix(defaultValue); - return new IpPrefix(ipv4); - } - if (defaultValue.matches(ipv6Pattern1) && defaultValue.matches(ipv6Pattern2)) { - Ipv6Prefix ipv6 = new Ipv6Prefix(defaultValue); - return new IpPrefix(ipv6); + public static IpPrefix getDefaultInstance(final String defaultValue) { + final Matcher ipv4Matcher = IPV4_PATTERN.matcher(defaultValue); + + if (ipv4Matcher.matches()) { + if (IPV6_PATTERN1.matcher(defaultValue).matches() && IPV6_PATTERN2.matcher(defaultValue).matches()) { + throw new IllegalArgumentException( + String.format("Cannot create IpPrefix from \"%s\", matches both %s and %s", + defaultValue, Ipv4Address.class.getSimpleName(), Ipv6Address.class.getSimpleName())); + + } + return new IpPrefix(new Ipv4Prefix(defaultValue)); + } else if (IPV6_PATTERN1.matcher(defaultValue).matches() && IPV6_PATTERN2.matcher(defaultValue).matches()) { + return new IpPrefix(new Ipv6Prefix(defaultValue)); + } else { + throw new IllegalArgumentException("Cannot create IpPrefix from " + defaultValue); } - throw new IllegalArgumentException("Cannot create IpPrefix from " + defaultValue); } }