From 65e0cdd9dd7f6df8cfba80392c60a8aad48caf02 Mon Sep 17 00:00:00 2001 From: Alex Tighe Date: Mon, 5 Aug 2019 22:53:17 -0400 Subject: [PATCH] Committing review changes - change to try-with-resources - change the order of main method --- core-java-modules/core-java-io2/README.md | 6 - core-java-modules/core-java-io2/pom.xml | 246 +++++++++--------- .../baeldung/resource/MyResourceLoader.java | 24 +- 3 files changed, 132 insertions(+), 144 deletions(-) delete mode 100644 core-java-modules/core-java-io2/README.md diff --git a/core-java-modules/core-java-io2/README.md b/core-java-modules/core-java-io2/README.md deleted file mode 100644 index d4b417e30e..0000000000 --- a/core-java-modules/core-java-io2/README.md +++ /dev/null @@ -1,6 +0,0 @@ -========= - -## Core Java IO Cookbooks and Examples - -### Relevant Articles: -- [Reading Files Versus Loading Resources](http://www.baeldung.com/reading-files-versus-loading-resources) \ No newline at end of file diff --git a/core-java-modules/core-java-io2/pom.xml b/core-java-modules/core-java-io2/pom.xml index 8ac7b2975f..922403edab 100644 --- a/core-java-modules/core-java-io2/pom.xml +++ b/core-java-modules/core-java-io2/pom.xml @@ -1,143 +1,139 @@ - 4.0.0 - core-java-io2 - 0.1.0-SNAPSHOT - core-java-io2 - jar + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + core-java-io2 + 0.1.0-SNAPSHOT + core-java-io2 + jar - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../../parent-java - + + com.baeldung + parent-java + 0.0.1-SNAPSHOT + ../../parent-java + - - - org.apache.commons - commons-collections4 - ${commons-collections4.version} - + + + org.apache.commons + commons-collections4 + ${commons-collections4.version} + - - commons-io - commons-io - 2.6 - + + commons-io + commons-io + 2.6 + - - org.projectlombok - lombok - ${lombok.version} - provided - + + org.projectlombok + lombok + ${lombok.version} + provided + - - log4j - log4j - ${log4j.version} - + + log4j + log4j + ${log4j.version} + - - org.slf4j - log4j-over-slf4j - ${org.slf4j.version} - + + org.slf4j + log4j-over-slf4j + ${org.slf4j.version} + - + + + core-java-io2 + + + src/main/resources + true + + + + + org.codehaus.mojo + exec-maven-plugin + ${exec-maven-plugin.version} + + java + com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed + + -Xmx300m + -XX:+UseParallelGC + -classpath + + com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven-jar-plugin.version} + + + + true + com.baeldung.resource.MyResourceLoader + + + + + + + + + integration + + + + org.codehaus.mojo + exec-maven-plugin + + + run-benchmarks + + none + + exec + + + test + java + + -classpath + + org.openjdk.jmh.Main + .* + + + + + + + + + - - core-java-io2 - - - src/main/resources - true - - - - - org.codehaus.mojo - exec-maven-plugin - ${exec-maven-plugin.version} - - java - com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed - - -Xmx300m - -XX:+UseParallelGC - -classpath - - com.baeldung.outofmemoryerror.OutOfMemoryGCLimitExceed - - - + - - - org.apache.maven.plugins - maven-jar-plugin - ${maven-jar-plugin.version} - - - - true - com.baeldung.resource.MyResourceLoader - - - - - - + + 4.1 - - - integration - - - - org.codehaus.mojo - exec-maven-plugin + + 3.1.0 - - - run-benchmarks - - none - - exec - - - test - java - - -classpath - - org.openjdk.jmh.Main - .* - - - - - - - - - - - - - - 4.1 - - - 3.1.0 - - + \ No newline at end of file diff --git a/core-java-modules/core-java-io2/src/main/java/com/baeldung/resource/MyResourceLoader.java b/core-java-modules/core-java-io2/src/main/java/com/baeldung/resource/MyResourceLoader.java index 1c5b52e18b..6cb201b173 100644 --- a/core-java-modules/core-java-io2/src/main/java/com/baeldung/resource/MyResourceLoader.java +++ b/core-java-modules/core-java-io2/src/main/java/com/baeldung/resource/MyResourceLoader.java @@ -11,31 +11,29 @@ public class MyResourceLoader { private void loadFileWithReader() throws IOException { - FileReader fileReader = new FileReader("src/main/resources/input.txt"); - BufferedReader reader = new BufferedReader(fileReader); - String contents = reader.lines() - .collect(Collectors.joining(System.lineSeparator())); - reader.close(); - System.out.println(contents); + try (FileReader fileReader = new FileReader("src/main/resources/input.txt"); BufferedReader reader = new BufferedReader(fileReader)) { + String contents = reader.lines() + .collect(Collectors.joining(System.lineSeparator())); + System.out.println(contents); + } } private void loadFileAsResource() throws IOException { - InputStream inputStream = getClass().getResourceAsStream("/input.txt"); - BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream)); - String contents = reader.lines() - .collect(Collectors.joining(System.lineSeparator())); - System.out.println(contents); - + try (InputStream inputStream = getClass().getResourceAsStream("/input.txt"); BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) { + String contents = reader.lines() + .collect(Collectors.joining(System.lineSeparator())); + System.out.println(contents); + } } public static void main(String[] args) throws IOException { MyResourceLoader resourceLoader = new MyResourceLoader(); - resourceLoader.loadFileWithReader(); resourceLoader.loadFileAsResource(); + resourceLoader.loadFileWithReader(); }