You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2018/12/04 04:54:34 UTC
[03/12] tomee git commit: Added diamond operator usage to the OpenEJB
Container Core project, where appropriate
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java
index f3dd5d5..b7ed410 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/OptionsTest.java
@@ -214,7 +214,7 @@ public class OptionsTest extends TestCase {
// Just to test if the logging works as expected
private static class TestLog implements Options.Log {
- private final List<Message> messages = new ArrayList<Message>();
+ private final List<Message> messages = new ArrayList<>();
public boolean isDebugEnabled() {
return isInfoEnabled();
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
index 6dc08cd..a24e352 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/PoolTest.java
@@ -60,7 +60,7 @@ public class PoolTest extends TestCase {
System.out.println("PoolTest.testEmptyPool");
final int max = 4;
final int min = 2;
- final Pool<Bean> pool = new Pool<Bean>(max, min, true);
+ final Pool<Bean> pool = new Pool<>(max, min, true);
final List<Pool<Bean>.Entry> entries = drain(pool);
@@ -167,7 +167,7 @@ public class PoolTest extends TestCase {
private void exerciseStrictPool(final int max, final int min) throws InterruptedException {
Bean.instances.set(0);
- final Pool<String> pool = new Pool<String>(max, min, true);
+ final Pool<String> pool = new Pool<>(max, min, true);
// Fill the pool
for (int i = 0; i < max; i++) {
@@ -279,7 +279,7 @@ public class PoolTest extends TestCase {
final int sweepInterval = 200;
final int pause = 1000;
- final List<Bean> discarded = new CopyOnWriteArrayList<Bean>();
+ final List<Bean> discarded = new CopyOnWriteArrayList<>();
final CountDownLatch discard = new CountDownLatch(max);
final Pool.Builder builder = new Pool.Builder();
builder.setMinSize(min);
@@ -344,11 +344,11 @@ public class PoolTest extends TestCase {
final int idleTimeout = 1000;
final int sweepInterval = idleTimeout / 4;
- final List<Bean> discarded = new CopyOnWriteArrayList<Bean>();
+ final List<Bean> discarded = new CopyOnWriteArrayList<>();
final CountDownLatch discard = new CountDownLatch(max - min);
final CountDownLatch hold = new CountDownLatch(1);
- final Pool.Builder<Bean> builder = new Pool.Builder<Bean>();
+ final Pool.Builder<Bean> builder = new Pool.Builder<>();
builder.setMinSize(min);
builder.setMaxSize(max);
builder.setExecutor(Executors.newFixedThreadPool(5));
@@ -431,7 +431,7 @@ public class PoolTest extends TestCase {
final int max = 9;
final int sweepInterval = 200;
- final List<Bean> discarded = new CopyOnWriteArrayList<Bean>();
+ final List<Bean> discarded = new CopyOnWriteArrayList<>();
final CountDownLatch discard = new CountDownLatch(max);
final CountDownLatch created = new CountDownLatch(min);
final CountDownLatch createInstances = new CountDownLatch(1);
@@ -566,7 +566,7 @@ public class PoolTest extends TestCase {
final int maxAge = 1000;
final int sweepInterval = maxAge / 4;
- final List<Bean> discarded = new CopyOnWriteArrayList<Bean>();
+ final List<Bean> discarded = new CopyOnWriteArrayList<>();
final CountDownLatch discard = new CountDownLatch(max);
final CountDownLatch created = new CountDownLatch(min);
final CountDownLatch createInstances = new CountDownLatch(1);
@@ -1329,7 +1329,7 @@ public class PoolTest extends TestCase {
}
private static <T> List<Pool<T>.Entry> getMin(final List<Pool<T>.Entry> entries) {
- final List<Pool<T>.Entry> list = new ArrayList<Pool<T>.Entry>();
+ final List<Pool<T>.Entry> list = new ArrayList<>();
for (final Pool<T>.Entry entry : entries) {
if (entry != null && entry.hasHardReference()) list.add(entry);
@@ -1353,7 +1353,7 @@ public class PoolTest extends TestCase {
}
private static <T> List<Pool<T>.Entry> drain(final Pool<T> pool, final int timeout) throws InterruptedException {
- final List<Pool<T>.Entry> entries = new ArrayList<Pool<T>.Entry>();
+ final List<Pool<T>.Entry> entries = new ArrayList<>();
try {
while (true) {
entries.add(pool.pop(timeout, MILLISECONDS));
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/test/java/org/apache/openejb/util/PropertiesTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/PropertiesTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/PropertiesTest.java
index c3f0866..5579f38 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/PropertiesTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/PropertiesTest.java
@@ -348,7 +348,7 @@ public class PropertiesTest extends TestCase {
final StringBuilder message = new StringBuilder().append("\n");
- final Set<String> keys = new TreeSet<String>();
+ final Set<String> keys = new TreeSet<>();
keys.addAll(new HashSet(expected.keySet()));
keys.addAll(new HashSet(actual.keySet()));
for (final String key : keys) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java
index 5770eb5..24f23be 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/ReferencesTest.java
@@ -36,13 +36,13 @@ public class ReferencesTest extends TestCase {
private List<Bean> beans;
public void testEmptyList() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
assertEquals(0, sort(beans, visitor).size());
}
public void test() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean a = bean("a");
final Bean b = bean("b", "a");
@@ -54,7 +54,7 @@ public class ReferencesTest extends TestCase {
public void testSimple() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean c = bean("c", "b", "a");
final Bean b = bean("b", "a");
@@ -67,7 +67,7 @@ public class ReferencesTest extends TestCase {
public void testOrder() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean c = bean("c", "b", "a");
final Bean b = bean("b", "a");
@@ -85,7 +85,7 @@ public class ReferencesTest extends TestCase {
public void testOrder2() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean c = bean("c", "b", "a");
final Bean a = bean("a");
@@ -103,7 +103,7 @@ public class ReferencesTest extends TestCase {
public void testCircuit() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean a = bean("a", "c");
final Bean b = bean("b", "a");
@@ -121,7 +121,7 @@ public class ReferencesTest extends TestCase {
public void testCircuit2() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean a = bean("a", "c");
final Bean b = bean("b", "a");
@@ -144,7 +144,7 @@ public class ReferencesTest extends TestCase {
public void testCircuit3() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean a = bean("a", "a", "b", "c");
final Bean b = bean("b", "a", "b", "c");
@@ -171,7 +171,7 @@ public class ReferencesTest extends TestCase {
public void testNonSuchObject() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean a = bean("a");
final Bean b = bean("b", "a");
@@ -190,7 +190,7 @@ public class ReferencesTest extends TestCase {
// this test needs to pass
public void testNoReferences() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean b = bean("b");
final Bean a = bean("a");
@@ -208,7 +208,7 @@ public class ReferencesTest extends TestCase {
// this should pass but doesn't
public void testOrderedReferences() {
- beans = new ArrayList<Bean>();
+ beans = new ArrayList<>();
final Bean b = bean("b");
final Bean a = bean("a");
@@ -239,7 +239,7 @@ public class ReferencesTest extends TestCase {
public Bean(final String name, final String... refs) {
this.name = name;
- this.refs = new LinkedHashSet<String>(refs.length);
+ this.refs = new LinkedHashSet<>(refs.length);
for (final String s : refs) {
this.refs.add(s);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/test/java/org/apache/openejb/util/SuperPropertiesTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/SuperPropertiesTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/SuperPropertiesTest.java
index 43bcbfa..60c24a6 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/SuperPropertiesTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/SuperPropertiesTest.java
@@ -356,7 +356,7 @@ public class SuperPropertiesTest extends PropertiesTest {
}
protected static Map<String, String> map(final String... keysAndValues) {
- final Map<String, String> map = new LinkedHashMap<String, String>();
+ final Map<String, String> map = new LinkedHashMap<>();
for (int i = 0; i + 1 < keysAndValues.length; i += 2) {
final String key = keysAndValues[i];
final String value = keysAndValues[i + 1];
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java
index a89fbd0..8fe8aa1 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/UrlComparatorTest.java
@@ -28,7 +28,7 @@ import java.util.Collections;
public class UrlComparatorTest extends TestCase {
public void test() throws Exception {
- final ArrayList<URL> urls = new ArrayList<URL>();
+ final ArrayList<URL> urls = new ArrayList<>();
urls.add(new URL("file:///Users/lblack/four"));
urls.add(new URL("file:///Users/jstuart/two"));
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/test/java/org/apache/openejb/util/WebArchives.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/WebArchives.java b/container/openejb-core/src/test/java/org/apache/openejb/util/WebArchives.java
index 33bad64..351a51d 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/WebArchives.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/WebArchives.java
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNotNull;
public class WebArchives {
public static File warArchive(final Class... classes) throws IOException {
- return warArchive(new HashMap<String, String>(), "temp", classes);
+ return warArchive(new HashMap<>(), "temp", classes);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java
index 96c2187..b0fc94c 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/LocalBeanProxyFactoryTest.java
@@ -84,7 +84,7 @@ public class LocalBeanProxyFactoryTest extends TestCase {
private class TestInvocationHandler implements InvocationHandler {
private final Object object;
- private final List<Call> calls = new ArrayList<Call>();
+ private final List<Call> calls = new ArrayList<>();
public TestInvocationHandler(final Object object) {
super();
@@ -825,11 +825,11 @@ public class LocalBeanProxyFactoryTest extends TestCase {
@Test
public void testGenericCollections() throws Exception {
- final List<ProxyTestObject> value = new ArrayList<ProxyTestObject>();
+ final List<ProxyTestObject> value = new ArrayList<>();
value.add(new ProxyTestObject("test1"));
value.add(new ProxyTestObject("test2"));
- final List<ProxyTestObject> expectedResult = new ArrayList<ProxyTestObject>();
+ final List<ProxyTestObject> expectedResult = new ArrayList<>();
expectedResult.add(new ProxyTestObject("test2"));
expectedResult.add(new ProxyTestObject("test1"));
http://git-wip-us.apache.org/repos/asf/tomee/blob/bfb1ed40/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/SampleLocalBean.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/SampleLocalBean.java b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/SampleLocalBean.java
index c24cbc1..6be63ee 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/SampleLocalBean.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/util/proxy/SampleLocalBean.java
@@ -347,7 +347,7 @@ public class SampleLocalBean extends BaseLocalBean {
/* 7 test generics */
public List<ProxyTestObject> reverseList(final List<ProxyTestObject> objectList) {
- final List<ProxyTestObject> result = new ArrayList<ProxyTestObject>();
+ final List<ProxyTestObject> result = new ArrayList<>();
for (int i = objectList.size() - 1; i >= 0; i--) {
result.add(objectList.get(i));
}