Remove Constant.toFormattedString()

This method is not really used anywhere and actually is a remnant of the
original PoC. Remove it.

Change-Id: I5e26ea57a98a24085e947ac6bec477d4b8c097bc
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java
index 165604acd7775cc61c39d104c29d5305727a18cc..d1b778b54f903511c253cb6d34d9ff2505bb420f 100644 (file)
--- a/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java
+++ b/binding/mdsal-binding-generator-api/src/main/java/org/opendaylight/mdsal/binding/model/api/Constant.java
@@ -38,14 +38,4 @@ public interface Constant {
      * @return boxed value that is assigned for context.
      */
     Object getValue();
-
-    /**
-     * Returns Constant definition in formatted string. <br>
-     * <br>
-     * The expected string SHOULD be in format: <code>public final
-     * static [Type] CONSTANT_NAME = [value];</code>
-     *
-     * @return Constant definition in formatted string.
-     */
-    String toFormattedString();
 }

diff --git a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImpl.java b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImpl.java
index a0437f3d28b3aea862a4577eb3895bb9a4703c26..7f7c2cd6ac4327e6b91ac107786184111822f7ca 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImpl.java
+++ b/binding/mdsal-binding-generator-util/src/main/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImpl.java
@@ -37,11 +37,6 @@ final class ConstantImpl implements Constant {
         return this.value;
     }
 
-    @Override
-    public String toFormattedString() {
-        return type + " " + name + " " + value;
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;

diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImplTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImplTest.java
index da833f6351282090f9b3e764065f52f9f40214dd..dd48d42d0efa16315c9c28991a348bfb255bedd0 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImplTest.java
+++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/ConstantImplTest.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.mdsal.binding.model.util.generated.type.builder;
 
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -30,14 +32,11 @@ public class ConstantImplTest {
         assertEquals("BaseType", constImpl.getType().getName());
         assertEquals("IpAddress", constImpl.getName());
         assertEquals("127.0.0.1", constImpl.getValue());
-        assertTrue(constImpl.toFormattedString().contains("GeneratedTransferObject"));
-        assertTrue(constImpl.toString().contains("GeneratedTransferObject"));
+        assertThat(constImpl.toString(), containsString("GeneratedTransferObject"));
         assertEquals(constImpl.hashCode(), constImpl2.hashCode());
         assertNotNull(constImpl.getType());
         assertNotNull(constImpl.getName());
         assertNotNull(constImpl.getValue());
-        assertNotNull(constImpl.toFormattedString());
-        assertNotNull(constImpl.toString());
         assertNotNull(constImpl.hashCode());
         assertFalse(constImpl.equals(null));
         assertFalse(constImpl.equals("test"));

diff --git a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderTest.java b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderTest.java
index 6c4980e3d9e40dad199af29794d556ec40b43dbd..fc99c72f7fa330c1c5156912e321ccc52f341a7e 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderTest.java
+++ b/binding/mdsal-binding-generator-util/src/test/java/org/opendaylight/mdsal/binding/model/util/generated/type/builder/GeneratedTypeBuilderTest.java
@@ -80,8 +80,6 @@ public class GeneratedTypeBuilderTest {
         assertEquals("Constant [type=Type (java.lang.String), name=myConstant, value=myConstantValue]",
             constant.toString());
 
-        assertEquals("Type (java.lang.String) myConstant myConstantValue", constant.toFormattedString());
-
         GeneratedType instance = generatedTypeBuilder.build();
         List<Constant> constantDefinitions = instance.getConstantDefinitions();
         assertNotNull(constantDefinitions);