Modernize getDeclarationAsString

javaparser · Mar 22, 2019 · 72e8ed1 · 72e8ed1
1 parent 4927f01
commit 72e8ed1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/body/CallableDeclaration.java
@@ -190,16 +190,6 @@ public T setTypeParameters(final NodeList<TypeParameter> typeParameters) {
         return (T) this;
     }
 
-    public String getDeclarationAsString(boolean includingModifiers, boolean includingThrows) {
-        return getDeclarationAsString(includingModifiers, includingThrows, true);
-    }
-
-    public String getDeclarationAsString() {
-        return getDeclarationAsString(true, true, true);
-    }
-
-    public abstract String getDeclarationAsString(boolean includingModifiers, boolean includingThrows, boolean includingParameterName);
-
     protected String appendThrowsIfRequested(boolean includingThrows) {
         StringBuilder sb = new StringBuilder();
         if (includingThrows) {

diff --git a/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java b/javaparser-core/src/main/java/com/github/javaparser/ast/nodeTypes/NodeWithDeclaration.java
@@ -35,7 +35,9 @@ public interface NodeWithDeclaration {
      *
      * @return String representation of declaration
      */
-    String getDeclarationAsString();
+    default String getDeclarationAsString() {
+        return getDeclarationAsString(true, true, true);
+    }
 
     /**
      * As {@link NodeWithDeclaration#getDeclarationAsString(boolean, boolean, boolean)} including
@@ -45,7 +47,9 @@ public interface NodeWithDeclaration {
      * @param includingThrows flag to include the throws clause (if present) in the string produced
      * @return String representation of declaration based on parameter flags
      */
-    String getDeclarationAsString(boolean includingModifiers, boolean includingThrows);
+    default String getDeclarationAsString(boolean includingModifiers, boolean includingThrows) {
+        return getDeclarationAsString(includingModifiers, includingThrows, true);
+    }
 
     /**
      * A simple representation of the element declaration.