Skip to content

Commit

Permalink
# ignite-556 minor
Browse files Browse the repository at this point in the history
  • Loading branch information
sboikov committed Mar 23, 2015
1 parent f3fc9ac commit 32af4a6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
Expand Up @@ -2889,7 +2889,7 @@ private <T> T getConfiguration(String springCfgPath, Class<T> cl) {
spring.loadConfigurations(url, cl);

if (cfgMap.get1().size() != 1)
throw new IgniteException("File " + url.toString() + " should have one cache configuration");
throw new IgniteException("File " + url.toString() + " should have one cache configuration.");

return F.first(cfgMap.get1());
}
Expand Down
Expand Up @@ -21,7 +21,6 @@
import org.apache.ignite.*;
import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.events.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.testframework.*;
import org.apache.ignite.testframework.http.*;
Expand Down Expand Up @@ -80,8 +79,6 @@ public int nodeCount() {

cfg.setCacheConfiguration(cacheCfg);

cfg.setIncludeEventTypes(EventType.EVT_CACHE_STARTED, EventType.EVT_CACHE_STOPPED, EventType.EVT_CACHE_NODES_LEFT);

return cfg;
}

Expand Down Expand Up @@ -112,7 +109,7 @@ public void testDynamicNearCacheStartFromConfig() throws Exception {

assertEquals(CACHE_NAME, cache.getName());

IgniteCache clientCache1 = ignite(nodeCount() + 1).createNearCache(CACHE_NAME,
IgniteCache<Integer, Integer> clientCache1 = ignite(nodeCount() + 1).createNearCache(CACHE_NAME,
"modules/core/src/test/config/cache.xml");

IgniteCache clientCache2 = ignite(nodeCount() + 1).getOrCreateNearCache(CACHE_NAME,
Expand Down Expand Up @@ -144,7 +141,7 @@ public void testCreateNearCache() throws Exception {

assertEquals(cache.getName(), CACHE_NAME);

IgniteCache clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
IgniteCache<Integer, Integer> clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
"modules/core/src/test/config/cache.xml");

IgniteCache clientCache2 = ignite(clientNode).getOrCreateNearCache(CACHE_NAME,
Expand Down Expand Up @@ -179,7 +176,7 @@ public void testGetOrCreateNearCache() throws Exception {

assertEquals(cache.getName(), cache1.getName());

IgniteCache clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
IgniteCache<Integer, Integer> clientCache1 = ignite(clientNode).createNearCache(CACHE_NAME,
"modules/core/src/test/config/cache.xml");

IgniteCache clientCache2 = ignite(clientNode).getOrCreateNearCache(CACHE_NAME,
Expand Down
Expand Up @@ -27,9 +27,10 @@ public class TestNodeFilter implements IgnitePredicate<ClusterNode> {
/** */
public static final String TEST_ATTRIBUTE_NAME = "TEST_ATTRIBUTE_NAME";

/** {@inheritDoc} */
@Override public boolean apply(ClusterNode n) {
Boolean val = n.attribute(TEST_ATTRIBUTE_NAME);

return val != null && val;
}
}
}

0 comments on commit 32af4a6

Please sign in to comment.