You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2020/02/19 14:36:59 UTC
[cayenne] branch master updated: Code cleanup
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 0843a6d Code cleanup
0843a6d is described below
commit 0843a6df2789677237cc7d249e58a3f9a68d1e82
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Feb 19 17:36:21 2020 +0300
Code cleanup
---
.../rop/client/JettyClientModuleProvider.java | 4 +---
.../cayenne/crypto/CryptoServerModuleProvider.java | 3 +--
.../org/apache/cayenne/di/spi/ModuleLoaderTest.java | 17 ++++-------------
.../cayenne/event/JGroupsServerModuleProvider.java | 4 +---
.../apache/cayenne/event/JMSServerModuleProvider.java | 4 +---
.../ProjectCompatibilityModuleProvider.java | 1 -
.../rop/client/ProtostuffClientModuleProvider.java | 4 +---
.../rop/server/ROPServerModuleProvider.java | 8 ++------
.../cayenne/velocity/VelocityServerModuleProvider.java | 4 +---
.../apache/cayenne/event/XMPPServerModuleProvider.java | 4 +---
10 files changed, 13 insertions(+), 40 deletions(-)
diff --git a/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/JettyClientModuleProvider.java b/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/JettyClientModuleProvider.java
index aa18f9d..9ec5d5e 100644
--- a/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/JettyClientModuleProvider.java
+++ b/cayenne-client-jetty/src/main/java/org/apache/cayenne/configuration/rop/client/JettyClientModuleProvider.java
@@ -39,10 +39,8 @@ public class JettyClientModuleProvider implements CayenneClientModuleProvider {
return ClientJettyHttpModule.class;
}
- @SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
- Collection modules = Collections.singletonList(ClientModule.class);
- return modules;
+ return Collections.singletonList(ClientModule.class);
}
}
diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
index 9c62bb5..621135c 100644
--- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
+++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/CryptoServerModuleProvider.java
@@ -42,7 +42,6 @@ public class CryptoServerModuleProvider implements CayenneServerModuleProvider {
@Override
public Collection<Class<? extends Module>> overrides() {
- Collection modules = Collections.singletonList(ServerModule.class);
- return modules;
+ return Collections.singletonList(ServerModule.class);
}
}
diff --git a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/ModuleLoaderTest.java b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/ModuleLoaderTest.java
index a0e3fe7..e87dfd2 100644
--- a/cayenne-di/src/test/java/org/apache/cayenne/di/spi/ModuleLoaderTest.java
+++ b/cayenne-di/src/test/java/org/apache/cayenne/di/spi/ModuleLoaderTest.java
@@ -117,12 +117,9 @@ public class ModuleLoaderTest {
return Module1.class;
}
-
- @SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
- Collection c = Collections.singletonList(Module2.class);
- return c;
+ return Collections.singletonList(Module2.class);
}
}
@@ -138,11 +135,9 @@ public class ModuleLoaderTest {
return Module2.class;
}
- @SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
- Collection c = Collections.singletonList(Module4.class);
- return c;
+ return Collections.singletonList(Module4.class);
}
}
@@ -177,10 +172,8 @@ public class ModuleLoaderTest {
}
@Override
- @SuppressWarnings("unchecked")
public Collection<Class<? extends Module>> overrides() {
- Collection c = Collections.singletonList(Module3.class);
- return c;
+ return Collections.singletonList(Module3.class);
}
}
@@ -215,10 +208,8 @@ public class ModuleLoaderTest {
}
@Override
- @SuppressWarnings("unchecked")
public Collection<Class<? extends Module>> overrides() {
- Collection c = Collections.singletonList(Module5.class);
- return c;
+ return Collections.singletonList(Module5.class);
}
}
}
diff --git a/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JGroupsServerModuleProvider.java b/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JGroupsServerModuleProvider.java
index de32910..5e29418 100644
--- a/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JGroupsServerModuleProvider.java
+++ b/cayenne-jgroups/src/main/java/org/apache/cayenne/event/JGroupsServerModuleProvider.java
@@ -41,10 +41,8 @@ public class JGroupsServerModuleProvider implements CayenneServerModuleProvider
return JGroupsModule.class;
}
- @SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
- Collection modules = Collections.singletonList(ServerModule.class);
- return modules;
+ return Collections.singletonList(ServerModule.class);
}
}
diff --git a/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSServerModuleProvider.java b/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSServerModuleProvider.java
index 6f68623..ec65ed1 100644
--- a/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSServerModuleProvider.java
+++ b/cayenne-jms/src/main/java/org/apache/cayenne/event/JMSServerModuleProvider.java
@@ -41,10 +41,8 @@ public class JMSServerModuleProvider implements CayenneServerModuleProvider {
return JMSModule.class;
}
- @SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
- Collection modules = Collections.singletonList(ServerModule.class);
- return modules;
+ return Collections.singletonList(ServerModule.class);
}
}
\ No newline at end of file
diff --git a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
index a41c3dc..36b4352 100644
--- a/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
+++ b/cayenne-project-compatibility/src/main/java/org/apache/cayenne/project/compatibility/ProjectCompatibilityModuleProvider.java
@@ -42,7 +42,6 @@ public class ProjectCompatibilityModuleProvider implements CayenneServerModulePr
return ProjectCompatibilityModule.class;
}
- @SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
// compatibility module overrides XML loaders defined in ServerModule and
diff --git a/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffClientModuleProvider.java b/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffClientModuleProvider.java
index d429602..df54feb 100644
--- a/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffClientModuleProvider.java
+++ b/cayenne-protostuff/src/main/java/org/apache/cayenne/configuration/rop/client/ProtostuffClientModuleProvider.java
@@ -39,10 +39,8 @@ public class ProtostuffClientModuleProvider implements CayenneClientModuleProvid
return ProtostuffModule.class;
}
- @SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
- Collection modules = Collections.singletonList(ClientModule.class);
- return modules;
+ return Collections.singletonList(ClientModule.class);
}
}
diff --git a/cayenne-rop-server/src/main/java/org/apache/cayenne/configuration/rop/server/ROPServerModuleProvider.java b/cayenne-rop-server/src/main/java/org/apache/cayenne/configuration/rop/server/ROPServerModuleProvider.java
index ad3a804..a242f16 100644
--- a/cayenne-rop-server/src/main/java/org/apache/cayenne/configuration/rop/server/ROPServerModuleProvider.java
+++ b/cayenne-rop-server/src/main/java/org/apache/cayenne/configuration/rop/server/ROPServerModuleProvider.java
@@ -18,9 +18,8 @@
****************************************************************/
package org.apache.cayenne.configuration.rop.server;
-import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.List;
import org.apache.cayenne.configuration.server.CayenneServerModuleProvider;
import org.apache.cayenne.configuration.server.ServerModule;
@@ -44,9 +43,6 @@ public class ROPServerModuleProvider implements CayenneServerModuleProvider {
@Override
public Collection<Class<? extends Module>> overrides() {
- List<Class<? extends Module>> modules = new ArrayList<>();
- modules.add(ServerModule.class);
- modules.add(WebModule.class);
- return modules;
+ return Arrays.asList(ServerModule.class, WebModule.class);
}
}
diff --git a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
index 5d704dc..e926994 100644
--- a/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
+++ b/cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityServerModuleProvider.java
@@ -41,10 +41,8 @@ public class VelocityServerModuleProvider implements CayenneServerModuleProvider
return VelocityModule.class;
}
- @SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
- Collection modules = Collections.singletonList(ServerModule.class);
- return modules;
+ return Collections.singletonList(ServerModule.class);
}
}
diff --git a/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPServerModuleProvider.java b/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPServerModuleProvider.java
index 832a94f..b989271 100644
--- a/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPServerModuleProvider.java
+++ b/cayenne-xmpp/src/main/java/org/apache/cayenne/event/XMPPServerModuleProvider.java
@@ -41,10 +41,8 @@ public class XMPPServerModuleProvider implements CayenneServerModuleProvider {
return XMPPModule.class;
}
- @SuppressWarnings("unchecked")
@Override
public Collection<Class<? extends Module>> overrides() {
- Collection modules = Collections.singletonList(ServerModule.class);
- return modules;
+ return Collections.singletonList(ServerModule.class);
}
}