Skip to content
This repository was archived by the owner on Apr 16, 2026. It is now read-only.

adam/fdc3-change#36

Open
adam-saland 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
Jan 28, 2020
0587e24
ADAP-183 WIP endpointId related change.
Jan 30, 2020
12960f8
ADAP-183 added unit test
Jan 30, 2020
896a942
ADAP-183 channel api endpointId implementation and code refactory
Feb 3, 2020
aa1da26
ADAP-183 removed logging info
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/main/java/com/openfin/desktop/demo/ChannelExample.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
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
Original file line numberDiff line numberDiff line change
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 DownExpand 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
Original file line numberDiff line numberDiff line change
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
Original file line numberDiff line numberDiff line change
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
Original file line numberDiff line numberDiff line change
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
Original file line numberDiff line numberDiff line change
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
Original file line numberDiff line numberDiff line change
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 DownExpand 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 DownExpand 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 DownExpand 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
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
adam/fdc3-change by adam-saland · Pull Request #36 · openfin/java-example · GitHub
Skip to content

This repository was archived by the owner on Apr 16, 2026. It is now read-only.

adam/fdc3-change#36
 Open

adam-saland
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

Jan 28, 2020
0587e24

ADAP-183 WIP endpointId related change.

Jan 30, 2020
12960f8

ADAP-183 added unit test

Jan 30, 2020
896a942

ADAP-183 channel api endpointId implementation and code refactory

Feb 3, 2020
aa1da26

ADAP-183 removed logging info

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. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/main/java/com/openfin/desktop/demo/ChannelExample.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
adam/fdc3-change by adam-saland · Pull Request #36 · openfin/java-example · GitHub
Skip to content

This repository was archived by the owner on Apr 16, 2026. It is now read-only.

adam/fdc3-change#36
 Open

adam-saland
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

Jan 28, 2020
0587e24

ADAP-183 WIP endpointId related change.

Jan 30, 2020
12960f8

ADAP-183 added unit test

Jan 30, 2020
896a942

ADAP-183 channel api endpointId implementation and code refactory

Feb 3, 2020
aa1da26

ADAP-183 removed logging info

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. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/main/java/com/openfin/desktop/demo/ChannelExample.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
adam/fdc3-change by adam-saland · Pull Request #36 · openfin/java-example · GitHub
Skip to content

This repository was archived by the owner on Apr 16, 2026. It is now read-only.

adam/fdc3-change#36
 Open

adam-saland
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

Jan 28, 2020
0587e24

ADAP-183 WIP endpointId related change.

Jan 30, 2020
12960f8

ADAP-183 added unit test

Jan 30, 2020
896a942

ADAP-183 channel api endpointId implementation and code refactory

Feb 3, 2020
aa1da26

ADAP-183 removed logging info

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. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/main/java/com/openfin/desktop/demo/ChannelExample.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
adam/fdc3-change by adam-saland · Pull Request #36 · openfin/java-example · GitHub
Skip to content

This repository was archived by the owner on Apr 16, 2026. It is now read-only.

adam/fdc3-change#36
 Open

adam-saland
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

Jan 28, 2020
0587e24

ADAP-183 WIP endpointId related change.

Jan 30, 2020
12960f8

ADAP-183 added unit test

Jan 30, 2020
896a942

ADAP-183 channel api endpointId implementation and code refactory

Feb 3, 2020
aa1da26

ADAP-183 removed logging info

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. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/main/java/com/openfin/desktop/demo/ChannelExample.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
adam/fdc3-change by adam-saland · Pull Request #36 · openfin/java-example · GitHub
Skip to content

This repository was archived by the owner on Apr 16, 2026. It is now read-only.

adam/fdc3-change#36
 Open

adam-saland
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

Jan 28, 2020
0587e24

ADAP-183 WIP endpointId related change.

Jan 30, 2020
12960f8

ADAP-183 added unit test

Jan 30, 2020
896a942

ADAP-183 channel api endpointId implementation and code refactory

Feb 3, 2020
aa1da26

ADAP-183 removed logging info

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. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/main/java/com/openfin/desktop/demo/ChannelExample.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
adam/fdc3-change by adam-saland · Pull Request #36 · openfin/java-example · GitHub
Skip to content

This repository was archived by the owner on Apr 16, 2026. It is now read-only.

adam/fdc3-change#36
 Open

adam-saland
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

Jan 28, 2020
0587e24

ADAP-183 WIP endpointId related change.

Jan 30, 2020
12960f8

ADAP-183 added unit test

Jan 30, 2020
896a942

ADAP-183 channel api endpointId implementation and code refactory

Feb 3, 2020
aa1da26

ADAP-183 removed logging info

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. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/main/java/com/openfin/desktop/demo/ChannelExample.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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 DownExpand 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 DownExpand 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

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
adam/fdc3-change by adam-saland · Pull Request #36 · openfin/java-example · GitHub
Skip to content

This repository was archived by the owner on Apr 16, 2026. It is now read-only.

adam/fdc3-change#36
 Open

adam-saland
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

Jan 28, 2020
0587e24

ADAP-183 WIP endpointId related change.

Jan 30, 2020
12960f8

ADAP-183 added unit test

Jan 30, 2020
896a942

ADAP-183 channel api endpointId implementation and code refactory

Feb 3, 2020
aa1da26

ADAP-183 removed logging info

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. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


10 changes: 5 additions & 5 deletions
src/main/java/com/openfin/desktop/demo/ChannelExample.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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

Original file line numberDiff line numberDiff line change
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 DownExpand 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 DownExpand 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 DownExpand 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