From 9d942e667ed8a2108cd146feea37b1ffb2a589a6 Mon Sep 17 00:00:00 2001 From: Angel Borroy Date: Thu, 29 Jul 2021 14:20:29 +0200 Subject: [PATCH] SEARCH-3022 Fix formatting --- .../apache/solr/core/CoreDescriptorDecorator.java | 4 ++-- .../org/alfresco/solr/config/ConfigUtilTest.java | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/search-services/alfresco-search/src/main/java/org/apache/solr/core/CoreDescriptorDecorator.java b/search-services/alfresco-search/src/main/java/org/apache/solr/core/CoreDescriptorDecorator.java index 7faf33cdb..7f7821d88 100644 --- a/search-services/alfresco-search/src/main/java/org/apache/solr/core/CoreDescriptorDecorator.java +++ b/search-services/alfresco-search/src/main/java/org/apache/solr/core/CoreDescriptorDecorator.java @@ -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); } diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/config/ConfigUtilTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/config/ConfigUtilTest.java index 3c29ca52c..6bf217bc9 100644 --- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/config/ConfigUtilTest.java +++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/config/ConfigUtilTest.java @@ -84,14 +84,17 @@ public class ConfigUtilTest { @Test public void testMissingCoreProperty() { - HashMap coreProps = new HashMap(); - Properties saved = (Properties)System.getProperties().clone(); + HashMap coreProps = new HashMap(); + 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");