From ca777d7967cde66ebfb5001ebf04ea93e9152346 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Fri, 24 Feb 2017 00:52:22 +0100 Subject: [PATCH] no effective code change: add some try-with resources (#978) * no effective code change: add some try-with resources * moved return statement outside try-with-resources, because otherwise the order changes --- src/main/java/io/ebean/dbmigration/DbMigration.java | 8 ++++---- .../migrationreader/MigrationXmlReader.java | 6 ++---- .../migrationreader/MigrationXmlWriter.java | 5 +---- src/main/java/io/ebean/text/json/EJsonWriter.java | 3 +-- .../server/changelog/ChangeJsonBuilder.java | 12 ++++++------ .../server/deploy/BeanDescriptorManager.java | 6 +++--- .../ebeaninternal/server/persist/BatchedPstmt.java | 9 ++------- .../server/readaudit/DefaultReadAuditLogger.java | 6 ++---- .../ebeaninternal/server/text/json/DJsonContext.java | 8 +++----- .../io/ebeaninternal/server/type/RsetDataReader.java | 10 ++++------ .../io/ebeaninternal/server/type/ScalarTypeFile.java | 8 ++++---- .../server/type/ScalarTypeJsonNode.java | 7 ++----- 12 files changed, 34 insertions(+), 54 deletions(-) diff --git a/src/main/java/io/ebean/dbmigration/DbMigration.java b/src/main/java/io/ebean/dbmigration/DbMigration.java index b595b41c8..ef597deca 100644 --- a/src/main/java/io/ebean/dbmigration/DbMigration.java +++ b/src/main/java/io/ebean/dbmigration/DbMigration.java @@ -263,10 +263,10 @@ public class DbMigration { logger.info("writing repeatable script {}", fullName); File file = new File(migrationDir, fullName); - FileWriter writer = new FileWriter(file); - writer.write(script.getValue()); - writer.flush(); - writer.close(); + try (FileWriter writer = new FileWriter(file)) { + writer.write(script.getValue()); + writer.flush(); + } } private String repeatableMigrationName(String scriptName) { diff --git a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java index 0860f6abf..a3f718e7b 100644 --- a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java +++ b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlReader.java @@ -37,10 +37,8 @@ public class MigrationXmlReader { */ public static Migration read(File migrationFile) { - try { - try (FileInputStream is = new FileInputStream(migrationFile)) { - return read(is); - } + try (FileInputStream is = new FileInputStream(migrationFile)) { + return read(is); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java index 67071d3cd..f3737f2d4 100644 --- a/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java +++ b/src/main/java/io/ebean/dbmigration/migrationreader/MigrationXmlWriter.java @@ -26,9 +26,8 @@ public class MigrationXmlWriter { */ public void write(Migration migration, File file) { - try { + try (FileWriter writer = new FileWriter(file)) { - FileWriter writer = new FileWriter(file); writer.write("\n"); writer.write("\n"); if (comment != null) { @@ -44,8 +43,6 @@ public class MigrationXmlWriter { marshaller.marshal(migration, writer); - writer.close(); - } catch (IOException | JAXBException e) { throw new RuntimeException(e); } diff --git a/src/main/java/io/ebean/text/json/EJsonWriter.java b/src/main/java/io/ebean/text/json/EJsonWriter.java index fb548c460..2e9d7b87c 100644 --- a/src/main/java/io/ebean/text/json/EJsonWriter.java +++ b/src/main/java/io/ebean/text/json/EJsonWriter.java @@ -23,8 +23,7 @@ class EJsonWriter { static String write(Object object) throws IOException { StringWriter writer = new StringWriter(200); - JsonGenerator jsonGenerator = write(object, writer); - jsonGenerator.close(); + write(object, writer).close(); return writer.toString(); } diff --git a/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java b/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java index ddfa3d980..cf43f271c 100644 --- a/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java +++ b/src/main/java/io/ebeaninternal/server/changelog/ChangeJsonBuilder.java @@ -30,12 +30,12 @@ public class ChangeJsonBuilder { */ public void writeBeanJson(Writer writer, BeanChange bean, ChangeSet changeSet, int position) throws IOException { - JsonGenerator generator = jsonFactory.createGenerator(writer); - - writeBeanChange(generator, bean, changeSet, position); - - generator.flush(); - generator.close(); + try (JsonGenerator generator = jsonFactory.createGenerator(writer)) { + + writeBeanChange(generator, bean, changeSet, position); + + generator.flush(); + } } /** diff --git a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java index 91eb1f879..132c9ac46 100644 --- a/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java +++ b/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorManager.java @@ -359,9 +359,9 @@ public class BeanDescriptorManager implements BeanDescriptorMap { List mappings = new ArrayList<>(); while (resources.hasMoreElements()) { URL url = resources.nextElement(); - InputStream is = url.openStream(); - mappings.add(XmlMappingReader.read(is)); - is.close(); + try (InputStream is = url.openStream()) { + mappings.add(XmlMappingReader.read(is)); + } } for (XmEbean mapping : mappings) { diff --git a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java index 94f0aef3e..f96cebcaa 100644 --- a/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java +++ b/src/main/java/io/ebeaninternal/server/persist/BatchedPstmt.java @@ -115,18 +115,13 @@ public class BatchedPstmt { private void getGeneratedKeys() throws SQLException { int index = 0; - ResultSet rset = pstmt.getGeneratedKeys(); - try { + try (ResultSet rset = pstmt.getGeneratedKeys()) { while (rset.next()) { Object idValue = rset.getObject(1); list.get(index).setGeneratedKey(idValue); index++; } - } finally { - if (rset != null) { - rset.close(); - } - } + } } } diff --git a/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java b/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java index 05f0b9646..64a9072eb 100644 --- a/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java +++ b/src/main/java/io/ebeaninternal/server/readaudit/DefaultReadAuditLogger.java @@ -35,9 +35,8 @@ public class DefaultReadAuditLogger implements ReadAuditLogger { */ @Override public void queryPlan(ReadAuditQueryPlan queryPlan) { - try { - StringWriter writer = new StringWriter(defaultQueryBuffer); - JsonGenerator gen = jsonFactory.createGenerator(writer); + StringWriter writer = new StringWriter(defaultQueryBuffer); + try (JsonGenerator gen = jsonFactory.createGenerator(writer)) { gen.writeStartObject(); String beanType = queryPlan.getBeanType(); @@ -54,7 +53,6 @@ public class DefaultReadAuditLogger implements ReadAuditLogger { } gen.writeEndObject(); gen.flush(); - gen.close(); queryLogger.info(writer.toString()); diff --git a/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java index 343783648..b0f3ae793 100644 --- a/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java +++ b/src/main/java/io/ebeaninternal/server/text/json/DJsonContext.java @@ -303,15 +303,13 @@ public class DJsonContext implements JsonContext { } private String toJsonString(Object value, JsonWriteOptions options) throws JsonIOException { - try { - StringWriter writer = new StringWriter(500); - JsonGenerator gen = createGenerator(writer); + StringWriter writer = new StringWriter(500); + try (JsonGenerator gen = createGenerator(writer)){ toJsonInternal(value, gen, options); - gen.close(); - return writer.toString(); } catch (IOException e) { throw new JsonIOException(e); } + return writer.toString(); } @SuppressWarnings("unchecked") diff --git a/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java index 2d5b5e3b4..36cb9388d 100644 --- a/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java +++ b/src/main/java/io/ebeaninternal/server/type/RsetDataReader.java @@ -217,11 +217,10 @@ public class RsetDataReader implements DataReader { protected byte[] getBinaryLob(InputStream in) throws SQLException { - try { - if (in == null) { - return null; - } - ByteArrayOutputStream out = new ByteArrayOutputStream(); + if (in == null) { + return null; + } + try (ByteArrayOutputStream out = new ByteArrayOutputStream()) { byte[] buf = new byte[bufferSize]; int len; @@ -234,7 +233,6 @@ public class RsetDataReader implements DataReader { data = null; } in.close(); - out.close(); return data; } catch (IOException e) { diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java index 4ad941c27..4b711c76f 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeFile.java @@ -124,10 +124,10 @@ public class ScalarTypeFile extends ScalarTypeBase { @Override public File jsonRead(JsonParser parser) throws IOException { File tempFile = File.createTempFile(prefix, suffix, directory); - OutputStream os = getOutputStream(tempFile); - parser.readBinaryValue(os); - os.flush(); - os.close(); + try (OutputStream os = getOutputStream(tempFile)) { + parser.readBinaryValue(os); + os.flush(); + } return tempFile; } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java index 83626f03b..309dbb786 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJsonNode.java @@ -68,11 +68,8 @@ public abstract class ScalarTypeJsonNode extends ScalarTypeBase { if (is == null) { return null; } - try { - InputStreamReader reader = new InputStreamReader(is); - JsonNode tree = parse(reader); - reader.close(); - return tree; + try (InputStreamReader reader = new InputStreamReader(is)) { + return parse(reader); } catch (IOException e) { throw new SQLException("Error reading Blob stream from DB", e); }