From cb40a133a75840fc4c01d7500d542fe9b3abb2aa Mon Sep 17 00:00:00 2001 From: agazzarini Date: Tue, 15 Oct 2019 10:59:44 +0200 Subject: [PATCH] [ SEARCH-1606 ] Formal code refactoring (formatting) --- .../solr/tracker/AbstractTracker.java | 6 +++-- .../alfresco/solr/tracker/ModelTracker.java | 22 +++++++------------ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AbstractTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AbstractTracker.java index 7915ea9b3..ae944dd4b 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AbstractTracker.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/AbstractTracker.java @@ -327,15 +327,17 @@ public abstract class AbstractTracker implements Tracker throw new IndexTrackingShutdownException(); } } - + + @Override public void setShutdown(boolean shutdown) { this.shutdown = shutdown; } + @Override public void shutdown() { - log.warn("Core "+ coreName+" shutdown called on tracker. " + getClass().getSimpleName() + " " + hashCode()); + log.warn("Core " + coreName + " shutdown called on tracker. " + getClass().getSimpleName() + " " + hashCode()); setShutdown(true); if(this.threadHandler != null) { diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java index ba4e00fa9..c19c31eaa 100644 --- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java +++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/ModelTracker.java @@ -115,12 +115,16 @@ public class ModelTracker extends AbstractTracker implements Tracker loadPersistedModels(); } - public boolean hasMaintenance() { + @Override + public boolean hasMaintenance() + { return false; } - public void maintenance() { - + @Override + public void maintenance() + { + // Nothing to be done here } /** @@ -203,7 +207,7 @@ public class ModelTracker extends AbstractTracker implements Tracker public void trackModels(boolean onlyFirstTime) throws AuthenticationException, IOException, JSONException { - boolean requiresWriteLock = false; + boolean requiresWriteLock; modelLock.readLock().lock(); try { @@ -271,10 +275,6 @@ public class ModelTracker extends AbstractTracker implements Tracker /** * Tracks models. Reflects changes and updates on disk copy - * - * @throws AuthenticationException - * @throws IOException - * @throws JSONException */ private void trackModelsImpl() throws AuthenticationException, IOException, JSONException { @@ -480,16 +480,10 @@ public class ModelTracker extends AbstractTracker implements Tracker } return expandedQName; - } - /** - * @param alfrescoModelDir - * @param modelName - */ private void removeMatchingModels(File alfrescoModelDir, QName modelName) { - final String prefix = modelName.toPrefixString(this.infoSrv.getNamespaceDAO()).replace(":", ".") + "."; final String postFix = ".xml";