cleanup

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
nknize · May 16, 2023 · 00850aa · 00850aa
1 parent a754c94
commit 00850aa
Show file tree

Hide file tree

Showing 62 changed files with 151 additions and 187 deletions.
diff --git a/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java b/client/rest-high-level/src/main/java/org/opensearch/client/RequestConverters.java
@@ -220,7 +220,7 @@ static Request bulk(BulkRequest bulkRequest) throws IOException {
 
                     if (opType == DocWriteRequest.OpType.INDEX || opType == DocWriteRequest.OpType.CREATE) {
                         IndexRequest indexRequest = (IndexRequest) action;
-                        if (org.opensearch.core.common.Strings.hasLength(indexRequest.getPipeline())) {
+                        if (Strings.hasLength(indexRequest.getPipeline())) {
                             metadata.field("pipeline", indexRequest.getPipeline());
                         }
                     } else if (opType == DocWriteRequest.OpType.UPDATE) {
@@ -338,7 +338,7 @@ static Request multiGet(MultiGetRequest multiGetRequest) throws IOException {
     }
 
     static Request index(IndexRequest indexRequest) {
-        String method = org.opensearch.core.common.Strings.hasLength(indexRequest.id()) ? HttpPut.METHOD_NAME : HttpPost.METHOD_NAME;
+        String method = Strings.hasLength(indexRequest.id()) ? HttpPut.METHOD_NAME : HttpPost.METHOD_NAME;
 
         String endpoint;
         if (indexRequest.opType() == DocWriteRequest.OpType.CREATE) {
@@ -747,7 +747,7 @@ static Request putScript(PutStoredScriptRequest putStoredScriptRequest) throws I
         Params params = new Params();
         params.withTimeout(putStoredScriptRequest.timeout());
         params.withClusterManagerTimeout(putStoredScriptRequest.clusterManagerNodeTimeout());
-        if (org.opensearch.core.common.Strings.hasText(putStoredScriptRequest.context())) {
+        if (Strings.hasText(putStoredScriptRequest.context())) {
             params.putParam("context", putStoredScriptRequest.context());
         }
         request.addParameters(params.asMap());
@@ -903,7 +903,7 @@ static class Params {
         Params() {}
 
         Params putParam(String name, String value) {
-            if (org.opensearch.core.common.Strings.hasLength(value)) {
+            if (Strings.hasLength(value)) {
                 parameters.put(name, value);
             }
             return this;
@@ -1298,7 +1298,7 @@ static class EndpointBuilder {
 
         EndpointBuilder addPathPart(String... parts) {
             for (String part : parts) {
-                if (org.opensearch.core.common.Strings.hasLength(part)) {
+                if (Strings.hasLength(part)) {
                     joiner.add(encodePart(part));
                 }
             }
@@ -1317,7 +1317,7 @@ EndpointBuilder addCommaSeparatedPathParts(List<String> parts) {
 
         EndpointBuilder addPathPartAsIs(String... parts) {
             for (String part : parts) {
-                if (org.opensearch.core.common.Strings.hasLength(part)) {
+                if (Strings.hasLength(part)) {
                     joiner.add(part);
                 }
             }

diff --git a/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java b/client/rest-high-level/src/test/java/org/opensearch/client/RequestConvertersTests.java
@@ -1074,7 +1074,7 @@ public void testSearch() throws Exception {
         Request request = RequestConverters.search(searchRequest, searchEndpoint);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (org.opensearch.core.common.Strings.hasLength(index)) {
+        if (Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add(searchEndpoint);
@@ -1179,7 +1179,7 @@ public void testCount() throws Exception {
         Request request = RequestConverters.count(countRequest);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (org.opensearch.core.common.Strings.hasLength(index)) {
+        if (Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add("_count");
@@ -1316,7 +1316,7 @@ public void testCreatePit() throws IOException {
         Request request = RequestConverters.createPit(createPitRequest);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (org.opensearch.core.common.Strings.hasLength(index)) {
+        if (Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add("_search/point_in_time");
@@ -1371,7 +1371,7 @@ public void testSearchTemplate() throws Exception {
         Request request = RequestConverters.searchTemplate(searchTemplateRequest);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (org.opensearch.core.common.Strings.hasLength(index)) {
+        if (Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add("_search/template");
@@ -1613,7 +1613,7 @@ public void testFieldCaps() throws IOException {
         // a hash set before being added to the request, and can appear in a
         // non-deterministic order.
         assertThat(request.getParameters(), hasKey("fields"));
-        String[] requestFields = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.getParameters().get("fields"));
+        String[] requestFields = Strings.splitStringByCommaToArray(request.getParameters().get("fields"));
         assertEquals(new HashSet<>(Arrays.asList(fields)), new HashSet<>(Arrays.asList(requestFields)));
 
         for (Map.Entry<String, String> param : indicesOptionsParams.entrySet()) {
@@ -1653,7 +1653,7 @@ public void testFieldCapsWithIndexFilter() throws IOException {
         // a hash set before being added to the request, and can appear in a
         // non-deterministic order.
         assertThat(request.getParameters(), hasKey("fields"));
-        String[] requestFields = org.opensearch.core.common.Strings.splitStringByCommaToArray(request.getParameters().get("fields"));
+        String[] requestFields = Strings.splitStringByCommaToArray(request.getParameters().get("fields"));
         assertEquals(new HashSet<>(Arrays.asList(fields)), new HashSet<>(Arrays.asList(requestFields)));
 
         for (Map.Entry<String, String> param : indicesOptionsParams.entrySet()) {
@@ -1681,7 +1681,7 @@ public void testRankEval() throws Exception {
         Request request = RequestConverters.rankEval(rankEvalRequest);
         StringJoiner endpoint = new StringJoiner("/", "/", "");
         String index = String.join(",", indices);
-        if (org.opensearch.core.common.Strings.hasLength(index)) {
+        if (Strings.hasLength(index)) {
             endpoint.add(index);
         }
         endpoint.add(RestRankEvalAction.ENDPOINT);

diff --git a/...-classic/src/main/java/org/opensearch/discovery/azure/classic/AzureSeedHostsProvider.java b/...-classic/src/main/java/org/opensearch/discovery/azure/classic/AzureSeedHostsProvider.java
@@ -204,7 +204,7 @@ public List<TransportAddress> getSeedAddresses(HostsResolver hostsResolver) {
             }
 
             // If provided, we check the deployment name
-            if (org.opensearch.core.common.Strings.hasLength(deploymentName) && !deploymentName.equals(deployment.getName())) {
+            if (Strings.hasLength(deploymentName) && !deploymentName.equals(deployment.getName())) {
                 logger.debug("current deployment name [{}] different from [{}]. skipping...", deployment.getName(), deploymentName);
                 continue;
             }

diff --git a/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java b/plugins/discovery-ec2/src/main/java/org/opensearch/discovery/ec2/AwsEc2ServiceImpl.java
@@ -66,7 +66,7 @@ AmazonEC2 buildClient(AWSCredentialsProvider credentials, ClientConfiguration co
         final AmazonEC2ClientBuilder builder = AmazonEC2ClientBuilder.standard()
             .withCredentials(credentials)
             .withClientConfiguration(configuration);
-        if (org.opensearch.core.common.Strings.hasText(endpoint)) {
+        if (Strings.hasText(endpoint)) {
             logger.debug("using explicit ec2 endpoint [{}]", endpoint);
             builder.withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration(endpoint, null));
         }

diff --git a/plugins/discovery-gce/src/main/java/org/opensearch/cloud/gce/network/GceNameResolver.java b/plugins/discovery-gce/src/main/java/org/opensearch/cloud/gce/network/GceNameResolver.java
@@ -97,7 +97,7 @@ private InetAddress[] resolve(String value) throws IOException {
         String gceMetadataPath;
         if (value.equals(GceAddressResolverType.GCE.configName)) {
             // We replace network placeholder with default network interface value: 0
-            gceMetadataPath = org.opensearch.core.common.Strings.replace(GceAddressResolverType.GCE.gceName, "{{network}}", "0");
+            gceMetadataPath = Strings.replace(GceAddressResolverType.GCE.gceName, "{{network}}", "0");
         } else if (value.equals(GceAddressResolverType.PRIVATE_DNS.configName)) {
             gceMetadataPath = GceAddressResolverType.PRIVATE_DNS.gceName;
         } else if (value.startsWith(GceAddressResolverType.PRIVATE_IP.configName)) {

diff --git a/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java b/plugins/discovery-gce/src/main/java/org/opensearch/discovery/gce/GceSeedHostsProvider.java
@@ -228,7 +228,7 @@ public List<TransportAddress> getSeedAddresses(HostsResolver hostsResolver) {
                         // Trying to get Public IP Address (For future use)
                         if (networkInterface.getAccessConfigs() != null) {
                             for (AccessConfig accessConfig : networkInterface.getAccessConfigs()) {
-                                if (org.opensearch.core.common.Strings.hasText(accessConfig.getNatIP())) {
+                                if (Strings.hasText(accessConfig.getNatIP())) {
                                     ip_public = accessConfig.getNatIP();
                                     break;
                                 }

diff --git a/...ingest-attachment/src/main/java/org/opensearch/ingest/attachment/AttachmentProcessor.java b/...ingest-attachment/src/main/java/org/opensearch/ingest/attachment/AttachmentProcessor.java
@@ -129,12 +129,12 @@ public IngestDocument execute(IngestDocument ingestDocument) {
             throw new OpenSearchParseException("Error parsing document in field [{}]", e, field);
         }
 
-        if (properties.contains(Property.CONTENT) && org.opensearch.core.common.Strings.hasLength(parsedContent)) {
+        if (properties.contains(Property.CONTENT) && Strings.hasLength(parsedContent)) {
             // somehow tika seems to append a newline at the end automatically, lets remove that again
             additionalFields.put(Property.CONTENT.toLowerCase(), parsedContent.trim());
         }
 
-        if (properties.contains(Property.LANGUAGE) && org.opensearch.core.common.Strings.hasLength(parsedContent)) {
+        if (properties.contains(Property.LANGUAGE) && Strings.hasLength(parsedContent)) {
             OptimaizeLangDetector langDetector = new OptimaizeLangDetector();
             langDetector.loadModels();
             LanguageResult result = langDetector.detect(parsedContent);
@@ -151,40 +151,40 @@ public IngestDocument execute(IngestDocument ingestDocument) {
 
         if (properties.contains(Property.TITLE)) {
             String title = metadata.get(TikaCoreProperties.TITLE);
-            if (org.opensearch.core.common.Strings.hasLength(title)) {
+            if (Strings.hasLength(title)) {
                 additionalFields.put(Property.TITLE.toLowerCase(), title);
             }
         }
 
         if (properties.contains(Property.AUTHOR)) {
             String author = metadata.get("Author");
-            if (org.opensearch.core.common.Strings.hasLength(author)) {
+            if (Strings.hasLength(author)) {
                 additionalFields.put(Property.AUTHOR.toLowerCase(), author);
             } else {
                 // The MSOffice parser has deprecated "Author" in favor of "Creator"
                 author = metadata.get(TikaCoreProperties.CREATOR);
-                if (org.opensearch.core.common.Strings.hasLength(author)) {
+                if (Strings.hasLength(author)) {
                     additionalFields.put(Property.AUTHOR.toLowerCase(), author);
                 }
             }
         }
 
         if (properties.contains(Property.KEYWORDS)) {
             String keywords = metadata.get("Keywords");
-            if (org.opensearch.core.common.Strings.hasLength(keywords)) {
+            if (Strings.hasLength(keywords)) {
                 additionalFields.put(Property.KEYWORDS.toLowerCase(), keywords);
             } else {
                 // Fallback - EPUBs put their keywords as multiple subject fields by convention
                 keywords = metadata.get(TikaCoreProperties.SUBJECT);
-                if (org.opensearch.core.common.Strings.hasLength(keywords)) {
+                if (Strings.hasLength(keywords)) {
                     additionalFields.put(Property.KEYWORDS.toLowerCase(), keywords);
                 }
             }
         }
 
         if (properties.contains(Property.CONTENT_TYPE)) {
             String contentType = metadata.get(Metadata.CONTENT_TYPE);
-            if (org.opensearch.core.common.Strings.hasLength(contentType)) {
+            if (Strings.hasLength(contentType)) {
                 additionalFields.put(Property.CONTENT_TYPE.toLowerCase(), contentType);
             }
         }

diff --git a/...lusterTest/java/org/opensearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java b/...lusterTest/java/org/opensearch/repositories/azure/AzureStorageCleanupThirdPartyTests.java
@@ -74,7 +74,7 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
     @Override
     protected Settings nodeSettings() {
         final String endpoint = System.getProperty("test.azure.endpoint_suffix");
-        if (org.opensearch.core.common.Strings.hasText(endpoint)) {
+        if (Strings.hasText(endpoint)) {
             return Settings.builder().put(super.nodeSettings()).put("azure.client.default.endpoint_suffix", endpoint).build();
         }
         return super.nodeSettings();
@@ -83,7 +83,7 @@ protected Settings nodeSettings() {
     @Override
     protected SecureSettings credentials() {
         assertThat(System.getProperty("test.azure.account"), not(blankOrNullString()));
-        final boolean hasSasToken = org.opensearch.core.common.Strings.hasText(System.getProperty("test.azure.sas_token"));
+        final boolean hasSasToken = Strings.hasText(System.getProperty("test.azure.sas_token"));
         if (hasSasToken == false) {
             assertThat(System.getProperty("test.azure.key"), not(blankOrNullString()));
         } else {

diff --git a/...ins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureRepository.java b/...ins/repository-azure/src/main/java/org/opensearch/repositories/azure/AzureRepository.java
@@ -128,7 +128,7 @@ public AzureRepository(
         this.storageService = storageService;
 
         final String basePath = Strings.trimLeadingCharacter(Repository.BASE_PATH_SETTING.get(metadata.settings()), '/');
-        if (org.opensearch.core.common.Strings.hasLength(basePath)) {
+        if (Strings.hasLength(basePath)) {
             // Remove starting / if any
             BlobPath path = new BlobPath();
             for (final String elem : basePath.split("/")) {

diff --git a/...epository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageSettings.java b/...epository-azure/src/main/java/org/opensearch/repositories/azure/AzureStorageSettings.java
@@ -279,8 +279,8 @@ public String getConnectString() {
     }
 
     private static String buildConnectString(String account, @Nullable String key, @Nullable String sasToken, String endpointSuffix) {
-        final boolean hasSasToken = org.opensearch.core.common.Strings.hasText(sasToken);
-        final boolean hasKey = org.opensearch.core.common.Strings.hasText(key);
+        final boolean hasSasToken = Strings.hasText(sasToken);
+        final boolean hasKey = Strings.hasText(key);
         if (hasSasToken == false && hasKey == false) {
             throw new SettingsException("Neither a secret key nor a shared access token was set.");
         }
@@ -294,7 +294,7 @@ private static String buildConnectString(String account, @Nullable String key, @
         } else {
             connectionStringBuilder.append(";SharedAccessSignature=").append(sasToken);
         }
-        if (org.opensearch.core.common.Strings.hasText(endpointSuffix)) {
+        if (Strings.hasText(endpointSuffix)) {
             connectionStringBuilder.append(";EndpointSuffix=").append(endpointSuffix);
         }
         return connectionStringBuilder.toString();
@@ -390,13 +390,10 @@ static ProxySettings validateAndCreateProxySettings(final Settings settings, fin
         final SecureString proxyPassword = getConfigValue(settings, clientName, PROXY_PASSWORD_SETTING);
         // Validate proxy settings
         if (proxyType == ProxySettings.ProxyType.DIRECT
-            && (proxyPort != 0
-                || Strings.hasText(proxyHost)
-                || org.opensearch.core.common.Strings.hasText(proxyUserName)
-                || org.opensearch.core.common.Strings.hasText(proxyPassword))) {
+            && (proxyPort != 0 || Strings.hasText(proxyHost) || Strings.hasText(proxyUserName) || Strings.hasText(proxyPassword))) {
             throw new SettingsException("Azure proxy port or host or username or password have been set but proxy type is not defined.");
         }
-        if (proxyType != ProxySettings.ProxyType.DIRECT && (proxyPort == 0 || org.opensearch.core.common.Strings.isEmpty(proxyHost))) {
+        if (proxyType != ProxySettings.ProxyType.DIRECT && (proxyPort == 0 || Strings.isEmpty(proxyHost))) {
             throw new SettingsException("Azure proxy type has been set but proxy host or port is not defined.");
         }
 

diff --git a/...y-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettings.java b/...y-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageClientSettings.java
@@ -221,9 +221,7 @@ public String getHost() {
     }
 
     public String getProjectId() {
-        return org.opensearch.core.common.Strings.hasLength(projectId)
-            ? projectId
-            : (credential != null ? credential.getProjectId() : null);
+        return Strings.hasLength(projectId) ? projectId : (credential != null ? credential.getProjectId() : null);
     }
 
     public TimeValue getConnectTimeout() {
@@ -280,15 +278,12 @@ static ProxySettings validateAndCreateProxySettings(final Settings settings, fin
         final SecureString proxyPassword = getConfigValue(settings, clientName, PROXY_PASSWORD_SETTING);
         // Validate proxy settings
         if (proxyType == Proxy.Type.DIRECT
-            && (proxyPort != 0
-                || Strings.hasText(proxyHost)
-                || org.opensearch.core.common.Strings.hasText(proxyUserName)
-                || org.opensearch.core.common.Strings.hasText(proxyPassword))) {
+            && (proxyPort != 0 || Strings.hasText(proxyHost) || Strings.hasText(proxyUserName) || Strings.hasText(proxyPassword))) {
             throw new SettingsException(
                 "Google Cloud Storage proxy port or host or username or password have been set but proxy type is not defined."
             );
         }
-        if (proxyType != Proxy.Type.DIRECT && (proxyPort == 0 || org.opensearch.core.common.Strings.isEmpty(proxyHost))) {
+        if (proxyType != Proxy.Type.DIRECT && (proxyPort == 0 || Strings.isEmpty(proxyHost))) {
             throw new SettingsException("Google Cloud Storage proxy type has been set but proxy host or port is not defined.");
         }
         if (proxyType == Proxy.Type.DIRECT) {

diff --git a/...itory-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageRepository.java b/...itory-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageRepository.java
@@ -98,7 +98,7 @@ class GoogleCloudStorageRepository extends MeteredBlobStoreRepository {
         this.storageService = storageService;
 
         String basePath = BASE_PATH.get(metadata.settings());
-        if (org.opensearch.core.common.Strings.hasLength(basePath)) {
+        if (Strings.hasLength(basePath)) {
             BlobPath path = new BlobPath();
             for (String elem : basePath.split("/")) {
                 path = path.add(elem);

diff --git a/...pository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java b/...pository-gcs/src/main/java/org/opensearch/repositories/gcs/GoogleCloudStorageService.java
@@ -118,7 +118,7 @@ public Storage client(final String clientName, final String repositoryName, fina
                     "Unknown client name ["
                         + clientName
                         + "]. Existing client configs: "
-                        + org.opensearch.core.common.Strings.collectionToDelimitedString(clientSettings.keySet(), ",")
+                        + Strings.collectionToDelimitedString(clientSettings.keySet(), ",")
                 );
             }
 
@@ -202,15 +202,15 @@ StorageOptions createStorageOptions(
             .setTransportOptions(httpTransportOptions)
             .setHeaderProvider(() -> {
                 final MapBuilder<String, String> mapBuilder = MapBuilder.newMapBuilder();
-                if (org.opensearch.core.common.Strings.hasLength(clientSettings.getApplicationName())) {
+                if (Strings.hasLength(clientSettings.getApplicationName())) {
                     mapBuilder.put("user-agent", clientSettings.getApplicationName());
                 }
                 return mapBuilder.immutableMap();
             });
-        if (org.opensearch.core.common.Strings.hasLength(clientSettings.getHost())) {
+        if (Strings.hasLength(clientSettings.getHost())) {
             storageOptionsBuilder.setHost(clientSettings.getHost());
         }
-        if (org.opensearch.core.common.Strings.hasLength(clientSettings.getProjectId())) {
+        if (Strings.hasLength(clientSettings.getProjectId())) {
             storageOptionsBuilder.setProjectId(clientSettings.getProjectId());
         }
         if (clientSettings.getCredential() == null) {