You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/03/02 14:25:52 UTC
[14/50] [abbrv] incubator-ignite git commit: # ignite-339 Refactored
Visor Configurations
# ignite-339 Refactored Visor Configurations
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/57bdd8a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/57bdd8a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/57bdd8a5
Branch: refs/heads/ignite-368
Commit: 57bdd8a5412bec7fafd2481bc42752d50de36463
Parents: 555e3f9
Author: anovikov <an...@gridgain.com>
Authored: Fri Feb 27 18:20:57 2015 +0700
Committer: anovikov <an...@gridgain.com>
Committed: Fri Feb 27 18:20:57 2015 +0700
----------------------------------------------------------------------
.../visor/cache/VisorCacheConfiguration.java | 10 -
.../visor/node/VisorAtomicConfiguration.java | 27 +-
.../visor/node/VisorBasicConfiguration.java | 180 ++------------
.../node/VisorCacheQueryConfiguration.java | 45 +---
.../node/VisorExecutorServiceConfiguration.java | 54 +---
.../visor/node/VisorGridConfiguration.java | 177 ++------------
.../visor/node/VisorIgfsConfiguration.java | 244 ++-----------------
.../visor/node/VisorLifecycleConfiguration.java | 9 +-
.../visor/node/VisorMetricsConfiguration.java | 29 +--
.../node/VisorPeerToPeerConfiguration.java | 28 +--
.../visor/node/VisorQueryConfiguration.java | 65 +----
.../visor/node/VisorRestConfiguration.java | 80 +-----
.../node/VisorSegmentationConfiguration.java | 45 +---
.../visor/node/VisorSpisConfiguration.java | 92 +------
.../node/VisorTransactionConfiguration.java | 64 +----
15 files changed, 139 insertions(+), 1010 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index cf149f7..8eee437 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -60,9 +60,6 @@ public class VisorCacheConfiguration implements Serializable {
/** Write synchronization mode. */
private CacheWriteSynchronizationMode writeSynchronizationMode;
- /** Sequence reserve size. */
- private int seqReserveSize;
-
/** Swap enabled flag. */
private boolean swapEnabled;
@@ -257,13 +254,6 @@ public class VisorCacheConfiguration implements Serializable {
}
/**
- * @return Sequence reserve size.
- */
- public int sequenceReserveSize() {
- return seqReserveSize;
- }
-
- /**
* @return Swap enabled flag.
*/
public boolean swapEnabled() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
index 79ce903..c39e3d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorAtomicConfiguration.java
@@ -48,9 +48,9 @@ public class VisorAtomicConfiguration implements Serializable {
public static VisorAtomicConfiguration from(AtomicConfiguration src) {
VisorAtomicConfiguration cfg = new VisorAtomicConfiguration();
- cfg.atomicSequenceReserveSize(src.getAtomicSequenceReserveSize());
- cfg.cacheMode(src.getCacheMode());
- cfg.backups(src.getBackups());
+ cfg.seqReserveSize = src.getAtomicSequenceReserveSize();
+ cfg.cacheMode = src.getCacheMode();
+ cfg.backups = src.getBackups();
return cfg;
}
@@ -63,13 +63,6 @@ public class VisorAtomicConfiguration implements Serializable {
}
/**
- * @param seqReserveSize Atomic sequence reservation size.
- */
- public void atomicSequenceReserveSize(int seqReserveSize) {
- this.seqReserveSize = seqReserveSize;
- }
-
- /**
* @return Cache mode.
*/
public CacheMode cacheMode() {
@@ -77,26 +70,12 @@ public class VisorAtomicConfiguration implements Serializable {
}
/**
- * @param cacheMode Cache mode.
- */
- public void cacheMode(CacheMode cacheMode) {
- this.cacheMode = cacheMode;
- }
-
- /**
* @return Number of backup nodes.
*/
public int backups() {
return backups;
}
- /**
- * @param backups Number of backup nodes.
- */
- public void backups(int backups) {
- this.backups = backups;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorAtomicConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index 8a79299..a3b6052 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -104,26 +104,26 @@ public class VisorBasicConfiguration implements Serializable {
public static VisorBasicConfiguration from(IgniteEx ignite, IgniteConfiguration c) {
VisorBasicConfiguration cfg = new VisorBasicConfiguration();
- cfg.gridName(c.getGridName());
- cfg.ggHome(getProperty(IGNITE_HOME, c.getIgniteHome()));
- cfg.localHost(getProperty(IGNITE_LOCAL_HOST, c.getLocalHost()));
- cfg.nodeId(ignite.localNode().id());
- cfg.marshaller(compactClass(c.getMarshaller()));
- cfg.deploymentMode(compactObject(c.getDeploymentMode()));
- cfg.daemon(boolValue(IGNITE_DAEMON, c.isDaemon()));
- cfg.jmxRemote(ignite.isJmxRemoteEnabled());
- cfg.restart(ignite.isRestartEnabled());
- cfg.networkTimeout(c.getNetworkTimeout());
- cfg.logger(compactClass(c.getGridLogger()));
- cfg.discoStartupDelay(c.getDiscoveryStartupDelay());
- cfg.mBeanServer(compactClass(c.getMBeanServer()));
- cfg.noAscii(boolValue(IGNITE_NO_ASCII, false));
- cfg.noDiscoOrder(boolValue(IGNITE_NO_DISCO_ORDER, false));
- cfg.noShutdownHook(boolValue(IGNITE_NO_SHUTDOWN_HOOK, false));
- cfg.programName(getProperty(IGNITE_PROG_NAME));
- cfg.quiet(boolValue(IGNITE_QUIET, true));
- cfg.successFile(getProperty(IGNITE_SUCCESS_FILE));
- cfg.updateNotifier(boolValue(IGNITE_UPDATE_NOTIFIER, true));
+ cfg.gridName = c.getGridName();
+ cfg.ggHome = getProperty(IGNITE_HOME, c.getIgniteHome());
+ cfg.locHost = getProperty(IGNITE_LOCAL_HOST, c.getLocalHost());
+ cfg.nodeId = ignite.localNode().id();
+ cfg.marsh = compactClass(c.getMarshaller());
+ cfg.deployMode = compactObject(c.getDeploymentMode());
+ cfg.daemon = boolValue(IGNITE_DAEMON, c.isDaemon());
+ cfg.jmxRemote = ignite.isJmxRemoteEnabled();
+ cfg.restart = ignite.isRestartEnabled();
+ cfg.netTimeout = c.getNetworkTimeout();
+ cfg.log = compactClass(c.getGridLogger());
+ cfg.discoStartupDelay = c.getDiscoveryStartupDelay();
+ cfg.mBeanSrv = compactClass(c.getMBeanServer());
+ cfg.noAscii = boolValue(IGNITE_NO_ASCII, false);
+ cfg.noDiscoOrder = boolValue(IGNITE_NO_DISCO_ORDER, false);
+ cfg.noShutdownHook = boolValue(IGNITE_NO_SHUTDOWN_HOOK, false);
+ cfg.progName = getProperty(IGNITE_PROG_NAME);
+ cfg.quiet = boolValue(IGNITE_QUIET, true);
+ cfg.successFile = getProperty(IGNITE_SUCCESS_FILE);
+ cfg.updateNtf = boolValue(IGNITE_UPDATE_NOTIFIER, true);
return cfg;
}
@@ -136,13 +136,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param gridName New grid name.
- */
- public void gridName(@Nullable String gridName) {
- this.gridName = gridName;
- }
-
- /**
* @return IGNITE_HOME determined at startup.
*/
@Nullable public String ggHome() {
@@ -150,13 +143,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param ggHome New IGNITE_HOME determined at startup.
- */
- public void ggHome(@Nullable String ggHome) {
- this.ggHome = ggHome;
- }
-
- /**
* @return Local host value used.
*/
@Nullable public String localHost() {
@@ -164,13 +150,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param locHost New local host value used.
- */
- public void localHost(@Nullable String locHost) {
- this.locHost = locHost;
- }
-
- /**
* @return Node id.
*/
public UUID nodeId() {
@@ -178,13 +157,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param nodeId New node id.
- */
- public void nodeId(UUID nodeId) {
- this.nodeId = nodeId;
- }
-
- /**
* @return Marshaller used.
*/
public String marshaller() {
@@ -192,13 +164,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param marsh New marshaller used.
- */
- public void marshaller(String marsh) {
- this.marsh = marsh;
- }
-
- /**
* @return Deployment Mode.
*/
public Object deploymentMode() {
@@ -206,13 +171,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param deployMode New Deployment Mode.
- */
- public void deploymentMode(Object deployMode) {
- this.deployMode = deployMode;
- }
-
- /**
* @return Whether this node daemon or not.
*/
public boolean daemon() {
@@ -220,13 +178,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param daemon New whether this node daemon or not.
- */
- public void daemon(boolean daemon) {
- this.daemon = daemon;
- }
-
- /**
* @return Whether remote JMX is enabled.
*/
public boolean jmxRemote() {
@@ -234,13 +185,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param jmxRemote New whether remote JMX is enabled.
- */
- public void jmxRemote(boolean jmxRemote) {
- this.jmxRemote = jmxRemote;
- }
-
- /**
* @return Is node restart enabled.
*/
public boolean restart() {
@@ -248,13 +192,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param restart New is node restart enabled.
- */
- public void restart(boolean restart) {
- this.restart = restart;
- }
-
- /**
* @return Network timeout.
*/
public long networkTimeout() {
@@ -262,13 +199,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param netTimeout New network timeout.
- */
- public void networkTimeout(long netTimeout) {
- this.netTimeout = netTimeout;
- }
-
- /**
* @return Logger used on node.
*/
public String logger() {
@@ -276,13 +206,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param log New logger used on node.
- */
- public void logger(String log) {
- this.log = log;
- }
-
- /**
* @return Discovery startup delay.
*/
public long discoStartupDelay() {
@@ -290,13 +213,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param discoStartupDelay New discovery startup delay.
- */
- public void discoStartupDelay(long discoStartupDelay) {
- this.discoStartupDelay = discoStartupDelay;
- }
-
- /**
* @return MBean server name
*/
@Nullable public String mBeanServer() {
@@ -304,13 +220,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param mBeanSrv New mBean server name
- */
- public void mBeanServer(@Nullable String mBeanSrv) {
- this.mBeanSrv = mBeanSrv;
- }
-
- /**
* @return Whether ASCII logo is disabled.
*/
public boolean noAscii() {
@@ -318,13 +227,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param noAscii New whether ASCII logo is disabled.
- */
- public void noAscii(boolean noAscii) {
- this.noAscii = noAscii;
- }
-
- /**
* @return Whether no discovery order is allowed.
*/
public boolean noDiscoOrder() {
@@ -332,13 +234,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param noDiscoOrder New whether no discovery order is allowed.
- */
- public void noDiscoOrder(boolean noDiscoOrder) {
- this.noDiscoOrder = noDiscoOrder;
- }
-
- /**
* @return Whether shutdown hook is disabled.
*/
public boolean noShutdownHook() {
@@ -346,13 +241,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param noShutdownHook New whether shutdown hook is disabled.
- */
- public void noShutdownHook(boolean noShutdownHook) {
- this.noShutdownHook = noShutdownHook;
- }
-
- /**
* @return Name of command line program.
*/
public String programName() {
@@ -360,13 +248,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param progName New name of command line program.
- */
- public void programName(String progName) {
- this.progName = progName;
- }
-
- /**
* @return Whether node is in quiet mode.
*/
public boolean quiet() {
@@ -374,13 +255,6 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param quiet New whether node is in quiet mode.
- */
- public void quiet(boolean quiet) {
- this.quiet = quiet;
- }
-
- /**
* @return Success file name.
*/
public String successFile() {
@@ -388,26 +262,12 @@ public class VisorBasicConfiguration implements Serializable {
}
/**
- * @param successFile New success file name.
- */
- public void successFile(String successFile) {
- this.successFile = successFile;
- }
-
- /**
* @return Whether update checker is enabled.
*/
public boolean updateNotifier() {
return updateNtf;
}
- /**
- * @param updateNtf New whether update checker is enabled.
- */
- public void updateNotifier(boolean updateNtf) {
- this.updateNtf = updateNtf;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorBasicConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
index 882fa34..8d284c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorCacheQueryConfiguration.java
@@ -58,12 +58,12 @@ public class VisorCacheQueryConfiguration implements Serializable {
QueryTypeResolver rslvr = qccfg.getTypeResolver();
if (rslvr != null)
- cfg.typeResolver(U.compact(rslvr.getClass().getName()));
+ cfg.typeRslvr = U.compact(rslvr.getClass().getName());
- cfg.indexPrimitiveKey(qccfg.isIndexPrimitiveKey());
- cfg.indexPrimitiveValue(qccfg.isIndexPrimitiveValue());
- cfg.indexFixedTyping(qccfg.isIndexFixedTyping());
- cfg.escapeAll(qccfg.isEscapeAll());
+ cfg.idxPrimitiveKey = qccfg.isIndexPrimitiveKey();
+ cfg.idxPrimitiveVal = qccfg.isIndexPrimitiveValue();
+ cfg.idxFixedTyping = qccfg.isIndexFixedTyping();
+ cfg.escapeAll = qccfg.isEscapeAll();
}
return cfg;
@@ -77,13 +77,6 @@ public class VisorCacheQueryConfiguration implements Serializable {
}
/**
- * @param typeRslvr Query type resolver class name.
- */
- public void typeResolver(String typeRslvr) {
- this.typeRslvr = typeRslvr;
- }
-
- /**
* @return {@code true} if primitive keys should be indexed.
*/
public boolean indexPrimitiveKey() {
@@ -91,13 +84,6 @@ public class VisorCacheQueryConfiguration implements Serializable {
}
/**
- * @param idxPrimitiveKey {@code true} if primitive keys should be indexed.
- */
- public void indexPrimitiveKey(boolean idxPrimitiveKey) {
- this.idxPrimitiveKey = idxPrimitiveKey;
- }
-
- /**
* @return {@code true} if primitive values should be indexed.
*/
public boolean indexPrimitiveValue() {
@@ -105,13 +91,6 @@ public class VisorCacheQueryConfiguration implements Serializable {
}
/**
- * @param idxPrimitiveVal {@code true} if primitive values should be indexed.
- */
- public void indexPrimitiveValue(boolean idxPrimitiveVal) {
- this.idxPrimitiveVal = idxPrimitiveVal;
- }
-
- /**
* @return {@code true} if SQL engine should try to convert values to their respective SQL types.
*/
public boolean indexFixedTyping() {
@@ -119,23 +98,9 @@ public class VisorCacheQueryConfiguration implements Serializable {
}
/**
- * @param idxFixedTyping {@code true} if SQL engine should try to convert values to their respective SQL types.
- */
- public void indexFixedTyping(boolean idxFixedTyping) {
- this.idxFixedTyping = idxFixedTyping;
- }
-
- /**
* @return {@code true} if SQL engine generate SQL statements with escaped names.
*/
public boolean escapeAll() {
return escapeAll;
}
-
- /**
- * @param escapeAll {@code true} if SQL engine should generate SQL statements with escaped names.
- */
- public void escapeAll(boolean escapeAll) {
- this.escapeAll = escapeAll;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
index 05f407e..8bc891e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorExecutorServiceConfiguration.java
@@ -54,16 +54,16 @@ public class VisorExecutorServiceConfiguration implements Serializable {
public static VisorExecutorServiceConfiguration from(IgniteConfiguration c) {
VisorExecutorServiceConfiguration cfg = new VisorExecutorServiceConfiguration();
- cfg.publicThreadPoolSize(c.getPublicThreadPoolSize());
- cfg.systemThreadPoolSize(c.getSystemThreadPoolSize());
- cfg.managementThreadPoolSize(c.getManagementThreadPoolSize());
- cfg.peerClassLoadingThreadPoolSize(c.getPeerClassLoadingThreadPoolSize());
- cfg.igfsThreadPoolSize(c.getIgfsThreadPoolSize());
+ cfg.pubPoolSize = c.getPublicThreadPoolSize();
+ cfg.sysPoolSz = c.getSystemThreadPoolSize();
+ cfg.mgmtPoolSize = c.getManagementThreadPoolSize();
+ cfg.p2pPoolSz = c.getPeerClassLoadingThreadPoolSize();
+ cfg.igfsPoolSize = c.getIgfsThreadPoolSize();
ConnectorConfiguration cc = c.getConnectorConfiguration();
if (cc != null)
- cfg.restThreadPoolSize(cc.getThreadPoolSize());
+ cfg.restPoolSz = cc.getThreadPoolSize();
return cfg;
}
@@ -76,13 +76,6 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param pubPoolSize Public pool size.
- */
- public void publicThreadPoolSize(int pubPoolSize) {
- this.pubPoolSize = pubPoolSize;
- }
-
- /**
* @return System pool size.
*/
public int systemThreadPoolSize() {
@@ -90,13 +83,6 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param sysPoolSz System pool size.
- */
- public void systemThreadPoolSize(int sysPoolSz) {
- this.sysPoolSz = sysPoolSz;
- }
-
- /**
* @return Management pool size.
*/
public int managementThreadPoolSize() {
@@ -104,13 +90,6 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param mgmtPoolSize New Management pool size.
- */
- public void managementThreadPoolSize(int mgmtPoolSize) {
- this.mgmtPoolSize = mgmtPoolSize;
- }
-
- /**
* @return IGFS pool size.
*/
public int igfsThreadPoolSize() {
@@ -118,13 +97,6 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param igfsPoolSize New iGFS pool size.
- */
- public void igfsThreadPoolSize(int igfsPoolSize) {
- this.igfsPoolSize = igfsPoolSize;
- }
-
- /**
* @return Peer-to-peer pool size.
*/
public int peerClassLoadingThreadPoolSize() {
@@ -132,26 +104,12 @@ public class VisorExecutorServiceConfiguration implements Serializable {
}
/**
- * @param p2pPoolSz New peer-to-peer pool size.
- */
- public void peerClassLoadingThreadPoolSize(int p2pPoolSz) {
- this.p2pPoolSz = p2pPoolSz;
- }
-
- /**
* @return REST requests pool size.
*/
public int restThreadPoolSize() {
return restPoolSz;
}
- /**
- * @param restPoolSz REST requests pool size.
- */
- public void restThreadPoolSize(int restPoolSz) {
- this.restPoolSz = restPoolSz;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorExecutorServiceConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
index 446db32..96c69d9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorGridConfiguration.java
@@ -102,25 +102,25 @@ public class VisorGridConfiguration implements Serializable {
IgniteConfiguration c = ignite.configuration();
- basic(VisorBasicConfiguration.from(ignite, c));
- metrics(VisorMetricsConfiguration.from(c));
- spis(VisorSpisConfiguration.from(c));
- p2p(VisorPeerToPeerConfiguration.from(c));
- lifecycle(VisorLifecycleConfiguration.from(c));
- executeService(VisorExecutorServiceConfiguration.from(c));
- segmentation(VisorSegmentationConfiguration.from(c));
- includeProperties(compactArray(c.getIncludeProperties()));
- includeEventTypes(c.getIncludeEventTypes());
- rest(VisorRestConfiguration.from(c));
- userAttributes(c.getUserAttributes());
- caches(VisorCacheConfiguration.list(ignite, c.getCacheConfiguration()));
- igfss(VisorIgfsConfiguration.list(c.getIgfsConfiguration()));
- streamers(VisorStreamerConfiguration.list(c.getStreamerConfiguration()));
- env(new HashMap<>(getenv()));
- systemProperties(getProperties());
- atomic(VisorAtomicConfiguration.from(c.getAtomicConfiguration()));
- transaction(VisorTransactionConfiguration.from(c.getTransactionConfiguration()));
- queryConfiguration(VisorQueryConfiguration.from(c.getQueryConfiguration()));
+ basic = VisorBasicConfiguration.from(ignite, c);
+ metrics = VisorMetricsConfiguration.from(c);
+ spis = VisorSpisConfiguration.from(c);
+ p2p = VisorPeerToPeerConfiguration.from(c);
+ lifecycle = VisorLifecycleConfiguration.from(c);
+ execSvc = VisorExecutorServiceConfiguration.from(c);
+ seg = VisorSegmentationConfiguration.from(c);
+ inclProps = compactArray(c.getIncludeProperties());
+ inclEvtTypes = c.getIncludeEventTypes();
+ rest = VisorRestConfiguration.from(c);
+ userAttrs = c.getUserAttributes();
+ caches = VisorCacheConfiguration.list(ignite, c.getCacheConfiguration());
+ igfss = VisorIgfsConfiguration.list(c.getIgfsConfiguration());
+ streamers = VisorStreamerConfiguration.list(c.getStreamerConfiguration());
+ env = new HashMap<>(getenv());
+ sysProps = getProperties();
+ atomic = VisorAtomicConfiguration.from(c.getAtomicConfiguration());
+ txCfg = VisorTransactionConfiguration.from(c.getTransactionConfiguration());
+ qryCfg = VisorQueryConfiguration.from(c.getQueryConfiguration());
return this;
}
@@ -133,13 +133,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param basic New basic.
- */
- public void basic(VisorBasicConfiguration basic) {
- this.basic = basic;
- }
-
- /**
* @return Metrics.
*/
public VisorMetricsConfiguration metrics() {
@@ -147,13 +140,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param metrics New metrics.
- */
- public void metrics(VisorMetricsConfiguration metrics) {
- this.metrics = metrics;
- }
-
- /**
* @return SPIs.
*/
public VisorSpisConfiguration spis() {
@@ -161,13 +147,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param spis New SPIs.
- */
- public void spis(VisorSpisConfiguration spis) {
- this.spis = spis;
- }
-
- /**
* @return P2P.
*/
public VisorPeerToPeerConfiguration p2p() {
@@ -175,13 +154,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param p2P New p2p.
- */
- public void p2p(VisorPeerToPeerConfiguration p2P) {
- p2p = p2P;
- }
-
- /**
* @return Lifecycle.
*/
public VisorLifecycleConfiguration lifecycle() {
@@ -189,13 +161,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param lifecycle New lifecycle.
- */
- public void lifecycle(VisorLifecycleConfiguration lifecycle) {
- this.lifecycle = lifecycle;
- }
-
- /**
* @return Executors service configuration.
*/
public VisorExecutorServiceConfiguration executeService() {
@@ -203,13 +168,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param execSvc New executors service configuration.
- */
- public void executeService(VisorExecutorServiceConfiguration execSvc) {
- this.execSvc = execSvc;
- }
-
- /**
* @return Segmentation.
*/
public VisorSegmentationConfiguration segmentation() {
@@ -217,13 +175,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param seg New segmentation.
- */
- public void segmentation(VisorSegmentationConfiguration seg) {
- this.seg = seg;
- }
-
- /**
* @return Include properties.
*/
public String includeProperties() {
@@ -231,13 +182,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param inclProps New include properties.
- */
- public void includeProperties(String inclProps) {
- this.inclProps = inclProps;
- }
-
- /**
* @return Include events types.
*/
public int[] includeEventTypes() {
@@ -245,13 +189,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param inclEvtTypes New include events types.
- */
- public void includeEventTypes(int[] inclEvtTypes) {
- this.inclEvtTypes = inclEvtTypes;
- }
-
- /**
* @return Rest.
*/
public VisorRestConfiguration rest() {
@@ -259,13 +196,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param rest New rest.
- */
- public void rest(VisorRestConfiguration rest) {
- this.rest = rest;
- }
-
- /**
* @return User attributes.
*/
public Map<String, ?> userAttributes() {
@@ -273,13 +203,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param userAttrs New user attributes.
- */
- public void userAttributes(Map<String, ?> userAttrs) {
- this.userAttrs = userAttrs;
- }
-
- /**
* @return Caches.
*/
public Iterable<VisorCacheConfiguration> caches() {
@@ -287,13 +210,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param caches New caches.
- */
- public void caches(Iterable<VisorCacheConfiguration> caches) {
- this.caches = caches;
- }
-
- /**
* @return Igfss.
*/
public Iterable<VisorIgfsConfiguration> igfss() {
@@ -301,13 +217,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param igfss New igfss.
- */
- public void igfss(Iterable<VisorIgfsConfiguration> igfss) {
- this.igfss = igfss;
- }
-
- /**
* @return Streamers.
*/
public Iterable<VisorStreamerConfiguration> streamers() {
@@ -315,13 +224,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param streamers New streamers.
- */
- public void streamers(Iterable<VisorStreamerConfiguration> streamers) {
- this.streamers = streamers;
- }
-
- /**
* @return Environment.
*/
public Map<String, String> env() {
@@ -329,13 +231,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param env New environment.
- */
- public void env(Map<String, String> env) {
- this.env = env;
- }
-
- /**
* @return System properties.
*/
public Properties systemProperties() {
@@ -343,13 +238,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param sysProps New system properties.
- */
- public void systemProperties(Properties sysProps) {
- this.sysProps = sysProps;
- }
-
- /**
* @return Configuration of atomic data structures.
*/
public VisorAtomicConfiguration atomic() {
@@ -357,13 +245,6 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param atomic New configuration of atomic data structures.
- */
- public void atomic(VisorAtomicConfiguration atomic) {
- this.atomic = atomic;
- }
-
- /**
* @return Transactions configuration.
*/
public VisorTransactionConfiguration transaction() {
@@ -371,28 +252,14 @@ public class VisorGridConfiguration implements Serializable {
}
/**
- * @param txCfg New transactions configuration.
- */
- public void transaction(VisorTransactionConfiguration txCfg) {
- this.txCfg = txCfg;
- }
-
- /** {@inheritDoc} */
- @Override public String toString() {
- return S.toString(VisorGridConfiguration.class, this);
- }
-
- /**
* @return Query configuration.
*/
public VisorQueryConfiguration queryConfiguration() {
return qryCfg;
}
- /**
- * @param qryCfg New query configuration.
- */
- public void queryConfiguration(VisorQueryConfiguration qryCfg) {
- this.qryCfg = qryCfg;
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorGridConfiguration.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
index 287de27..056ac7f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorIgfsConfiguration.java
@@ -128,44 +128,44 @@ public class VisorIgfsConfiguration implements Serializable {
public static VisorIgfsConfiguration from(IgfsConfiguration igfs) {
VisorIgfsConfiguration cfg = new VisorIgfsConfiguration();
- cfg.name(igfs.getName());
- cfg.metaCacheName(igfs.getMetaCacheName());
- cfg.dataCacheName(igfs.getDataCacheName());
- cfg.blockSize(igfs.getBlockSize());
- cfg.prefetchBlocks(igfs.getPrefetchBlocks());
- cfg.streamBufferSize(igfs.getStreamBufferSize());
- cfg.perNodeBatchSize(igfs.getPerNodeBatchSize());
- cfg.perNodeParallelBatchCount(igfs.getPerNodeParallelBatchCount());
+ cfg.name = igfs.getName();
+ cfg.metaCacheName = igfs.getMetaCacheName();
+ cfg.dataCacheName = igfs.getDataCacheName();
+ cfg.blockSize = igfs.getBlockSize();
+ cfg.prefetchBlocks = igfs.getPrefetchBlocks();
+ cfg.streamBufSize = igfs.getStreamBufferSize();
+ cfg.perNodeBatchSize = igfs.getPerNodeBatchSize();
+ cfg.perNodeParallelBatchCnt = igfs.getPerNodeParallelBatchCount();
Igfs secFs = igfs.getSecondaryFileSystem();
if (secFs != null) {
Map<String, String> props = secFs.properties();
- cfg.secondaryHadoopFileSystemUri(props.get(SECONDARY_FS_URI));
- cfg.secondaryHadoopFileSystemConfigPath(props.get(SECONDARY_FS_CONFIG_PATH));
+ cfg.secondaryHadoopFileSysUri = props.get(SECONDARY_FS_URI);
+ cfg.secondaryHadoopFileSysCfgPath = props.get(SECONDARY_FS_CONFIG_PATH);
}
- cfg.defaultMode(igfs.getDefaultMode());
- cfg.pathModes(igfs.getPathModes());
- cfg.dualModePutExecutorService(compactClass(igfs.getDualModePutExecutorService()));
- cfg.dualModePutExecutorServiceShutdown(igfs.getDualModePutExecutorServiceShutdown());
- cfg.dualModeMaxPendingPutsSize(igfs.getDualModeMaxPendingPutsSize());
- cfg.maxTaskRangeLength(igfs.getMaximumTaskRangeLength());
- cfg.fragmentizerConcurrentFiles(igfs.getFragmentizerConcurrentFiles());
- cfg.fragmentizerLocalWritesRatio(igfs.getFragmentizerLocalWritesRatio());
- cfg.fragmentizerEnabled(igfs.isFragmentizerEnabled());
- cfg.fragmentizerThrottlingBlockLength(igfs.getFragmentizerThrottlingBlockLength());
- cfg.fragmentizerThrottlingDelay(igfs.getFragmentizerThrottlingDelay());
+ cfg.dfltMode = igfs.getDefaultMode();
+ cfg.pathModes = igfs.getPathModes();
+ cfg.dualModePutExecutorSrvc = compactClass(igfs.getDualModePutExecutorService());
+ cfg.dualModePutExecutorSrvcShutdown = igfs.getDualModePutExecutorServiceShutdown();
+ cfg.dualModeMaxPendingPutsSize = igfs.getDualModeMaxPendingPutsSize();
+ cfg.maxTaskRangeLen = igfs.getMaximumTaskRangeLength();
+ cfg.fragmentizerConcurrentFiles = igfs.getFragmentizerConcurrentFiles();
+ cfg.fragmentizerLocWritesRatio = igfs.getFragmentizerLocalWritesRatio();
+ cfg.fragmentizerEnabled = igfs.isFragmentizerEnabled();
+ cfg.fragmentizerThrottlingBlockLen = igfs.getFragmentizerThrottlingBlockLength();
+ cfg.fragmentizerThrottlingDelay = igfs.getFragmentizerThrottlingDelay();
Map<String, String> endpointCfg = igfs.getIpcEndpointConfiguration();
- cfg.ipcEndpointConfiguration(endpointCfg != null ? endpointCfg.toString() : null);
+ cfg.ipcEndpointCfg = endpointCfg != null ? endpointCfg.toString() : null;
- cfg.ipcEndpointEnabled(igfs.isIpcEndpointEnabled());
- cfg.maxSpace(igfs.getMaxSpaceSize());
- cfg.managementPort(igfs.getManagementPort());
- cfg.sequenceReadsBeforePrefetch(igfs.getSequentialReadsBeforePrefetch());
- cfg.trashPurgeTimeout(igfs.getTrashPurgeTimeout());
+ cfg.ipcEndpointEnabled = igfs.isIpcEndpointEnabled();
+ cfg.maxSpace = igfs.getMaxSpaceSize();
+ cfg.mgmtPort = igfs.getManagementPort();
+ cfg.seqReadsBeforePrefetch = igfs.getSequentialReadsBeforePrefetch();
+ cfg.trashPurgeTimeout = igfs.getTrashPurgeTimeout();
return cfg;
}
@@ -196,13 +196,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param name New IGFS instance name.
- */
- public void name(@Nullable String name) {
- this.name = name;
- }
-
- /**
* @return Cache name to store IGFS meta information.
*/
@Nullable public String metaCacheName() {
@@ -210,13 +203,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param metaCacheName New cache name to store IGFS meta information.
- */
- public void metaCacheName(@Nullable String metaCacheName) {
- this.metaCacheName = metaCacheName;
- }
-
- /**
* @return Cache name to store IGFS data.
*/
@Nullable public String dataCacheName() {
@@ -224,13 +210,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dataCacheName New cache name to store IGFS data.
- */
- public void dataCacheName(@Nullable String dataCacheName) {
- this.dataCacheName = dataCacheName;
- }
-
- /**
* @return File's data block size.
*/
public int blockSize() {
@@ -238,13 +217,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param blockSize New file's data block size.
- */
- public void blockSize(int blockSize) {
- this.blockSize = blockSize;
- }
-
- /**
* @return Number of pre-fetched blocks if specific file's chunk is requested.
*/
public int prefetchBlocks() {
@@ -252,13 +224,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param prefetchBlocks New number of pre-fetched blocks if specific file's chunk is requested.
- */
- public void prefetchBlocks(int prefetchBlocks) {
- this.prefetchBlocks = prefetchBlocks;
- }
-
- /**
* @return Read/write buffer size for IGFS stream operations in bytes.
*/
public int streamBufferSize() {
@@ -266,13 +231,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param streamBufSize New read/write buffer size for IGFS stream operations in bytes.
- */
- public void streamBufferSize(int streamBufSize) {
- this.streamBufSize = streamBufSize;
- }
-
- /**
* @return Number of file blocks buffered on local node before sending batch to remote node.
*/
public int perNodeBatchSize() {
@@ -280,13 +238,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param perNodeBatchSize New number of file blocks buffered on local node before sending batch to remote node.
- */
- public void perNodeBatchSize(int perNodeBatchSize) {
- this.perNodeBatchSize = perNodeBatchSize;
- }
-
- /**
* @return Number of batches that can be concurrently sent to remote node.
*/
public int perNodeParallelBatchCount() {
@@ -294,13 +245,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param perNodeParallelBatchCnt New number of batches that can be concurrently sent to remote node.
- */
- public void perNodeParallelBatchCount(int perNodeParallelBatchCnt) {
- this.perNodeParallelBatchCnt = perNodeParallelBatchCnt;
- }
-
- /**
* @return URI of the secondary Hadoop file system.
*/
@Nullable public String secondaryHadoopFileSystemUri() {
@@ -308,13 +252,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param secondaryHadoopFileSysUri New URI of the secondary Hadoop file system.
- */
- public void secondaryHadoopFileSystemUri(@Nullable String secondaryHadoopFileSysUri) {
- this.secondaryHadoopFileSysUri = secondaryHadoopFileSysUri;
- }
-
- /**
* @return Path for the secondary hadoop file system config.
*/
@Nullable public String secondaryHadoopFileSystemConfigPath() {
@@ -322,13 +259,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param secondaryHadoopFileSysCfgPath New path for the secondary hadoop file system config.
- */
- public void secondaryHadoopFileSystemConfigPath(@Nullable String secondaryHadoopFileSysCfgPath) {
- this.secondaryHadoopFileSysCfgPath = secondaryHadoopFileSysCfgPath;
- }
-
- /**
* @return IGFS instance mode.
*/
public IgfsMode defaultMode() {
@@ -336,13 +266,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dfltMode New IGFS instance mode.
- */
- public void defaultMode(IgfsMode dfltMode) {
- this.dfltMode = dfltMode;
- }
-
- /**
* @return Map of paths to IGFS modes.
*/
@Nullable public Map<String, IgfsMode> pathModes() {
@@ -350,13 +273,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param pathModes New map of paths to IGFS modes.
- */
- public void pathModes(@Nullable Map<String, IgfsMode> pathModes) {
- this.pathModes = pathModes;
- }
-
- /**
* @return Dual mode PUT operations executor service.
*/
public String dualModePutExecutorService() {
@@ -364,13 +280,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dualModePutExecutorSrvc New dual mode PUT operations executor service.
- */
- public void dualModePutExecutorService(String dualModePutExecutorSrvc) {
- this.dualModePutExecutorSrvc = dualModePutExecutorSrvc;
- }
-
- /**
* @return Dual mode PUT operations executor service shutdown flag.
*/
public boolean dualModePutExecutorServiceShutdown() {
@@ -378,13 +287,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dualModePutExecutorSrvcShutdown New dual mode PUT operations executor service shutdown flag.
- */
- public void dualModePutExecutorServiceShutdown(boolean dualModePutExecutorSrvcShutdown) {
- this.dualModePutExecutorSrvcShutdown = dualModePutExecutorSrvcShutdown;
- }
-
- /**
* @return Maximum amount of data in pending puts.
*/
public long dualModeMaxPendingPutsSize() {
@@ -392,13 +294,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param dualModeMaxPendingPutsSize New maximum amount of data in pending puts.
- */
- public void dualModeMaxPendingPutsSize(long dualModeMaxPendingPutsSize) {
- this.dualModeMaxPendingPutsSize = dualModeMaxPendingPutsSize;
- }
-
- /**
* @return Maximum range length.
*/
public long maxTaskRangeLength() {
@@ -406,13 +301,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param maxTaskRangeLen New maximum range length.
- */
- public void maxTaskRangeLength(long maxTaskRangeLen) {
- this.maxTaskRangeLen = maxTaskRangeLen;
- }
-
- /**
* @return Fragmentizer concurrent files.
*/
public int fragmentizerConcurrentFiles() {
@@ -420,13 +308,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerConcurrentFiles New fragmentizer concurrent files.
- */
- public void fragmentizerConcurrentFiles(int fragmentizerConcurrentFiles) {
- this.fragmentizerConcurrentFiles = fragmentizerConcurrentFiles;
- }
-
- /**
* @return Fragmentizer local writes ratio.
*/
public float fragmentizerLocalWritesRatio() {
@@ -434,13 +315,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerLocWritesRatio New fragmentizer local writes ratio.
- */
- public void fragmentizerLocalWritesRatio(float fragmentizerLocWritesRatio) {
- this.fragmentizerLocWritesRatio = fragmentizerLocWritesRatio;
- }
-
- /**
* @return Fragmentizer enabled flag.
*/
public boolean fragmentizerEnabled() {
@@ -448,13 +322,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerEnabled New fragmentizer enabled flag.
- */
- public void fragmentizerEnabled(boolean fragmentizerEnabled) {
- this.fragmentizerEnabled = fragmentizerEnabled;
- }
-
- /**
* @return Fragmentizer throttling block length.
*/
public long fragmentizerThrottlingBlockLength() {
@@ -462,13 +329,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerThrottlingBlockLen New fragmentizer throttling block length.
- */
- public void fragmentizerThrottlingBlockLength(long fragmentizerThrottlingBlockLen) {
- this.fragmentizerThrottlingBlockLen = fragmentizerThrottlingBlockLen;
- }
-
- /**
* @return Fragmentizer throttling delay.
*/
public long fragmentizerThrottlingDelay() {
@@ -476,13 +336,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param fragmentizerThrottlingDelay New fragmentizer throttling delay.
- */
- public void fragmentizerThrottlingDelay(long fragmentizerThrottlingDelay) {
- this.fragmentizerThrottlingDelay = fragmentizerThrottlingDelay;
- }
-
- /**
* @return IPC endpoint config (in JSON format) to publish IGFS over.
*/
@Nullable public String ipcEndpointConfiguration() {
@@ -490,13 +343,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param ipcEndpointCfg New IPC endpoint config (in JSON format) to publish IGFS over.
- */
- public void ipcEndpointConfiguration(@Nullable String ipcEndpointCfg) {
- this.ipcEndpointCfg = ipcEndpointCfg;
- }
-
- /**
* @return IPC endpoint enabled flag.
*/
public boolean ipcEndpointEnabled() {
@@ -504,13 +350,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param ipcEndpointEnabled New iPC endpoint enabled flag.
- */
- public void ipcEndpointEnabled(boolean ipcEndpointEnabled) {
- this.ipcEndpointEnabled = ipcEndpointEnabled;
- }
-
- /**
* @return Maximum space.
*/
public long maxSpace() {
@@ -518,13 +357,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param maxSpace New maximum space.
- */
- public void maxSpace(long maxSpace) {
- this.maxSpace = maxSpace;
- }
-
- /**
* @return Management port.
*/
public int managementPort() {
@@ -532,13 +364,6 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param mgmtPort New management port.
- */
- public void managementPort(int mgmtPort) {
- this.mgmtPort = mgmtPort;
- }
-
- /**
* @return Amount of sequential block reads before prefetch is triggered.
*/
public int sequenceReadsBeforePrefetch() {
@@ -546,29 +371,14 @@ public class VisorIgfsConfiguration implements Serializable {
}
/**
- * @param seqReadsBeforePrefetch New amount of sequential block reads before prefetch is triggered.
- */
- public void sequenceReadsBeforePrefetch(int seqReadsBeforePrefetch) {
- this.seqReadsBeforePrefetch = seqReadsBeforePrefetch;
- }
-
- /**
* @return Trash purge await timeout.
*/
public long trashPurgeTimeout() {
return trashPurgeTimeout;
}
- /**
- * @param trashPurgeTimeout New trash purge await timeout.
- */
- public void trashPurgeTimeout(long trashPurgeTimeout) {
- this.trashPurgeTimeout = trashPurgeTimeout;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorIgfsConfiguration.class, this);
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
index 723fbee..3e0f9cc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorLifecycleConfiguration.java
@@ -42,7 +42,7 @@ public class VisorLifecycleConfiguration implements Serializable {
public static VisorLifecycleConfiguration from(IgniteConfiguration c) {
VisorLifecycleConfiguration cfg = new VisorLifecycleConfiguration();
- cfg.beans(compactArray(c.getLifecycleBeans()));
+ cfg.beans = compactArray(c.getLifecycleBeans());
return cfg;
}
@@ -54,13 +54,6 @@ public class VisorLifecycleConfiguration implements Serializable {
return beans;
}
- /**
- * @param beans New lifecycle beans.
- */
- public void beans(@Nullable String beans) {
- this.beans = beans;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorLifecycleConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
index 51dc092..e76adac 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorMetricsConfiguration.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.visor.node;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
@@ -44,9 +45,9 @@ public class VisorMetricsConfiguration implements Serializable {
public static VisorMetricsConfiguration from(IgniteConfiguration c) {
VisorMetricsConfiguration cfg = new VisorMetricsConfiguration();
- cfg.expireTime(c.getMetricsExpireTime());
- cfg.historySize(c.getMetricsHistorySize());
- cfg.loggerFrequency(c.getMetricsLogFrequency());
+ cfg.expTime = c.getMetricsExpireTime();
+ cfg.histSize = c.getMetricsHistorySize();
+ cfg.logFreq = c.getMetricsLogFrequency();
return cfg;
}
@@ -59,13 +60,6 @@ public class VisorMetricsConfiguration implements Serializable {
}
/**
- * @param expTime New metrics expire time.
- */
- public void expireTime(long expTime) {
- this.expTime = expTime;
- }
-
- /**
* @return Number of node metrics stored in memory.
*/
public int historySize() {
@@ -73,23 +67,14 @@ public class VisorMetricsConfiguration implements Serializable {
}
/**
- * @param histSize New number of node metrics stored in memory.
- */
- public void historySize(int histSize) {
- this.histSize = histSize;
- }
-
- /**
* @return Frequency of metrics log printout.
*/
public long loggerFrequency() {
return logFreq;
}
- /**
- * @param logFreq New frequency of metrics log printout.
- */
- public void loggerFrequency(long logFreq) {
- this.logFreq = logFreq;
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorMetricsConfiguration.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
index 7f0d050..5c4f8fc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorPeerToPeerConfiguration.java
@@ -48,9 +48,9 @@ public class VisorPeerToPeerConfiguration implements Serializable {
public static VisorPeerToPeerConfiguration from(IgniteConfiguration c) {
VisorPeerToPeerConfiguration cfg = new VisorPeerToPeerConfiguration();
- cfg.p2pEnabled(c.isPeerClassLoadingEnabled());
- cfg.p2pMissedResponseCacheSize(c.getPeerClassLoadingMissedResourcesCacheSize());
- cfg.p2pLocalClassPathExclude(compactArray(c.getPeerClassLoadingLocalClassPathExclude()));
+ cfg.p2pEnabled = c.isPeerClassLoadingEnabled();
+ cfg.p2pMissedResCacheSize = c.getPeerClassLoadingMissedResourcesCacheSize();
+ cfg.p2pLocClsPathExcl = compactArray(c.getPeerClassLoadingLocalClassPathExclude());
return cfg;
}
@@ -63,13 +63,6 @@ public class VisorPeerToPeerConfiguration implements Serializable {
}
/**
- * @param p2pEnabled New whether peer-to-peer class loading is enabled.
- */
- public void p2pEnabled(boolean p2pEnabled) {
- this.p2pEnabled = p2pEnabled;
- }
-
- /**
* @return Missed resource cache size.
*/
public int p2pMissedResponseCacheSize() {
@@ -77,27 +70,12 @@ public class VisorPeerToPeerConfiguration implements Serializable {
}
/**
- * @param p2pMissedResCacheSize New missed resource cache size.
- */
- public void p2pMissedResponseCacheSize(int p2pMissedResCacheSize) {
- this.p2pMissedResCacheSize = p2pMissedResCacheSize;
- }
-
- /**
* @return List of packages from the system classpath that need to be loaded from task originating node.
*/
@Nullable public String p2pLocalClassPathExclude() {
return p2pLocClsPathExcl;
}
- /**
- * @param p2pLocClsPathExcl New list of packages from the system classpath that need to be loaded from task
- * originating node.
- */
- public void p2pLocalClassPathExclude(@Nullable String p2pLocClsPathExcl) {
- this.p2pLocClsPathExcl = p2pLocClsPathExcl;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorPeerToPeerConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
index a2599ab..de5e0b2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorQueryConfiguration.java
@@ -70,13 +70,13 @@ public class VisorQueryConfiguration implements Serializable {
for (int i = 0; i < sz; i++)
strClss[i] = U.compact(clss[i].getName());
- c.indexCustomFunctionClasses(strClss);
- c.searchPath(qcfg.getSearchPath());
- c.initialScriptPath(qcfg.getInitialScriptPath());
- c.maxOffHeapMemory(qcfg.getMaxOffHeapMemory());
- c.longQueryExecutionTimeout(qcfg.getLongQueryExecutionTimeout());
- c.longQueryExplain(qcfg.isLongQueryExplain());
- c.useOptimizedSerializer(qcfg.isUseOptimizedSerializer());
+ c.idxCustomFuncClss = strClss;
+ c.searchPath = qcfg.getSearchPath();
+ c.initScriptPath = qcfg.getInitialScriptPath();
+ c.maxOffHeapMemory = qcfg.getMaxOffHeapMemory();
+ c.longQryExecTimeout = qcfg.getLongQueryExecutionTimeout();
+ c.longQryExplain = qcfg.isLongQueryExplain();
+ c.useOptimizedSerializer = qcfg.isUseOptimizedSerializer();
}
return c;
@@ -90,13 +90,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param idxCustomFuncClss Classes with methods annotated by {@link QuerySqlFunction}.
- */
- public void indexCustomFunctionClasses(String[] idxCustomFuncClss) {
- this.idxCustomFuncClss = idxCustomFuncClss;
- }
-
- /**
* @return Optional search path consisting of space names to search SQL schema objects.
*/
public String[] searchPath() {
@@ -104,13 +97,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param searchPath Optional search path consisting of space names to search SQL schema objects.
- */
- public void searchPath(String[] searchPath) {
- this.searchPath = searchPath;
- }
-
- /**
* @return Script path to be ran against H2 database after opening.
*/
public String initialScriptPath() {
@@ -118,13 +104,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param initScriptPath Script path to be ran against H2 database after opening.
- */
- public void initialScriptPath(String initScriptPath) {
- this.initScriptPath = initScriptPath;
- }
-
- /**
* @return Maximum amount of memory available to off-heap storage.
*/
public long maxOffHeapMemory() {
@@ -132,13 +111,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param maxOffHeapMemory Maximum amount of memory available to off-heap storage.
- */
- public void maxOffHeapMemory(long maxOffHeapMemory) {
- this.maxOffHeapMemory = maxOffHeapMemory;
- }
-
- /**
* @return Query execution time threshold.
*/
public long longQueryExecutionTimeout() {
@@ -146,13 +118,6 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param longQryExecTimeout Query execution time threshold.
- */
- public void longQueryExecutionTimeout(long longQryExecTimeout) {
- this.longQryExecTimeout = longQryExecTimeout;
- }
-
- /**
* @return If {@code true}, SPI will print SQL execution plan for long queries.
*/
public boolean longQryExplain() {
@@ -160,24 +125,14 @@ public class VisorQueryConfiguration implements Serializable {
}
/**
- * @param longQryExplain If {@code true}, SPI will print SQL execution plan for long queries.
- */
- public void longQueryExplain(boolean longQryExplain) {
- this.longQryExplain = longQryExplain;
- }
-
- /**
* @return The flag indicating that serializer for H2 database will be set to Ignite's marshaller.
*/
public boolean useOptimizedSerializer() {
return useOptimizedSerializer;
}
- /**
- * @param useOptimizedSerializer The flag indicating that serializer for H2 database will be set to Ignite's
- * marshaller.
- */
- public void useOptimizedSerializer(boolean useOptimizedSerializer) {
- this.useOptimizedSerializer = useOptimizedSerializer;
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(VisorQueryConfiguration.class, this);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
index 1bdb7b7..f279253 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorRestConfiguration.java
@@ -72,16 +72,16 @@ public class VisorRestConfiguration implements Serializable {
boolean restEnabled = clnCfg != null;
- cfg.restEnabled(restEnabled);
+ cfg.restEnabled = restEnabled;
if (restEnabled) {
- cfg.tcpSslEnabled(clnCfg.isSslEnabled());
- cfg.jettyPath(clnCfg.getJettyPath());
- cfg.jettyHost(getProperty(IGNITE_JETTY_HOST));
- cfg.jettyPort(intValue(IGNITE_JETTY_PORT, null));
- cfg.tcpHost(clnCfg.getHost());
- cfg.tcpPort(clnCfg.getPort());
- cfg.tcpSslContextFactory(compactClass(clnCfg.getSslContextFactory()));
+ cfg.tcpSslEnabled = clnCfg.isSslEnabled();
+ cfg.jettyPath = clnCfg.getJettyPath();
+ cfg.jettyHost = getProperty(IGNITE_JETTY_HOST);
+ cfg.jettyPort = intValue(IGNITE_JETTY_PORT, null);
+ cfg.tcpHost = clnCfg.getHost();
+ cfg.tcpPort = clnCfg.getPort();
+ cfg.tcpSslCtxFactory = compactClass(clnCfg.getSslContextFactory());
}
return cfg;
@@ -93,14 +93,6 @@ public class VisorRestConfiguration implements Serializable {
public boolean restEnabled() {
return restEnabled;
}
-
- /**
- * @param restEnabled New whether REST enabled or not.
- */
- public void restEnabled(boolean restEnabled) {
- this.restEnabled = restEnabled;
- }
-
/**
* @return Whether or not SSL is enabled for TCP binary protocol.
*/
@@ -109,13 +101,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param tcpSslEnabled New whether or not SSL is enabled for TCP binary protocol.
- */
- public void tcpSslEnabled(boolean tcpSslEnabled) {
- this.tcpSslEnabled = tcpSslEnabled;
- }
-
- /**
* @return Rest accessible folders (log command can get files from).
*/
@Nullable public String[] accessibleFolders() {
@@ -123,13 +108,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param accessibleFolders New rest accessible folders (log command can get files from).
- */
- public void accessibleFolders(String[] accessibleFolders) {
- this.accessibleFolders = accessibleFolders;
- }
-
- /**
* @return Jetty config path.
*/
@Nullable public String jettyPath() {
@@ -137,13 +115,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param jettyPath New jetty config path.
- */
- public void jettyPath(String jettyPath) {
- this.jettyPath = jettyPath;
- }
-
- /**
* @return Jetty host.
*/
@Nullable public String jettyHost() {
@@ -151,13 +122,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param jettyHost New jetty host.
- */
- public void jettyHost(String jettyHost) {
- this.jettyHost = jettyHost;
- }
-
- /**
* @return Jetty port.
*/
@Nullable public Integer jettyPort() {
@@ -165,13 +129,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param jettyPort New jetty port.
- */
- public void jettyPort(Integer jettyPort) {
- this.jettyPort = jettyPort;
- }
-
- /**
* @return REST TCP binary host.
*/
@Nullable public String tcpHost() {
@@ -179,13 +136,6 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param tcpHost New rEST TCP binary host.
- */
- public void tcpHost(String tcpHost) {
- this.tcpHost = tcpHost;
- }
-
- /**
* @return REST TCP binary port.
*/
@Nullable public Integer tcpPort() {
@@ -193,26 +143,12 @@ public class VisorRestConfiguration implements Serializable {
}
/**
- * @param tcpPort New rEST TCP binary port.
- */
- public void tcpPort(Integer tcpPort) {
- this.tcpPort = tcpPort;
- }
-
- /**
* @return Context factory for SSL.
*/
@Nullable public String tcpSslContextFactory() {
return tcpSslCtxFactory;
}
- /**
- * @param tcpSslCtxFactory New context factory for SSL.
- */
- public void tcpSslContextFactory(String tcpSslCtxFactory) {
- this.tcpSslCtxFactory = tcpSslCtxFactory;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorRestConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
index 547e1c6..d712774 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSegmentationConfiguration.java
@@ -55,11 +55,11 @@ public class VisorSegmentationConfiguration implements Serializable {
public static VisorSegmentationConfiguration from(IgniteConfiguration c) {
VisorSegmentationConfiguration cfg = new VisorSegmentationConfiguration();
- cfg.policy(c.getSegmentationPolicy());
- cfg.resolvers(compactArray(c.getSegmentationResolvers()));
- cfg.checkFrequency(c.getSegmentCheckFrequency());
- cfg.waitOnStart(c.isWaitForSegmentOnStart());
- cfg.passRequired(c.isAllSegmentationResolversPassRequired());
+ cfg.plc = c.getSegmentationPolicy();
+ cfg.resolvers = compactArray(c.getSegmentationResolvers());
+ cfg.checkFreq = c.getSegmentCheckFrequency();
+ cfg.waitOnStart = c.isWaitForSegmentOnStart();
+ cfg.passRequired = c.isAllSegmentationResolversPassRequired();
return cfg;
}
@@ -72,13 +72,6 @@ public class VisorSegmentationConfiguration implements Serializable {
}
/**
- * @param plc New segmentation policy.
- */
- public void policy(GridSegmentationPolicy plc) {
- this.plc = plc;
- }
-
- /**
* @return Segmentation resolvers.
*/
@Nullable public String resolvers() {
@@ -86,13 +79,6 @@ public class VisorSegmentationConfiguration implements Serializable {
}
/**
- * @param resolvers New segmentation resolvers.
- */
- public void resolvers(@Nullable String resolvers) {
- this.resolvers = resolvers;
- }
-
- /**
* @return Frequency of network segment check by discovery manager.
*/
public long checkFrequency() {
@@ -100,13 +86,6 @@ public class VisorSegmentationConfiguration implements Serializable {
}
/**
- * @param checkFreq New frequency of network segment check by discovery manager.
- */
- public void checkFrequency(long checkFreq) {
- this.checkFreq = checkFreq;
- }
-
- /**
* @return Whether or not node should wait for correct segment on start.
*/
public boolean waitOnStart() {
@@ -114,26 +93,12 @@ public class VisorSegmentationConfiguration implements Serializable {
}
/**
- * @param waitOnStart New whether or not node should wait for correct segment on start.
- */
- public void waitOnStart(boolean waitOnStart) {
- this.waitOnStart = waitOnStart;
- }
-
- /**
* @return Whether or not all resolvers should succeed for node to be in correct segment.
*/
public boolean passRequired() {
return passRequired;
}
- /**
- * @param passRequired New whether or not all resolvers should succeed for node to be in correct segment.
- */
- public void passRequired(boolean passRequired) {
- this.passRequired = passRequired;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorSegmentationConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
index 6833393..4afb90f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorSpisConfiguration.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.visor.node;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.spi.*;
@@ -141,16 +142,16 @@ public class VisorSpisConfiguration implements Serializable {
public static VisorSpisConfiguration from(IgniteConfiguration c) {
VisorSpisConfiguration cfg = new VisorSpisConfiguration();
- cfg.discoverySpi(collectSpiInfo(c.getDiscoverySpi()));
- cfg.communicationSpi(collectSpiInfo(c.getCommunicationSpi()));
- cfg.eventStorageSpi(collectSpiInfo(c.getEventStorageSpi()));
- cfg.collisionSpi(collectSpiInfo(c.getCollisionSpi()));
- cfg.deploymentSpi(collectSpiInfo(c.getDeploymentSpi()));
- cfg.checkpointSpis(collectSpiInfo(c.getCheckpointSpi()));
- cfg.failoverSpis(collectSpiInfo(c.getFailoverSpi()));
- cfg.loadBalancingSpis(collectSpiInfo(c.getLoadBalancingSpi()));
- cfg.swapSpaceSpi(collectSpiInfo(c.getSwapSpaceSpi()));
- cfg.indexingSpis(collectSpiInfo(c.getIndexingSpi()));
+ cfg.discoSpi = collectSpiInfo(c.getDiscoverySpi());
+ cfg.commSpi = collectSpiInfo(c.getCommunicationSpi());
+ cfg.evtSpi = collectSpiInfo(c.getEventStorageSpi());
+ cfg.colSpi = collectSpiInfo(c.getCollisionSpi());
+ cfg.deploySpi = collectSpiInfo(c.getDeploymentSpi());
+ cfg.cpSpis = collectSpiInfo(c.getCheckpointSpi());
+ cfg.failSpis = collectSpiInfo(c.getFailoverSpi());
+ cfg.loadBalancingSpis = collectSpiInfo(c.getLoadBalancingSpi());
+ cfg.swapSpaceSpis = collectSpiInfo(c.getSwapSpaceSpi());
+ cfg.indexingSpis = F.asArray(collectSpiInfo(c.getIndexingSpi()));
return cfg;
}
@@ -163,13 +164,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param discoSpi New discovery SPI.
- */
- public void discoverySpi(IgniteBiTuple<String, Map<String, Object>> discoSpi) {
- this.discoSpi = discoSpi;
- }
-
- /**
* @return Communication SPI.
*/
public IgniteBiTuple<String, Map<String, Object>> communicationSpi() {
@@ -177,13 +171,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param commSpi New communication SPI.
- */
- public void communicationSpi(IgniteBiTuple<String, Map<String, Object>> commSpi) {
- this.commSpi = commSpi;
- }
-
- /**
* @return Event storage SPI.
*/
public IgniteBiTuple<String, Map<String, Object>> eventStorageSpi() {
@@ -191,13 +178,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param evtSpi New event storage SPI.
- */
- public void eventStorageSpi(IgniteBiTuple<String, Map<String, Object>> evtSpi) {
- this.evtSpi = evtSpi;
- }
-
- /**
* @return Collision SPI.
*/
public IgniteBiTuple<String, Map<String, Object>> collisionSpi() {
@@ -205,13 +185,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param colSpi New collision SPI.
- */
- public void collisionSpi(IgniteBiTuple<String, Map<String, Object>> colSpi) {
- this.colSpi = colSpi;
- }
-
- /**
* @return Deployment SPI.
*/
public IgniteBiTuple<String, Map<String, Object>> deploymentSpi() {
@@ -219,13 +192,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param deploySpi New deployment SPI.
- */
- public void deploymentSpi(IgniteBiTuple<String, Map<String, Object>> deploySpi) {
- this.deploySpi = deploySpi;
- }
-
- /**
* @return Checkpoint SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>>[] checkpointSpis() {
@@ -233,13 +199,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param cpSpis New checkpoint SPIs.
- */
- public void checkpointSpis(IgniteBiTuple<String, Map<String, Object>>[] cpSpis) {
- this.cpSpis = cpSpis;
- }
-
- /**
* @return Failover SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>>[] failoverSpis() {
@@ -247,13 +206,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param failSpis New failover SPIs.
- */
- public void failoverSpis(IgniteBiTuple<String, Map<String, Object>>[] failSpis) {
- this.failSpis = failSpis;
- }
-
- /**
* @return Load balancing SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>>[] loadBalancingSpis() {
@@ -261,13 +213,6 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param loadBalancingSpis New load balancing SPIs.
- */
- public void loadBalancingSpis(IgniteBiTuple<String, Map<String, Object>>[] loadBalancingSpis) {
- this.loadBalancingSpis = loadBalancingSpis;
- }
-
- /**
* @return Swap space SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>> swapSpaceSpi() {
@@ -275,27 +220,12 @@ public class VisorSpisConfiguration implements Serializable {
}
/**
- * @param swapSpaceSpis New swap space SPIs.
- */
- public void swapSpaceSpi(IgniteBiTuple<String, Map<String, Object>> swapSpaceSpis) {
- this.swapSpaceSpis = swapSpaceSpis;
- }
-
- /**
* @return Indexing SPIs.
*/
public IgniteBiTuple<String, Map<String, Object>>[] indexingSpis() {
return indexingSpis;
}
- /**
- * @param indexingSpis New indexing SPIs.
- */
- @SafeVarargs
- public final void indexingSpis(IgniteBiTuple<String, Map<String, Object>>... indexingSpis) {
- this.indexingSpis = indexingSpis;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorSpisConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/57bdd8a5/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
index 597336b..667ff51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorTransactionConfiguration.java
@@ -3,7 +3,7 @@
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
+ * (the "License"; you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
@@ -31,10 +31,10 @@ public class VisorTransactionConfiguration implements Serializable {
private static final long serialVersionUID = 0L;
/** Default cache concurrency. */
- private TransactionConcurrency dfltConcurrency;
+ private TransactionConcurrency dfltTxConcurrency;
/** Default transaction isolation. */
- private TransactionIsolation dfltIsolation;
+ private TransactionIsolation dfltTxIsolation;
/** Default transaction timeout. */
private long dfltTxTimeout;
@@ -57,12 +57,12 @@ public class VisorTransactionConfiguration implements Serializable {
public static VisorTransactionConfiguration from(TransactionConfiguration src) {
VisorTransactionConfiguration cfg = new VisorTransactionConfiguration();
- cfg.defaultTxConcurrency(src.getDefaultTxConcurrency());
- cfg.defaultTxIsolation(src.getDefaultTxIsolation());
- cfg.defaultTxTimeout(src.getDefaultTxTimeout());
- cfg.pessimisticTxLogLinger(src.getPessimisticTxLogLinger());
- cfg.pessimisticTxLogSize(src.getPessimisticTxLogSize());
- cfg.txSerializableEnabled(src.isTxSerializableEnabled());
+ cfg.dfltTxConcurrency = src.getDefaultTxConcurrency();
+ cfg.dfltTxIsolation = src.getDefaultTxIsolation();
+ cfg.dfltTxTimeout = src.getDefaultTxTimeout();
+ cfg.pessimisticTxLogLinger = src.getPessimisticTxLogLinger();
+ cfg.pessimisticTxLogSize = src.getPessimisticTxLogSize();
+ cfg.txSerEnabled = src.isTxSerializableEnabled();
return cfg;
}
@@ -71,28 +71,14 @@ public class VisorTransactionConfiguration implements Serializable {
* @return Default cache transaction concurrency.
*/
public TransactionConcurrency defaultTxConcurrency() {
- return dfltConcurrency;
- }
-
- /**
- * @param dfltConcurrency Default cache transaction concurrency.
- */
- public void defaultTxConcurrency(TransactionConcurrency dfltConcurrency) {
- this.dfltConcurrency = dfltConcurrency;
+ return dfltTxConcurrency;
}
/**
* @return Default cache transaction isolation.
*/
public TransactionIsolation defaultTxIsolation() {
- return dfltIsolation;
- }
-
- /**
- * @param dfltIsolation Default cache transaction isolation.
- */
- public void defaultTxIsolation(TransactionIsolation dfltIsolation) {
- this.dfltIsolation = dfltIsolation;
+ return dfltTxIsolation;
}
/**
@@ -103,13 +89,6 @@ public class VisorTransactionConfiguration implements Serializable {
}
/**
- * @param dfltTxTimeout Default transaction timeout.
- */
- public void defaultTxTimeout(long dfltTxTimeout) {
- this.dfltTxTimeout = dfltTxTimeout;
- }
-
- /**
* @return Pessimistic log cleanup delay in milliseconds.
*/
public int pessimisticTxLogLinger() {
@@ -117,13 +96,6 @@ public class VisorTransactionConfiguration implements Serializable {
}
/**
- * @param pessimisticTxLogLinger Pessimistic log cleanup delay.
- */
- public void pessimisticTxLogLinger(int pessimisticTxLogLinger) {
- this.pessimisticTxLogLinger = pessimisticTxLogLinger;
- }
-
- /**
* @return Pessimistic transaction log size.
*/
public int getPessimisticTxLogSize() {
@@ -131,26 +103,12 @@ public class VisorTransactionConfiguration implements Serializable {
}
/**
- * @param pessimisticTxLogSize Pessimistic transactions log size.
- */
- public void pessimisticTxLogSize(int pessimisticTxLogSize) {
- this.pessimisticTxLogSize = pessimisticTxLogSize;
- }
-
- /**
* @return {@code True} if serializable transactions are enabled, {@code false} otherwise.
*/
public boolean txSerializableEnabled() {
return txSerEnabled;
}
- /**
- * @param txSerEnabled Flag to enable/disable serializable cache transactions.
- */
- public void txSerializableEnabled(boolean txSerEnabled) {
- this.txSerEnabled = txSerEnabled;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(VisorTransactionConfiguration.class, this);