Get rid of usage deprecated Reader/WriterFactory

Fix #369

Author: slawekjaranowski

modello-core/src/main/java/org/codehaus/modello/ModelloCli.java

@@ -25,8 +25,8 @@
 import java.io.File;
 import java.util.Properties;
 
-import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 /**
  * @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
@@ -43,7 +43,7 @@ public static void main(String[] args) throws Exception {
 
         parseArgumentsFromCommandLine(args);
 
-        modello.generate(ReaderFactory.newXmlReader(modelFile), outputType, parameters);
+        modello.generate(new XmlStreamReader(modelFile), outputType, parameters);
     }
 
     public static void parseArgumentsFromCommandLine(String[] args) throws Exception {

modello-core/src/main/java/org/codehaus/modello/core/DefaultModelloCore.java

@@ -53,7 +53,7 @@
 import org.codehaus.modello.model.ModelInterface;
 import org.codehaus.modello.model.ModelValidationException;
 import org.codehaus.modello.plugin.ModelloGenerator;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 
 /**
  * @author <a href="mailto:[email protected]">Trygve Laugst&oslash;l</a>
@@ -74,7 +74,7 @@ public MetadataPluginManager getMetadataPluginManager() {
     }
 
     public Model loadModel(File file) throws IOException, ModelloException, ModelValidationException {
-        try (Reader reader = ReaderFactory.newXmlReader(file)) {
+        try (Reader reader = new XmlStreamReader(file)) {
             return loadModel(reader);
         }
     }

modello-maven-plugin/src/it/maven-model/src/test/java/org/codehaus/modello/xpp3/Xpp3ParsingTest.java

@@ -6,7 +6,7 @@
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 import org.hamcrest.core.StringStartsWith;
 
@@ -28,7 +28,7 @@ public void testXpp3ParsingWithModelWithWrongRootTag()
 
         MavenXpp3Reader reader = new MavenXpp3Reader();
 
-        reader.read( ReaderFactory.newXmlReader( model ), true );
+        reader.read( new XmlStreamReader( model ), true );
     }
 
     @Test
@@ -41,7 +41,7 @@ public void testXpp3ParsingWithModelWithMissingElements()
 
         MavenXpp3Reader reader = new MavenXpp3Reader();
 
-        reader.read( ReaderFactory.newXmlReader( model ), true );
+        reader.read( new XmlStreamReader( model ), true );
     }
 
     @Test
@@ -55,7 +55,7 @@ public void testXpp3ParsingWithModelWithPostTags()
 
         MavenXpp3Reader reader = new MavenXpp3Reader();
 
-        reader.read( ReaderFactory.newXmlReader( model ), true );
+        reader.read( new XmlStreamReader( model ), true );
     }
 
 }

modello-plugins/modello-plugin-converters/src/main/java/org/codehaus/modello/plugin/converters/ConverterGenerator.java

@@ -52,7 +52,6 @@
 import org.codehaus.modello.plugin.java.javasource.JType;
 import org.codehaus.modello.plugin.java.metadata.JavaClassMetadata;
 import org.codehaus.modello.plugin.java.metadata.JavaFieldMetadata;
-import org.codehaus.plexus.util.IOUtil;
 
 /**
  * Generate a basic conversion class between two versions of a model.
@@ -310,18 +309,10 @@ private void generateConverters(Version toVersion) throws ModelloException, IOEx
             sc.add("return value;");
         }
 
-        JSourceWriter interfaceWriter = null;
-        JSourceWriter classWriter = null;
-
-        try {
-            interfaceWriter = newJSourceWriter(packageName, conversionInterface.getName(true));
-            classWriter = newJSourceWriter(packageName, basicConverterClass.getName(true));
-
+        try (JSourceWriter interfaceWriter = newJSourceWriter(packageName, conversionInterface.getName(true));
+                JSourceWriter classWriter = newJSourceWriter(packageName, basicConverterClass.getName(true))) {
             conversionInterface.print(interfaceWriter);
             basicConverterClass.print(classWriter);
-        } finally {
-            IOUtil.close(classWriter);
-            IOUtil.close(interfaceWriter);
         }
     }
 
@@ -351,12 +342,8 @@ private void generateConverterTool(List<Version> allVersions) throws ModelloExce
         }
         writeConvertMethod(converterClass, objectModel, basePackage, allVersions, null, rootClass);
 
-        JSourceWriter classWriter = null;
-        try {
-            classWriter = newJSourceWriter(packageName, converterClass.getName(true));
+        try (JSourceWriter classWriter = newJSourceWriter(packageName, converterClass.getName(true))) {
             converterClass.print(new JSourceWriter(classWriter));
-        } finally {
-            IOUtil.close(classWriter);
         }
     }
 

modello-plugins/modello-plugin-dom4j/src/test/verifiers/dom4j/Dom4jVerifier.java

@@ -35,7 +35,7 @@
 import org.codehaus.modello.test.model.io.dom4j.MavenDom4jWriter;
 import org.codehaus.modello.verifier.Verifier;
 import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 import org.dom4j.DocumentException;
 
@@ -80,7 +80,7 @@ public void verifyEncodedRead()
     {
         String path = "src/test/verifiers/dom4j/expected-encoding.xml";
 
-        Reader reader = ReaderFactory.newXmlReader( new File( path ) );
+        Reader reader = new XmlStreamReader( new File( path ) );
         MavenDom4jReader modelReader = new MavenDom4jReader();
 
         Model model = modelReader.read( reader );

modello-plugins/modello-plugin-jackson/src/test/verifiers/jackson/JacksonVerifier.java

@@ -42,7 +42,6 @@
 import org.codehaus.modello.verifier.VerifierException;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
-import org.codehaus.plexus.util.ReaderFactory;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;

modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/JavaModelloGenerator.java

@@ -32,6 +32,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 
@@ -1465,12 +1466,11 @@ private void createAssociation(JClass jClass, ModelAssociation modelAssociation,
                 }
             }
 
-            if (StringUtils.equals(
-                    javaAssociationMetadata.getInitializationMode(), JavaAssociationMetadata.FIELD_INIT)) {
+            if (Objects.equals(javaAssociationMetadata.getInitializationMode(), JavaAssociationMetadata.FIELD_INIT)) {
                 jField.setInitString(defaultValue);
             }
 
-            if (StringUtils.equals(
+            if (Objects.equals(
                     javaAssociationMetadata.getInitializationMode(), JavaAssociationMetadata.CONSTRUCTOR_INIT)) {
                 jConstructorSource.add("this." + jField.getName() + " = " + defaultValue + ";");
             }
@@ -1484,7 +1484,7 @@ private void createAssociation(JClass jClass, ModelAssociation modelAssociation,
 
                 JSourceCode sc = getter.getSourceCode();
 
-                if (StringUtils.equals(
+                if (Objects.equals(
                         javaAssociationMetadata.getInitializationMode(), JavaAssociationMetadata.LAZY_INIT)) {
                     sc.add("if ( this." + jField.getName() + " == null )");
 

modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JCompUnit.java

@@ -75,14 +75,13 @@
  */
 
 import java.io.File;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.codehaus.plexus.util.WriterFactory;
