ADAP-175 corresponding change for java adapter fdc3 change. (openfin#31)

weiteho · wenjunche · wenjunche · commit 1694cfd43d76 · 2020-01-16T12:55:41.000-05:00
* ADAP-175 updated example code and tests per java-adapter change.

* ADAP-175 restored channel api connect name alias option

* ADAP-175: updated FDC3 example

Co-authored-by: Wenjun Che &lt;wenjun@openfin.co&gt;
diff --git a/src/main/java/com/openfin/desktop/demo/FDC3Example.java b/src/main/java/com/openfin/desktop/demo/FDC3Example.java
@@ -13,6 +13,7 @@
 import java.awt.event.WindowEvent;
 import java.io.IOException;
 import java.lang.System;
+import java.util.List;
 import java.util.UUID;
 
 public class FDC3Example implements DesktopStateListener {
@@ -220,41 +221,38 @@ private void sendTickerToReds() {
         JSONObject id = new JSONObject();
         id.put("ticker", ticker.toLowerCase());
         context.setId(id);
-        fdc3Client.raiseIntent("fdc3.ViewChart", context, "fdc3-charts-red", new AsyncCallback<IntentResolution>() {
+        fdc3Client.raiseIntent("ViewChart", context, "fdc3-charts-red", new AsyncCallback<IntentResolution>() {
             @Override
             public void onSuccess(IntentResolution result) {
+            	output.setText(String.format("IntentResolution source=%s, version=%s", result.getSource(), result.getVersion()));
             }
         });
     }
 
     private void findIntent() {
-        fdc3Client.findIntent("fdc3.ViewChart", null, new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                if (ack.isSuccessful()) {
-                    output.setText(String.format("Intent found: %s", ack.getJsonObject().getJSONObject("data").getJSONObject("result")));
-                }
-            }
-            @Override
-            public void onError(Ack ack) {
-            }
+        fdc3Client.findIntent("ViewChart", null, new AsyncCallback<AppIntent>() {
+			@Override
+			public void onSuccess(AppIntent result) {
+				output.setText(result.toString());
+				
+			}
         });
     }
 
-    private void findContextIntent() {
-        String ticker = getTicker();
-        Context context = new Context("fdc3.instrument", ticker);
+	private void findContextIntent() {
+		String ticker = getTicker();
+		Context context = new Context("fdc3.instrument", ticker);
 
-        fdc3Client.findIntentsByContext(context, new AckListener() {
-            @Override
-            public void onSuccess(Ack ack) {
-                output.setText(String.format("Intent found: %s", ack.getJsonObject().getJSONObject("data").getJSONArray("result")));
-            }
-            @Override
-            public void onError(Ack ack) {
-            }
-        });
-    }
+		fdc3Client.findIntentsByContext(context, new AsyncCallback<List<AppIntent>>() {
+
+			@Override
+			public void onSuccess(List<AppIntent> result) {
+				for (int i=0; i<result.size(); i++) {
+					output.setText(i + ":" + result.get(i).toString());
+				}
+			}
+		});
+	}
 
     private void broadcast() {
         String ticker = getTicker();
@@ -300,7 +298,7 @@ public void onError(Ack ack) {
     }
 
     private void addIntentListener() {
-        fdc3Client.addIntentListener("fdc3.ViewChart", new IntentListener() {
+        fdc3Client.addIntentListener("ViewChartByJava", new IntentListener() {
             @Override
             public JSONObject onIntent(Context context) {
                 output.setText(String.format("Received Intent: %s", context.toString()));
diff --git a/src/test/java/com/openfin/desktop/ChannelTest.java b/src/test/java/com/openfin/desktop/ChannelTest.java
@@ -232,7 +232,7 @@ public void onChannelDisconnect(ConnectionEvent connectionEvent) {
 				desktopConnection.getChannel(channelName).connect(channelName, new AsyncCallback<ChannelClient>() {
 					@Override
 					public void onSuccess(ChannelClient client) {
-						desktopConnection.getChannel(channelName).disconnect(client, null);
+						client.disconnect(null);
 					}
 
 				});

Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public void onChannelDisconnect(ConnectionEvent connectionEvent) {`
`232`	`232`	`desktopConnection.getChannel(channelName).connect(channelName, new AsyncCallback<ChannelClient>() {`
`233`	`233`	`@Override`
`234`	`234`	`public void onSuccess(ChannelClient client) {`
`235`		`- desktopConnection.getChannel(channelName).disconnect(client, null);`
	`235`	`+ client.disconnect(null);`
`236`	`236`	`}`
`237`	`237`
`238`	`238`	`});`