You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2026/02/28 19:36:35 UTC
(tomee) 01/02: Reduce use of generic classes with omitted type params
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch tomee-10.x
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit ad47407a5263aab9c69d85ed4a4f0e455589b65f
Author: Martin Wiesner <ma...@hs-heilbronn.de>
AuthorDate: Wed Feb 25 23:31:12 2026 +0100
Reduce use of generic classes with omitted type params
(cherry picked from commit 036825aada472532b235f17d6662a1e49ec2e01b)
---
.../org/apache/openejb/InjectionProcessor.java | 2 +-
.../openejb/assembler/classic/EjbResolver.java | 4 +-
.../assembler/classic/cmd/Info2Properties.java | 2 +-
.../org/apache/openejb/config/SunConversion.java | 4 +-
.../java/org/apache/openejb/config/WsDeployer.java | 4 +-
.../config/rules/CheckIncorrectPropertyNames.java | 6 +-
.../java/org/apache/openejb/jee/Interceptor.java | 2 +-
.../openejb/junit/security/TestLoginModule.java | 10 +-
.../src/main/java/org/superbiz/FriendlyPerson.java | 3 +-
.../test/java/org/superbiz/FriendlyPersonTest.java | 3 +
.../java/org/apache/openejb/test/TestClient.java | 6 +-
.../java/org/apache/openejb/test/TestRunner.java | 3 +-
.../test/entity/cmr/ManyToManyComplexPkTests.java | 108 ++++++++++-----------
.../openejb/test/entity/cmr/ManyToManyTests.java | 108 ++++++++++-----------
.../openejb/server/ejbd/DeploymentIndex.java | 5 +-
.../openejb/server/httpd/HttpSessionImpl.java | 2 +-
.../webservices/LightWeightMappingValidator.java | 2 +-
.../openejb/server/webservices/WsdlVisitor.java | 59 +++++------
.../tomee/catalina/TomcatSecurityService.java | 2 +-
19 files changed, 166 insertions(+), 169 deletions(-)
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java b/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
index 7cc06ef7e0..fa404f8bd0 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/InjectionProcessor.java
@@ -132,7 +132,7 @@ public class InjectionProcessor<T> {
throw new OpenEJBException("Error while creating bean " + clazz.getName(), e);
}
- final Map unsetProperties = objectRecipe.getUnsetProperties();
+ final Map<String, Object> unsetProperties = objectRecipe.getUnsetProperties();
if (unsetProperties.size() > 0) {
for (final Object property : unsetProperties.keySet()) {
logger.warning("Injection: No such property '" + property + "' in class " + clazz.getName());
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
index bf6daccb08..ba5705d8b8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EjbResolver.java
@@ -187,7 +187,7 @@ public class EjbResolver {
private List<Interfaces> filter(final List<Interfaces> list, final String name) {
final String shortName = name.replaceAll(".*/", "");
- final List<Interfaces> matches = new ArrayList();
+ final List<Interfaces> matches = new ArrayList<>();
for (final Interfaces entry : list) {
if (name.equalsIgnoreCase(entry.getId())) {
matches.add(entry);
@@ -199,7 +199,7 @@ public class EjbResolver {
}
private List<Interfaces> filter(final List<Interfaces> list, final Type type) {
- final List<Interfaces> matches = new ArrayList();
+ final List<Interfaces> matches = new ArrayList<>();
for (final Interfaces entry : list) {
if (type == Type.UNKNOWN || type == entry.type) {
matches.add(entry);
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
index c2cecf9b08..c99035c15a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
@@ -269,7 +269,7 @@ public class Info2Properties {
String uri = "new://" + info.service;
if (info.service.matches("Container|Resource|Connector")) {
try {
- final Map query = new HashMap();
+ final Map<String, String> query = new HashMap<>();
query.put("type", info.types.get(0));
uri += "?" + URISupport.createQueryString(query);
} catch (final Exception e) {
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java b/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
index e528f557e8..2b574f7621 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/SunConversion.java
@@ -1089,7 +1089,7 @@ public class SunConversion implements DynamicDeployer {
return Collections.emptyList();
}
- final List bits = Collections.list(new StringTokenizer(queryParams, " \t\n\r\f,", false));
+ final List<Object> bits = Collections.list(new StringTokenizer(queryParams, " \t\n\r\f,", false));
final List<List<String>> params = new ArrayList<>(bits.size() / 2);
for (int i = 0; i < bits.size(); i++) {
final String type = resolveType((String) bits.get(i));
@@ -1166,7 +1166,7 @@ public class SunConversion implements DynamicDeployer {
private List<String> tokenize(final String queryFilter) {
final LinkedList<String> tokens = new LinkedList<>();
- final List bits = Collections.list(new StringTokenizer(queryFilter, " \t\n\r\f()&|<>=!~+-/*", true));
+ final List<Object> bits = Collections.list(new StringTokenizer(queryFilter, " \t\n\r\f()&|<>=!~+-/*", true));
boolean inWitespace = false;
StringBuilder currentSymbol = new StringBuilder();
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java b/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
index c1092ca3ca..476c35a587 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/WsDeployer.java
@@ -96,9 +96,9 @@ public class WsDeployer implements DynamicDeployer {
final String wsdlFile = serviceRef.getWsdlFile();
final Definition definition = getWsdl(module, wsdlFile);
- final Set serviceQNames = definition.getServices().keySet();
+ final Set<QName> serviceQNames = definition.getServices().keySet();
if (serviceQNames.size() == 1) {
- final QName serviceQName = (QName) serviceQNames.iterator().next();
+ final QName serviceQName = serviceQNames.iterator().next();
serviceRef.setServiceQname(serviceQName);
} else if (serviceQNames.isEmpty()) {
logger.error("The service-ref " + serviceRef.getName() + " must define service-qname because the wsdl-file " + serviceRef.getWsdlFile() + " does not constain any service definitions ");
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java
index 3d14fccf99..651a18b1e8 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/rules/CheckIncorrectPropertyNames.java
@@ -26,7 +26,7 @@ import java.util.Properties;
public class CheckIncorrectPropertyNames extends ValidationBase {
- Map incorrectAndCorrectPropNames = new HashMap<String, String>();
+ Map<String, String> incorrectAndCorrectPropNames = new HashMap<>();
{
//incorrect property key : correct property key
@@ -46,7 +46,6 @@ public class CheckIncorrectPropertyNames extends ValidationBase {
incorrectAndCorrectPropNames.put("java.xml.soap.MetaFactory", "jakarta.xml.soap.MetaFactory");
incorrectAndCorrectPropNames.put("java.persistence.sharedCache.mode", "jakarta.persistence.sharedCache.mode");
incorrectAndCorrectPropNames.put("java.persistence.validation.mode", "jakarta.persistence.validation.mode");
- incorrectAndCorrectPropNames.put("java.persistence.transactionType", "jakarta.persistence.transactionType");
incorrectAndCorrectPropNames.put("javax.naming.applet", "java.naming.applet");
incorrectAndCorrectPropNames.put("javax.naming.authoritative", "java.naming.authoritative");
@@ -71,8 +70,7 @@ public class CheckIncorrectPropertyNames extends ValidationBase {
this.module = appModule;
final Properties systemProperties = SystemInstance.get().getProperties();
- for (Object o : incorrectAndCorrectPropNames.entrySet()) {
- final Map.Entry<String, String> entry = (Map.Entry<String, String>) o;
+ for (Map.Entry<String, String> entry : incorrectAndCorrectPropNames.entrySet()) {
if (systemProperties.containsKey(entry.getKey())) {
warn(appModule.toString(), "incorrect.property.name", entry.getKey(), entry.getValue());
}
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java
index e5b9a5a67b..bb01b52a47 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/Interceptor.java
@@ -496,7 +496,7 @@ public class Interceptor implements JndiConsumer, Session {
@Override
public Map<String, ManagedExecutor> getManagedExecutorMap() {
if (managedExecutor == null) {
- managedExecutor = new KeyedCollection();
+ managedExecutor = new KeyedCollection<>();
}
return this.managedExecutor.toMap();
}
diff --git a/container/openejb-junit/src/main/java/org/apache/openejb/junit/security/TestLoginModule.java b/container/openejb-junit/src/main/java/org/apache/openejb/junit/security/TestLoginModule.java
index 60a3d31ee7..01e7caf4ee 100644
--- a/container/openejb-junit/src/main/java/org/apache/openejb/junit/security/TestLoginModule.java
+++ b/container/openejb-junit/src/main/java/org/apache/openejb/junit/security/TestLoginModule.java
@@ -29,6 +29,7 @@ import javax.security.auth.callback.NameCallback;
import javax.security.auth.callback.PasswordCallback;
import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
+import java.security.Principal;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
@@ -45,13 +46,15 @@ public class TestLoginModule implements LoginModule {
private String user;
- private final Set principals = new HashSet();
+ private final Set<Principal> principals = new HashSet<>();
+ @Override
public void initialize(final Subject subject, final CallbackHandler callbackHandler, final Map sharedState, final Map options) {
this.subject = subject;
this.callbackHandler = callbackHandler;
}
+ @Override
public boolean login() throws LoginException {
final Callback[] callbacks = new Callback[2];
@@ -67,7 +70,8 @@ public class TestLoginModule implements LoginModule {
return true;
}
-
+
+ @Override
public boolean commit() throws LoginException {
principals.add(new UserPrincipal(user));
principals.add(new GroupPrincipal(user));
@@ -78,11 +82,13 @@ public class TestLoginModule implements LoginModule {
return true;
}
+ @Override
public boolean abort() throws LoginException {
user = null;
return true;
}
+ @Override
public boolean logout() throws LoginException {
subject.getPrincipals().removeAll(principals);
principals.clear();
diff --git a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java
index f25689c986..8dfa19a2a1 100644
--- a/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java
+++ b/examples/component-interfaces/src/main/java/org/superbiz/FriendlyPerson.java
@@ -57,10 +57,11 @@ public class FriendlyPerson implements FriendlyPersonLocal, FriendlyPersonRemote
private String defaultLanguage;
public FriendlyPerson() {
- greetings = new HashMap();
+ greetings = new HashMap<>();
languagePreferences = new Properties();
defaultLanguage = Locale.getDefault().getLanguage();
+ addGreeting("de", "Hallo {0}!");
addGreeting("en", "Hello {0}!");
addGreeting("es", "Hola {0}!");
addGreeting("fr", "Bonjour {0}!");
diff --git a/examples/component-interfaces/src/test/java/org/superbiz/FriendlyPersonTest.java b/examples/component-interfaces/src/test/java/org/superbiz/FriendlyPersonTest.java
index 0f09bb8412..98ac74cb72 100644
--- a/examples/component-interfaces/src/test/java/org/superbiz/FriendlyPersonTest.java
+++ b/examples/component-interfaces/src/test/java/org/superbiz/FriendlyPersonTest.java
@@ -60,6 +60,9 @@ public class FriendlyPersonTest extends TestCase {
// Dave should take some Polish and if he had, he could say Hi in Polish
assertEquals("Witaj Dave!", friendlyPerson.greet("pl", "Dave"));
+ // Richard is a native speaker of German, so let's salute him
+ assertEquals("Hallo Richard!", friendlyPerson.greet("de", "Richard"));
+
// Let's see if I speak Portuguese
assertEquals("Sorry, I don't speak " + new Locale("pt").getDisplayLanguage() + ".", friendlyPerson.greet("pt", "David"));
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
index dec349c1d0..4dd27254ac 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestClient.java
@@ -58,8 +58,7 @@ public abstract class TestClient extends NamedTestCase {
finder = new ClassFinder(getClassPath());
fieldList = finder.findAnnotatedFields(EJB.class);
- for (final Iterator fields = fieldList.iterator(); fields.hasNext(); ) {
- final Field field = (Field) fields.next();
+ for (final Field field : fieldList) {
final EJB ejbAnnotation = field.getAnnotation(EJB.class);
if ((ejbAnnotation.name() != null) && (ejbAnnotation.name() != "") && (ejbAnnotation.beanInterface() != null)) {
try {
@@ -83,8 +82,7 @@ public abstract class TestClient extends NamedTestCase {
finder = new ClassFinder(getClassPath());
methodList = finder.findAnnotatedMethods(EJB.class);
- for (final Iterator methods = methodList.iterator(); methods.hasNext(); ) {
- final Method method = (Method) methods.next();
+ for (final Method method : methodList) {
final EJB ejbAnnotation = method.getAnnotation(EJB.class);
if ((ejbAnnotation.name() != null) && (ejbAnnotation.name() != "") && (ejbAnnotation.beanInterface() != null)) {
try {
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java
index 0242bf0a18..2f684a30f0 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java
@@ -85,8 +85,7 @@ public class TestRunner extends junit.textui.TestRunner {
System.out.println("_________________________________________________");
System.out.println("CLIENT JNDI PROPERTIES");
final Properties env = TestManager.getServer().getContextEnvironment();
- for (final Iterator iterator = env.entrySet().iterator(); iterator.hasNext(); ) {
- final Map.Entry entry = (Map.Entry) iterator.next();
+ for (final Map.Entry<Object, Object> entry : env.entrySet()) {
final String key = (String) entry.getKey();
final Object value = entry.getValue();
System.out.println(key + " = " + value);
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyComplexPkTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyComplexPkTests.java
index f41163fffb..8c9ec4208e 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyComplexPkTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyComplexPkTests.java
@@ -58,14 +58,13 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
+ final PlatformLocal platform = findPlatform(1);
final Set<GameLocal> gameSets = platform.getGames();
assertEquals(2, gameSets.size());
- for (final Iterator iter = gameSets.iterator(); iter.hasNext(); ) {
- final GameLocal game = (GameLocal) iter.next();
- if (game.getId().equals(new Integer(11))) {
+ for (final GameLocal game : gameSets) {
+ if (game.getId().equals(11)) {
assertEquals("value11", game.getName());
- } else if (game.getId().equals(new Integer(22))) {
+ } else if (game.getId().equals(22)) {
assertEquals("value22", game.getName());
} else {
fail();
@@ -80,7 +79,7 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
+ final PlatformLocal platform = findPlatform(1);
try {
platform.setGames(null);
fail("expected platform.setGames(null) to throw an IllegalArgumentException");
@@ -98,16 +97,15 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final GameLocal game = findGame(new Integer(22));
- final Set aSet = game.getPlatforms();
+ final GameLocal game = findGame(22);
+ final Set<PlatformLocal> aSet = game.getPlatforms();
assertEquals(3, aSet.size());
- for (final Iterator iter = aSet.iterator(); iter.hasNext(); ) {
- final PlatformLocal platform = (PlatformLocal) iter.next();
- if (platform.getId().equals(new Integer(1))) {
+ for (final PlatformLocal platform : aSet) {
+ if (platform.getId().equals(1)) {
assertEquals("value1", platform.getName());
- } else if (platform.getId().equals(new Integer(2))) {
+ } else if (platform.getId().equals(2)) {
assertEquals("value2", platform.getName());
- } else if (platform.getId().equals(new Integer(3))) {
+ } else if (platform.getId().equals(3)) {
assertEquals("value3", platform.getName());
} else {
fail();
@@ -122,11 +120,11 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- PlatformLocal platform = findPlatform(new Integer(1));
+ PlatformLocal platform = findPlatform(1);
platform.setGames(new HashSet<>());
- platform = findPlatform(new Integer(2));
+ platform = findPlatform(2);
platform.setGames(new HashSet<>());
- platform = findPlatform(new Integer(3));
+ platform = findPlatform(3);
platform.setGames(new HashSet<>());
} finally {
completeTransaction();
@@ -139,9 +137,9 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- GameLocal game = findGame(new Integer(11));
+ GameLocal game = findGame(11);
game.setPlatforms(new HashSet<>());
- game = findGame(new Integer(22));
+ game = findGame(22);
game.setPlatforms(new HashSet<>());
} finally {
completeTransaction();
@@ -154,8 +152,8 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = createPlatform(new Integer(4));
- final GameLocal game = createGame(new Integer(33));
+ final PlatformLocal platform = createPlatform(4);
+ final GameLocal game = createGame(33);
final Set<GameLocal> gameSets = platform.getGames();
gameSets.add(game);
} finally {
@@ -169,8 +167,8 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = createPlatform(new Integer(4));
- final GameLocal game = createGame(new Integer(33));
+ final PlatformLocal platform = createPlatform(4);
+ final GameLocal game = createGame(33);
final Set<PlatformLocal> platformSets = game.getPlatforms();
platformSets.add(platform);
} finally {
@@ -184,8 +182,8 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = createPlatform(new Integer(4));
- final GameLocal game = findGame(new Integer(11));
+ final PlatformLocal platform = createPlatform(4);
+ final GameLocal game = findGame(11);
final Set<GameLocal> gameSets = platform.getGames();
gameSets.add(game);
} finally {
@@ -199,8 +197,8 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = createPlatform(new Integer(4));
- final GameLocal game = findGame(new Integer(11));
+ final PlatformLocal platform = createPlatform(4);
+ final GameLocal game = findGame(11);
final Set<PlatformLocal> platformSets = game.getPlatforms();
platformSets.add(platform);
} finally {
@@ -214,8 +212,8 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- final GameLocal game = createGame(new Integer(33));
+ final PlatformLocal platform = findPlatform(1);
+ final GameLocal game = createGame(33);
final Set<GameLocal> gameSets = platform.getGames();
gameSets.add(game);
} finally {
@@ -229,8 +227,8 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- final GameLocal game = createGame(new Integer(33));
+ final PlatformLocal platform = findPlatform(1);
+ final GameLocal game = createGame(33);
final Set<PlatformLocal> platformSets = game.getPlatforms();
platformSets.add(platform);
} finally {
@@ -244,7 +242,7 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
+ final PlatformLocal platform = findPlatform(1);
platform.remove();
} finally {
completeTransaction();
@@ -257,7 +255,7 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
+ final PlatformLocal platform = findPlatform(1);
final Set games = platform.getGames();
try {
@@ -279,11 +277,11 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
public void testModifyCmrCollectionOusideTx() throws Exception {
resetDB();
beginTransaction();
- Set games;
+ Set<GameLocal> games;
GameLocal newGame;
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- newGame = createGame(new Integer(33));
+ final PlatformLocal platform = findPlatform(1);
+ newGame = createGame(33);
games = platform.getGames();
} finally {
completeTransaction();
@@ -292,11 +290,10 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
// CMR collections should still be readable
assertFalse(games.isEmpty());
assertEquals(2, games.size());
- for (final Iterator iter = games.iterator(); iter.hasNext(); ) {
- final GameLocal game = (GameLocal) iter.next();
- if (game.getId().equals(new Integer(11))) {
+ for (final GameLocal game : games) {
+ if (game.getId().equals(11)) {
assertEquals("value11", game.getName());
- } else if (game.getId().equals(new Integer(22))) {
+ } else if (game.getId().equals(22)) {
assertEquals("value22", game.getName());
} else {
fail();
@@ -324,7 +321,7 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
fail("expected games.removeAll(game) to throw an IllegalStateException");
} catch (final IllegalStateException expected) {
}
- final Iterator iterator = games.iterator();
+ final Iterator<GameLocal> iterator = games.iterator();
try {
iterator.remove();
fail("expected iterator.remove() to throw an ConcurrentModificationException");
@@ -335,11 +332,11 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
public void testModifyCmrCollectionInNewTx() throws Exception {
resetDB();
beginTransaction();
- Set games;
+ Set<GameLocal> games;
GameLocal newGame;
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- newGame = createGame(new Integer(33));
+ final PlatformLocal platform = findPlatform(1);
+ newGame = createGame(33);
games = platform.getGames();
} finally {
completeTransaction();
@@ -350,11 +347,10 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
// CMR collections should still be readable
assertFalse(games.isEmpty());
assertEquals(2, games.size());
- for (final Iterator iter = games.iterator(); iter.hasNext(); ) {
- final GameLocal game = (GameLocal) iter.next();
- if (game.getId().equals(new Integer(11))) {
+ for (final GameLocal game : games) {
+ if (game.getId().equals(11)) {
assertEquals("value11", game.getName());
- } else if (game.getId().equals(new Integer(22))) {
+ } else if (game.getId().equals(22)) {
assertEquals("value22", game.getName());
} else {
fail();
@@ -382,7 +378,7 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
fail("expected games.removeAll(game) to throw an IllegalStateException");
} catch (final IllegalStateException expected) {
}
- final Iterator iterator = games.iterator();
+ final Iterator<GameLocal> iterator = games.iterator();
try {
iterator.remove();
fail("expected iterator.remove() to throw an ConcurrentModificationException");
@@ -396,15 +392,15 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
public void testIteratorConcurrentModification() throws Exception {
resetDB();
beginTransaction();
- final Set games;
+ final Set<GameLocal> games;
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- final GameLocal game = findGame(new Integer(11));
+ final PlatformLocal platform = findPlatform(1);
+ final GameLocal game = findGame(11);
games = platform.getGames();
assertFalse(games.isEmpty());
assertEquals(2, games.size());
- final Iterator iterator = games.iterator();
+ final Iterator<GameLocal> iterator = games.iterator();
games.remove(game);
assertEquals(1, games.size());
@@ -422,15 +418,15 @@ public class ManyToManyComplexPkTests extends AbstractCMRTest {
public void testIteratorAndRemove() throws Exception {
resetDB();
beginTransaction();
- final Set games;
+ final Set<GameLocal> games;
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- final GameLocal game = findGame(new Integer(11));
+ final PlatformLocal platform = findPlatform(1);
+ final GameLocal game = findGame(11);
games = platform.getGames();
assertFalse(games.isEmpty());
assertEquals(2, games.size());
- final Iterator iterator = games.iterator();
+ final Iterator<GameLocal> iterator = games.iterator();
assertTrue(games.contains(game));
platform.remove();
diff --git a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyTests.java b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyTests.java
index e58318cc34..0f4a246800 100644
--- a/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyTests.java
+++ b/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/entity/cmr/ManyToManyTests.java
@@ -56,14 +56,13 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
+ final PlatformLocal platform = findPlatform(1);
final Set<GameLocal> gameSets = platform.getGames();
assertEquals(2, gameSets.size());
- for (final Iterator iter = gameSets.iterator(); iter.hasNext(); ) {
- final GameLocal game = (GameLocal) iter.next();
- if (game.getId().equals(new Integer(11))) {
+ for (final GameLocal game : gameSets) {
+ if (game.getId().equals(11)) {
assertEquals("value11", game.getName());
- } else if (game.getId().equals(new Integer(22))) {
+ } else if (game.getId().equals(22)) {
assertEquals("value22", game.getName());
} else {
fail();
@@ -78,7 +77,7 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
+ final PlatformLocal platform = findPlatform(1);
try {
platform.setGames(null);
fail("expected platform.setGames(null) to throw an IllegalArgumentException");
@@ -96,16 +95,15 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final GameLocal game = findGame(new Integer(22));
- final Set aSet = game.getPlatforms();
+ final GameLocal game = findGame(22);
+ final Set<PlatformLocal> aSet = game.getPlatforms();
assertEquals(3, aSet.size());
- for (final Iterator iter = aSet.iterator(); iter.hasNext(); ) {
- final PlatformLocal platform = (PlatformLocal) iter.next();
- if (platform.getId().equals(new Integer(1))) {
+ for (final PlatformLocal platform : aSet) {
+ if (platform.getId().equals(1)) {
assertEquals("value1", platform.getName());
- } else if (platform.getId().equals(new Integer(2))) {
+ } else if (platform.getId().equals(2)) {
assertEquals("value2", platform.getName());
- } else if (platform.getId().equals(new Integer(3))) {
+ } else if (platform.getId().equals(3)) {
assertEquals("value3", platform.getName());
} else {
fail();
@@ -120,11 +118,11 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- PlatformLocal platform = findPlatform(new Integer(1));
+ PlatformLocal platform = findPlatform(1);
platform.setGames(new HashSet<>());
- platform = findPlatform(new Integer(2));
+ platform = findPlatform(2);
platform.setGames(new HashSet<>());
- platform = findPlatform(new Integer(3));
+ platform = findPlatform(3);
platform.setGames(new HashSet<>());
} finally {
completeTransaction();
@@ -137,9 +135,9 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- GameLocal game = findGame(new Integer(11));
+ GameLocal game = findGame(11);
game.setPlatforms(new HashSet<>());
- game = findGame(new Integer(22));
+ game = findGame(22);
game.setPlatforms(new HashSet<>());
} finally {
completeTransaction();
@@ -152,8 +150,8 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = createPlatform(new Integer(4));
- final GameLocal game = createGame(new Integer(33));
+ final PlatformLocal platform = createPlatform(4);
+ final GameLocal game = createGame(33);
final Set<GameLocal> gameSets = platform.getGames();
gameSets.add(game);
} finally {
@@ -167,8 +165,8 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = createPlatform(new Integer(4));
- final GameLocal game = createGame(new Integer(33));
+ final PlatformLocal platform = createPlatform(4);
+ final GameLocal game = createGame(33);
final Set<PlatformLocal> platformSets = game.getPlatforms();
platformSets.add(platform);
} finally {
@@ -182,8 +180,8 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = createPlatform(new Integer(4));
- final GameLocal game = findGame(new Integer(11));
+ final PlatformLocal platform = createPlatform(4);
+ final GameLocal game = findGame(11);
final Set<GameLocal> gameSets = platform.getGames();
gameSets.add(game);
} finally {
@@ -197,8 +195,8 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = createPlatform(new Integer(4));
- final GameLocal game = findGame(new Integer(11));
+ final PlatformLocal platform = createPlatform(4);
+ final GameLocal game = findGame(11);
final Set<PlatformLocal> platformSets = game.getPlatforms();
platformSets.add(platform);
} finally {
@@ -212,8 +210,8 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- final GameLocal game = createGame(new Integer(33));
+ final PlatformLocal platform = findPlatform(1);
+ final GameLocal game = createGame(33);
final Set<GameLocal> gameSets = platform.getGames();
gameSets.add(game);
} finally {
@@ -227,8 +225,8 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- final GameLocal game = createGame(new Integer(33));
+ final PlatformLocal platform = findPlatform(1);
+ final GameLocal game = createGame(33);
final Set<PlatformLocal> platformSets = game.getPlatforms();
platformSets.add(platform);
} finally {
@@ -242,7 +240,7 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
+ final PlatformLocal platform = findPlatform(1);
platform.remove();
} finally {
completeTransaction();
@@ -254,7 +252,7 @@ public class ManyToManyTests extends AbstractCMRTest {
resetDB();
beginTransaction();
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
+ final PlatformLocal platform = findPlatform(1);
final Set games = platform.getGames();
try {
@@ -276,11 +274,11 @@ public class ManyToManyTests extends AbstractCMRTest {
public void testModifyCmrCollectionOusideTx() throws Exception {
resetDB();
beginTransaction();
- Set games;
+ Set<GameLocal> games;
GameLocal newGame;
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- newGame = createGame(new Integer(33));
+ final PlatformLocal platform = findPlatform(1);
+ newGame = createGame(33);
games = platform.getGames();
} finally {
completeTransaction();
@@ -289,11 +287,10 @@ public class ManyToManyTests extends AbstractCMRTest {
// CMR collections should still be readable
assertFalse(games.isEmpty());
assertEquals(2, games.size());
- for (final Iterator iter = games.iterator(); iter.hasNext(); ) {
- final GameLocal game = (GameLocal) iter.next();
- if (game.getId().equals(new Integer(11))) {
+ for (final GameLocal game : games) {
+ if (game.getId().equals(11)) {
assertEquals("value11", game.getName());
- } else if (game.getId().equals(new Integer(22))) {
+ } else if (game.getId().equals(22)) {
assertEquals("value22", game.getName());
} else {
fail();
@@ -321,7 +318,7 @@ public class ManyToManyTests extends AbstractCMRTest {
fail("expected games.removeAll(game) to throw an IllegalStateException");
} catch (final IllegalStateException expected) {
}
- final Iterator iterator = games.iterator();
+ final Iterator<GameLocal> iterator = games.iterator();
try {
iterator.remove();
fail("expected iterator.remove() to throw an ConcurrentModificationException");
@@ -332,11 +329,11 @@ public class ManyToManyTests extends AbstractCMRTest {
public void testModifyCmrCollectionInNewTx() throws Exception {
resetDB();
beginTransaction();
- Set games;
+ Set<GameLocal> games;
GameLocal newGame;
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- newGame = createGame(new Integer(33));
+ final PlatformLocal platform = findPlatform(1);
+ newGame = createGame(33);
games = platform.getGames();
} finally {
completeTransaction();
@@ -347,11 +344,10 @@ public class ManyToManyTests extends AbstractCMRTest {
// CMR collections should still be readable
assertFalse(games.isEmpty());
assertEquals(2, games.size());
- for (final Iterator iter = games.iterator(); iter.hasNext(); ) {
- final GameLocal game = (GameLocal) iter.next();
- if (game.getId().equals(new Integer(11))) {
+ for (final GameLocal game : games) {
+ if (game.getId().equals(11)) {
assertEquals("value11", game.getName());
- } else if (game.getId().equals(new Integer(22))) {
+ } else if (game.getId().equals(22)) {
assertEquals("value22", game.getName());
} else {
fail();
@@ -379,7 +375,7 @@ public class ManyToManyTests extends AbstractCMRTest {
fail("expected games.removeAll(game) to throw an IllegalStateException");
} catch (final IllegalStateException expected) {
}
- final Iterator iterator = games.iterator();
+ final Iterator<GameLocal> iterator = games.iterator();
try {
iterator.remove();
fail("expected iterator.remove() to throw an ConcurrentModificationException");
@@ -393,15 +389,15 @@ public class ManyToManyTests extends AbstractCMRTest {
public void testIteratorConcurrentModification() throws Exception {
resetDB();
beginTransaction();
- final Set games;
+ final Set<GameLocal> games;
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- final GameLocal game = findGame(new Integer(11));
+ final PlatformLocal platform = findPlatform(1);
+ final GameLocal game = findGame(11);
games = platform.getGames();
assertFalse(games.isEmpty());
assertEquals(2, games.size());
- final Iterator iterator = games.iterator();
+ final Iterator<GameLocal> iterator = games.iterator();
games.remove(game);
assertEquals(1, games.size());
@@ -419,15 +415,15 @@ public class ManyToManyTests extends AbstractCMRTest {
public void testIteratorAndRemove() throws Exception {
resetDB();
beginTransaction();
- final Set games;
+ final Set<GameLocal> games;
try {
- final PlatformLocal platform = findPlatform(new Integer(1));
- final GameLocal game = findGame(new Integer(11));
+ final PlatformLocal platform = findPlatform(1);
+ final GameLocal game = findGame(11);
games = platform.getGames();
assertFalse(games.isEmpty());
assertEquals(2, games.size());
- final Iterator iterator = games.iterator();
+ final Iterator<GameLocal> iterator = games.iterator();
assertTrue(games.contains(game));
platform.remove();
diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/DeploymentIndex.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/DeploymentIndex.java
index a548a2663a..63e8e12614 100644
--- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/DeploymentIndex.java
+++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/DeploymentIndex.java
@@ -30,16 +30,15 @@ public class DeploymentIndex {
BeanContext[] deployments = null;
- Map index = null;
+ Map<Object, Integer> index = null;
- @SuppressWarnings("unchecked")
public DeploymentIndex(final BeanContext[] beanContexts) {
deployments = new BeanContext[beanContexts.length + 1];
System.arraycopy(beanContexts, 0, deployments, 1, beanContexts.length);
- index = new HashMap(deployments.length);
+ index = new HashMap<>(deployments.length);
for (int i = 1; i < deployments.length; i++) {
index.put(deployments[i].getDeploymentID(), i);
}
diff --git a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSessionImpl.java b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSessionImpl.java
index fa0bc67869..5968138209 100644
--- a/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSessionImpl.java
+++ b/server/openejb-http/src/main/java/org/apache/openejb/server/httpd/HttpSessionImpl.java
@@ -119,7 +119,7 @@ public class HttpSessionImpl implements HttpSession {
@Override
public Enumeration<String> getAttributeNames() {
touch();
- return new ArrayEnumeration(new ArrayList(attributes.keySet()));
+ return new ArrayEnumeration(new ArrayList<>(attributes.keySet()));
}
@Override
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java
index ab386884c2..d578ea7762 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java
@@ -76,7 +76,7 @@ public class LightWeightMappingValidator extends WsdlVisitor {
@Override
protected void visit(Output output) {
- Map outputParts = output.getMessage().getParts();
+ Map<String, Part> outputParts = output.getMessage().getParts();
if (outputParts.size() != 0 && outputParts.size() != 1) {
context.addFailure(new ValidationFailure("The output message must contain zero or one parts: " + output.getName()));
}
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsdlVisitor.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsdlVisitor.java
index 58b364355a..1a08ca3e84 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsdlVisitor.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsdlVisitor.java
@@ -36,6 +36,7 @@ import javax.wsdl.Port;
import javax.wsdl.PortType;
import javax.wsdl.Service;
import javax.wsdl.Types;
+import javax.wsdl.extensions.ExtensibilityElement;
import javax.wsdl.extensions.soap.SOAPBinding;
import javax.wsdl.extensions.soap.SOAPBody;
import java.util.Collection;
@@ -56,54 +57,54 @@ public class WsdlVisitor {
begin();
try {
visit(definition);
- for (Iterator iterator = definition.getImports().entrySet().iterator(); iterator.hasNext(); ) {
- Map.Entry entry = (Map.Entry) iterator.next();
- String namespaceURI = (String) entry.getKey();
- List importsForNamespace = (List) entry.getValue();
- for (Iterator iterator1 = importsForNamespace.iterator(); iterator1.hasNext(); ) {
- Import anImport = (Import) iterator1.next();
+ for (Iterator<Map.Entry<String, List<Import>>> iterator = definition.getImports().entrySet().iterator(); iterator.hasNext(); ) {
+ Map.Entry<String, List<Import>> entry = iterator.next();
+ String namespaceURI = entry.getKey();
+ List<Import> importsForNamespace = entry.getValue();
+ for (Iterator<Import> iterator1 = importsForNamespace.iterator(); iterator1.hasNext(); ) {
+ Import anImport = iterator1.next();
visit(anImport);
}
}
visit(definition.getTypes());
- Collection messages = definition.getMessages().values();
- for (Iterator iterator = messages.iterator(); iterator.hasNext(); ) {
- Message message = (Message) iterator.next();
+ Collection<Message> messages = definition.getMessages().values();
+ for (Iterator<Message> iterator = messages.iterator(); iterator.hasNext(); ) {
+ Message message = iterator.next();
visit(message);
- Collection parts = message.getParts().values();
- for (Iterator iterator2 = parts.iterator(); iterator2.hasNext(); ) {
- Part part = (Part) iterator2.next();
+ Collection<Part> parts = message.getParts().values();
+ for (Iterator<Part> iterator2 = parts.iterator(); iterator2.hasNext(); ) {
+ Part part = iterator2.next();
visit(part);
}
}
- Collection services = definition.getServices().values();
- for (Iterator iterator = services.iterator(); iterator.hasNext(); ) {
- Service service = (Service) iterator.next();
+ Collection<Service> services = definition.getServices().values();
+ for (Iterator<Service> iterator = services.iterator(); iterator.hasNext(); ) {
+ Service service = iterator.next();
visit(service);
- Collection ports = service.getPorts().values();
- for (Iterator iterator1 = ports.iterator(); iterator1.hasNext(); ) {
- Port port = (Port) iterator1.next();
+ Collection<Port> ports = service.getPorts().values();
+ for (Iterator<Port> iterator1 = ports.iterator(); iterator1.hasNext(); ) {
+ Port port = iterator1.next();
visit(port);
Binding binding = port.getBinding();
visit(binding);
- List bindingOperations = binding.getBindingOperations();
+ List<BindingOperation> bindingOperations = binding.getBindingOperations();
for (int i = 0; i < bindingOperations.size(); i++) {
- BindingOperation bindingOperation = (BindingOperation) bindingOperations.get(i);
+ BindingOperation bindingOperation = bindingOperations.get(i);
visit(bindingOperation);
visit(bindingOperation.getBindingInput());
visit(bindingOperation.getBindingOutput());
- Collection bindingFaults = bindingOperation.getBindingFaults().values();
- for (Iterator iterator2 = bindingFaults.iterator(); iterator2.hasNext(); ) {
- BindingFault bindingFault = (BindingFault) iterator2.next();
+ Collection<BindingFault> bindingFaults = bindingOperation.getBindingFaults().values();
+ for (Iterator<BindingFault> iterator2 = bindingFaults.iterator(); iterator2.hasNext(); ) {
+ BindingFault bindingFault = iterator2.next();
visit(bindingFault);
}
}
PortType portType = binding.getPortType();
visit(portType);
- List operations = portType.getOperations();
+ List<Operation> operations = portType.getOperations();
for (int i = 0; i < operations.size(); i++) {
- Operation operation = (Operation) operations.get(i);
+ Operation operation = operations.get(i);
visit(operation);
{
Input input = operation.getInput();
@@ -113,9 +114,9 @@ public class WsdlVisitor {
Output output = operation.getOutput();
visit(output);
}
- Collection faults = operation.getFaults().values();
- for (Iterator iterator2 = faults.iterator(); iterator2.hasNext(); ) {
- Fault fault = (Fault) iterator2.next();
+ Collection<Fault> faults = operation.getFaults().values();
+ for (Iterator<Fault> iterator2 = faults.iterator(); iterator2.hasNext(); ) {
+ Fault fault = iterator2.next();
visit(fault);
}
@@ -200,7 +201,7 @@ public class WsdlVisitor {
protected SOAPBinding getSOAPBinding(Binding binding) {
SOAPBinding soapBinding = null;
- List extensibilityElements = binding.getExtensibilityElements();
+ List<ExtensibilityElement> extensibilityElements = binding.getExtensibilityElements();
for (int i = 0; i < extensibilityElements.size(); i++) {
Object element = extensibilityElements.get(i);
if (element instanceof SOAPBinding) {
diff --git a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatSecurityService.java b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatSecurityService.java
index 19774e7c27..617251d7a6 100644
--- a/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatSecurityService.java
+++ b/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatSecurityService.java
@@ -242,7 +242,7 @@ public class TomcatSecurityService extends AbstractSecurityService {
final Set<Principal> principals = new HashSet<>();
principals.add(new RunAsRole(role));
- return new Subject(true, principals, new HashSet(), new HashSet());
+ return new Subject(true, principals, new HashSet<>(), new HashSet<>());
}
@CallerPrincipal