-
 /**
  * A representation of the Java Source code for a Java compilation
  * unit. This is
@@ -337,7 +336,7 @@ public void print(String destDir, String lineSeparator) {
         File file = new File(filename);
         JSourceWriter jsw = null;
         try {
-            jsw = new JSourceWriter(WriterFactory.newPlatformWriter(file));
+            jsw = new JSourceWriter(Files.newBufferedWriter(file.toPath()));
         } catch (java.io.IOException ioe) {
             System.out.println("unable to create compilation unit file: " + filename);
             return;

modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JMethodSignature.java

@@ -125,7 +125,7 @@ public final class JMethodSignature {
      **/
     public JMethodSignature(String name, JType returnType) {
 
-        if ((name == null) || (name.length() == 0)) {
+        if ((name == null) || (name.isEmpty())) {
             String err = "The method name must not be null or zero-length";
             throw new IllegalArgumentException(err);
         }

modello-plugins/modello-plugin-java/src/main/java/org/codehaus/modello/plugin/java/javasource/JStructure.java

@@ -67,13 +67,12 @@
  */
 
 import java.io.File;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 
-import org.codehaus.plexus.util.WriterFactory;
-
 /**
  * This class represents the basic Java "structure" for a Java
  * source file. This is the base class for JClass and JInterface.
@@ -555,7 +554,7 @@ public void print(String destDir, String lineSeparator) {
         File file = new File(filename);
         JSourceWriter jsw = null;
         try {
-            jsw = new JSourceWriter(WriterFactory.newPlatformWriter(file));
+            jsw = new JSourceWriter(Files.newBufferedWriter(file.toPath()));
         } catch (java.io.IOException ioe) {
             System.out.println("unable to create class file: " + filename);
             return;