From f22fd3b194129aca9c46c9cb1f28074154fa74a5 Mon Sep 17 00:00:00 2001 From: Houssein Date: Tue, 6 Jun 2023 16:15:00 -0400 Subject: [PATCH 1/3] LENS-840 add code samples to create push and catalog source instance and the real sources in coveo org --- samples/CreateCatalogSourceInstance.java | 25 +++++++++++++++++++ samples/CreateCoveoCatalogSource.java | 19 ++++++++++++++ samples/CreateCoveoPushSource.java | 17 +++++++++++++ samples/CreatePushSourceInstance.java | 24 ++++++++++++++++++ samples/CreateSource.java | 1 + .../coveo/pushapiclient/CatalogSource.java | 2 +- .../com/coveo/pushapiclient/PushSource.java | 2 +- 7 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 samples/CreateCatalogSourceInstance.java create mode 100644 samples/CreateCoveoCatalogSource.java create mode 100644 samples/CreateCoveoPushSource.java create mode 100644 samples/CreatePushSourceInstance.java diff --git a/samples/CreateCatalogSourceInstance.java b/samples/CreateCatalogSourceInstance.java new file mode 100644 index 00000000..89f877c1 --- /dev/null +++ b/samples/CreateCatalogSourceInstance.java @@ -0,0 +1,25 @@ +import com.coveo.pushapiclient.*; + +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Properties; + +public class CreateCatalogSourceInstance { + public static void main(String[] args) throws FileNotFoundException { + Properties properties = new Properties(); + try { + //create source from url + URL url = new URL("my_api_url"); + CatalogSource catalogSource1 = new CatalogSource("my_api_key", url); + + //create source from platform config + PlatformUrl platformUrl = new PlatformUrlBuilder().withEnvironment(Environment.PRODUCTION).withRegion(Region.EU).build(); + CatalogSource catalogSource2 = CatalogSource.fromPlatformUrl("my_api_key","my_organization_id","my_source_id", platformUrl); + + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } +} diff --git a/samples/CreateCoveoCatalogSource.java b/samples/CreateCoveoCatalogSource.java new file mode 100644 index 00000000..2431c52b --- /dev/null +++ b/samples/CreateCoveoCatalogSource.java @@ -0,0 +1,19 @@ +import com.coveo.pushapiclient.*; + +import java.io.IOException; +import java.net.http.HttpResponse; + +import com.coveo.pushapiclient.CatalogSource; + +public class CreateCoveoCatalogSource { + public static void main(String[] args) { + PlatformClient platformClient = new PlatformClient("my_api_key", "my_org_id"); + try { + HttpResponse response = CatalogSource.create(platformClient, "the_name_of_my_source", SourceVisibility.SHARED); + System.out.println(String.format("Catalog Source creation status: %s", response.statusCode())); + System.out.println(String.format("Catalog Source creation response: %s", response.body())); + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + } +} diff --git a/samples/CreateCoveoPushSource.java b/samples/CreateCoveoPushSource.java new file mode 100644 index 00000000..1f83265b --- /dev/null +++ b/samples/CreateCoveoPushSource.java @@ -0,0 +1,17 @@ +import com.coveo.pushapiclient.*; + +import java.io.IOException; +import java.net.http.HttpResponse; + +public class CreateCoveoPushSource { + public static void main(String[] args) { + PlatformClient platformClient = new PlatformClient("my_api_key", "my_org_id"); + try { + HttpResponse response = PushSource.create(platformClient, "the_name_of_my_source", SourceVisibility.SHARED); + System.out.println(String.format("Push Source creation status: %s", response.statusCode())); + System.out.println(String.format("Push Source creation response: %s", response.body())); + } catch (IOException | InterruptedException e) { + e.printStackTrace(); + } + } +} diff --git a/samples/CreatePushSourceInstance.java b/samples/CreatePushSourceInstance.java new file mode 100644 index 00000000..74167bd4 --- /dev/null +++ b/samples/CreatePushSourceInstance.java @@ -0,0 +1,24 @@ +import com.coveo.pushapiclient.*; + +import java.io.FileNotFoundException; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.Properties; + +public class CreatePushSourceInstance { + public static void main(String[] args) throws FileNotFoundException { + Properties properties = new Properties(); + try { + //create source from url + URL url = new URL("my_api_url"); + PushSource pushSource1 = new PushSource("my_api_key", url); + + //create source from platform config + PlatformUrl platformUrl = new PlatformUrlBuilder().withEnvironment(Environment.PRODUCTION).withRegion(Region.EU).build(); + PushSource pushSource2 = PushSource.fromPlatformUrl("my_api_key","my_organization_id","my_source_id", platformUrl); + + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } +} diff --git a/samples/CreateSource.java b/samples/CreateSource.java index 41b19c5e..c0b4f4dc 100644 --- a/samples/CreateSource.java +++ b/samples/CreateSource.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.net.http.HttpResponse; +@Deprecated public class CreateSource { public static void main(String[] args) { PlatformUrl platformUrl = new PlatformUrlBuilder() diff --git a/src/main/java/com/coveo/pushapiclient/CatalogSource.java b/src/main/java/com/coveo/pushapiclient/CatalogSource.java index ea723153..09f47a49 100644 --- a/src/main/java/com/coveo/pushapiclient/CatalogSource.java +++ b/src/main/java/com/coveo/pushapiclient/CatalogSource.java @@ -6,7 +6,7 @@ import java.net.http.HttpResponse; // TODO: LENS-851 - Make public when ready -class CatalogSource implements StreamEnabledSource { +public class CatalogSource implements StreamEnabledSource { private final String apiKey; private final ApiUrl urlExtractor; diff --git a/src/main/java/com/coveo/pushapiclient/PushSource.java b/src/main/java/com/coveo/pushapiclient/PushSource.java index b84bf354..823b4b67 100644 --- a/src/main/java/com/coveo/pushapiclient/PushSource.java +++ b/src/main/java/com/coveo/pushapiclient/PushSource.java @@ -8,7 +8,7 @@ import java.net.http.HttpResponse; // TODO: LENS-851 - Make public when ready -class PushSource implements PushEnabledSource { +public class PushSource implements PushEnabledSource { private final String apiKey; private final ApiUrl urlExtractor; private final PlatformClient platformClient; From f934c5a22b711d3ed4f86a7dbfc8cbe3b549e1a5 Mon Sep 17 00:00:00 2001 From: Houssein Date: Wed, 7 Jun 2023 16:32:23 -0400 Subject: [PATCH 2/3] LENS-840 apply review comments --- samples/CreateCoveoPushSource.java | 17 ----------------- ...atalogSource.java => CreateCoveoSource.java} | 14 +++++++++++--- samples/CreateSource.java | 2 +- ...urceInstance.java => InstantiateSource.java} | 17 ++++++----------- .../com/coveo/pushapiclient/CatalogSource.java | 2 +- .../com/coveo/pushapiclient/PushSource.java | 2 +- 6 files changed, 20 insertions(+), 34 deletions(-) delete mode 100644 samples/CreateCoveoPushSource.java rename samples/{CreateCoveoCatalogSource.java => CreateCoveoSource.java} (57%) rename samples/{CreateCatalogSourceInstance.java => InstantiateSource.java} (56%) diff --git a/samples/CreateCoveoPushSource.java b/samples/CreateCoveoPushSource.java deleted file mode 100644 index 1f83265b..00000000 --- a/samples/CreateCoveoPushSource.java +++ /dev/null @@ -1,17 +0,0 @@ -import com.coveo.pushapiclient.*; - -import java.io.IOException; -import java.net.http.HttpResponse; - -public class CreateCoveoPushSource { - public static void main(String[] args) { - PlatformClient platformClient = new PlatformClient("my_api_key", "my_org_id"); - try { - HttpResponse response = PushSource.create(platformClient, "the_name_of_my_source", SourceVisibility.SHARED); - System.out.println(String.format("Push Source creation status: %s", response.statusCode())); - System.out.println(String.format("Push Source creation response: %s", response.body())); - } catch (IOException | InterruptedException e) { - e.printStackTrace(); - } - } -} diff --git a/samples/CreateCoveoCatalogSource.java b/samples/CreateCoveoSource.java similarity index 57% rename from samples/CreateCoveoCatalogSource.java rename to samples/CreateCoveoSource.java index 2431c52b..a5dc6215 100644 --- a/samples/CreateCoveoCatalogSource.java +++ b/samples/CreateCoveoSource.java @@ -1,17 +1,25 @@ -import com.coveo.pushapiclient.*; +import com.coveo.pushapiclient.CatalogSource; +import com.coveo.pushapiclient.PlatformClient; +import com.coveo.pushapiclient.PushSource; +import com.coveo.pushapiclient.SourceVisibility; import java.io.IOException; import java.net.http.HttpResponse; -import com.coveo.pushapiclient.CatalogSource; -public class CreateCoveoCatalogSource { + +public class CreateCoveoSource { public static void main(String[] args) { PlatformClient platformClient = new PlatformClient("my_api_key", "my_org_id"); try { + HttpResponse pushResponse = PushSource.create(platformClient, "the_name_of_my_source", SourceVisibility.SHARED); + System.out.println(String.format("Push Source creation status: %s", pushResponse.statusCode())); + System.out.println(String.format("Push Source creation response: %s", pushResponse.body())); + HttpResponse response = CatalogSource.create(platformClient, "the_name_of_my_source", SourceVisibility.SHARED); System.out.println(String.format("Catalog Source creation status: %s", response.statusCode())); System.out.println(String.format("Catalog Source creation response: %s", response.body())); + } catch (IOException | InterruptedException e) { e.printStackTrace(); } diff --git a/samples/CreateSource.java b/samples/CreateSource.java index c0b4f4dc..9e84669b 100644 --- a/samples/CreateSource.java +++ b/samples/CreateSource.java @@ -7,7 +7,7 @@ import java.io.IOException; import java.net.http.HttpResponse; -@Deprecated +// TODO: LENS-844 - Deprecate class public class CreateSource { public static void main(String[] args) { PlatformUrl platformUrl = new PlatformUrlBuilder() diff --git a/samples/CreateCatalogSourceInstance.java b/samples/InstantiateSource.java similarity index 56% rename from samples/CreateCatalogSourceInstance.java rename to samples/InstantiateSource.java index 89f877c1..721e1f65 100644 --- a/samples/CreateCatalogSourceInstance.java +++ b/samples/InstantiateSource.java @@ -1,25 +1,20 @@ import com.coveo.pushapiclient.*; -import java.io.FileNotFoundException; -import java.io.FileReader; import java.net.MalformedURLException; import java.net.URL; -import java.util.Properties; -public class CreateCatalogSourceInstance { - public static void main(String[] args) throws FileNotFoundException { - Properties properties = new Properties(); - try { +public class InstantiateSource { + public static void main(String[] args) throws MalformedURLException { //create source from url - URL url = new URL("my_api_url"); + URL url = new URL("https://api-eu.cloud.coveo.com/push/v1/organizations/my-org-id/sources/my-source-id/documents"); + PushSource pushSource1 = new PushSource("my_api_key", url); CatalogSource catalogSource1 = new CatalogSource("my_api_key", url); + //create source from platform config PlatformUrl platformUrl = new PlatformUrlBuilder().withEnvironment(Environment.PRODUCTION).withRegion(Region.EU).build(); + PushSource pushSource2 = PushSource.fromPlatformUrl("my_api_key","my_organization_id","my_source_id", platformUrl); CatalogSource catalogSource2 = CatalogSource.fromPlatformUrl("my_api_key","my_organization_id","my_source_id", platformUrl); - } catch (MalformedURLException e) { - throw new RuntimeException(e); - } } } diff --git a/src/main/java/com/coveo/pushapiclient/CatalogSource.java b/src/main/java/com/coveo/pushapiclient/CatalogSource.java index 09f47a49..ea723153 100644 --- a/src/main/java/com/coveo/pushapiclient/CatalogSource.java +++ b/src/main/java/com/coveo/pushapiclient/CatalogSource.java @@ -6,7 +6,7 @@ import java.net.http.HttpResponse; // TODO: LENS-851 - Make public when ready -public class CatalogSource implements StreamEnabledSource { +class CatalogSource implements StreamEnabledSource { private final String apiKey; private final ApiUrl urlExtractor; diff --git a/src/main/java/com/coveo/pushapiclient/PushSource.java b/src/main/java/com/coveo/pushapiclient/PushSource.java index 823b4b67..b84bf354 100644 --- a/src/main/java/com/coveo/pushapiclient/PushSource.java +++ b/src/main/java/com/coveo/pushapiclient/PushSource.java @@ -8,7 +8,7 @@ import java.net.http.HttpResponse; // TODO: LENS-851 - Make public when ready -public class PushSource implements PushEnabledSource { +class PushSource implements PushEnabledSource { private final String apiKey; private final ApiUrl urlExtractor; private final PlatformClient platformClient; From c5bc94170ccce9f937b27ba42c4b2e51f40e25ad Mon Sep 17 00:00:00 2001 From: Houssein Date: Thu, 8 Jun 2023 10:39:25 -0400 Subject: [PATCH 3/3] LENS-840 apply review comments by merging sample code classes for push and catalog into one class --- samples/CreatePushSourceInstance.java | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 samples/CreatePushSourceInstance.java diff --git a/samples/CreatePushSourceInstance.java b/samples/CreatePushSourceInstance.java deleted file mode 100644 index 74167bd4..00000000 --- a/samples/CreatePushSourceInstance.java +++ /dev/null @@ -1,24 +0,0 @@ -import com.coveo.pushapiclient.*; - -import java.io.FileNotFoundException; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Properties; - -public class CreatePushSourceInstance { - public static void main(String[] args) throws FileNotFoundException { - Properties properties = new Properties(); - try { - //create source from url - URL url = new URL("my_api_url"); - PushSource pushSource1 = new PushSource("my_api_key", url); - - //create source from platform config - PlatformUrl platformUrl = new PlatformUrlBuilder().withEnvironment(Environment.PRODUCTION).withRegion(Region.EU).build(); - PushSource pushSource2 = PushSource.fromPlatformUrl("my_api_key","my_organization_id","my_source_id", platformUrl); - - } catch (MalformedURLException e) { - throw new RuntimeException(e); - } - } -}