You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ja...@apache.org on 2024/01/12 21:56:08 UTC
(solr) branch branch_9x updated: SOLR-15960: Move EnvUtils to Solrj common (#2192)
This is an automated email from the ASF dual-hosted git repository.
janhoy pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 800a7cf1c22 SOLR-15960: Move EnvUtils to Solrj common (#2192)
800a7cf1c22 is described below
commit 800a7cf1c22f5cbc91c63fd7ccccb3e2d6e3b95e
Author: Jan Høydahl <ja...@apache.org>
AuthorDate: Fri Jan 12 22:52:49 2024 +0100
SOLR-15960: Move EnvUtils to Solrj common (#2192)
Also use EncUtils for property substitution in solr.xml
(cherry picked from commit 84c5eccc4063747c67ebfa9b1942d33a3296844e)
---
solr/core/src/java/org/apache/solr/cli/SolrCLI.java | 2 +-
solr/core/src/java/org/apache/solr/core/TracerConfigurator.java | 2 +-
solr/core/src/java/org/apache/solr/pkg/PackageAPI.java | 2 +-
solr/core/src/java/org/apache/solr/util/ModuleUtils.java | 1 +
solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java | 1 +
.../org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java | 2 +-
.../solr => solrj/src/java/org/apache/solr/common}/util/EnvUtils.java | 4 +---
solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java | 2 +-
.../src/test/org/apache/solr/common}/util/EnvUtilsTest.java | 2 +-
solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
index de3e37a4d58..18b92ca8fa0 100755
--- a/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
+++ b/solr/core/src/java/org/apache/solr/cli/SolrCLI.java
@@ -60,8 +60,8 @@ import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.util.ContentStreamBase;
+import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.util.EnvUtils;
import org.apache.solr.util.StartupLoggingUtils;
import org.apache.solr.util.configuration.SSLConfigurationsFactory;
import org.slf4j.Logger;
diff --git a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
index 9e48baaa35e..bf3acd5281e 100644
--- a/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
+++ b/solr/core/src/java/org/apache/solr/core/TracerConfigurator.java
@@ -26,9 +26,9 @@ import java.util.Locale;
import java.util.Map;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.util.EnvUtils;
import org.apache.solr.util.plugin.NamedListInitializedPlugin;
import org.apache.solr.util.tracing.SimplePropagator;
import org.slf4j.Logger;
diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java
index 37954cde5ee..647309e42c9 100644
--- a/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java
+++ b/solr/core/src/java/org/apache/solr/pkg/PackageAPI.java
@@ -41,13 +41,13 @@ import org.apache.solr.common.annotation.JsonProperty;
import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.common.util.CommandOperation;
+import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.ReflectMapWriter;
import org.apache.solr.common.util.Utils;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.filestore.FileStoreAPI;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.util.EnvUtils;
import org.apache.solr.util.SolrJacksonAnnotationInspector;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
diff --git a/solr/core/src/java/org/apache/solr/util/ModuleUtils.java b/solr/core/src/java/org/apache/solr/util/ModuleUtils.java
index 4506b00ea3e..51826681234 100644
--- a/solr/core/src/java/org/apache/solr/util/ModuleUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/ModuleUtils.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.Set;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.StrUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
index 859c08e3452..4ef8110db36 100644
--- a/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/StartupLoggingUtils.java
@@ -27,6 +27,7 @@ import org.apache.logging.log4j.core.appender.AbstractOutputStreamAppender;
import org.apache.logging.log4j.core.appender.ConsoleAppender;
import org.apache.logging.log4j.core.config.Configuration;
import org.apache.logging.log4j.core.config.LoggerConfig;
+import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.SuppressForbidden;
import org.slf4j.ILoggerFactory;
import org.slf4j.Logger;
diff --git a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
index b1782867cce..1168d31e92d 100644
--- a/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
+++ b/solr/core/src/java/org/apache/solr/util/circuitbreaker/CircuitBreakerRegistry.java
@@ -33,8 +33,8 @@ import java.util.regex.Pattern;
import java.util.stream.Collectors;
import org.apache.solr.client.solrj.SolrRequest.SolrRequestType;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.util.EnvUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/solr/core/src/java/org/apache/solr/util/EnvUtils.java b/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.java
similarity index 98%
rename from solr/core/src/java/org/apache/solr/util/EnvUtils.java
rename to solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.java
index 721ce677791..9bc33e624e9 100644
--- a/solr/core/src/java/org/apache/solr/util/EnvUtils.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/EnvUtils.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.solr.util;
+package org.apache.solr.common.util;
import java.io.IOException;
import java.io.InputStream;
@@ -31,8 +31,6 @@ import java.util.SortedMap;
import java.util.TreeMap;
import java.util.stream.Collectors;
import org.apache.solr.common.SolrException;
-import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.common.util.Utils;
/**
* This class is a unified provider of environment variables and system properties. It exposes a
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java b/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java
index a2b0f0a250f..abc5ee98fa9 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/PropertiesUtil.java
@@ -65,7 +65,7 @@ public class PropertiesUtil {
fragment = coreProperties.apply(propertyName);
}
if (fragment == null) {
- fragment = System.getProperty(propertyName, defaultValue);
+ fragment = EnvUtils.getProp(propertyName, defaultValue);
}
if (fragment == null) {
throw new SolrException(
diff --git a/solr/core/src/test/org/apache/solr/util/EnvUtilsTest.java b/solr/solrj/src/test/org/apache/solr/common/util/EnvUtilsTest.java
similarity index 99%
rename from solr/core/src/test/org/apache/solr/util/EnvUtilsTest.java
rename to solr/solrj/src/test/org/apache/solr/common/util/EnvUtilsTest.java
index 19e1d2431c0..1bbcc3cc4a3 100644
--- a/solr/core/src/test/org/apache/solr/util/EnvUtilsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/EnvUtilsTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.solr.util;
+package org.apache.solr.common.util;
import java.util.List;
import java.util.Map;
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index f722ea1b660..fbacb652eea 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -33,9 +33,9 @@ import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.lucene.tests.util.LuceneTestCase.SuppressSysoutChecks;
import org.apache.lucene.tests.util.QuickPatchThreadsFilter;
import org.apache.lucene.tests.util.VerifyTestClassNamingConvention;
+import org.apache.solr.common.util.EnvUtils;
import org.apache.solr.common.util.ObjectReleaseTracker;
import org.apache.solr.servlet.SolrDispatchFilter;
-import org.apache.solr.util.EnvUtils;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.RevertDefaultThreadHandlerRule;
import org.apache.solr.util.StartupLoggingUtils;