[Refactor] Various Utilities, Assertion, and Concurrency Exception fr…

…om server to libraries (opensearch-project#6875)

To further reduce the surface area of utility methods in :server: this commit refactors the
following:

 * MapBuilder from server module to common library
 * Assertions from server module to core library
 * BytesRef methods from CollectionUtils in server module to
   new BytesRefUtils in core library

It also removes CollectionUtils dependency on hppc in prep for
refactoring CollectionUtils methods to the proper library.

Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
Signed-off-by: Valentin Mitrofanov <mitrofmep@gmail.com>

client/rest-high-level/src/test/java/org/opensearch/client/OpenSearchRestHighLevelClientTestCase.java

@@ -55,7 +55,7 @@
 import org.opensearch.common.xcontent.XContentHelper;
 import org.opensearch.common.xcontent.XContentType;
 import org.opensearch.common.xcontent.json.JsonXContent;
-import org.opensearch.core.internal.io.IOUtils;
+import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.ingest.Pipeline;
 import org.opensearch.search.SearchHit;
 import org.opensearch.search.SearchModule;

distribution/tools/keystore-cli/src/test/java/org/opensearch/bootstrap/BootstrapTests.java

@@ -31,7 +31,7 @@
 
 package org.opensearch.bootstrap;
 
-import org.opensearch.core.internal.io.IOUtils;
+import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.common.settings.KeyStoreCommandTestCase;
 import org.opensearch.common.settings.KeyStoreWrapper;
 import org.opensearch.common.settings.SecureSettings;

distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreCommandTestCase.java

@@ -42,7 +42,7 @@
 
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
-import org.opensearch.core.internal.io.IOUtils;
+import org.opensearch.common.util.io.IOUtils;
 import org.apache.lucene.tests.util.LuceneTestCase;
 import org.opensearch.cli.CommandTestCase;
 import org.opensearch.common.io.PathUtilsForTesting;

distribution/tools/keystore-cli/src/test/java/org/opensearch/common/settings/KeyStoreWrapperTests.java

@@ -39,7 +39,7 @@
 import org.apache.lucene.store.IndexOutput;
 import org.apache.lucene.store.NIOFSDirectory;
 import org.opensearch.common.Randomness;
-import org.opensearch.core.internal.io.IOUtils;
+import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.env.Environment;
 import org.opensearch.test.OpenSearchTestCase;
 import org.hamcrest.Matchers;

distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/InstallPluginCommand.java

@@ -58,7 +58,7 @@
 import org.opensearch.common.SuppressForbidden;
 import org.opensearch.common.collect.Tuple;
 import org.opensearch.common.hash.MessageDigests;
-import org.opensearch.core.internal.io.IOUtils;
+import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.env.Environment;
 
 import java.io.BufferedReader;

distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/PluginCli.java

@@ -32,7 +32,7 @@
 
 package org.opensearch.plugins;
 
-import org.opensearch.core.internal.io.IOUtils;
+import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.cli.Command;
 import org.opensearch.cli.LoggingAwareMultiCommand;
 import org.opensearch.cli.Terminal;

distribution/tools/plugin-cli/src/main/java/org/opensearch/plugins/RemovePluginCommand.java

@@ -38,7 +38,7 @@
 import org.opensearch.cli.ExitCodes;
 import org.opensearch.cli.Terminal;
 import org.opensearch.cli.UserException;
-import org.opensearch.core.internal.io.IOUtils;
+import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.env.Environment;
 
 import java.io.IOException;

distribution/tools/upgrade-cli/src/test/java/org/opensearch/upgrade/UpgradeCliTests.java

@@ -18,7 +18,7 @@
 import org.opensearch.common.io.PathUtilsForTesting;
 import org.opensearch.common.settings.KeyStoreWrapper;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.core.internal.io.IOUtils;
+import org.opensearch.common.util.io.IOUtils;
 import org.opensearch.env.Environment;
 import org.opensearch.env.TestEnvironment;
 

libs/cli/build.gradle

@@ -34,7 +34,6 @@ apply plugin: 'opensearch.publish'
 dependencies {
  api 'net.sf.jopt-simple:jopt-simple:5.0.4'
  api project(':libs:opensearch-common')
- api project(':libs:opensearch-core')
 }
 
 test.enabled = false

libs/cli/src/main/java/org/opensearch/cli/MultiCommand.java

@@ -36,7 +36,7 @@
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 import joptsimple.util.KeyValuePair;
-import org.opensearch.core.internal.io.IOUtils;
+import org.opensearch.common.util.io.IOUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;

libs/core/src/main/java/org/opensearch/core/internal/io/IOUtils.java → libs/common/src/main/java/org/opensearch/common/util/io/IOUtils.java

@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.core.internal.io;
+package org.opensearch.common.util.io;
 
 import org.opensearch.common.Nullable;
 

libs/core/src/main/java/org/opensearch/core/internal/io/Streams.java → libs/common/src/main/java/org/opensearch/common/util/io/Streams.java

@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.core.internal.io;
+package org.opensearch.common.util.io;
 
 import java.io.IOException;
 import java.io.InputStream;

libs/core/src/main/java/org/opensearch/core/internal/io/package-info.java → libs/common/src/main/java/org/opensearch/common/util/io/package-info.java

@@ -6,5 +6,5 @@
  * compatible open source license.
  */
 
-/** Common internal I/O classes */
-package org.opensearch.core.internal.io;
+/** Common internal I/O utility classes */
+package org.opensearch.common.util.io;

libs/core/src/main/java/org/opensearch/core/internal/net/NetUtils.java → libs/common/src/main/java/org/opensearch/common/util/net/NetUtils.java

@@ -30,7 +30,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.core.internal.net;
+package org.opensearch.common.util.net;
 
 import java.io.IOException;
 import java.lang.reflect.Field;

libs/core/src/main/java/org/opensearch/core/internal/net/package-info.java → libs/common/src/main/java/org/opensearch/common/util/net/package-info.java

@@ -7,4 +7,4 @@
  */
 
 /** Common Network Utility Classes */
-package org.opensearch.core.internal.net;
+package org.opensearch.common.util.net;

libs/core/build.gradle

@@ -79,6 +79,9 @@ dependencies {
 
  api "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
 
+ // lucene
+ api "org.apache.lucene:lucene-core:${versions.lucene}"
+
  testImplementation "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}"
  testImplementation "junit:junit:${versions.junit}"
  testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
@@ -96,4 +99,5 @@ tasks.named('forbiddenApisMain').configure {
 
 tasks.named("dependencyLicenses").configure {
  mapping from: /jackson-.*/, to: 'jackson'
+ mapping from: /lucene-.*/, to: 'lucene'
 }