inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

SEARCH-3022 Fix formatting

Browse Source
This commit is contained in:
Angel Borroy
2021-07-29 14:20:29 +02:00
parent 866c3434b6
commit 9d942e667e
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
search-services/alfresco-search/src/main/java/org/apache/solr/core/CoreDescriptorDecorator.java
+2 -2
View File
@@ -93,13 +93,13 @@ public class CoreDescriptorDecorator
{
coreProperties.forEach(prop -> {
String value = ConfigUtil.locateProperty(prop, null);
if (value != null)
if (value != null)
{
properties.put(prop, value);
}
});
}
catch(Exception e)
catch (Exception e)
{
log.warn("Unable to locate alfresco host|port|baseUrl|ssl properties", e);
}
search-services/alfresco-search/src/test/java/org/alfresco/solr/config/ConfigUtilTest.java
+8 -5
View File
@@ -84,14 +84,17 @@ public class ConfigUtilTest {
@Test
public void testMissingCoreProperty()
{
HashMap<String,String> coreProps = new HashMap<String,String>();
Properties saved = (Properties)System.getProperties().clone();
HashMap<String, String> coreProps = new HashMap<String, String>();
Properties saved = (Properties) System.getProperties().clone();
System.setProperty("alfresco.secureComms", "https");
for (String key : CoreDescriptorDecorator.SUBSTITUTABLE_PROPERTIES_SECURE) {
for (String key : CoreDescriptorDecorator.SUBSTITUTABLE_PROPERTIES_SECURE)
{
// Intentionally omit store provider settings
if (!key.endsWith("store.provider")) {
if (!key.endsWith("store.provider"))
{
// Set store type as system property
if (key.endsWith("store.type")) {
if (key.endsWith("store.type"))
{
System.setProperty(key, "JKS");
}
coreProps.put(key, "irrelevant");