IGNITE-5064 Removed obsolete EventTypes + minor cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4e4a22d9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4e4a22d9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4e4a22d9 Branch: refs/heads/ignite-5072 Commit: 4e4a22d9aad4fdbfbcefc4eeacb65f8cffa181f2 Parents: 8a5266e Author: Alexey Kuznetsov <[email protected]> Authored: Tue Apr 25 16:12:01 2017 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Apr 25 16:12:01 2017 +0700 ---------------------------------------------------------------------- .../web-console/frontend/app/data/event-groups.json | 14 -------------- .../web-console/frontend/app/modules/cluster/Cache.js | 4 ---- .../frontend/app/modules/cluster/CacheMetrics.js | 4 ---- modules/web-console/web-agent/pom.xml | 2 +- .../apache/ignite/console/agent/AgentLauncher.java | 10 +++++----- 5 files changed, 6 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4e4a22d9/modules/web-console/frontend/app/data/event-groups.json ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/data/event-groups.json b/modules/web-console/frontend/app/data/event-groups.json index 8d0c878..094fd28 100644 --- a/modules/web-console/frontend/app/data/event-groups.json +++ b/modules/web-console/frontend/app/data/event-groups.json @@ -97,8 +97,6 @@ "EVT_CACHE_OBJECT_REMOVED", "EVT_CACHE_OBJECT_LOCKED", "EVT_CACHE_OBJECT_UNLOCKED", - "EVT_CACHE_OBJECT_SWAPPED", - "EVT_CACHE_OBJECT_UNSWAPPED", "EVT_CACHE_OBJECT_EXPIRED" ] }, @@ -136,18 +134,6 @@ ] }, { - "label": "EVTS_SWAPSPACE", - "value": "EVTS_SWAPSPACE", - "class": "org.apache.ignite.events.EventType", - "events": [ - "EVT_SWAP_SPACE_CLEARED", - "EVT_SWAP_SPACE_DATA_REMOVED", - "EVT_SWAP_SPACE_DATA_READ", - "EVT_SWAP_SPACE_DATA_STORED", - "EVT_SWAP_SPACE_DATA_EVICTED" - ] - }, - { "label": "EVTS_IGFS", "value": "EVTS_IGFS", "class": "org.apache.ignite.events.EventType", http://git-wip-us.apache.org/repos/asf/ignite/blob/4e4a22d9/modules/web-console/frontend/app/modules/cluster/Cache.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/cluster/Cache.js b/modules/web-console/frontend/app/modules/cluster/Cache.js index 4918a7c..f954ad2 100644 --- a/modules/web-console/frontend/app/modules/cluster/Cache.js +++ b/modules/web-console/frontend/app/modules/cluster/Cache.js @@ -40,10 +40,6 @@ export default class Cache { this.offHeapPrimarySize = cache.offHeapPrimaryEntriesCount || 0; this.offHeapBackupSize = cache.offHeapBackupEntriesCount || 0; - // Swap. - this.swapSize = cache.swapSize; - this.swapKeys = cache.swapKeys; - const m = cache.metrics; // Read/write metrics. http://git-wip-us.apache.org/repos/asf/ignite/blob/4e4a22d9/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js b/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js index 90d3a9b..160b7d1 100644 --- a/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js +++ b/modules/web-console/frontend/app/modules/cluster/CacheMetrics.js @@ -40,10 +40,6 @@ export default class CacheMetrics { this.offHeapPrimarySize = cache.offHeapPrimaryEntriesCount || 0; this.offHeapBackupSize = cache.offHeapBackupEntriesCount || 0; - // Swap. - this.swapSize = cache.swapSize; - this.swapKeys = cache.swapKeys; - const m = cache.metrics; // Read/write metrics. http://git-wip-us.apache.org/repos/asf/ignite/blob/4e4a22d9/modules/web-console/web-agent/pom.xml ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/pom.xml b/modules/web-console/web-agent/pom.xml index 697e58f..49e0ef0 100644 --- a/modules/web-console/web-agent/pom.xml +++ b/modules/web-console/web-agent/pom.xml @@ -61,7 +61,7 @@ <dependency> <groupId>com.squareup.okhttp3</groupId> <artifactId>okhttp</artifactId> - <version>3.6.0</version> + <version>3.7.0</version> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/ignite/blob/4e4a22d9/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java index 65b8192..4db26ba 100644 --- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java +++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/AgentLauncher.java @@ -33,9 +33,9 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.UnknownHostException; import java.util.Arrays; -import java.util.Scanner; import java.util.Collection; import java.util.List; +import java.util.Scanner; import java.util.concurrent.CountDownLatch; import java.util.jar.Attributes; import java.util.jar.Manifest; @@ -65,7 +65,7 @@ import static org.apache.ignite.console.agent.AgentUtils.fromJSON; import static org.apache.ignite.console.agent.AgentUtils.toJSON; /** - * Control Center Agent launcher. + * Ignite Web Agent launcher. */ public class AgentLauncher { /** */ @@ -235,7 +235,7 @@ public class AgentLauncher { * @param fmt Format string. * @param args Arguments. */ - private static String readLine(String fmt, Object ... args) { + private static String readLine(String fmt, Object... args) { if (System.console() != null) return System.console().readLine(fmt, args); @@ -248,7 +248,7 @@ public class AgentLauncher { * @param fmt Format string. * @param args Arguments. */ - private static char[] readPassword(String fmt, Object ... args) { + private static char[] readPassword(String fmt, Object... args) { if (System.console() != null) return System.console().readPassword(fmt, args); @@ -339,7 +339,7 @@ public class AgentLauncher { case "http": case "https": final String username = System.getProperty(uri.getScheme() + ".proxyUsername"); - final char[] pwd = System.getProperty(uri.getScheme() + ".proxyPassword", "").toCharArray(); + final char[] pwd = System.getProperty(uri.getScheme() + ".proxyPassword", "").toCharArray(); Authenticator.setDefault(new Authenticator() { @Override protected PasswordAuthentication getPasswordAuthentication() {
