From 0b0f7a7b6ff41d4d7f312c5a43de98c1c9776436 Mon Sep 17 00:00:00 2001
From: Gunnar Morling <gunnar.morling@googlemail.com>
Date: Sat, 31 May 2014 09:21:49 +0200
Subject: [PATCH] #169 Removing dependency to commons-io

---
 parent/pom.xml                                              | 5 -----
 processor/pom.xml                                           | 5 -----
 .../ap/test/imports/ConflictingTypesNamesTest.java          | 4 ++--
 .../mapstruct/ap/testutil/assertions/JavaFileAssert.java    | 6 ++++--
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 34cde9d2e..0221fcb4a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -120,11 +120,6 @@
                 <artifactId>junit</artifactId>
                 <version>4.11</version>
             </dependency>
-	        <dependency>
-	            <groupId>commons-io</groupId>
-	            <artifactId>commons-io</artifactId>
-	            <version>2.4</version>
-	        </dependency>
 
             <!-- CDI, Weld, Arquillian -->
             <dependency>
diff --git a/processor/pom.xml b/processor/pom.xml
index 1f683e840..328f4fc1a 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -79,11 +79,6 @@
             <artifactId>javax.inject</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <scope>test</scope>
-        </dependency>
 
         <!-- There is no compile dependency to Joda-Time; It's only required for testing the Joda conversions -->
         <dependency>
diff --git a/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java b/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java
index 8bdeebf6b..44a46260c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/imports/ConflictingTypesNamesTest.java
@@ -59,7 +59,7 @@ import static org.fest.assertions.Assertions.assertThat;
 @RunWith(AnnotationProcessorTestRunner.class)
 public class ConflictingTypesNamesTest {
 
-    private GeneratedSource generatedSource = new GeneratedSource();
+    private final GeneratedSource generatedSource = new GeneratedSource();
 
     @Rule
     public GeneratedSource getGeneratedSource() {
@@ -86,7 +86,7 @@ public class ConflictingTypesNamesTest {
 
     @Test
     @IssueKey("178")
-    public void mapperHasNoUnecessaryImports() {
+    public void mapperHasNoUnnecessaryImports() {
         Source source = new Source();
         source.setNotImported( new NotImportedDatatype( 42 ) );
 
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/assertions/JavaFileAssert.java b/processor/src/test/java/org/mapstruct/ap/testutil/assertions/JavaFileAssert.java
index 0fef0ab6f..9c0cb9e55 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/assertions/JavaFileAssert.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/assertions/JavaFileAssert.java
@@ -21,11 +21,13 @@ package org.mapstruct.ap.testutil.assertions;
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.commons.io.FileUtils;
 import org.fest.assertions.Assertions;
 import org.fest.assertions.FileAssert;
 import org.fest.assertions.StringAssert;
 
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
+
 /**
  * Allows to perform assertions on .java source files.
  *
@@ -47,7 +49,7 @@ public class JavaFileAssert extends FileAssert {
         isFile();
 
         try {
-            return Assertions.assertThat( FileUtils.readFileToString( actual ) );
+            return Assertions.assertThat( Files.toString( actual, Charsets.UTF_8 ) );
         }
         catch ( IOException e ) {
             failIfCustomMessageIsSet( e );