From bcb97ddd0dc8a8266cbc6969164661b6ef0f57aa Mon Sep 17 00:00:00 2001 From: Tom Page Date: Thu, 23 Apr 2020 16:25:42 +0100 Subject: [PATCH] SEARCH-2202 Use constants for fields in SOLRAPIQueueClient. These collections should be constants anyway - they're never set. --- .../org/alfresco/solr/AlfrescoSolrReloadIT.java | 6 +++--- .../org/alfresco/solr/AlfrescoSolrUtils.java | 7 +++---- .../solr/AlfrescoTrackerRegistrationIT.java | 6 +++--- .../org/alfresco/solr/SolrITInitializer.java | 8 +++----- .../solr/handler/ContentStoreReplicationIT.java | 6 +++--- .../solr/highlight/AlfrescoHighlighterIT.java | 6 +++--- .../solr/query/AlfrescoSolrFingerprintIT.java | 6 +++--- .../tracker/AlfrescoSolrTrackerExceptionIT.java | 6 +++--- .../solr/tracker/AlfrescoSolrTrackerIT.java | 6 +++--- .../tracker/AlfrescoSolrTrackerRollbackIT.java | 6 +++--- .../solr/tracker/AlfrescoSolrTrackerStateIT.java | 6 +++--- .../org/alfresco/solr/tracker/CascadingIT.java | 6 +++--- .../alfresco/solr/client/SOLRAPIQueueClient.java | 16 ++++++++-------- 13 files changed, 44 insertions(+), 47 deletions(-) diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java index 70500adf6..a67431823 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrReloadIT.java @@ -51,9 +51,9 @@ public class AlfrescoSolrReloadIT extends AbstractAlfrescoSolrIT public void clearQueue() throws Exception { SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java index 92f73d41b..aa7cb5ba6 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java @@ -89,7 +89,6 @@ import org.alfresco.solr.client.SOLRAPIQueueClient; import org.alfresco.solr.client.StringPropertyValue; import org.alfresco.solr.client.Transaction; import org.alfresco.util.ISO9075; -import org.alfresco.util.Pair; import org.apache.solr.SolrTestCaseJ4.XmlDoc; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.CoreAdminParams; @@ -383,17 +382,17 @@ public class AlfrescoSolrUtils public static void indexAclChangeSet(AclChangeSet aclChangeSet, List aclList, List aclReadersList) { //First map the nodes to a transaction. - SOLRAPIQueueClient.aclMap.put(aclChangeSet.getId(), aclList); + SOLRAPIQueueClient.ACL_MAP.put(aclChangeSet.getId(), aclList); //Next map a node to the NodeMetaData for(AclReaders aclReaders : aclReadersList) { - SOLRAPIQueueClient.aclReadersMap.put(aclReaders.getId(), aclReaders); + SOLRAPIQueueClient.ACL_READERS_MAP.put(aclReaders.getId(), aclReaders); } //Next add the transaction to the queue - SOLRAPIQueueClient.aclChangeSetQueue.add(aclChangeSet); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.add(aclChangeSet); } /** * Generate a collection from input. diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationIT.java index b679ec5fe..b744df26a 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoTrackerRegistrationIT.java @@ -41,9 +41,9 @@ public class AlfrescoTrackerRegistrationIT extends AbstractAlfrescoSolrIT public void clearQueue() throws Exception { SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); } @Test diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java index 3bc5bd666..d73b3b2a9 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/SolrITInitializer.java @@ -4,7 +4,6 @@ import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering; import org.alfresco.solr.basics.RandomSupplier; import org.alfresco.solr.client.SOLRAPIQueueClient; import org.apache.commons.io.FileUtils; -import org.apache.hadoop.util.Time; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.embedded.JettyConfig; @@ -15,7 +14,6 @@ import org.apache.solr.core.CoreContainer; import org.apache.solr.core.SolrCore; import org.eclipse.jetty.servlet.ServletHolder; import org.junit.BeforeClass; -import org.junit.rules.ExternalResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -224,9 +222,9 @@ public abstract class SolrITInitializer extends SolrTestCaseJ4 SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/handler/ContentStoreReplicationIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/handler/ContentStoreReplicationIT.java index 678afd5ad..14f3f1489 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/handler/ContentStoreReplicationIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/handler/ContentStoreReplicationIT.java @@ -146,9 +146,9 @@ public class ContentStoreReplicationIT extends AbstractAlfrescoDistributedIT SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); SOLRAPIQueueClient.nodeContentMap.clear(); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java index c19a8ee68..91f8d7e4f 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/highlight/AlfrescoHighlighterIT.java @@ -154,9 +154,9 @@ public class AlfrescoHighlighterIT extends AbstractAlfrescoSolrIT public static void clearQueue() { SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); SOLRAPIQueueClient.nodeContentMap.clear(); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java index d9f0694e2..be091661f 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/query/AlfrescoSolrFingerprintIT.java @@ -90,9 +90,9 @@ public class AlfrescoSolrFingerprintIT extends AbstractAlfrescoSolrIT { SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); SOLRAPIQueueClient.nodeContentMap.clear(); diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java index 00f697a91..b2af29019 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerExceptionIT.java @@ -87,9 +87,9 @@ public class AlfrescoSolrTrackerExceptionIT extends AbstractAlfrescoSolrIT public void clearQueue() throws Exception { SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java index b02400952..3ac837bf4 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerIT.java @@ -88,9 +88,9 @@ public class AlfrescoSolrTrackerIT extends AbstractAlfrescoSolrIT public void clearQueue() throws Exception { SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java index 9baf19990..73da64f64 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerRollbackIT.java @@ -80,9 +80,9 @@ public class AlfrescoSolrTrackerRollbackIT extends AbstractAlfrescoSolrIT public void clearQueue() throws Exception { SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java index 119aab737..078f6fa7e 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerStateIT.java @@ -82,9 +82,9 @@ public class AlfrescoSolrTrackerStateIT extends AbstractAlfrescoSolrIT public void clearQueue() throws Exception { SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java index 7d1e145a9..b14d792ad 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/CascadingIT.java @@ -152,9 +152,9 @@ public class CascadingIT extends AbstractAlfrescoSolrIT { SOLRAPIQueueClient.nodeMetaDataMap.clear(); SOLRAPIQueueClient.transactionQueue.clear(); - SOLRAPIQueueClient.aclChangeSetQueue.clear(); - SOLRAPIQueueClient.aclReadersMap.clear(); - SOLRAPIQueueClient.aclMap.clear(); + SOLRAPIQueueClient.ACL_CHANGE_SET_QUEUE.clear(); + SOLRAPIQueueClient.ACL_READERS_MAP.clear(); + SOLRAPIQueueClient.ACL_MAP.clear(); SOLRAPIQueueClient.nodeMap.clear(); } diff --git a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIQueueClient.java b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIQueueClient.java index a87a83b26..2037236fb 100644 --- a/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIQueueClient.java +++ b/search-services/alfresco-solrclient-lib/src/main/java/org/alfresco/solr/client/SOLRAPIQueueClient.java @@ -47,9 +47,9 @@ import org.json.JSONException; public class SOLRAPIQueueClient extends SOLRAPIClient { - public static List aclChangeSetQueue = Collections.synchronizedList(new ArrayList()); - public static Map> aclMap = Collections.synchronizedMap(new HashMap()); - public static Map aclReadersMap = Collections.synchronizedMap(new HashMap()); + protected static final List ACL_CHANGE_SET_QUEUE = Collections.synchronizedList(new ArrayList()); + protected static final Map> ACL_MAP = Collections.synchronizedMap(new HashMap()); + protected static final Map ACL_READERS_MAP = Collections.synchronizedMap(new HashMap()); public static List transactionQueue = Collections.synchronizedList(new ArrayList()); public static Map> nodeMap = Collections.synchronizedMap(new HashMap()); @@ -74,7 +74,7 @@ public class SOLRAPIQueueClient extends SOLRAPIClient throw new ConnectException("THROWING EXCEPTION, better be ready!"); } - int size = aclChangeSetQueue.size(); + int size = ACL_CHANGE_SET_QUEUE.size(); long maxTime = 0L; long maxId = 0L; @@ -83,7 +83,7 @@ public class SOLRAPIQueueClient extends SOLRAPIClient List aclChangeSetList = new ArrayList(); for(int i=0; i= minAclChangeSetId && aclChangeSet.getId() < maxAclChangeSetId) { aclChangeSetList.add(aclChangeSet); @@ -103,7 +103,7 @@ public class SOLRAPIQueueClient extends SOLRAPIClient for(int i=0; i allAcls = new ArrayList(); for(AclChangeSet aclChangeSet : aclChangeSets) { - List aclList = aclMap.get(aclChangeSet.getId()); + List aclList = ACL_MAP.get(aclChangeSet.getId()); allAcls.addAll(aclList); } return allAcls; @@ -170,7 +170,7 @@ public class SOLRAPIQueueClient extends SOLRAPIClient List allAclReaders = new ArrayList(); for(Acl acl : acls) { - AclReaders aclReaders = aclReadersMap.get(acl.getId()); + AclReaders aclReaders = ACL_READERS_MAP.get(acl.getId()); allAclReaders.add(aclReaders); } return allAclReaders;