Modified toString and name methods for both EppRequestmessage and Epp…

…ResponseMessage
google · Aug 9, 2019 · 081e20d · 081e20d
1 parent 69c5110
commit 081e20d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppRequestMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppRequestMessage.java
@@ -225,7 +225,7 @@ public EppRequestMessage modifyMessage(String... args) throws EppClientException
 
     @Override
     public String toString() {
-      return "Login Action expecting response: " + expectedResponse.toString();
+      return "Login Action expecting response: " + expectedResponse.name();
     }
   }
 
@@ -251,7 +251,7 @@ public Check(EppResponseMessage response) {
 
     @Override
     public String toString() {
-      return "Check Action expecting response: " + expectedResponse.toString();
+      return "Check Action expecting response: " + expectedResponse.name();
     }
   }
 
@@ -277,7 +277,7 @@ public Create(EppResponseMessage response) {
 
     @Override
     public String toString() {
-      return "Create Action expecting response: " + expectedResponse.toString();
+      return "Create Action expecting response: " + expectedResponse.name();
     }
   }
 
@@ -304,7 +304,7 @@ public Delete(EppResponseMessage response) {
 
     @Override
     public String toString() {
-      return "Delete Action expecting response: " + expectedResponse.toString();
+      return "Delete Action expecting response: " + expectedResponse.name();
     }
   }
 

diff --git a/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppResponseMessage.java b/prober/src/main/java/google/registry/monitoring/blackbox/messages/EppResponseMessage.java
@@ -62,10 +62,7 @@ void updateInformation(String expectedClTRID, String expectedDomainName) {
     this.expectedDomainName = expectedDomainName;
   }
 
-  @Override
-  public String toString() {
-    return "Failure";
-  }
+  public abstract String name();
 
   /**
    * {@link EppResponseMessage} subclass that represents basic successful response containing only
@@ -94,8 +91,7 @@ public void verify() throws FailureException {
           true);
     }
 
-    @Override
-    public String toString() {
+    public String name() {
       return "Success";
     }
   }
@@ -127,8 +123,7 @@ public void verify() throws FailureException {
           true);
     }
 
-    @Override
-    public String toString() {
+    public String name() {
       return "Domain exists";
     }
   }
@@ -160,8 +155,7 @@ public void verify() throws FailureException {
           true);
     }
 
-    @Override
-    public String toString() {
+    public String name() {
       return "Domain does not exist";
     }
   }
@@ -189,8 +183,7 @@ public void verify() throws FailureException {
           true);
     }
 
-    @Override
-    public String toString() {
+    public String name() {
       return "Greeting";
     }
   }
@@ -221,5 +214,9 @@ public void verify() throws FailureException {
               XFAIL_EXPRESSION),
           true);
     }
+
+    public String name() {
+      return "Failure";
+    }
   }
 }