From 30a2eca0926ef759b49dda7c7afdda7330c08459 Mon Sep 17 00:00:00 2001 From: Michael Suzuki Date: Tue, 16 Aug 2016 10:53:54 +0100 Subject: [PATCH] Tidy up formatting --- .../solr/AbstractAlfrescoDistributedTest.java | 36 ++++++++++++------- ...stributedAclIdAlfrescoSolrTrackerTest.java | 4 +-- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java index 03add8e9d..6c2a18485 100644 --- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java +++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/AbstractAlfrescoDistributedTest.java @@ -256,7 +256,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4 * @param waitMillis * @throws Exception */ - public void waitForDocCountAllCores(Query query, int count, long waitMillis) throws Exception { + public void waitForDocCountAllCores(Query query, int count, long waitMillis) throws Exception + { List cores = getJettyCores(jettyContainers.values()); cores.addAll(getJettyCores(jettyShards)); @@ -273,10 +274,9 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4 * @param waitMillis * @throws Exception */ - public void waitForDocCount(Query query, int count, long waitMillis) throws Exception { - + public void waitForDocCount(Query query, int count, long waitMillis) throws Exception + { long begin = System.currentTimeMillis(); - List cores = getJettyCores(jettyContainers.values()); //TODO: Support multiple cores per jetty SolrCore controlCore = cores.get(0); //Get the first one @@ -292,7 +292,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4 * @param start * @throws Exception */ - public void waitForShardsCount(Query query, int count, long waitMillis, long start) throws Exception { + public void waitForShardsCount(Query query, int count, long waitMillis, long start) throws Exception + { List cores = getJettyCores(jettyShards); long timeOut = start+waitMillis; int totalCount = 0; @@ -323,7 +324,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4 protected List getJettyCores(Collection runners) { List cores = new ArrayList(); - for (JettySolrRunner jettySolrRunner : runners) { + for (JettySolrRunner jettySolrRunner : runners) + { jettySolrRunner.getCoreContainer().getCores().forEach(aCore -> cores.add(aCore)); } return cores; @@ -338,19 +340,25 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4 return jettyClients.get(DEFAULT_TEST_CORENAME); } - public void assertNodesPerShardGreaterThan(int count) throws Exception { + public void assertNodesPerShardGreaterThan(int count) throws Exception + { List cores = getJettyCores(jettyShards); Query query = new TermQuery(new Term(FIELD_DOC_TYPE, SolrInformationServer.DOC_TYPE_NODE)); - for (SolrCore core : cores) { + for (SolrCore core : cores) + { RefCounted refCounted = null; - try { + try + { refCounted = core.getSearcher(); SolrIndexSearcher searcher = refCounted.get(); TopDocs topDocs = searcher.search(query, 10); - if(topDocs.totalHits < count) { + if(topDocs.totalHits < count) + { throw new Exception("Expected nodes per shard greater than "+count+" found "+topDocs.totalHits+" : "+query.toString()); } - } finally { + } + finally + { refCounted.decref(); } } @@ -469,7 +477,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4 JettySolrRunner jsr = createJetty(jettyKey); jettyContainers.put(jettyKey, jsr); - for (int i = 0; i < coreNames.length; i++) { + for (int i = 0; i < coreNames.length; i++) + { addCoreToJetty(jettyKey, coreNames[i], coreNames[i], additionalProperties); } @@ -477,7 +486,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4 startJetty(jsr); int jettyPort = jsr.getLocalPort(); - for (int i = 0; i < coreNames.length; i++) { + for (int i = 0; i < coreNames.length; i++) + { String url = buildUrl(jettyPort) + "/" + coreNames[i]; log.info(url); jettyClients.put(coreNames[i], createNewSolrClient(url)); diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java index 8809ba42b..0bf9f22f9 100644 --- a/search-services/alfresco-solr/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java +++ b/search-services/alfresco-solr/src/test/java/org/alfresco/solr/tracker/DistributedAclIdAlfrescoSolrTrackerTest.java @@ -116,14 +116,14 @@ public class DistributedAclIdAlfrescoSolrTrackerTest extends AbstractAlfrescoDis } } - protected ShardMethodEnum getShardMethod() { + protected ShardMethodEnum getShardMethod() + { Random random = random(); List methods = new ArrayList(); methods.add(ShardMethodEnum.ACL_ID); methods.add(ShardMethodEnum.MOD_ACL_ID); Collections.shuffle(methods, random); return methods.get(0); - } }