Correction in class MinimumSecuritySettingsSupplierFactory to pass ch…

…eckstyle tests, licence header added where missing, test classes moved to proper packages. Signed-off-by: Lukasz Soszynski <[email protected]>
opensearch-project · Aug 17, 2022 · 88394ec · 88394ec
1 parent ed8ac9a
commit 88394ec
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 78 deletions.
diff --git a/...g/opensearch/test/SecurityRolesTests.java → ...ensearch/security/SecurityRolesTests.java b/...g/opensearch/test/SecurityRolesTests.java → ...ensearch/security/SecurityRolesTests.java
@@ -24,7 +24,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.test;
+package org.opensearch.security;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.apache.http.HttpStatus;

diff --git a/...nsearch/test/PrivilegesEvaluatorTest.java → ...y/privileges/PrivilegesEvaluatorTest.java b/...nsearch/test/PrivilegesEvaluatorTest.java → ...y/privileges/PrivilegesEvaluatorTest.java
@@ -9,7 +9,7 @@
  * GitHub history for details.
  */
 
-package org.opensearch.test;
+package org.opensearch.security.privileges;
 
 import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
 import org.apache.http.HttpStatus;

diff --git a/src/integrationTest/java/org/opensearch/test/GenericIntegrationTest.java b/src/integrationTest/java/org/opensearch/test/GenericIntegrationTest.java
diff --git a/...egrationTest/java/org/opensearch/test/framework/cluster/ContextHeaderDecoratorClient.java b/...egrationTest/java/org/opensearch/test/framework/cluster/ContextHeaderDecoratorClient.java
@@ -1,3 +1,12 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ */
 package org.opensearch.test.framework.cluster;
 
 import java.util.Collections;

diff --git a/...st/java/org/opensearch/test/framework/cluster/MinimumSecuritySettingsSupplierFactory.java b/...st/java/org/opensearch/test/framework/cluster/MinimumSecuritySettingsSupplierFactory.java
@@ -28,8 +28,6 @@
 
 package org.opensearch.test.framework.cluster;
 
-import java.io.IOException;
-
 import org.opensearch.common.settings.Settings;
 import org.opensearch.test.framework.certificate.TestCertificates;
 

diff --git a/src/integrationTest/java/org/opensearch/test/framework/cluster/NodeType.java b/src/integrationTest/java/org/opensearch/test/framework/cluster/NodeType.java
@@ -1,3 +1,13 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ * Modifications Copyright OpenSearch Contributors. See
+ * GitHub history for details.
+ */
 package org.opensearch.test.framework.cluster;
 
 enum NodeType {

diff --git a/src/integrationTest/java/org/opensearch/test/framework/cluster/RestClientException.java b/src/integrationTest/java/org/opensearch/test/framework/cluster/RestClientException.java
@@ -1,3 +1,12 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ */
 package org.opensearch.test.framework.cluster;
 
 class RestClientException extends RuntimeException {

diff --git a/src/integrationTest/java/org/opensearch/test/framework/cluster/StartStage.java b/src/integrationTest/java/org/opensearch/test/framework/cluster/StartStage.java
@@ -1,3 +1,12 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * The OpenSearch Contributors require contributions made to
+ * this file be licensed under the Apache-2.0 license or a
+ * compatible open source license.
+ *
+ */
 package org.opensearch.test.framework.cluster;
 
 enum StartStage {