Skip to content

Commit ef048a2

Browse files
stephen-crawfordRyanL1997
stephen-crawford
authored and
RyanL1997
committed
IntegrationTest spotless (opensearch-project#2863)
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
1 parent b6bfb11 commit ef048a2

38 files changed

Lines changed: 7336 additions & 6728 deletions

‎build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ spotless {
7979
target '**/com/amazon/dlic/**/*.java'
8080
target '**/com/amazon/security/**/*.java'
8181
target '**/test/**/*.java'
82+
target '**/integrationTest/**/*.java'
8283

8384
removeUnusedImports()
8485
eclipse().configFile rootProject.file('formatter/formatterConfig.xml')
@@ -113,6 +114,7 @@ spotless {
113114
targetExclude '**/com/amazon/dlic/**/*.java'
114115
targetExclude '**/com/amazon/security/**/*.java'
115116
targetExclude '**/test/**/*.java'
117+
targetExclude '**/integrationTest/**/*.java'
116118

117119
trimTrailingWhitespace()
118120
endWithNewline();

‎src/integrationTest/java/org/opensearch/common/logging/NodeAndClusterIdConverter.java‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,9 @@
2121

2222
class NodeAndClusterIdConverter {
2323

24+
public NodeAndClusterIdConverter() {}
2425

25-
public NodeAndClusterIdConverter() {
26-
}
26+
public static void setNodeIdAndClusterId(String nodeId, String clusterUUID) {}
2727

28-
public static void setNodeIdAndClusterId(String nodeId, String clusterUUID) {
29-
}
30-
31-
public void format(LogEvent event, StringBuilder toAppendTo) {
32-
}
28+
public void format(LogEvent event, StringBuilder toAppendTo) {}
3329
}

‎src/integrationTest/java/org/opensearch/node/PluginAwareNode.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,19 @@
3434

3535
public class PluginAwareNode extends Node {
3636

37-
private final boolean clusterManagerEligible;
38-
39-
@SafeVarargs
40-
public PluginAwareNode(boolean clusterManagerEligible, final Settings preparedSettings, final Class<? extends Plugin>... plugins) {
41-
super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, Collections.emptyMap(), null, () -> System.getenv("HOSTNAME")), Arrays.asList(plugins), true);
42-
this.clusterManagerEligible = clusterManagerEligible;
43-
}
44-
45-
46-
public boolean isClusterManagerEligible() {
47-
return clusterManagerEligible;
48-
}
37+
private final boolean clusterManagerEligible;
38+
39+
@SafeVarargs
40+
public PluginAwareNode(boolean clusterManagerEligible, final Settings preparedSettings, final Class<? extends Plugin>... plugins) {
41+
super(
42+
InternalSettingsPreparer.prepareEnvironment(preparedSettings, Collections.emptyMap(), null, () -> System.getenv("HOSTNAME")),
43+
Arrays.asList(plugins),
44+
true
45+
);
46+
this.clusterManagerEligible = clusterManagerEligible;
47+
}
48+
49+
public boolean isClusterManagerEligible() {
50+
return clusterManagerEligible;
51+
}
4952
}

‎src/integrationTest/java/org/opensearch/security/ConfigurationFiles.java‎

Lines changed: 35 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -20,47 +20,41 @@
2020

2121
class ConfigurationFiles {
2222

23-
public static void createRoleMappingFile(File destination) {
24-
String resource = "roles_mapping.yml";
25-
copyResourceToFile(resource, destination);
26-
}
23+
public static void createRoleMappingFile(File destination) {
24+
String resource = "roles_mapping.yml";
25+
copyResourceToFile(resource, destination);
26+
}
2727

28-
public static void createConfigFile(File destination) {
29-
String resource = "config.yml";
30-
copyResourceToFile(resource, destination);
31-
}
28+
public static Path createConfigurationDirectory() {
29+
try {
30+
Path tempDirectory = Files.createTempDirectory("test-security-config");
31+
String[] configurationFiles = {
32+
"config.yml",
33+
"action_groups.yml",
34+
"config.yml",
35+
"internal_users.yml",
36+
"roles.yml",
37+
"roles_mapping.yml",
38+
"security_tenants.yml",
39+
"tenants.yml" };
40+
for (String fileName : configurationFiles) {
41+
Path configFileDestination = tempDirectory.resolve(fileName);
42+
copyResourceToFile(fileName, configFileDestination.toFile());
43+
}
44+
return tempDirectory.toAbsolutePath();
45+
} catch (IOException ex) {
46+
throw new RuntimeException("Cannot create directory with security plugin configuration.", ex);
47+
}
48+
}
3249

33-
public static Path createConfigurationDirectory() {
34-
try {
35-
Path tempDirectory = Files.createTempDirectory("test-security-config");
36-
String[] configurationFiles = {
37-
"config.yml",
38-
"action_groups.yml",
39-
"config.yml",
40-
"internal_users.yml",
41-
"roles.yml",
42-
"roles_mapping.yml",
43-
"security_tenants.yml",
44-
"tenants.yml"
45-
};
46-
for (String fileName : configurationFiles) {
47-
Path configFileDestination = tempDirectory.resolve(fileName);
48-
copyResourceToFile(fileName, configFileDestination.toFile());
49-
}
50-
return tempDirectory.toAbsolutePath();
51-
} catch (IOException ex) {
52-
throw new RuntimeException("Cannot create directory with security plugin configuration.", ex);
53-
}
54-
}
55-
56-
private static void copyResourceToFile(String resource, File destination) {
57-
try(InputStream input = ConfigurationFiles.class.getClassLoader().getResourceAsStream(resource)) {
58-
Objects.requireNonNull(input, "Cannot find source resource " + resource);
59-
try(OutputStream output = new FileOutputStream(destination)) {
60-
input.transferTo(output);
61-
}
62-
} catch (IOException e) {
63-
throw new RuntimeException("Cannot create file with security plugin configuration", e);
64-
}
65-
}
50+
private static void copyResourceToFile(String resource, File destination) {
51+
try (InputStream input = ConfigurationFiles.class.getClassLoader().getResourceAsStream(resource)) {
52+
Objects.requireNonNull(input, "Cannot find source resource " + resource);
53+
try (OutputStream output = new FileOutputStream(destination)) {
54+
input.transferTo(output);
55+
}
56+
} catch (IOException e) {
57+
throw new RuntimeException("Cannot create file with security plugin configuration", e);
58+
}
59+
}
6660
}

0 commit comments

Comments
 (0)