From 59a5182dabc09d27d008b3c776751138ce5b5508 Mon Sep 17 00:00:00 2001
From: Andrei Arlou <andrei.arlou@gmail.com>
Date: Mon, 12 Aug 2019 22:20:53 +0300
Subject: [PATCH] Fix minor warnings:

remove unnecessary generic type for collections,
replace Charset.forName on StandartCharset
---
 .../testutil/runner/ProcessorSuiteRunner.java   |  4 ++--
 .../ap/internal/model/HelperMethod.java         |  2 +-
 .../org/mapstruct/ap/internal/util/Strings.java |  6 +++---
 .../ap/internal/writer/ModelWriter.java         | 17 +++++++----------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/integrationtest/src/test/java/org/mapstruct/itest/testutil/runner/ProcessorSuiteRunner.java b/integrationtest/src/test/java/org/mapstruct/itest/testutil/runner/ProcessorSuiteRunner.java
index c2d20e056..cb3f601b2 100644
--- a/integrationtest/src/test/java/org/mapstruct/itest/testutil/runner/ProcessorSuiteRunner.java
+++ b/integrationtest/src/test/java/org/mapstruct/itest/testutil/runner/ProcessorSuiteRunner.java
@@ -111,7 +111,7 @@ public class ProcessorSuiteRunner extends ParentRunner<ProcessorTestCase> {
 
     private List<ProcessorTestCase> initializeTestCases(ProcessorSuite suite,
                 Constructor<? extends CommandLineEnhancer> cliEnhancerConstructor) {
-        List<ProcessorType> types = new ArrayList<ProcessorType>();
+        List<ProcessorType> types = new ArrayList<>();
 
         for ( ProcessorType compiler : suite.processorTypes() ) {
             if ( compiler.getIncluded().length > 0 ) {
@@ -190,7 +190,7 @@ public class ProcessorSuiteRunner extends ParentRunner<ProcessorTestCase> {
             verifier = new Verifier( destination.getCanonicalPath() );
         }
 
-        List<String> goals = new ArrayList<String>( 3 );
+        List<String> goals = new ArrayList<>( 3 );
 
         goals.add( "clean" );
 
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java b/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java
index 5921d1517..149e71333 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/model/HelperMethod.java
@@ -51,7 +51,7 @@ public abstract class HelperMethod implements Method {
      * @return the types used by this method for which import statements need to be generated
      */
     public Set<Type> getImportTypes() {
-        return Collections.<Type>emptySet();
+        return Collections.emptySet();
     }
 
     /**
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java b/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java
index 7fbca6dc4..71acee3cf 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/util/Strings.java
@@ -153,12 +153,12 @@ public class Strings {
         }
 
         int c = 1;
-        String seperator = Character.isDigit( name.charAt( name.length() - 1 ) ) ? "_" : "";
-        while ( conflictingNames.contains( name + seperator + c ) ) {
+        String separator = Character.isDigit( name.charAt( name.length() - 1 ) ) ? "_" : "";
+        while ( conflictingNames.contains( name + separator + c ) ) {
             c++;
         }
 
-        return name + seperator + c;
+        return name + separator + c;
     }
 
     /**
diff --git a/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelWriter.java b/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelWriter.java
index cb2e2a911..2c3f762c0 100644
--- a/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelWriter.java
+++ b/processor/src/main/java/org/mapstruct/ap/internal/writer/ModelWriter.java
@@ -12,7 +12,7 @@ import java.io.InputStreamReader;
 import java.io.Reader;
 import java.net.URL;
 import java.net.URLConnection;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -62,16 +62,13 @@ public class ModelWriter {
     }
 
     public void writeModel(FileObject sourceFile, Writable model) {
-        try {
-            BufferedWriter writer = new BufferedWriter( new IndentationCorrectingWriter( sourceFile.openWriter() ) );
+        try ( BufferedWriter writer = new BufferedWriter( new IndentationCorrectingWriter( sourceFile.openWriter() ))) {
+                Map<Class<?>, Object> values = new HashMap<>();
+                values.put( Configuration.class, CONFIGURATION );
 
-            Map<Class<?>, Object> values = new HashMap<>();
-            values.put( Configuration.class, CONFIGURATION );
+                model.write( new DefaultModelElementWriterContext( values ), writer );
 
-            model.write( new DefaultModelElementWriterContext( values ), writer );
-
-            writer.flush();
-            writer.close();
+                writer.flush();
         }
         catch ( RuntimeException e ) {
             throw e;
@@ -100,7 +97,7 @@ public class ModelWriter {
 
             InputStream is = connection.getInputStream();
 
-            return new InputStreamReader( is, Charset.forName( "UTF-8" ) );
+            return new InputStreamReader( is, StandardCharsets.UTF_8 );
         }
 
         @Override