Revert 4cc8455a7232d6833ba88911ad5c45a77ddda3dc

[mdsal.git] / model / ietf / ietf-type-util / src / main / java / org / opendaylight / mdsal / model / ietf / util / AbstractIetfInetUtil.java

diff --git a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java
index 01f3887375dfb3620ebe14b2f93630d1f1ec4a8e..153b796d884e0d87161723cc0381dc048ddc37f8 100644 (file)
--- a/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java
+++ b/model/ietf/ietf-type-util/src/main/java/org/opendaylight/mdsal/model/ietf/util/AbstractIetfInetUtil.java
@@ -20,7 +20,7 @@ import java.util.AbstractMap.SimpleImmutableEntry;
 import java.util.Map.Entry;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import org.opendaylight.yangtools.yang.binding.util.StringValueObjectFactory;
+import org.opendaylight.mdsal.binding.spec.reflect.StringValueObjectFactory;
 
 /**
  * A set of utility methods to efficiently instantiate various ietf-inet-types DTOs.
@@ -356,26 +356,6 @@ public abstract class AbstractIetfInetUtil<A4, A4NZ extends A4, P4, A6, A6NZ ext
         return prefix4Factory.newInstance(addr.getHostAddress() + "/32");
     }
 
-    @Nonnull public final String stringForIpAddress(@Nonnull final A addr) {
-        final A4 ipv4 = maybeIpv4Address(addr);
-        if (ipv4 != null) {
-            return ipv4AddressString(ipv4);
-        }
-        final A6 v6 = maybeIpv6Address(addr);
-        checkArgument(v6 != null, "Address %s is neither IPv4 nor IPv6", addr);
-        return ipv6AddressString(v6);
-    }
-
-    @Nonnull public final String stringForIpAddressNoZone(@Nonnull final ANZ addr) {
-        final A4NZ v4 = maybeIpv4AddressNoZone(addr);
-        if (v4 != null) {
-            return ipv4AddressString(v4);
-        }
-        final A6NZ v6 = maybeIpv6AddressNoZone(addr);
-        checkArgument(v6 != null, "Address %s is neither IPv4 nor IPv6", addr);
-        return ipv6AddressString(v6);
-    }
-
     /**
      * Create a Ipv4Prefix by combining the address with a mask. The address bytes are not masked.
      *