From b40332f11c894b6d635b6b5377f0c66e9aeff772 Mon Sep 17 00:00:00 2001 From: Nicholas Walter Knize Date: Fri, 4 Aug 2023 16:56:56 -0500 Subject: [PATCH] cleanup stray fqcn Signed-off-by: Nicholas Walter Knize --- .../snapshots/blobstore/BlobStoreIndexShardSnapshot.java | 2 +- .../java/org/opensearch/snapshots/SnapshotsService.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/org/opensearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java b/server/src/main/java/org/opensearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java index 5d71c21a70755..6a48007234260 100644 --- a/server/src/main/java/org/opensearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java +++ b/server/src/main/java/org/opensearch/index/snapshots/blobstore/BlobStoreIndexShardSnapshot.java @@ -338,7 +338,7 @@ public static FileInfo fromXContent(XContentParser parser) throws IOException { } // Verify that file information is complete - if (name == null || org.opensearch.core.common.Strings.validFileName(name) == false) { + if (name == null || Strings.validFileName(name) == false) { throw new OpenSearchParseException("missing or invalid file name [" + name + "]"); } else if (physicalName == null || Strings.validFileName(physicalName) == false) { throw new OpenSearchParseException("missing or invalid physical file name [" + physicalName + "]"); diff --git a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java index 7a841893c4420..71dba24717ed1 100644 --- a/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java +++ b/server/src/main/java/org/opensearch/snapshots/SnapshotsService.java @@ -477,7 +477,7 @@ public ClusterState execute(ClusterState currentState) { "No indices in the source snapshot [" + sourceSnapshotId + "] matched requested pattern [" - + org.opensearch.core.common.Strings.arrayToCommaDelimitedString(request.indices()) + + Strings.arrayToCommaDelimitedString(request.indices()) + "]" ); } @@ -823,7 +823,7 @@ private static void validate(String repositoryName, String snapshotName, Cluster } private static void validate(final String repositoryName, final String snapshotName) { - if (org.opensearch.core.common.Strings.hasLength(snapshotName) == false) { + if (Strings.hasLength(snapshotName) == false) { throw new InvalidSnapshotNameException(repositoryName, snapshotName, "cannot be empty"); } if (snapshotName.contains(" ")) { @@ -845,7 +845,7 @@ private static void validate(final String repositoryName, final String snapshotN throw new InvalidSnapshotNameException( repositoryName, snapshotName, - "must not contain the following characters " + org.opensearch.core.common.Strings.INVALID_FILENAME_CHARS + "must not contain the following characters " + Strings.INVALID_FILENAME_CHARS ); } } @@ -1806,7 +1806,7 @@ public void deleteSnapshots(final DeleteSnapshotRequest request, final ActionLis logger.info( () -> new ParameterizedMessage( "deleting snapshots [{}] from repository [{}]", - org.opensearch.core.common.Strings.arrayToCommaDelimitedString(snapshotNames), + Strings.arrayToCommaDelimitedString(snapshotNames), repoName ) );