From 72e8ed16f9abc3fb777face4a271d6303fbe4e80 Mon Sep 17 00:00:00 2001
From: Danny van Bruggen <hexagonaal@gmail.com>
Date: Fri, 22 Mar 2019 21:35:31 +0100
Subject: [PATCH] Modernize getDeclarationAsString

---
 .../javaparser/ast/body/CallableDeclaration.java       | 10 ----------
 .../javaparser/ast/nodeTypes/NodeWithDeclaration.java  |  8 ++++++--
 2 files changed, 6 insertions(+), 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
index df1919d009..09c2330dcb 100644
--- 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
index d490ed1580..8f67d49f70 100644
--- 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.