You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/06/18 08:36:06 UTC
[47/50] incubator-ignite git commit: #IGNITE-GG-10429 Extract utility
method.
#IGNITE-GG-10429 Extract utility method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/01eee2da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/01eee2da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/01eee2da
Branch: refs/heads/ignite-gg-10416
Commit: 01eee2da37961d8f6c8ae477f4a6b3cb8a6a6372
Parents: 9142eb7
Author: nikolay_tikhonov <nt...@gridgain.com>
Authored: Wed Jun 17 10:48:19 2015 +0300
Committer: nikolay_tikhonov <nt...@gridgain.com>
Committed: Wed Jun 17 10:48:19 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 13 +-----------
.../client/GridClientConfiguration.java | 17 +---------------
.../impl/GridTcpRouterNioListenerAdapter.java | 17 +---------------
.../ignite/internal/util/IgniteUtils.java | 21 ++++++++++++++++++++
4 files changed, 24 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01eee2da/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 9e0dcbf..e19d3d3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -630,18 +630,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
// Ack configuration.
ackSpis();
- List<PluginProvider> plugins = AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
- @Override public List<PluginProvider> run() {
- List<PluginProvider> providers = new ArrayList<>();
-
- ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
-
- for (PluginProvider provider : ldr)
- providers.add(provider);
-
- return providers;
- }
- });
+ List<PluginProvider> plugins = U.allPluginProviders();
// Spin out SPIs & managers.
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01eee2da/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
index 4a909a3..f06d779 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientConfiguration.java
@@ -23,12 +23,10 @@ import org.apache.ignite.internal.client.marshaller.optimized.*;
import org.apache.ignite.internal.client.ssl.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.*;
import org.apache.ignite.plugin.security.*;
import org.jetbrains.annotations.*;
import java.net.*;
-import java.security.*;
import java.util.*;
import java.util.concurrent.*;
@@ -121,20 +119,7 @@ public class GridClientConfiguration {
* Creates default configuration.
*/
public GridClientConfiguration() {
- List<PluginProvider> plugins = AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
- @Override public List<PluginProvider> run() {
- List<PluginProvider> providers = new ArrayList<>();
-
- ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
-
- for (PluginProvider provider : ldr)
- providers.add(provider);
-
- return providers;
- }
- });
-
- marshaller = new GridClientOptimizedMarshaller(plugins);
+ marshaller = new GridClientOptimizedMarshaller(U.allPluginProviders());
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01eee2da/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
index e60f2aa..1775b21 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/router/impl/GridTcpRouterNioListenerAdapter.java
@@ -25,10 +25,8 @@ import org.apache.ignite.internal.client.marshaller.optimized.*;
import org.apache.ignite.internal.processors.rest.client.message.*;
import org.apache.ignite.internal.util.nio.*;
import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.plugin.*;
import org.jetbrains.annotations.*;
-import java.security.*;
import java.util.*;
import static org.apache.ignite.internal.util.nio.GridNioSessionMetaKey.*;
@@ -67,20 +65,7 @@ public abstract class GridTcpRouterNioListenerAdapter implements GridNioServerLi
marshMap = new HashMap<>();
- List<PluginProvider> plugins = AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
- @Override public List<PluginProvider> run() {
- List<PluginProvider> providers = new ArrayList<>();
-
- ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
-
- for (PluginProvider provider : ldr)
- providers.add(provider);
-
- return providers;
- }
- });
-
- marshMap.put(GridClientOptimizedMarshaller.ID, new GridClientOptimizedMarshaller(plugins));
+ marshMap.put(GridClientOptimizedMarshaller.ID, new GridClientOptimizedMarshaller(U.allPluginProviders()));
marshMap.put(GridClientJdkMarshaller.ID, new GridClientJdkMarshaller());
init();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/01eee2da/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index a303abc..6623e85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -39,6 +39,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.internal.util.worker.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.plugin.*;
import org.apache.ignite.plugin.extensions.communication.*;
import org.apache.ignite.spi.*;
import org.apache.ignite.spi.discovery.*;
@@ -629,6 +630,26 @@ public abstract class IgniteUtils {
}
/**
+ * Gets all plugin providers.
+ *
+ * @return Plugins.
+ */
+ public static List<PluginProvider> allPluginProviders() {
+ return AccessController.doPrivileged(new PrivilegedAction<List<PluginProvider>>() {
+ @Override public List<PluginProvider> run() {
+ List<PluginProvider> providers = new ArrayList<>();
+
+ ServiceLoader<PluginProvider> ldr = ServiceLoader.load(PluginProvider.class);
+
+ for (PluginProvider provider : ldr)
+ providers.add(provider);
+
+ return providers;
+ }
+ });
+ }
+
+ /**
* Converts exception, but unlike {@link #convertException(IgniteCheckedException)}
* does not wrap passed in exception if none suitable converter found.
*