You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/08/04 23:13:46 UTC

svn commit: r1615794 - /tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java

Author: rmannibucau
Date: Mon Aug  4 21:13:46 2014
New Revision: 1615794

URL: http://svn.apache.org/r1615794
Log:
java 7

Modified:
    tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java

Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java?rev=1615794&r1=1615793&r2=1615794&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/test/java/org/apache/openejb/maven/plugin/TomEEMavenPluginRule.java Mon Aug  4 21:13:46 2014
@@ -18,7 +18,6 @@ package org.apache.openejb.maven.plugin;
 
 import org.apache.maven.artifact.DefaultArtifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
@@ -28,7 +27,6 @@ import org.apache.maven.settings.io.xpp3
 import org.apache.openejb.config.RemoteServer;
 import org.apache.openejb.loader.Files;
 import org.apache.openejb.util.NetworkUtil;
-import org.apache.openejb.util.OpenEjbVersion;
 import org.junit.rules.MethodRule;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
@@ -115,14 +113,15 @@ public class TomEEMavenPluginRule implem
     }
 
     protected static abstract class TestTomEEMojo extends StartTomEEMojo {
-        final AtomicReference<Throwable> ex = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> ex = new AtomicReference<>();
 
         protected abstract void asserts() throws Throwable;
 
         public void runTest() throws Throwable {
             execute();
-            if (ex.get() != null) {
-                throw ex.get();
+            final Throwable throwable = ex.get();
+            if (throwable != null) {
+                throw throwable;
             }
         }
 
@@ -145,11 +144,8 @@ public class TomEEMavenPluginRule implem
         final File settingsXml = new File(System.getProperty("user.home") + "/.m2/settings.xml");
         if (settingsXml.exists()) {
             try {
-                final FileReader reader = new FileReader(settingsXml);
-                try {
+                try (final FileReader reader = new FileReader(settingsXml)) {
                     tomEEMojo.settings = new SettingsXpp3Reader().read(reader, false);
-                } finally {
-                    reader.close();
                 }
             } catch (final Exception e) {
                 // no-op
@@ -200,7 +196,7 @@ public class TomEEMavenPluginRule implem
         tomEEMojo.checkStarted = true;
 
         // we mock all the artifact resolution in test
-        tomEEMojo.remoteRepos = new LinkedList<ArtifactRepository>();
+        tomEEMojo.remoteRepos = new LinkedList<>();
         tomEEMojo.local = new DefaultArtifactRepository("local", tomEEMojo.settings.getLocalRepository(), new DefaultRepositoryLayout());
 
         tomEEMojo.factory = ArtifactFactory.class.cast(Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class<?>[]{ArtifactFactory.class}, new InvocationHandler() {