From de82345f4c3adb26b76ac863147f7581852efde7 Mon Sep 17 00:00:00 2001
From: Graeme Rocher <graeme.rocher@gmail.com>
Date: Wed, 10 Dec 2014 10:15:44 +0100
Subject: [PATCH] cleanup deprecation warnings

---
 .../grails/core/ArtefactHandlerAdapter.java       | 15 ++++++---------
 .../grails/core/DefaultGrailsApplication.java     |  1 +
 .../org/grails/buffer/StreamCharBufferTests.java  |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/grails-core/src/main/groovy/grails/core/ArtefactHandlerAdapter.java b/grails-core/src/main/groovy/grails/core/ArtefactHandlerAdapter.java
index 7b59d2d5ef1..8c702d189f1 100644
--- a/grails-core/src/main/groovy/grails/core/ArtefactHandlerAdapter.java
+++ b/grails-core/src/main/groovy/grails/core/ArtefactHandlerAdapter.java
@@ -16,22 +16,18 @@
 package grails.core;
 
 import groovy.lang.Closure;
+import org.codehaus.groovy.ast.ClassNode;
+import org.codehaus.groovy.ast.InnerClassNode;
+import org.grails.io.support.GrailsResourceUtils;
+import org.grails.io.support.Resource;
+import org.grails.io.support.UrlResource;
 
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
-import java.net.MalformedURLException;
 import java.net.URI;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.codehaus.groovy.ast.ClassNode;
-import org.codehaus.groovy.ast.InnerClassNode;
-import org.grails.io.support.GrailsResourceUtils;
-import org.grails.io.support.Resource;
-import org.grails.io.support.UrlResource;
-
 /**
  * Adapter for the {@link grails.core.ArtefactHandler} interface
  *
@@ -39,6 +35,7 @@
  * @author Graeme Rocher
  * @since 1.0
  */
+@SuppressWarnings( "deprecation" )
 public class ArtefactHandlerAdapter implements ArtefactHandler, org.codehaus.groovy.grails.commons.ArtefactHandler {
 
     protected String type;
diff --git a/grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java b/grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java
index 762d78bf2dc..ca5b28b4a27 100644
--- a/grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java
+++ b/grails-core/src/main/groovy/grails/core/DefaultGrailsApplication.java
@@ -176,6 +176,7 @@ public DefaultGrailsApplication(org.grails.io.support.Resource[] resources) {
      *
      * @see grails.core.ArtefactHandler
      */
+    @SuppressWarnings( "deprecation" )
     protected void initArtefactHandlers() {
 
         List<org.codehaus.groovy.grails.commons.ArtefactHandler> legacyArtefactHandlers = GrailsFactoriesLoader.loadFactories(org.codehaus.groovy.grails.commons.ArtefactHandler.class, getClassLoader());
diff --git a/grails-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferTests.java b/grails-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferTests.java
index 5f4bb95cd60..8f5cfcd8bc7 100644
--- a/grails-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferTests.java
+++ b/grails-encoder/src/test/groovy/org/grails/buffer/StreamCharBufferTests.java
@@ -273,7 +273,7 @@ public void testToString() throws IOException {
         writer.write("Hello world!");
         writer.close();
         //assertEquals(0, charBuffer.filledChunkCount());
-        String str=charBuffer.readAsString();
+        String str=charBuffer.toString();
         assertEquals("Hello world!", str);
 
         assertEquals(12, charBuffer.size());
@@ -281,7 +281,7 @@ public void testToString() throws IOException {
 
     public void testToCharArray() throws IOException {
         StreamCharBuffer charBuffer = createTestInstance();
-        char[] result = charBuffer.readAsCharArray();
+        char[] result = charBuffer.toCharArray();
         assertTrue(Arrays.equals(testbuffer, result));
 
         assertEquals(testbuffer.length, charBuffer.size());