This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git commit 07cbdf3562f34c05ac390bb2a2b8d8dfa120331c Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 26 10:34:20 2016 +0200 Let's define java level to 1.6 (Fixes #3934) --- pom.xml | 4 ++-- src/main/java/org/nuiton/util/FileUtil.java | 9 ++++++++- src/main/java/org/nuiton/util/beans/Binder.java | 2 +- src/main/java/org/nuiton/util/beans/BinderModelBuilder.java | 2 +- src/main/java/org/nuiton/util/version/VersionComparator.java | 2 +- src/test/java/org/nuiton/util/ResourceTest.java | 2 +- src/test/java/org/nuiton/util/beans/BinderTest.java | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index c0ed0c5..cf55fcd 100644 --- a/pom.xml +++ b/pom.xml @@ -132,8 +132,8 @@ <ciViewId>nuiton-utils</ciViewId> <!-- Java level --> - <javaVersion>1.7</javaVersion> - <signatureArtifactId>java17</signatureArtifactId> + <javaVersion>1.6</javaVersion> + <signatureArtifactId>java16</signatureArtifactId> <signatureVersion>1.0</signatureVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> diff --git a/src/main/java/org/nuiton/util/FileUtil.java b/src/main/java/org/nuiton/util/FileUtil.java index 7799ef0..2e0ee33 100644 --- a/src/main/java/org/nuiton/util/FileUtil.java +++ b/src/main/java/org/nuiton/util/FileUtil.java @@ -23,6 +23,7 @@ package org.nuiton.util; import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; @@ -1361,10 +1362,16 @@ public class FileUtil { // FileUtil */ public static boolean isGzipFile(File file) throws IOException { - try (InputStream in = new BufferedInputStream(new FileInputStream(file))) { + InputStream in = new BufferedInputStream(new FileInputStream(file)); + + try { boolean gzip = GZUtil.isGzipStream(in); + in.close(); return gzip; + } finally { + IOUtils.closeQuietly(in); } + } } // FileUtil diff --git a/src/main/java/org/nuiton/util/beans/Binder.java b/src/main/java/org/nuiton/util/beans/Binder.java index b94131a..f8c6cc6 100644 --- a/src/main/java/org/nuiton/util/beans/Binder.java +++ b/src/main/java/org/nuiton/util/beans/Binder.java @@ -853,7 +853,7 @@ public class Binder<I, O> implements Serializable { propertiesMapping = new TreeMap<String, String>(); collectionStrategies = new TreeMap<String, CollectionStrategy>(); binders = new TreeMap<String, Binder<?, ?>>(); - functions = new LinkedHashMap<>(); + functions = new LinkedHashMap<Class<?>, Function<?, ?>>(); } /** diff --git a/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java b/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java index e0b068a..e98e531 100644 --- a/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java +++ b/src/main/java/org/nuiton/util/beans/BinderModelBuilder.java @@ -472,7 +472,7 @@ public class BinderModelBuilder<S, T> { */ public BinderModelBuilder<T, S> buildInverseModelBuilder() { - BinderModelBuilder<T, S> builder = new BinderModelBuilder<>(model.getTargetType(), model.getSourceType()) + BinderModelBuilder<T, S> builder = new BinderModelBuilder<T, S>(model.getTargetType(), model.getSourceType()) .canTypeMismatch(canTypeMismatch); for (Map.Entry<String, String> entry : model.getPropertiesMapping().entrySet()) { diff --git a/src/main/java/org/nuiton/util/version/VersionComparator.java b/src/main/java/org/nuiton/util/version/VersionComparator.java index 34b48b2..8b19d01 100644 --- a/src/main/java/org/nuiton/util/version/VersionComparator.java +++ b/src/main/java/org/nuiton/util/version/VersionComparator.java @@ -208,7 +208,7 @@ public class VersionComparator implements Comparator<Version>, Serializable { */ public static void main(String... args) { - List<Version> versions = new ArrayList<>(); + List<Version> versions = new ArrayList<Version>(); for (String arg : args) { Version version = Versions.valueOf(arg); versions.add(version); diff --git a/src/test/java/org/nuiton/util/ResourceTest.java b/src/test/java/org/nuiton/util/ResourceTest.java index 14cfed4..67276ae 100644 --- a/src/test/java/org/nuiton/util/ResourceTest.java +++ b/src/test/java/org/nuiton/util/ResourceTest.java @@ -71,7 +71,7 @@ public class ResourceTest { // ResourceTest String javaExecFilename = getJavaExecName(); - url = Resource.getURL("README.txt"); + url = Resource.getURL("README.md"); Assert.assertNotNull(url); try { diff --git a/src/test/java/org/nuiton/util/beans/BinderTest.java b/src/test/java/org/nuiton/util/beans/BinderTest.java index b2daae4..038848c 100644 --- a/src/test/java/org/nuiton/util/beans/BinderTest.java +++ b/src/test/java/org/nuiton/util/beans/BinderTest.java @@ -230,7 +230,7 @@ public class BinderTest { @Test public void testInjectProperties() { - ImmutableMap.Builder<String, Object> builder = new ImmutableMap.Builder<>(); + ImmutableMap.Builder<String, Object> builder = new ImmutableMap.Builder<String, Object>(); builder.put(BeanA.PROPERTY_A, "a"); Assert.assertNull(a.getA()); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.