Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature/extensions] Rename to extensions #3951

Closed
wants to merge 11 commits into from
Closed

[Feature/extensions] Rename to extensions #3951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d3f46b5
Update ExtensionsOrchestrator.java
mloufra Jul 19, 2022
a0d7714
Rename PluginRequest.java to InitializeExtensionsRequest.java
mloufra Jul 19, 2022
c254e4e
Rename PluginResponse.java to InitializeExtensionsResponse.java
mloufra Jul 19, 2022
3d912b2
Issue #28
Jul 20, 2022
9018985
issue #28
mloufra Jul 20, 2022
b81a7a1
issue #28
mloufra Jul 20, 2022
cdb5ba8
Merge branch 'feature/extensions' of https://github.com/mloufra/OpenS…
mloufra Jul 20, 2022
21e2ab3
issue #28
mloufra Jul 20, 2022
654b7e3
Merge branch 'opensearch-project:feature/extensions' into feature/ext…
mloufra Jul 20, 2022
5e52f00
Merge branch 'opensearch-project:feature/extensions' into feature/ext…
mloufra Jul 22, 2022
6f05107
Rename to extensions
mloufra Jul 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions git-secrets
Open in desktop
Submodule git-secrets added at b9e96b
8 changes: 4 additions & 4 deletions ...g/opensearch/discovery/PluginRequest.java → ...iscovery/InitializeExtensionsRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
*
* @opensearch.internal
*/
public class PluginRequest extends TransportRequest {
public class InitializeExtensionsRequest extends TransportRequest {
private final DiscoveryNode sourceNode;
/*
* TODO change DiscoveryNode to Extension information
*/
private final List<DiscoveryExtension> extensions;

public PluginRequest(DiscoveryNode sourceNode, List<DiscoveryExtension> extensions) {
public InitializeExtensionsRequest(DiscoveryNode sourceNode, List<DiscoveryExtension> extensions) {
this.sourceNode = sourceNode;
this.extensions = extensions;
}

public PluginRequest(StreamInput in) throws IOException {
public InitializeExtensionsRequest(StreamInput in) throws IOException {
super(in);
sourceNode = new DiscoveryNode(in);
extensions = in.readList(DiscoveryExtension::new);
Expand Down Expand Up @@ -65,7 +65,7 @@ public String toString() {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PluginRequest that = (PluginRequest) o;
InitializeExtensionsRequest that = (InitializeExtensionsRequest) o;
return Objects.equals(sourceNode, that.sourceNode) && Objects.equals(extensions, that.extensions);
}

Expand Down
8 changes: 4 additions & 4 deletions .../opensearch/discovery/PluginResponse.java → ...scovery/InitializeExtensionsResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,14 @@
*
* @opensearch.internal
*/
public class PluginResponse extends TransportResponse {
public class InitializeExtensionsResponse extends TransportResponse {
private String name;

public PluginResponse(String name) {
public InitializeExtensionsResponse(String name) {
this.name = name;
}

public PluginResponse(StreamInput in) throws IOException {
public InitializeExtensionsResponse(StreamInput in) throws IOException {
name = in.readString();
}

Expand All @@ -77,7 +77,7 @@ public String toString() {
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
PluginResponse that = (PluginResponse) o;
InitializeExtensionsResponse that = (InitializeExtensionsResponse) o;
return Objects.equals(name, that.name);
}

Expand Down
15 changes: 8 additions & 7 deletions server/src/main/java/org/opensearch/extensions/ExtensionsOrchestrator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
import org.opensearch.common.io.stream.StreamInput;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.transport.TransportAddress;
import org.opensearch.discovery.PluginRequest;
import org.opensearch.discovery.PluginResponse;
import org.opensearch.discovery.InitializeExtensionsRequest;
import org.opensearch.discovery.InitializeExtensionsResponse;
import org.opensearch.extensions.ExtensionsSettings.Extension;
import org.opensearch.index.IndexModule;
import org.opensearch.index.IndexService;
Expand Down Expand Up @@ -208,15 +208,16 @@ public void extensionsInitialize() {

private void extensionInitialize(DiscoveryNode extensionNode) {

final TransportResponseHandler<PluginResponse> pluginResponseHandler = new TransportResponseHandler<PluginResponse>() {
final TransportResponseHandler<InitializeExtensionsResponse> pluginResponseHandler = new TransportResponseHandler<
InitializeExtensionsResponse>() {

@Override
public PluginResponse read(StreamInput in) throws IOException {
return new PluginResponse(in);
public InitializeExtensionsResponse read(StreamInput in) throws IOException {
return new InitializeExtensionsResponse(in);
}

@Override
public void handleResponse(PluginResponse response) {
public void handleResponse(InitializeExtensionsResponse response) {
for (DiscoveryExtension extension : extensionsList) {
if (extension.getName().equals(response.getName())) {
extensionsInitializedList.add(extension);
Expand All @@ -240,7 +241,7 @@ public String executor() {
transportService.sendRequest(
extensionNode,
REQUEST_EXTENSION_ACTION_NAME,
new PluginRequest(transportService.getLocalNode(), new ArrayList<DiscoveryExtension>(extensionsList)),
new InitializeExtensionsRequest(transportService.getLocalNode(), new ArrayList<DiscoveryExtension>(extensionsList)),
pluginResponseHandler
);
} catch (Exception e) {
Expand Down