Encapsulate regexes in a non-capturing group

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / BaseTypes.java

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
index 18e58d41a5d14a8d52c2f4b993c1850feaeb1807..27ca7a90b3be03ad87c0609336101b2505d9a016 100644 (file)
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/BaseTypes.java
@@ -7,14 +7,10 @@
  */
 package org.opendaylight.yangtools.yang.model.util;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableSet;
-import java.net.URI;
 import java.util.Set;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.YangConstants;
 import org.opendaylight.yangtools.yang.model.api.TypeDefinition;
 
@@ -28,17 +24,6 @@ public final class BaseTypes {
     private BaseTypes() {
     }
 
-    /**
-     * @deprecated Use {@link YangConstants#RFC6020_YANG_NAMESPACE} instead. To be removed in Boron release.
-     */
-    @Deprecated
-    public static final URI BASE_TYPES_NAMESPACE = YangConstants.RFC6020_YANG_NAMESPACE;
-    /**
-     * @deprecated Use {@link YangConstants#RFC6020_YANG_MODULE} instead. To be removed in Boron release.
-     */
-    @Deprecated
-    public static final QNameModule BASE_TYPES_MODULE = YangConstants.RFC6020_YANG_MODULE;
-
     public static final QName BINARY_QNAME = constructQName("binary");
     public static final QName BITS_QNAME = constructQName("bits");
     public static final QName BOOLEAN_QNAME = constructQName("boolean");
@@ -103,10 +88,8 @@ public final class BaseTypes {
      * @return true if type is built-in YANG Types.
      */
     public static boolean isYangBuildInType(final String type) {
-        if (Strings.isNullOrEmpty(type)) {
-            return false;
-        }
-        return BUILT_IN_TYPES.contains(QName.create(YangConstants.RFC6020_YANG_MODULE, type));
+        return !Strings.isNullOrEmpty(type) && BUILT_IN_TYPES.contains(
+                QName.create(YangConstants.RFC6020_YANG_MODULE, type));
     }
 
     /**
@@ -119,65 +102,6 @@ public final class BaseTypes {
      * @return true if type is built-in YANG Types.
      */
     public static boolean isYangBuildInType(final TypeDefinition<?> type) {
-        if(type == null) {
-            return false;
-        }
-        return BUILT_IN_TYPES.contains(type.getQName());
+        return type != null && BUILT_IN_TYPES.contains(type.getQName());
     }
-
-    /**
-     * Returns default instance of built-in for supplied type
-     *
-     * See package documentation for description of base build-in types
-     * with default instance.
-     *
-     * @param typeName
-     * @return Returns default instance or {@link Optional#absent()} if default
-     *         instance does not exists
-     *
-     * @deprecated Use parser-specific lookup tables.
-     */
-    @Deprecated
-    public static Optional<TypeDefinition<?>> defaultBaseTypeFor(final String typeName) {
-        return Optional.<TypeDefinition<?>> fromNullable(defaultBaseTypeForImpl(typeName));
-    }
-
-    @Deprecated
-    private static TypeDefinition<?> defaultBaseTypeForImpl(final String typeName) {
-        Preconditions.checkNotNull(typeName, "typeName must not be null.");
-
-        if (typeName.startsWith("int")) {
-            if ("int8".equals(typeName)) {
-                return Int8.getInstance();
-            } else if ("int16".equals(typeName)) {
-                return Int16.getInstance();
-            } else if ("int32".equals(typeName)) {
-                return Int32.getInstance();
-            } else if ("int64".equals(typeName)) {
-                return Int64.getInstance();
-            }
-        } else if (typeName.startsWith("uint")) {
-            if ("uint8".equals(typeName)) {
-                return Uint8.getInstance();
-            } else if ("uint16".equals(typeName)) {
-                return Uint16.getInstance();
-            } else if ("uint32".equals(typeName)) {
-                return Uint32.getInstance();
-            } else if ("uint64".equals(typeName)) {
-                return Uint64.getInstance();
-            }
-        } else if ("string".equals(typeName)) {
-            return StringType.getInstance();
-        } else if ("binary".equals(typeName)) {
-            return BinaryType.getInstance();
-        } else if ("boolean".equals(typeName)) {
-            return BooleanType.getInstance();
-        } else if ("empty".equals(typeName)) {
-            return EmptyType.getInstance();
-        } else if ("instance-identifier".equals(typeName)) {
-            return InstanceIdentifierType.getInstance();
-        }
-        return null;
-    }
-
 }