Drop support for Java 6

etsy · Apr 10, 2015 · 1febd8d · 1febd8d
1 parent f36cfb3
commit 1febd8d
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 34 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,4 @@
 language: java
 jdk:
     - oraclejdk8
-    - oraclejdk7
-    - openjdk6
+    - oraclejdk7
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.etsy</groupId>
     <artifactId>statsd-jvm-profiler</artifactId>
-    <version>0.7.1-SNAPSHOT</version>
+    <version>0.7.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>statsd-jvm-profiler</name>
@@ -144,8 +144,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.1</version>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.7</source>
+                    <target>1.7</target>
                 </configuration>
             </plugin>
             <plugin>

diff --git a/src/main/java/com/etsy/statsd/profiler/Agent.java b/src/main/java/com/etsy/statsd/profiler/Agent.java
@@ -37,7 +37,7 @@ public static void premain(final String args, final Instrumentation instrumentat
 
         Reporter reporter = instantiate(arguments.reporter, Reporter.CONSTRUCTOR_PARAM_TYPES, server, port, prefix, arguments);
 
-        Collection<Profiler> profilers = new ArrayList<Profiler>();
+        Collection<Profiler> profilers = new ArrayList<>();
         for (Class<? extends Profiler> profiler : arguments.profilers) {
             profilers.add(instantiate(profiler, Profiler.CONSTRUCTOR_PARAM_TYPES, reporter, arguments));
         }
@@ -96,13 +96,7 @@ private static <T> T instantiate(final Class<T> clazz, Class<?>[] parameterTypes
         try {
             Constructor<T> constructor = clazz.getConstructor(parameterTypes);
             return constructor.newInstance(initArgs);
-        } catch (NoSuchMethodException e) {
-            handleInitializationException(clazz, e);
-        } catch (InvocationTargetException e) {
-            handleInitializationException(clazz, e);
-        } catch (InstantiationException e) {
-            handleInitializationException(clazz, e);
-        } catch (IllegalAccessException e) {
+        } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
             handleInitializationException(clazz, e);
         }
 

diff --git a/src/main/java/com/etsy/statsd/profiler/Arguments.java b/src/main/java/com/etsy/statsd/profiler/Arguments.java
@@ -29,7 +29,7 @@ public class Arguments {
      * @return An Arguments object representing the given arguments
      */
     public static Arguments parseArgs(final String args) {
-        Map<String, String> parsed = new HashMap<String, String>();
+        Map<String, String> parsed = new HashMap<>();
         for (String argPair : args.split(",")) {
             String[] tokens = argPair.split("=");
             if (tokens.length != 2) {
@@ -89,7 +89,7 @@ private Class<? extends Reporter<?>> parserReporterArg(String reporterArg) {
 
     @SuppressWarnings("unchecked")
     private Set<Class<? extends Profiler>> parseProfilerArg(String profilerArg) {
-        Set<Class<? extends Profiler>> profilers = new HashSet<Class<? extends Profiler>>();
+        Set<Class<? extends Profiler>> profilers = new HashSet<>();
         if (profilerArg == null) {
             profilers.add(CPUProfiler.class);
             profilers.add(MemoryProfiler.class);

diff --git a/src/main/java/com/etsy/statsd/profiler/profilers/CPUProfiler.java b/src/main/java/com/etsy/statsd/profiler/profilers/CPUProfiler.java
@@ -99,7 +99,7 @@ protected void handleArguments(Arguments arguments) {
      */
     private List<String> parsePackageList(String packages) {
         if (packages == null) {
-            return new ArrayList<String>();
+            return new ArrayList<>();
         } else {
             return Arrays.asList(packages.split(":"));
         }

diff --git a/src/main/java/com/etsy/statsd/profiler/util/CPUTraces.java b/src/main/java/com/etsy/statsd/profiler/util/CPUTraces.java
@@ -15,8 +15,8 @@ public class CPUTraces {
     private Set<String> dirtyTraces;
 
     public CPUTraces() {
-        traces = new HashMap<String, Long>();
-        dirtyTraces = new HashSet<String>();
+        traces = new HashMap<>();
+        dirtyTraces = new HashSet<>();
     }
 
     /**
@@ -38,7 +38,7 @@ public void increment(String traceKey, long inc) {
      * @param flushAll Indicate if all data, not just deltas, should be flushed
      */
     public Map<String, Long> getDataToFlush(boolean flushAll) {
-        Map<String, Long> result = new HashMap<String, Long>();
+        Map<String, Long> result = new HashMap<>();
         if (flushAll) {
             result = traces;
         } else {

diff --git a/src/main/java/com/etsy/statsd/profiler/util/StackTraceFormatter.java b/src/main/java/com/etsy/statsd/profiler/util/StackTraceFormatter.java
@@ -28,7 +28,7 @@ public static String formatStackTraceElement(StackTraceElement element) {
      * @return A String representing the given stack trace
      */
     public static String formatStackTrace(StackTraceElement[] stack) {
-        List<String> lines = new ArrayList<String>();
+        List<String> lines = new ArrayList<>();
         for (StackTraceElement element : stack) {
             lines.add(formatStackTraceElement(element));
         }

diff --git a/src/test/java/com/etsy/statsd/profiler/ArgumentsTest.java b/src/test/java/com/etsy/statsd/profiler/ArgumentsTest.java
@@ -66,7 +66,7 @@ public void testDefaultProfilers() {
         String args = "server=localhost,port=8125";
         Arguments arguments = Arguments.parseArgs(args);
 
-        Set<Class<? extends Profiler>> expected = new HashSet<Class<? extends Profiler>>();
+        Set<Class<? extends Profiler>> expected = new HashSet<>();
         expected.add(CPUProfiler.class);
         expected.add(MemoryProfiler.class);
 
@@ -78,7 +78,7 @@ public void testProfilerWithPackage() {
         String args = "server=localhost,port=8125,profilers=com.etsy.statsd.profiler.profilers.CPUProfiler";
         Arguments arguments = Arguments.parseArgs(args);
 
-        Set<Class<? extends Profiler>> expected = new HashSet<Class<? extends Profiler>>();
+        Set<Class<? extends Profiler>> expected = new HashSet<>();
         expected.add(CPUProfiler.class);
 
         assertEquals(expected, arguments.profilers);
@@ -89,7 +89,7 @@ public void testProfilerWithoutPackage() {
         String args = "server=localhost,port=8125,profilers=MemoryProfiler";
         Arguments arguments = Arguments.parseArgs(args);
 
-        Set<Class<? extends Profiler>> expected = new HashSet<Class<? extends Profiler>>();
+        Set<Class<? extends Profiler>> expected = new HashSet<>();
         expected.add(MemoryProfiler.class);
 
         assertEquals(expected, arguments.profilers);
@@ -100,7 +100,7 @@ public void testMultipleProfilers() {
         String args = "server=localhost,port=8125,profilers=CPUProfiler:MemoryProfiler";
         Arguments arguments = Arguments.parseArgs(args);
 
-        Set<Class<? extends Profiler>> expected = new HashSet<Class<? extends Profiler>>();
+        Set<Class<? extends Profiler>> expected = new HashSet<>();
         expected.add(CPUProfiler.class);
         expected.add(MemoryProfiler.class);
 

diff --git a/src/test/java/com/etsy/statsd/profiler/reporter/MockReporter.java b/src/test/java/com/etsy/statsd/profiler/reporter/MockReporter.java
@@ -16,7 +16,7 @@ public class MockReporter extends Reporter<String> {
 
     public MockReporter() {
         super("", 1, "", null);
-        output = new HashMap<String, Long>();
+        output = new HashMap<>();
     }
 
     @Override

diff --git a/src/test/java/com/etsy/statsd/profiler/reporter/ReporterTest.java b/src/test/java/com/etsy/statsd/profiler/reporter/ReporterTest.java
@@ -18,7 +18,7 @@ public void testReporter() {
         profiler.profile();
         profiler.flushData();
 
-        Map<String, Long> expected = new HashMap<String, Long>();
+        Map<String, Long> expected = new HashMap<>();
         expected.put("profile", 1L);
         expected.put("flushData", 1L);
         assertEquals(expected, mockReporter.getOutput());

diff --git a/src/test/java/com/etsy/statsd/profiler/util/CPUTracesTest.java b/src/test/java/com/etsy/statsd/profiler/util/CPUTracesTest.java
@@ -21,7 +21,7 @@ public void testGetDataToFlush() {
         traces.increment("key", 1);
         traces.increment("key2", 3);
 
-        Map<String, Long> expectedMap = new HashMap<String, Long>();
+        Map<String, Long> expectedMap = new HashMap<>();
         expectedMap.put("key", 1L);
         expectedMap.put("key2", 3L);
 
@@ -30,7 +30,7 @@ public void testGetDataToFlush() {
         traces.increment("key", 1);
         traces.increment("key2", 3);
 
-        expectedMap = new HashMap<String, Long>();
+        expectedMap = new HashMap<>();
         expectedMap.put("key", 2L);
         expectedMap.put("key2", 6L);
 
@@ -39,7 +39,7 @@ public void testGetDataToFlush() {
         traces.increment("key3", 100);
         traces.increment("key2", 3);
 
-        expectedMap = new HashMap<String, Long>();
+        expectedMap = new HashMap<>();
         expectedMap.put("key", 2L);
         expectedMap.put("key2", 9L);
         expectedMap.put("key3", 100L);

diff --git a/src/test/java/com/etsy/statsd/profiler/util/MapUtilTest.java b/src/test/java/com/etsy/statsd/profiler/util/MapUtilTest.java
@@ -11,7 +11,7 @@ public class MapUtilTest {
 
     @Test
     public void testSetOrIncrementMap() {
-        Map<String, Long> map = new HashMap<String, Long>();
+        Map<String, Long> map = new HashMap<>();
         MapUtil.setOrIncrementMap(map, "key", 1);
         assertEquals(new Long(1L), map.get("key"));
 

diff --git a/src/test/java/com/etsy/statsd/profiler/worker/ProfilerShutdownHookWorkerTest.java b/src/test/java/com/etsy/statsd/profiler/worker/ProfilerShutdownHookWorkerTest.java
@@ -15,7 +15,7 @@
 public class ProfilerShutdownHookWorkerTest {
     @Test
     public void testRunnable() throws InterruptedException {
-        Set<String> output = new HashSet<String>();
+        Set<String> output = new HashSet<>();
         Profiler mockProfiler1 = new MockProfiler1(output);
         Profiler mockProfiler2 = new MockProfiler2(output);
         Collection<Profiler> profilers = Arrays.asList(mockProfiler1, mockProfiler2);
@@ -24,7 +24,7 @@ public void testRunnable() throws InterruptedException {
         t.run();
         t.join();
 
-        Set<String> expectedOutput = new HashSet<String>();
+        Set<String> expectedOutput = new HashSet<>();
         expectedOutput.add(MockProfiler1.class.getSimpleName() + "-flushData");
         expectedOutput.add(MockProfiler2.class.getSimpleName() + "-flushData");
         assertEquals(expectedOutput, output);

diff --git a/src/test/java/com/etsy/statsd/profiler/worker/ProfilerWorkerThreadTest.java b/src/test/java/com/etsy/statsd/profiler/worker/ProfilerWorkerThreadTest.java
@@ -12,14 +12,14 @@
 public class ProfilerWorkerThreadTest {
     @Test
     public void testRunnable() throws InterruptedException {
-        Set<String> output = new HashSet<String>();
+        Set<String> output = new HashSet<>();
         Profiler mockProfiler1 = new MockProfiler1(output);
 
         Thread t = new Thread(new ProfilerWorkerThread(mockProfiler1));
         t.run();
         t.join();
 
-        Set<String> expectedOutput = new HashSet<String>();
+        Set<String> expectedOutput = new HashSet<>();
         expectedOutput.add(MockProfiler1.class.getSimpleName() + "-profile");
         assertEquals(expectedOutput, output);
     }