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

Jump to bottom

adam/fdc3-change #36

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

adam/fdc3-change #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67c56b6
ADAP-183 WIP Channel API change
weiteho Jan 28, 2020
0587e24
ADAP-183 WIP endpointId related change.
weiteho Jan 30, 2020
12960f8
ADAP-183 added unit test
weiteho Jan 30, 2020
896a942
ADAP-183 channel api endpointId implementation and code refactory
weiteho Feb 3, 2020
aa1da26
ADAP-183 removed logging info
weiteho Feb 3, 2020
400401f
create new OpenFinRuntime instance with desktop connection as per ada…
adam-saland Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/java/com/openfin/desktop/demo/ChannelExample.java
View file
Open in desktop
Expand Up @@ -65,7 +65,7 @@ public void onSuccess(ChannelProvider provider) {

provider.register("getValue", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
JSONObject obj = new JSONObject();
obj.put("value", x.get());
Expand All @@ -74,7 +74,7 @@ public JSONObject invoke(String action, JSONObject payload) {
});
provider.register("increment", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
JSONObject obj = new JSONObject();
obj.put("value", x.incrementAndGet());
Expand All @@ -84,7 +84,7 @@ public JSONObject invoke(String action, JSONObject payload) {
});
provider.register("incrementBy", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
logger.info(String.format("provider processing action %s, payload=%s", action, payload.toString()));
int delta = payload.getInt("delta");
JSONObject obj = new JSONObject();
Expand All @@ -100,13 +100,13 @@ public JSONObject invoke(String action, JSONObject payload) {
* Create a channel client that invokes "getValue", "increment" and "incrementBy n" actions
*/
public void createChannelClient() {
desktopConnection.getChannel(CHANNEL_NAME).connect(CHANNEL_NAME + "Client", new AsyncCallback<ChannelClient>() {
desktopConnection.getChannel(CHANNEL_NAME).connect(new AsyncCallback<ChannelClient>() {
@Override
public void onSuccess(ChannelClient client) {
// register a channel event
client.register("event", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
logger.info("channel event {}", action);
return null;
}
Expand Down
15 changes: 8 additions & 7 deletions src/main/java/com/openfin/desktop/demo/FDC3Example.java
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
public class FDC3Example implements DesktopStateListener {

private final static String javaConnectUuid = "JavaFDC3Demo";

private OpenFinRuntime openFinRuntime;
private DesktopConnection desktopConnection;
private JFrame mainWindow;
private JButton btnLaunchRed;
Expand Down Expand Up @@ -166,17 +166,18 @@ protected JScrollPane layoutOutputPanel() {

void launchOpenfin() throws DesktopException, DesktopIOException, IOException, InterruptedException {
RuntimeConfiguration config = new RuntimeConfiguration();
// config.setRuntimeVersion("stable");
config.setRuntimeVersion("10.66.41.18");
config.setRuntimeVersion("stable");
// config.setRuntimeVersion("10.66.41.18");
config.setAdditionalRuntimeArguments("--v=1 ");
// serviceConfig = new JSONArray();
// JSONObject layout = new JSONObject();
// layout.put("name", "fdc3");
// serviceConfig.put(0, layout);
// config.addConfigurationItem("services", serviceConfig);
JSONObject serviceItem = new JSONObject();
serviceItem.put("name", "fdc3");
serviceConfig.put(0, serviceItem);
config.addConfigurationItem("services", serviceConfig);

this.desktopConnection = new DesktopConnection(javaConnectUuid);
this.desktopConnection.connect(config, this, 60);
this.openFinRuntime = new OpenFinRuntime(this.desktopConnection);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/openfin/desktop/demo/FxLayoutFrame.java
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ public void run() {
@Override
public void onSuccess(Ack ack) {
ExternalWindowObserver observer = (ExternalWindowObserver) ack.getSource();
observer.getDesktopConnection().getChannel(LayoutServiceChannelName).connect(LayoutServiceChannelName,
observer.getDesktopConnection().getChannel(LayoutServiceChannelName).connect(
new AsyncCallback<ChannelClient>() {
@Override
public void onSuccess(ChannelClient client) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/openfin/desktop/demo/LaunchManifestDemo.java
View file
Open in desktop
Expand Up @@ -176,15 +176,15 @@ private void createExternalWindowObserver() {
@Override
public void onSuccess(Ack ack) {
ExternalWindowObserver observer = (ExternalWindowObserver) ack.getSource();
observer.getDesktopConnection().getChannel(LayoutServiceChannelName).connect(LayoutServiceChannelName,
observer.getDesktopConnection().getChannel(LayoutServiceChannelName).connect(
new AsyncCallback<ChannelClient>() {
@Override
public void onSuccess(ChannelClient client) {
LaunchManifestDemo.this.channelClient = client;

client.register("event", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
System.out.printf("channel event " + action);
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/openfin/desktop/demo/LayoutFrame.java
View file
Open in desktop
Expand Up @@ -113,7 +113,7 @@ public void actionPerformed(ActionEvent e) {
@Override
public void onSuccess(Ack ack) {
ExternalWindowObserver observer = (ExternalWindowObserver) ack.getSource();
observer.getDesktopConnection().getChannel(LayoutServiceChannelName).connect(LayoutServiceChannelName,
observer.getDesktopConnection().getChannel(LayoutServiceChannelName).connect(
new AsyncCallback<ChannelClient>() {
@Override
public void onSuccess(ChannelClient client) {
Expand All @@ -130,7 +130,7 @@ public void actionPerformed(ActionEvent e) {

client.register("event", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
System.out.printf("channel event " + action);
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/openfin/desktop/demo/LayoutServiceDemo.java
View file
Open in desktop
Expand Up @@ -159,7 +159,7 @@ void launchOpenfin() throws DesktopException, DesktopIOException, IOException, I
if (rvm != null) {
config.setLaunchRVMPath(rvm);
}
config.setRuntimeVersion("stable");
config.setRuntimeVersion("alpha");
config.setAdditionalRuntimeArguments("--v=1 ");
serviceConfig = new JSONArray();
JSONObject layout = new JSONObject();
Expand Down
132 changes: 109 additions & 23 deletions src/test/java/com/openfin/desktop/ChannelTest.java
View file
Open in desktop
Expand Up @@ -73,12 +73,11 @@ public void createChannelClient() throws Exception {
desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
@Override
public void onSuccess(ChannelProvider provider) {
desktopConnection.getChannel(channelName).connect(channelName, new AsyncCallback<ChannelClient>() {
desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
@Override
public void onSuccess(ChannelClient result) {
latch.countDown();
}

});
}
});
Expand All @@ -87,6 +86,66 @@ public void onSuccess(ChannelClient result) {

assertEquals(0, latch.getCount());
}

@Ignore
@Test
public void multipleChannelClients() throws Exception {
CountDownLatch latch1 = new CountDownLatch(1);
CountDownLatch latch2 = new CountDownLatch(1);
final String channelName = "createMultipleChannelClientTest";
final String clientActionName = "clientAction";
final String providerActionName = "providerAction";
desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
@Override
public void onSuccess(ChannelProvider provider) {

provider.register(providerActionName, new ChannelAction() {

@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
return null;
}
});

//first channel client
desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
@Override
public void onSuccess(ChannelClient client) {
client.dispatch(providerActionName, new JSONObject(), null);

client.register(clientActionName, new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
latch1.countDown();
return null;
}
});
}
});
//second channel client
desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
@Override
public void onSuccess(ChannelClient client) {
client.register(clientActionName, new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
latch2.countDown();
return null;
}
});

provider.publish(clientActionName, new JSONObject(), null);
}
});
}
});

latch1.await(10, TimeUnit.SECONDS);
latch2.await(10, TimeUnit.SECONDS);

assertEquals(0, latch1.getCount());
assertEquals(0, latch2.getCount());
}

@Test
public void registerAction() throws Exception {
Expand All @@ -97,7 +156,7 @@ public void registerAction() throws Exception {
public void onSuccess(ChannelProvider provider) {
provider.register("currentTime", new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
return payload.put("currentTime", java.lang.System.currentTimeMillis());
}
});
Expand All @@ -123,13 +182,13 @@ public void invokeProviderAction() throws Exception {
public void onSuccess(ChannelProvider provider) {
provider.register(actionName, new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
int currentValue = payload.getInt("value");
return payload.put("value", currentValue + 1);
}
});

desktopConnection.getChannel(channelName).connect(channelName, new AsyncCallback<ChannelClient>() {
desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {

@Override
public void onSuccess(ChannelClient client) {
Expand Down Expand Up @@ -158,48 +217,75 @@ public void onError(Ack ack) {
assertEquals(0, latch.getCount());
assertEquals(initValue + 1, resultValue.get());
}

@Test
public void publishToClient() throws Exception {
final String channelName = "publishToClientTest";
final String actionName = "message";
final String actionMessage = "actionMessage";
public void invokeClientAction() throws Exception {
final String channelName = "invokeClientActionTest";
final String providerActionName = "invokeClientAction";
final String clientActionName = "clientAction";

CountDownLatch latch = new CountDownLatch(1);
desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
@Override
public void onSuccess(ChannelProvider provider) {
desktopConnection.getChannel(channelName).addChannelListener(new ChannelListener() {
provider.register(providerActionName, new ChannelAction() {
@Override
public void onChannelConnect(ConnectionEvent connectionEvent) {
// once the channel is connected, invoke publish method
JSONObject payload = new JSONObject();
payload.put("message", actionMessage);
provider.publish(actionName, payload, null);
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
provider.dispatch(senderIdentity, clientActionName, new JSONObject(), null);
return null;
}
});

desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
@Override
public void onChannelDisconnect(ConnectionEvent connectionEvent) {
public void onSuccess(ChannelClient client) {
client.register(clientActionName, new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
latch.countDown();
return null;
}
});

client.dispatch(providerActionName, new JSONObject(), null);
}
});
}
});

desktopConnection.getChannel(channelName).connect(channelName, new AsyncCallback<ChannelClient>() {
latch.await(10, TimeUnit.SECONDS);

assertEquals(0, latch.getCount());
}

@Test
public void publishToClient() throws Exception {
final String channelName = "publishToClientTest";
final String actionName = "message";
final String actionMessage = "actionMessage";

CountDownLatch latch = new CountDownLatch(1);
desktopConnection.getChannel(channelName).create(new AsyncCallback<ChannelProvider>() {
@Override
public void onSuccess(ChannelProvider provider) {
desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
@Override
public void onSuccess(ChannelClient client) {

client.register(actionName, new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
if (actionName.equals(action) && actionMessage.equals(payload.getString("message"))) {
latch.countDown();
}
return null;
}
});

JSONObject payload = new JSONObject();
payload.put("message", actionMessage);
provider.publish(actionName, payload, null);
}

});
}
});
Expand Down Expand Up @@ -229,7 +315,7 @@ public void onChannelDisconnect(ConnectionEvent connectionEvent) {
}
});

desktopConnection.getChannel(channelName).connect(channelName, new AsyncCallback<ChannelClient>() {
desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {
@Override
public void onSuccess(ChannelClient client) {
client.disconnect(null);
Expand Down Expand Up @@ -269,13 +355,13 @@ public JSONObject invoke(String action, JSONObject payload, JSONObject senderId)

provider.register(actionName, new ChannelAction() {
@Override
public JSONObject invoke(String action, JSONObject payload) {
public JSONObject invoke(String action, JSONObject payload, JSONObject senderIdentity) {
int currentValue = payload.getInt("value");
return payload.put("value", currentValue + 1);
}
});

desktopConnection.getChannel(channelName).connect(channelName, new AsyncCallback<ChannelClient>() {
desktopConnection.getChannel(channelName).connect(new AsyncCallback<ChannelClient>() {

@Override
public void onSuccess(ChannelClient client) {
Expand Down