inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-2602: Fix JSON getString methods for values containing Number

Browse Source
This commit is contained in:
Angel Borroy
2020-12-03 14:27:06 +01:00
parent c595196343
commit 796c887f1b
1 changed files with 89 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
repository/src/main/java/org/alfresco/repo/search/impl/solr/SolrChildApplicationContextFactory.java
View File

@@ -45,38 +45,50 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
private static final Log LOGGER = LogFactory.getLog(SolrChildApplicationContextFactory.class); private static final Log LOGGER = LogFactory.getLog(SolrChildApplicationContextFactory.class);
private static final String ALFRESCO_ACTIVE = "tracker.alfresco.active"; protected static final String ALFRESCO_ACTIVE = "tracker.alfresco.active";
protected static final String ALFRESCO_LAG = "tracker.alfresco.lag";
protected static final String ALFRESCO_LAG_DURATION = "tracker.alfresco.lag.duration";
protected static final String ALFRESCO_LAST_INDEXED_TXN = "tracker.alfresco.last.indexed.txn";
protected static final String ALFRESCO_APPROX_TXNS_REMAINING = "tracker.alfresco.approx.txns.remaining";
protected static final String ALFRESCO_APPROX_INDEXING_TIME_REMAINING = "tracker.alfresco.approx.indexing.time.remaining";
protected static final String ALFRESCO_DISK = "tracker.alfresco.disk";
protected static final String ALFRESCO_MEMORY = "tracker.alfresco.memory";
private static final String ALFRESCO_LAG = "tracker.alfresco.lag"; protected static final String ARCHIVE_ACTIVE = "tracker.archive.active";
protected static final String ARCHIVE_LAG = "tracker.archive.lag";
protected static final String ARCHIVE_LAG_DURATION = "tracker.archive.lag.duration";
protected static final String ARCHIVE_LAST_INDEXED_TXN = "tracker.archive.last.indexed.txn";
protected static final String ARCHIVE_APPROX_TXNS_REMAINING = "tracker.archive.approx.txns.remaining";
protected static final String ARCHIVE_APPROX_INDEXING_TIME_REMAINING = "tracker.archive.approx.indexing.time.remaining";
protected static final String ARCHIVE_DISK = "tracker.archive.disk";
protected static final String ARCHIVE_MEMORY = "tracker.archive.memory";
private static final String ALFRESCO_LAG_DURATION = "tracker.alfresco.lag.duration"; private SolrAdminHTTPClient adminClient;
private static final String ALFRESCO_LAST_INDEXED_TXN = "tracker.alfresco.last.indexed.txn"; public void setAdminClient(SolrAdminHTTPClient adminClient)
{
this.adminClient = adminClient;
}
private static final String ALFRESCO_APPROX_TXNS_REMAINING = "tracker.alfresco.approx.txns.remaining"; public SolrAdminHTTPClient getAdminClient()
{
if (adminClient == null)
{
ApplicationContext ctx = getApplicationContext();
adminClient = (SolrAdminHTTPClient) ctx.getBean("search.solrAdminHTTPCLient");
}
return adminClient;
}
private static final String ALFRESCO_APPROX_INDEXING_TIME_REMAINING = "tracker.alfresco.approx.indexing.time.remaining"; private static boolean isAlfrescoCoreProperty(String name)
{
private static final String ALFRESCO_DISK = "tracker.alfresco.disk"; return name.startsWith("tracker.alfresco.");
}
private static final String ALFRESCO_MEMORY = "tracker.alfresco.memory";
private static final String ARCHIVE_ACTIVE = "tracker.archive.active";
private static final String ARCHIVE_LAG = "tracker.archive.lag";
private static final String ARCHIVE_LAG_DURATION = "tracker.archive.lag.duration";
private static final String ARCHIVE_LAST_INDEXED_TXN = "tracker.archive.last.indexed.txn";
private static final String ARCHIVE_APPROX_TXNS_REMAINING = "tracker.archive.approx.txns.remaining";
private static final String ARCHIVE_APPROX_INDEXING_TIME_REMAINING = "tracker.archive.approx.indexing.time.remaining";
private static final String ARCHIVE_DISK = "tracker.archive.disk";
private static final String ARCHIVE_MEMORY = "tracker.archive.memory";
private static boolean isArchiveCoreProperty(String name)
{
return name.startsWith("tracker.archive.");
}
@Override @Override
public boolean isUpdateable(String name) public boolean isUpdateable(String name)
@@ -137,22 +149,28 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
} }
} }
private JSONObject getSolrSummary()
{
HashMap<String, String> args = new HashMap<String, String>();
args.put("action", "SUMMARY");
args.put("wt", "json");
JSONObject json = getAdminClient().execute(args);
return json.getJSONObject("Summary");
}
@Override @Override
public String getProperty(String name) public String getProperty(String name)
{ {
// MNT-9254 fix, use search.solrAdminHTTPCLient bean to retrive property value only if sorl subsystem is active and started (application context in state should be not null) // MNT-9254 fix, use search.solrAdminHTTPCLient bean to retrieve property value only if sorl subsystem is active and started (application context in state should be not null)
if (false == isUpdateable(name) && ((ApplicationContextState) getState(false)).getApplicationContext(false) != null) if (false == isUpdateable(name) && ((ApplicationContextState) getState(false)).getApplicationContext(false) != null)
{ {
try try
{ {
ApplicationContext ctx = getApplicationContext();
SolrAdminHTTPClient adminClient = (SolrAdminHTTPClient) ctx.getBean("search.solrAdminHTTPCLient");
HashMap<String, String> args = new HashMap<String, String>();
args.put("action", "SUMMARY");
args.put("wt", "json");
JSONObject json = adminClient.execute(args);
JSONObject summary = json.getJSONObject("Summary");
JSONObject summary = getSolrSummary();
if (isAlfrescoCoreProperty(name))
{
JSONObject alfresco = null; JSONObject alfresco = null;
try try
{ {
@@ -168,7 +186,10 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
{ {
return getPropertyValue(alfresco, name); return getPropertyValue(alfresco, name);
} }
}
if (isArchiveCoreProperty(name))
{
JSONObject archive = null; JSONObject archive = null;
try try
{ {
@@ -182,7 +203,8 @@ public class SolrChildApplicationContextFactory extends ChildApplicationContextF
if (archive != null) if (archive != null)
{ {
return getPropertyValue(alfresco, name); return getPropertyValue(archive, name);
}
} }
// Did not find the property in JSON or the core is turned off // Did not find the property in JSON or the core is turned off