Remove default params

Author: codeconsole

grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/CodeSnippetPrinter.groovy

@@ -27,7 +27,11 @@ interface CodeSnippetPrinter {
      * Attempts to present a preview code snippet of the code that went wrong
      *
      * @param exception The exception
+     * @param optional attributes for formatting
      * @return The code snippet or nothing if it can't be previewed
      */
+    String prettyPrintCodeSnippet(Throwable exception, Map attrs)
+
+    @Deprecated
     String prettyPrintCodeSnippet(Throwable exception)
 }

grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/DefaultStackTracePrinter.groovy

@@ -23,7 +23,13 @@ import org.codehaus.groovy.control.MultipleCompilationErrorsException
  */
 class DefaultStackTracePrinter implements StackTracePrinter {
 
-    String prettyPrint(Throwable t, Map attrs = [:]) {
+    @Deprecated
+    String prettyPrint(Throwable t) {
+        prettyPrint(t, [:])
+    }
+
+    @Override
+    String prettyPrint(Throwable t, Map attrs) {
         if (t == null) return ''
         if (!t.stackTrace) return 'No stack trace available'
         final sw = new StringWriter()

grails-bootstrap/src/main/groovy/org/grails/exceptions/reporting/StackTracePrinter.groovy

@@ -29,5 +29,16 @@ interface StackTracePrinter {
      * @param throwable The throwable
      * @return The result
      */
+    @Deprecated
     String prettyPrint(Throwable throwable)
+
+    /**
+     * Pretty print the given stack trace and return the result
+     *
+     * @param throwable The throwable
+     * @param optional attributes for formatting
+     * @return The result
+     */
+    String prettyPrint(Throwable throwable, Map attrs)
+
 }

grails-core/src/main/groovy/org/grails/core/exceptions/DefaultErrorsPrinter.groovy

@@ -47,7 +47,12 @@ class DefaultErrorsPrinter extends DefaultStackTracePrinter implements CodeSnipp
         res == null ? te.className : res.getFilename()
     }
 
-    String prettyPrintCodeSnippet(Throwable exception, Map attrs = [:]) {
+    @Deprecated
+    String prettyPrintCodeSnippet(Throwable exception) {
+        prettyPrintCodeSnippet(exception, [:])
+    }
+
+    String prettyPrintCodeSnippet(Throwable exception, Map attrs) {
         if (exception == null) {
             return ''
         }
@@ -198,18 +203,32 @@ class DefaultErrorsPrinter extends DefaultStackTracePrinter implements CodeSnipp
         ""
     }
 
-    String formatCodeSnippetStart(Resource resource, int lineNumber, Map attrs = [:]) {
+    @Deprecated
+    String formatCodeSnippetStart(Resource resource, int lineNumber) {
+        formatCodeSnippetStart(resource, lineNumber, [:])
+    }
+
+    String formatCodeSnippetStart(Resource resource, int lineNumber, Map attrs) {
         """Around line $lineNumber of $resource.filename
 """
+    }
 
+    @Deprecated
+    protected String formatCodeSnippetLine(int currentLineNumber, currentLine) {
+        formatCodeSnippetLine(currentLineNumber, currentLine, [:])
     }
 
-    protected String formatCodeSnippetLine(int currentLineNumber, currentLine, Map attrs = [:]) {
+    protected String formatCodeSnippetLine(int currentLineNumber, currentLine, Map attrs) {
         """${currentLineNumber}: ${currentLine}
 """
     }
 
-    protected String formatCodeSnippetErrorLine(int currentLineNumber, currentLine, Map attrs = [:]) {
+    @Deprecated
+    protected String formatCodeSnippetErrorLine(int currentLineNumber, currentLine) {
+        formatCodeSnippetErrorLine(currentLineNumber, currentLine, [:])
+    }
+
+    protected String formatCodeSnippetErrorLine(int currentLineNumber, currentLine, Map attrs) {
         """${currentLineNumber}: ${currentLine}
 """
     }

grails-web-common/src/main/groovy/org/grails/web/errors/ErrorsViewStackTracePrinter.groovy

@@ -38,23 +38,23 @@ class ErrorsViewStackTracePrinter extends DefaultErrorsPrinter {
     }
 
     @Override
-    String prettyPrint(Throwable t, Map attrs = [:]) {
+    String prettyPrint(Throwable t, Map attrs) {
         if (t instanceof GrailsWrappedRuntimeException) {
             t = t.cause
         }
         return super.prettyPrint(t, attrs)
     }
 
     @Override
-    String prettyPrintCodeSnippet(Throwable t, Map attrs = [:]) {
+    String prettyPrintCodeSnippet(Throwable t, Map attrs) {
         if (t instanceof GrailsWrappedRuntimeException) {
             t = t.cause
         }
         return super.prettyPrintCodeSnippet(t, attrs)
     }
 
     @Override
-    String formatCodeSnippetStart(Resource resource, int lineNumber, Map attrs = [:]) {
+    String formatCodeSnippetStart(Resource resource, int lineNumber, Map attrs) {
         String path = resource.filename
         // try calc better path
         try {
@@ -77,12 +77,12 @@ class ErrorsViewStackTracePrinter extends DefaultErrorsPrinter {
     }
 
     @Override
-    protected String formatCodeSnippetLine(int currentLineNumber, Object currentLine, Map attrs = [:]) {
+    protected String formatCodeSnippetLine(int currentLineNumber, Object currentLine, Map attrs) {
         """<code class="${attrs['lineClass'] ?: 'line'}"><span class="${attrs['lineNumberClass'] ?: 'lineNumber'}">${currentLineNumber}:</span>${currentLine.encodeAsHTML()}</code>"""
     }
 
     @Override
-    protected String formatCodeSnippetErrorLine(int currentLineNumber, Object currentLine, Map attrs = [:]) {
+    protected String formatCodeSnippetErrorLine(int currentLineNumber, Object currentLine, Map attrs) {
         """<code class="${attrs['lineErrorClass'] ?: 'line error'}"><span class="${attrs['lineNumberClass'] ?: 'lineNumber'}">${currentLineNumber}:</span>${currentLine.encodeAsHTML()}</code>"""
     }