Skip to content

Commit fbe0154

Browse files
authored
Fix a unit test and update github workflow to use actions/setup-java@v3. (#757)
Signed-off-by: Bo Zhang <bzhangam@amazon.com>
1 parent ac6b398 commit fbe0154

File tree

3 files changed

+26
-3
lines changed

3 files changed

+26
-3
lines changed

.github/workflows/test_security.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ jobs:
2929
uses: actions/checkout@v1
3030

3131
- name: Setup Java ${{ matrix.java }}
32-
uses: actions/setup-java@v1
32+
uses: actions/setup-java@v3
3333
with:
34+
distribution: 'corretto'
3435
java-version: ${{ matrix.java }}
3536

3637
- name: Assemble Geospatial

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ See the [CONTRIBUTING guide](./CONTRIBUTING.md#Changelog) for instructions on ho
1111
### Infrastructure
1212
### Documentation
1313
### Maintenance
14+
Fix a unit test and update github workflow to use actions/setup-java@v3.
1415
### Refactoring
1516

1617
## [Unreleased 2.x](https://github.com/opensearch-project/geospatial/compare/2.19...2.x)

src/test/java/org/opensearch/geospatial/ClusterSettingHelper.java

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@
1616
import java.io.IOException;
1717
import java.nio.file.Path;
1818
import java.util.ArrayList;
19+
import java.util.Collection;
20+
import java.util.Collections;
1921
import java.util.List;
2022
import java.util.Map;
23+
import java.util.stream.Collectors;
2124

25+
import org.opensearch.Version;
2226
import org.opensearch.cluster.ClusterName;
2327
import org.opensearch.common.SuppressForbidden;
2428
import org.opensearch.common.network.NetworkModule;
@@ -27,6 +31,7 @@
2731
import org.opensearch.node.MockNode;
2832
import org.opensearch.node.Node;
2933
import org.opensearch.plugins.Plugin;
34+
import org.opensearch.plugins.PluginInfo;
3035
import org.opensearch.test.InternalTestCluster;
3136
import org.opensearch.test.MockHttpTransport;
3237

@@ -44,12 +49,28 @@ public Node createMockNode(Map<String, Object> configSettings) throws IOExceptio
4449
return new MockNode(baseSettings().build(), basePlugins(), configDir, true);
4550
}
4651

47-
private List<Class<? extends Plugin>> basePlugins() {
52+
private Collection<PluginInfo> basePlugins() {
4853
List<Class<? extends Plugin>> plugins = new ArrayList<>();
4954
plugins.add(getTestTransportPlugin());
5055
plugins.add(MockHttpTransport.TestPlugin.class);
5156
plugins.add(TestGeospatialPlugin.class);
52-
return plugins;
57+
58+
Collection<PluginInfo> pluginInfos = plugins.stream()
59+
.map(
60+
p -> new PluginInfo(
61+
p.getName(),
62+
"classpath plugin",
63+
"NA",
64+
Version.CURRENT,
65+
"1.8",
66+
p.getName(),
67+
null,
68+
Collections.emptyList(),
69+
false
70+
)
71+
)
72+
.collect(Collectors.toList());
73+
return pluginInfos;
5374
}
5475

5576
private static Settings.Builder baseSettings() {

0 commit comments

Comments
 (0)