You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2020/06/03 12:56:33 UTC
[myfaces-tobago] 02/02: replace deprecated calls
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
commit dd9d9fe939bc8a509ec51c3cd349c262a1995562
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Wed Jun 3 14:46:45 2020 +0200
replace deprecated calls
---
tobago-core/src/main/faces-config/faces-config.xml | 2 +-
.../tobago/apt/processor/CheckstyleConfigGenerator.java | 16 ++++++----------
.../myfaces/tobago/apt/processor/ClassesGenerator.java | 14 ++++----------
.../tobago/apt/processor/FacesConfigGenerator.java | 3 ++-
.../myfaces/tobago/apt/processor/TaglibGenerator.java | 7 +------
5 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/tobago-core/src/main/faces-config/faces-config.xml b/tobago-core/src/main/faces-config/faces-config.xml
index 66f9275..96cbe79 100644
--- a/tobago-core/src/main/faces-config/faces-config.xml
+++ b/tobago-core/src/main/faces-config/faces-config.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java
index ff7bfe7..25b6cad 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/CheckstyleConfigGenerator.java
@@ -20,7 +20,6 @@
package org.apache.myfaces.tobago.apt.processor;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.myfaces.tobago.apt.AnnotationUtils;
import org.apache.myfaces.tobago.apt.annotation.ConverterTag;
@@ -123,14 +122,13 @@ public class CheckstyleConfigGenerator extends AbstractGenerator {
}
protected void writeCheckstyleConfig(final Document document) throws IOException, TransformerException {
- Writer writer = null;
- try {
- final String path = "checkstyle-tobago.xml";
- final String name = (StringUtils.isNotBlank(targetCheckstyle) ? targetCheckstyle + '/' : "") + path;
- final FileObject resource = processingEnv.getFiler().createResource(StandardLocation.SOURCE_OUTPUT, "", name);
- info("Writing to file: " + resource.toUri());
- writer = resource.openWriter();
+ final String path = "checkstyle-tobago.xml";
+ final String name = (StringUtils.isNotBlank(targetCheckstyle) ? targetCheckstyle + '/' : "") + path;
+ final FileObject resource = processingEnv.getFiler().createResource(StandardLocation.SOURCE_OUTPUT, "", name);
+ info("Writing to file: " + resource.toUri());
+
+ try (Writer writer = resource.openWriter()) {
final TransformerFactory transFactory = TransformerFactory.newInstance();
transFactory.setAttribute("indent-number", 2);
final Transformer transformer = transFactory.newTransformer();
@@ -138,8 +136,6 @@ public class CheckstyleConfigGenerator extends AbstractGenerator {
transformer.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM, "http://www.puppycrawl.com/dtds/configuration_1_2.dtd");
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
transformer.transform(new DOMSource(document), new StreamResult(writer));
- } finally {
- IOUtils.closeQuietly(writer);
}
}
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
index a1b5a2f..6f0da23 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/ClassesGenerator.java
@@ -21,7 +21,6 @@ package org.apache.myfaces.tobago.apt.processor;
import org.antlr.stringtemplate.StringTemplate;
import org.antlr.stringtemplate.StringTemplateGroup;
-import org.apache.commons.io.IOUtils;
import org.apache.myfaces.tobago.apt.annotation.Behavior;
import org.apache.myfaces.tobago.apt.annotation.DynamicExpression;
import org.apache.myfaces.tobago.apt.annotation.Tag;
@@ -288,16 +287,11 @@ public class ClassesGenerator extends AbstractGenerator {
}
private void writeFile(final ClassInfo info, final StringTemplate stringTemplate) throws IOException {
- Writer writer = null;
- try {
- final FileObject resource = processingEnv.getFiler().createSourceFile(
- info.getPackageName() + '.' + info.getClassName());
- info("Writing to file: " + resource.toUri());
- writer = resource.openWriter();
-
+ final FileObject resource = processingEnv.getFiler().createSourceFile(
+ info.getPackageName() + '.' + info.getClassName());
+ info("Writing to file: " + resource.toUri());
+ try (Writer writer = resource.openWriter()) {
writer.append(stringTemplate.toString());
- } finally {
- IOUtils.closeQuietly(writer);
}
}
}
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
index d587c20..9d80ab7 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/FacesConfigGenerator.java
@@ -49,6 +49,7 @@ import java.io.IOException;
import java.io.StringReader;
import java.io.StringWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -151,7 +152,7 @@ public class FacesConfigGenerator extends AbstractGenerator {
@Override
protected void generate() throws Exception {
final Document document;
- final String content = IOUtils.toString(new FileInputStream(sourceFacesConfigFile));
+ final String content = IOUtils.toString(new FileInputStream(sourceFacesConfigFile), StandardCharsets.UTF_8);
final SAXBuilder builder = new SAXBuilder();
document = builder.build(new StringReader(content));
diff --git a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
index 348e817..4589d44 100644
--- a/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
+++ b/tobago-tool/tobago-tool-apt/src/main/java/org/apache/myfaces/tobago/apt/processor/TaglibGenerator.java
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.apt.processor;
-import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.myfaces.tobago.apt.AnnotationUtils;
import org.apache.myfaces.tobago.apt.annotation.ConverterTag;
@@ -150,22 +149,18 @@ public class TaglibGenerator extends AbstractGenerator {
// writing the XML document
- Writer writer = null;
- try {
String target = targetTaglib;
target = StringUtils.isNotBlank(target) ? target + '/' : "";
final String name = target + taglibAnnotation.name() + ".taglib.xml";
final FileObject resource = processingEnv.getFiler().createResource(StandardLocation.SOURCE_OUTPUT, "", name);
info("Writing to file: " + resource.toUri());
- writer = resource.openWriter();
+ try (Writer writer = resource.openWriter()) {
final TransformerFactory transFactory = TransformerFactory.newInstance();
transFactory.setAttribute("indent-number", 2);
final Transformer transformer = transFactory.newTransformer();
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
transformer.transform(new DOMSource(document), new StreamResult(writer));
- } finally {
- IOUtils.closeQuietly(writer);
}
}