From ecf427d62f90e11f78f4bd9fbaa448c9a10bfc4c Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Mon, 1 Aug 2016 10:02:48 +0200
Subject: [PATCH] Search-98, Formatting changes

---
 .../AbstractAlfrescoDistributedTest.java      | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/search-services/alfresco-solr/src/test/java/org/alfresco/distributed/AbstractAlfrescoDistributedTest.java b/search-services/alfresco-solr/src/test/java/org/alfresco/distributed/AbstractAlfrescoDistributedTest.java
index e0a1c66d7..ccba998c4 100644
--- a/search-services/alfresco-solr/src/test/java/org/alfresco/distributed/AbstractAlfrescoDistributedTest.java
+++ b/search-services/alfresco-solr/src/test/java/org/alfresco/distributed/AbstractAlfrescoDistributedTest.java
@@ -302,8 +302,6 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
     public void assertNodesPerShardGreaterThan(int count) throws Exception {
         List<SolrCore> cores = getJettyCores(jettyShards);
         Query query = new TermQuery(new Term(FIELD_DOC_TYPE, SolrInformationServer.DOC_TYPE_NODE));
-        try {
-
             for (SolrCore core : cores) {
                 RefCounted<SolrIndexSearcher> refCounted = null;
                 try {
@@ -317,11 +315,6 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
                     refCounted.decref();
                 }
             }
-
-
-        } finally {
-
-        }
     }
 
     private void waitForDocCountCore(SolrCore core,
@@ -1424,7 +1417,8 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
         SOLRAPIQueueClient.transactionQueue.add(transaction);
     }
 
-    public enum JettyInstances {
+    public enum JettyInstances
+    {
         PER_SHARD,
         PER_CORE,
         SINGLE;
@@ -1433,40 +1427,47 @@ public abstract class AbstractAlfrescoDistributedTest extends SolrTestCaseJ4
     /**
      * A JUnit Rule to setup Jetty
      */
-    public class JettyServerRule extends ExternalResource {
+    public class JettyServerRule extends ExternalResource
+    {
 
         final String[] coreNames;
         final int numShards;
         final JettyInstances jettyStrategy;
 
-        public JettyServerRule(int numShards, JettyInstances jettyStategy, String ...coreNames) {
+        public JettyServerRule(int numShards, JettyInstances jettyStategy, String ...coreNames)
+        {
             this.coreNames = coreNames;
             this.numShards = numShards;
             this.jettyStrategy = jettyStategy;
         }
 
-        public JettyServerRule(int numShards) {
+        public JettyServerRule(int numShards)
+        {
             coreNames = new String[]{DEFAULT_TEST_CORENAME};
             this.jettyStrategy = JettyInstances.PER_SHARD;
             this.numShards = numShards;
         }
 
         @Override
-        protected void before() throws Throwable {
-
+        protected void before() throws Throwable
+        {
             distribSetUp();
             RandVal.uniqueValues = new HashSet(); // reset random values
             createServers(jettyStrategy, coreNames, numShards);
         }
 
         @Override
-        protected void after() {
+        protected void after()
+        {
 
-            try {
+            try
+            {
                 destroyServers();
                 distribTearDown();
-            } catch (Exception e) {
                 FileUtils.deleteDirectory(testDir);
+            }
+            catch (Exception e)
+            {
                 e.printStackTrace();
             }
         }