Java 7/8 features, given that we are now on Java 8

harmanpa · Oct 3, 2018 · c98f0ac · c98f0ac
1 parent 70ab029
commit c98f0ac
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 44 deletions.
diff --git a/src/main/java/com/github/harmanpa/jrecon/ReconReader.java b/src/main/java/com/github/harmanpa/jrecon/ReconReader.java
@@ -36,7 +36,6 @@
 import org.msgpack.core.MessagePack;
 import org.msgpack.core.MessageUnpacker;
 import org.msgpack.value.ArrayValue;
-import org.msgpack.value.ImmutableMapValue;
 import org.msgpack.value.ImmutableValue;
 import org.msgpack.value.MapValue;
 import org.msgpack.value.Value;
@@ -352,7 +351,7 @@ public final Map<String, Object> getTableMeta() {
 
         @Override
         public final Map<String, Object> getSignalMeta(String signal) {
-            return signalMeta.containsKey(signal) ? signalMeta.get(signal) : new HashMap<String, Object>();
+            return signalMeta.containsKey(signal) ? signalMeta.get(signal) : new HashMap<>();
         }
 
         @Override

diff --git a/src/main/java/com/github/harmanpa/jrecon/ReconWriter.java b/src/main/java/com/github/harmanpa/jrecon/ReconWriter.java
@@ -46,8 +46,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import org.msgpack.core.MessageBufferPacker;
 import org.msgpack.core.MessagePack;
 import org.msgpack.value.Value;

diff --git a/src/main/java/com/github/harmanpa/jrecon/WallReader.java b/src/main/java/com/github/harmanpa/jrecon/WallReader.java
@@ -279,7 +279,7 @@ protected <T> T[] getSignal(int index, Class<T> c) throws ReconException {
             }
             String signal = getSignalName(index);
             try {
-                List<T> out = new ArrayList<T>(readRows().size());
+                List<T> out = new ArrayList<>(readRows().size());
                 String transform = getSignalTransform(signal);
                 for (Row row : readRows()) {
                     if (getName().equals(row.getName())) {

diff --git a/src/main/java/com/github/harmanpa/jrecon/WallWriter.java b/src/main/java/com/github/harmanpa/jrecon/WallWriter.java
@@ -161,12 +161,7 @@ public final void addAlias(final String alias, String of, String transform) thro
             checkNotFinalized();
             checkSignalExistence(of, true);
             checkSignalExistence(alias, false);
-            if (!Sets.filter(aliases, new Predicate<Alias>() {
-                @Override
-                public boolean apply(Alias t) {
-                    return t.getAlias().equals(alias);
-                }
-            }).isEmpty()) {
+            if (!Sets.filter(aliases, (Alias t) -> t.getAlias().equals(alias)).isEmpty()) {
                 throw new ReconException("Alias already exists");
             }
             Alias a = new Alias(alias, of, transform);
@@ -181,9 +176,9 @@ public final Alias[] getAliases() {
         @Override
         public final String[] getVariables() {
             List<String> vars = Lists.newArrayList();
-            for (Alias alias : aliases) {
+            aliases.forEach((alias) -> {
                 vars.add(alias.getAlias());
-            }
+            });
             vars.addAll(signals);
             return vars.toArray(new String[0]);
         }

diff --git a/src/main/java/com/github/harmanpa/jrecon/utils/Compression.java b/src/main/java/com/github/harmanpa/jrecon/utils/Compression.java
@@ -39,20 +39,21 @@ public class Compression {
 
     public static byte[] compress(byte[] data) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream(128);
-        OutputStream os = new BZip2CompressorOutputStream(baos);
-        os.write(data);
-        os.close();
+        try (OutputStream os = new BZip2CompressorOutputStream(baos)) {
+            os.write(data);
+        }
         return baos.toByteArray();
     }
 
     public static byte[] decompress(byte[] data) throws IOException {
-        InputStream is = new BZip2CompressorInputStream(new ByteArrayInputStream(data));
-        ByteArrayOutputStream baos = new ByteArrayOutputStream(128);
-        int b;
-        while ((b = is.read()) > -1) {
-            baos.write(b);
+        ByteArrayOutputStream baos;
+        try (InputStream is = new BZip2CompressorInputStream(new ByteArrayInputStream(data))) {
+            baos = new ByteArrayOutputStream(128);
+            int b;
+            while ((b = is.read()) > -1) {
+                baos.write(b);
+            }
         }
-        is.close();
         return baos.toByteArray();
     }
 }
diff --git a/src/main/java/com/github/harmanpa/jrecon/utils/Transforms.java b/src/main/java/com/github/harmanpa/jrecon/utils/Transforms.java
@@ -74,25 +74,27 @@ public static <T> T apply(Class<T> t, T obj, String transform) throws ReconExcep
     }
 
 
+    @SuppressWarnings("UnnecessaryBoxing")
     private static <T> T inverse(T obj) throws ReconException {
         if (obj instanceof Double) {
-            return (T) Double.valueOf(-1.0 * ((Double) obj).doubleValue());
+            return (T) Double.valueOf(-1.0 * ((Double) obj));
         }
         if (obj instanceof Integer) {
-            return (T) Integer.valueOf(-1 * ((Integer) obj).intValue());
+            return (T) Integer.valueOf(-1 * ((Integer) obj));
         }
         if (obj instanceof Boolean) {
-            return (T) Boolean.valueOf(!((Boolean) obj).booleanValue());
+            return (T) Boolean.valueOf(!((Boolean) obj));
         }
         throw new ReconException("Cannot invert " + obj);
     }
 
+    @SuppressWarnings("UnnecessaryBoxing")
     private static <T> T affine(T obj, Number a, Number b) throws ReconException {
         if (obj instanceof Double) {
-            return (T) Double.valueOf(b.doubleValue() + a.doubleValue() * ((Double) obj).doubleValue());
+            return (T) Double.valueOf(b.doubleValue() + a.doubleValue() * ((Double) obj));
         }
         if (obj instanceof Integer) {
-            return (T) Integer.valueOf(b.intValue() + a.intValue() * ((Integer) obj).intValue());
+            return (T) Integer.valueOf(b.intValue() + a.intValue() * ((Integer) obj));
         }
         throw new ReconException("Cannot apply affine transform to " + obj);
     }

diff --git a/src/test/java/com/github/harmanpa/jrecon/CSVTest.java b/src/test/java/com/github/harmanpa/jrecon/CSVTest.java
@@ -37,13 +37,7 @@ public void csv2wall() {
             File f = File.createTempFile("test", ".mld");
             // Create the wall object with a file object to write to
             MeldWriter meld = new MeldWriter(f);
-            Meld.csv2meld(parser, new Function<String, String>() {
-
-                @Override
-                public String apply(String f) {
-                    return f.substring(0, f.lastIndexOf('[')).trim();
-                }
-            }, Meld.defaultValueExtractor(), meld);
+            Meld.csv2meld(parser, (String f1) -> f1.substring(0, f1.lastIndexOf('[')).trim(), Meld.defaultValueExtractor(), meld);
 
             MeldReader reader = new MeldReader(new FileRandomAccessResource(f));
             for(ReconTable table : reader.getTables().values()) {

diff --git a/src/test/java/com/github/harmanpa/jrecon/MeldReadTest.java b/src/test/java/com/github/harmanpa/jrecon/MeldReadTest.java
@@ -23,8 +23,10 @@
  */
 package com.github.harmanpa.jrecon;
 
+import com.github.harmanpa.jrecon.exceptions.ReconException;
 import com.github.harmanpa.jrecon.io.FileRandomAccessResource;
 import java.io.File;
+import java.io.FileNotFoundException;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -51,7 +53,7 @@ public void test() {
                     System.out.println("\t" + field);
                 }
             }
-        } catch (Exception ex) {
+        } catch (ReconException | FileNotFoundException ex) {
             ex.printStackTrace();
             Assert.fail(ex.getMessage());
         }

diff --git a/src/test/java/com/github/harmanpa/jrecon/MeldRemoteReadTest.java b/src/test/java/com/github/harmanpa/jrecon/MeldRemoteReadTest.java
@@ -44,6 +44,7 @@ public void test() {
             String signal = "axis1.gear.bearingFriction.flange_a.phi";
             MeldReader reader = new MeldReader(new HttpRandomAccessResource(new URI(url)));
             ReconTable table = reader.findTableForSignal(signal);
+            @SuppressWarnings("MismatchedReadAndWriteOfArray")
             Double[] t = table.getSignal("Time", Double.class);
             Double[] x = table.getSignal(signal, Double.class);
             System.out.println(x.length);

diff --git a/src/test/java/com/github/harmanpa/jrecon/MeldTest.java b/src/test/java/com/github/harmanpa/jrecon/MeldTest.java
@@ -24,7 +24,6 @@
 package com.github.harmanpa.jrecon;
 
 import com.github.harmanpa.jrecon.exceptions.ReconException;
-import com.github.harmanpa.jrecon.io.FileRandomAccessResource;
 import java.io.File;
 import java.io.IOException;
 import org.junit.Assert;

diff --git a/src/test/java/com/github/harmanpa/jrecon/MeldWriteTest.java b/src/test/java/com/github/harmanpa/jrecon/MeldWriteTest.java
@@ -24,7 +24,6 @@
 package com.github.harmanpa.jrecon;
 
 import com.github.harmanpa.jrecon.exceptions.ReconException;
-import com.github.harmanpa.jrecon.io.FileRandomAccessResource;
 import java.io.File;
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/src/test/java/com/github/harmanpa/jrecon/WallTest.java b/src/test/java/com/github/harmanpa/jrecon/WallTest.java
@@ -58,9 +58,7 @@ public void test0() {
                     System.out.println(table.getName() + ": " + signal + "=" + table.getSignal(signal).length);
                 }
             }
-        } catch (ReconException ex) {
-            Assert.fail(ex.getMessage());
-        } catch (IOException ex) {
+        } catch (ReconException | IOException ex) {
             Assert.fail(ex.getMessage());
         }
     }
@@ -126,10 +124,7 @@ public void test1() {
                 }
             }
 
-        } catch (ReconException ex) {
-            Logger.getLogger(WallTest.class.getName()).log(Level.SEVERE, null, ex);
-            Assert.fail();
-        } catch (IOException ex) {
+        } catch (ReconException | IOException ex) {
             Logger.getLogger(WallTest.class.getName()).log(Level.SEVERE, null, ex);
             Assert.fail();
         }