[Rename] refactor libs/ssl-config. (#264)

Refactor the libs/ssl-config module to rename the package names from`org.elasticsearch.common.ssl` to `org.opensearch.common.ssl`. Signed-off-by: Rabi Panda <adnapibar@gmail.com>
opensearch-project · Mar 22, 2021 · 577e2b7 · 577e2b7
1 parent ad22e7f
commit 577e2b7
Show file tree

Hide file tree

Showing 35 changed files with 84 additions and 84 deletions.
diff --git a/libs/ssl-config/build.gradle b/libs/ssl-config/build.gradle
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-apply plugin: "elasticsearch.publish"
+apply plugin: "opensearch.publish"
 
 dependencies {
-  api project(':libs:elasticsearch-core')
+  api project(':libs:opensearch-core')
 
   testImplementation(project(":test:framework")) {
-    exclude group: 'org.elasticsearch', module: 'elasticsearch-ssl-config'
+    exclude group: 'org.opensearch', module: 'opensearch-ssl-config'
   }
 
   testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"

diff --git a/...rch/common/ssl/DefaultJdkTrustConfig.java → ...rch/common/ssl/DefaultJdkTrustConfig.java b/...rch/common/ssl/DefaultJdkTrustConfig.java → ...rch/common/ssl/DefaultJdkTrustConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.common.Nullable;
 

diff --git a/...g/elasticsearch/common/ssl/DerParser.java → .../org/opensearch/common/ssl/DerParser.java b/...g/elasticsearch/common/ssl/DerParser.java → .../org/opensearch/common/ssl/DerParser.java
@@ -15,7 +15,7 @@
 
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 
 import java.io.ByteArrayInputStream;

diff --git a/...ch/common/ssl/DiagnosticTrustManager.java → ...ch/common/ssl/DiagnosticTrustManager.java b/...ch/common/ssl/DiagnosticTrustManager.java → ...ch/common/ssl/DiagnosticTrustManager.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLSession;
@@ -35,7 +35,7 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import static org.elasticsearch.common.ssl.SslDiagnostics.getTrustDiagnosticFailure;
+import static org.opensearch.common.ssl.SslDiagnostics.getTrustDiagnosticFailure;
 
 public final class DiagnosticTrustManager extends X509ExtendedTrustManager {
 

diff --git a/...sticsearch/common/ssl/EmptyKeyConfig.java → ...opensearch/common/ssl/EmptyKeyConfig.java b/...sticsearch/common/ssl/EmptyKeyConfig.java → ...opensearch/common/ssl/EmptyKeyConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.X509ExtendedKeyManager;
 import java.nio.file.Path;

diff --git a/...lasticsearch/common/ssl/KeyStoreUtil.java → ...g/opensearch/common/ssl/KeyStoreUtil.java b/...lasticsearch/common/ssl/KeyStoreUtil.java → ...g/opensearch/common/ssl/KeyStoreUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.common.Nullable;
 

diff --git a/...lasticsearch/common/ssl/PemKeyConfig.java → ...g/opensearch/common/ssl/PemKeyConfig.java b/...lasticsearch/common/ssl/PemKeyConfig.java → ...g/opensearch/common/ssl/PemKeyConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.X509ExtendedKeyManager;

diff --git a/...sticsearch/common/ssl/PemTrustConfig.java → ...opensearch/common/ssl/PemTrustConfig.java b/...sticsearch/common/ssl/PemTrustConfig.java → ...opensearch/common/ssl/PemTrustConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.TrustManagerFactory;
 import javax.net.ssl.X509ExtendedTrustManager;
@@ -37,7 +37,7 @@
 import java.util.stream.Collectors;
 
 /**
- * A {@link org.elasticsearch.common.ssl.SslTrustConfig} that reads a list of PEM encoded trusted certificates (CAs) from the file
+ * A {@link org.opensearch.common.ssl.SslTrustConfig} that reads a list of PEM encoded trusted certificates (CAs) from the file
  * system.
  * Strictly speaking, this class does not require PEM certificates, and will load any file that can be read by
  * {@link java.security.cert.CertificateFactory#generateCertificate(InputStream)}.

diff --git a/...rg/elasticsearch/common/ssl/PemUtils.java → ...a/org/opensearch/common/ssl/PemUtils.java b/...rg/elasticsearch/common/ssl/PemUtils.java → ...a/org/opensearch/common/ssl/PemUtils.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.common.CharArrays;
 

diff --git a/...mmon/ssl/SslClientAuthenticationMode.java → ...mmon/ssl/SslClientAuthenticationMode.java b/...mmon/ssl/SslClientAuthenticationMode.java → ...mmon/ssl/SslClientAuthenticationMode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.SSLParameters;
 import java.util.Collections;

diff --git a/...search/common/ssl/SslConfigException.java → ...search/common/ssl/SslConfigException.java b/...search/common/ssl/SslConfigException.java → ...search/common/ssl/SslConfigException.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 /**
  * A base exception for problems that occur while trying to configure SSL.

diff --git a/...icsearch/common/ssl/SslConfiguration.java → ...ensearch/common/ssl/SslConfiguration.java b/...icsearch/common/ssl/SslConfiguration.java → ...ensearch/common/ssl/SslConfiguration.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509ExtendedKeyManager;

diff --git a/...arch/common/ssl/SslConfigurationKeys.java → ...arch/common/ssl/SslConfigurationKeys.java b/...arch/common/ssl/SslConfigurationKeys.java → ...arch/common/ssl/SslConfigurationKeys.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.TrustManagerFactory;
 import java.security.KeyStore;
@@ -164,7 +164,7 @@ public static List<String> getListKeys() {
     }
 
     /**
-     * The list of keys that are used to load a secure setting (such as a password) that would typically be stored in the elasticsearch
+     * The list of keys that are used to load a secure setting (such as a password) that would typically be stored in the opensearch
      * keystore.
      */
     public static List<String> getSecureStringKeys() {

diff --git a/...ch/common/ssl/SslConfigurationLoader.java → ...ch/common/ssl/SslConfigurationLoader.java b/...ch/common/ssl/SslConfigurationLoader.java → ...ch/common/ssl/SslConfigurationLoader.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.bootstrap.JavaVersion;
 
@@ -34,29 +34,29 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static org.elasticsearch.common.ssl.KeyStoreUtil.inferKeyStoreType;
-import static org.elasticsearch.common.ssl.SslConfiguration.ORDERED_PROTOCOL_ALGORITHM_MAP;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.CERTIFICATE;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.CERTIFICATE_AUTHORITIES;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.CIPHERS;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.CLIENT_AUTH;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEY;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_ALGORITHM;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_LEGACY_KEY_PASSWORD;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_LEGACY_PASSWORD;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_PATH;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_SECURE_KEY_PASSWORD;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_SECURE_PASSWORD;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEYSTORE_TYPE;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEY_LEGACY_PASSPHRASE;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.KEY_SECURE_PASSPHRASE;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.PROTOCOLS;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_ALGORITHM;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_LEGACY_PASSWORD;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_PATH;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_SECURE_PASSWORD;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_TYPE;
-import static org.elasticsearch.common.ssl.SslConfigurationKeys.VERIFICATION_MODE;
+import static org.opensearch.common.ssl.KeyStoreUtil.inferKeyStoreType;
+import static org.opensearch.common.ssl.SslConfiguration.ORDERED_PROTOCOL_ALGORITHM_MAP;
+import static org.opensearch.common.ssl.SslConfigurationKeys.CERTIFICATE;
+import static org.opensearch.common.ssl.SslConfigurationKeys.CERTIFICATE_AUTHORITIES;
+import static org.opensearch.common.ssl.SslConfigurationKeys.CIPHERS;
+import static org.opensearch.common.ssl.SslConfigurationKeys.CLIENT_AUTH;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEY;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_ALGORITHM;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_LEGACY_KEY_PASSWORD;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_LEGACY_PASSWORD;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_PATH;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_SECURE_KEY_PASSWORD;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_SECURE_PASSWORD;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEYSTORE_TYPE;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEY_LEGACY_PASSPHRASE;
+import static org.opensearch.common.ssl.SslConfigurationKeys.KEY_SECURE_PASSPHRASE;
+import static org.opensearch.common.ssl.SslConfigurationKeys.PROTOCOLS;
+import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_ALGORITHM;
+import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_LEGACY_PASSWORD;
+import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_PATH;
+import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_SECURE_PASSWORD;
+import static org.opensearch.common.ssl.SslConfigurationKeys.TRUSTSTORE_TYPE;
+import static org.opensearch.common.ssl.SslConfigurationKeys.VERIFICATION_MODE;
 
 /**
  * Loads {@link SslConfiguration} from settings.
@@ -194,7 +194,7 @@ public void setDefaultProtocols(List<String> defaultProtocols) {
     /**
      * Resolve all necessary configuration settings, and load a {@link SslConfiguration}.
      *
-     * @param basePath The base path to use for any settings that represent file paths. Typically points to the Elasticsearch
+     * @param basePath The base path to use for any settings that represent file paths. Typically points to the OpenSearch
      *                 configuration directory.
      * @throws SslConfigException For any problems with the configuration, or with loading the required SSL classes.
      */

diff --git a/...sticsearch/common/ssl/SslDiagnostics.java → ...opensearch/common/ssl/SslDiagnostics.java b/...sticsearch/common/ssl/SslDiagnostics.java → ...opensearch/common/ssl/SslDiagnostics.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.common.Nullable;
 

diff --git a/...lasticsearch/common/ssl/SslKeyConfig.java → ...g/opensearch/common/ssl/SslKeyConfig.java b/...lasticsearch/common/ssl/SslKeyConfig.java → ...g/opensearch/common/ssl/SslKeyConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.X509ExtendedKeyManager;
 import java.nio.file.Path;

diff --git a/...sticsearch/common/ssl/SslTrustConfig.java → ...opensearch/common/ssl/SslTrustConfig.java b/...sticsearch/common/ssl/SslTrustConfig.java → ...opensearch/common/ssl/SslTrustConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.X509ExtendedTrustManager;
 import java.nio.file.Path;

diff --git a/...org/elasticsearch/common/ssl/SslUtil.java → ...va/org/opensearch/common/ssl/SslUtil.java b/...org/elasticsearch/common/ssl/SslUtil.java → ...va/org/opensearch/common/ssl/SslUtil.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;

diff --git a/...earch/common/ssl/SslVerificationMode.java → ...earch/common/ssl/SslVerificationMode.java b/...earch/common/ssl/SslVerificationMode.java → ...earch/common/ssl/SslVerificationMode.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;

diff --git a/...sticsearch/common/ssl/StoreKeyConfig.java → ...opensearch/common/ssl/StoreKeyConfig.java b/...sticsearch/common/ssl/StoreKeyConfig.java → ...opensearch/common/ssl/StoreKeyConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.X509ExtendedKeyManager;

diff --git a/...icsearch/common/ssl/StoreTrustConfig.java → ...ensearch/common/ssl/StoreTrustConfig.java b/...icsearch/common/ssl/StoreTrustConfig.java → ...ensearch/common/ssl/StoreTrustConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.X509ExtendedTrustManager;
 import java.nio.file.Path;

diff --git a/...rch/common/ssl/TrustEverythingConfig.java → ...rch/common/ssl/TrustEverythingConfig.java b/...rch/common/ssl/TrustEverythingConfig.java → ...rch/common/ssl/TrustEverythingConfig.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.X509ExtendedTrustManager;

diff --git a/...ommon/ssl/DefaultJdkTrustConfigTests.java → ...ommon/ssl/DefaultJdkTrustConfigTests.java b/...ommon/ssl/DefaultJdkTrustConfigTests.java → ...ommon/ssl/DefaultJdkTrustConfigTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.test.ESTestCase;
 import org.junit.Assert;

diff --git a/...csearch/common/ssl/PemKeyConfigTests.java → ...nsearch/common/ssl/PemKeyConfigTests.java b/...csearch/common/ssl/PemKeyConfigTests.java → ...nsearch/common/ssl/PemKeyConfigTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.test.ESTestCase;
 import org.hamcrest.Matchers;

diff --git a/...earch/common/ssl/PemTrustConfigTests.java → ...earch/common/ssl/PemTrustConfigTests.java b/...earch/common/ssl/PemTrustConfigTests.java → ...earch/common/ssl/PemTrustConfigTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.test.ESTestCase;
 import org.hamcrest.Matchers;

diff --git a/...asticsearch/common/ssl/PemUtilsTests.java → .../opensearch/common/ssl/PemUtilsTests.java b/...asticsearch/common/ssl/PemUtilsTests.java → .../opensearch/common/ssl/PemUtilsTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.test.ESTestCase;
 

diff --git a/...mmon/ssl/SslConfigurationLoaderTests.java → ...mmon/ssl/SslConfigurationLoaderTests.java b/...mmon/ssl/SslConfigurationLoaderTests.java → ...mmon/ssl/SslConfigurationLoaderTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.common.settings.MockSecureSettings;
 import org.elasticsearch.common.settings.SecureString;

diff --git a/...rch/common/ssl/SslConfigurationTests.java → ...rch/common/ssl/SslConfigurationTests.java b/...rch/common/ssl/SslConfigurationTests.java → ...rch/common/ssl/SslConfigurationTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.test.ESTestCase;
 import org.elasticsearch.test.EqualsHashCodeTestUtils;
@@ -30,7 +30,7 @@
 import java.util.Collections;
 import java.util.List;
 
-import static org.elasticsearch.common.ssl.SslConfigurationLoader.DEFAULT_CIPHERS;
+import static org.opensearch.common.ssl.SslConfigurationLoader.DEFAULT_CIPHERS;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;

diff --git a/...earch/common/ssl/SslDiagnosticsTests.java → ...earch/common/ssl/SslDiagnosticsTests.java b/...earch/common/ssl/SslDiagnosticsTests.java → ...earch/common/ssl/SslDiagnosticsTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.common.Nullable;
 import org.elasticsearch.test.ESTestCase;

diff --git a/...earch/common/ssl/StoreKeyConfigTests.java → ...earch/common/ssl/StoreKeyConfigTests.java b/...earch/common/ssl/StoreKeyConfigTests.java → ...earch/common/ssl/StoreKeyConfigTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.test.ESTestCase;
 import org.hamcrest.Matchers;

diff --git a/...rch/common/ssl/StoreTrustConfigTests.java → ...rch/common/ssl/StoreTrustConfigTests.java b/...rch/common/ssl/StoreTrustConfigTests.java → ...rch/common/ssl/StoreTrustConfigTests.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.common.ssl;
+package org.opensearch.common.ssl;
 
 import org.elasticsearch.test.ESTestCase;
 import org.hamcrest.Matchers;