Updates for 3.0.0 RBAC release

Azure · Jul 1, 2019 · 118133b · 118133b · elonmallin · Jul 18, 2019
1 parent 37cf05a
commit 118133b
Show file tree

Hide file tree

Showing 20 changed files with 23 additions and 213 deletions.
diff --git a/samples/Java/Basic/AdvancedSendOptions/pom.xml b/samples/Java/Basic/AdvancedSendOptions/pom.xml
@@ -47,7 +47,7 @@
 	<dependency>
 	  		<groupId>com.microsoft.azure</groupId>
 	  		<artifactId>azure-eventhubs</artifactId>
-	  		<version>2.3.0</version>
+	  		<version>3.0.0</version>
 	 	</dependency>
          <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/...n/java/com/microsoft/azure/eventhubs/samples/AdvancedSendOptions/AdvancedSendOptions.java b/...n/java/com/microsoft/azure/eventhubs/samples/AdvancedSendOptions/AdvancedSendOptions.java
@@ -46,7 +46,7 @@ public static void main(String[] args)
 
         // Each EventHubClient instance spins up a new TCP/SSL connection, which is expensive.
         // It is always a best practice to reuse these instances. The following sample shows the same.
-        final EventHubClient ehClient = EventHubClient.createSync(connStr.toString(), executorService);
+        final EventHubClient ehClient = EventHubClient.createFromConnectionStringSync(connStr.toString(), executorService);
         PartitionSender sender = null;
 
         try {

diff --git a/samples/Java/Basic/EventProcessorSample/.classpath b/samples/Java/Basic/EventProcessorSample/.classpath
diff --git a/samples/Java/Basic/EventProcessorSample/.project b/samples/Java/Basic/EventProcessorSample/.project
diff --git a/samples/Java/Basic/EventProcessorSample/pom.xml b/samples/Java/Basic/EventProcessorSample/pom.xml
@@ -47,12 +47,12 @@
 	<dependency>
 	  		<groupId>com.microsoft.azure</groupId>
 	  		<artifactId>azure-eventhubs</artifactId>
-	  		<version>2.3.0</version>
+	  		<version>3.0.0</version>
 	 	</dependency>
 	 	<dependency>
 	  		<groupId>com.microsoft.azure</groupId>
 	  		<artifactId>azure-eventhubs-eph</artifactId>
-	  		<version>2.5.0</version>
+	  		<version>3.0.0</version>
 	 	</dependency>
 	 	<dependency>
 	  		<groupId>log4j</groupId>

diff --git a/...java/com/microsoft/azure/eventhubs/samples/eventprocessorsample/EventProcessorSample.java b/...java/com/microsoft/azure/eventhubs/samples/eventprocessorsample/EventProcessorSample.java
@@ -12,6 +12,7 @@
 import com.microsoft.azure.eventprocessorhost.ExceptionReceivedEventArgs;
 import com.microsoft.azure.eventprocessorhost.IEventProcessor;
 import com.microsoft.azure.eventprocessorhost.PartitionContext;
+import com.microsoft.azure.eventprocessorhost.EventProcessorHost.EventProcessorHostBuilder;
 
 import java.util.concurrent.ExecutionException;
 import java.util.function.Consumer;
@@ -43,16 +44,13 @@ public static void main(String args[]) throws InterruptedException, ExecutionExc
     			.setSasKeyName(sasKeyName)
     			.setSasKey(sasKey);
 
-		// Create the instance of EventProcessorHost using the most basic constructor. This constructor uses Azure Storage for
+		// Create the instance of EventProcessorHost using the builder. This sample uses Azure Storage for
 		// persisting partition leases and checkpoints. The host name, which identifies the instance of EventProcessorHost, must be unique.
 		// You can use a plain UUID, or use the createHostName utility method which appends a UUID to a supplied string.
-		EventProcessorHost host = new EventProcessorHost(
-				EventProcessorHost.createHostName(hostNamePrefix),
-				eventHubName,
-				consumerGroupName,
-				eventHubConnectionString.toString(),
-				storageConnectionString,
-				storageContainerName);
+		EventProcessorHost host = EventProcessorHostBuilder.newBuilder(EventProcessorHost.createHostName(hostNamePrefix), consumerGroupName)
+	    		.useAzureStorageCheckpointLeaseManager(storageConnectionString, storageContainerName, "")
+	    		.useEventHubConnectionString(eventHubConnectionString.toString(), eventHubName)
+	    		.build();
 
 		// Registering an event processor class with an instance of EventProcessorHost starts event processing. The host instance
 		// obtains leases on some partitions of the Event Hub, possibly stealing some from other host instances, in a way that

diff --git a/samples/Java/Basic/ReceiveByDateTime/pom.xml b/samples/Java/Basic/ReceiveByDateTime/pom.xml
@@ -47,7 +47,7 @@
 	<dependency>
 	  		<groupId>com.microsoft.azure</groupId>
 	  		<artifactId>azure-eventhubs</artifactId>
-	  		<version>2.3.0</version>
+	  		<version>3.0.0</version>
 	 	</dependency>
 	</dependencies>
 </project>
diff --git a/.../main/java/com/microsoft/azure/eventhubs/samples/receivebydatetime/ReceiveByDateTime.java b/.../main/java/com/microsoft/azure/eventhubs/samples/receivebydatetime/ReceiveByDateTime.java
@@ -31,7 +31,7 @@ public static void main(String[] args)
                 .setSasKey("---SharedAccessSignatureKey----");
 
         final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(4);
-        final EventHubClient ehClient = EventHubClient.createSync(connStr.toString(), executorService);
+        final EventHubClient ehClient = EventHubClient.createFromConnectionStringSync(connStr.toString(), executorService);
 
         final EventHubRuntimeInformation eventHubInfo = ehClient.getRuntimeInformation().get();
         final String partitionId = eventHubInfo.getPartitionIds()[0]; // get first partition's id

diff --git a/samples/Java/Basic/ReceiveUsingSequenceNumber/pom.xml b/samples/Java/Basic/ReceiveUsingSequenceNumber/pom.xml
@@ -47,7 +47,7 @@
 	<dependency>
 	  		<groupId>com.microsoft.azure</groupId>
 	  		<artifactId>azure-eventhubs</artifactId>
-	  		<version>2.3.0</version>
+	  		<version>3.0.0</version>
 	 	</dependency>
 	</dependencies>
 </project>
diff --git a/...rosoft/azure/eventhubs/samples/receiveusingsequencenumber/ReceiveUsingSequenceNumber.java b/...rosoft/azure/eventhubs/samples/receiveusingsequencenumber/ReceiveUsingSequenceNumber.java
@@ -30,7 +30,7 @@ public static void main(String[] args)
                 .setSasKey("---SharedAccessSignatureKey----");
 
         final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(4);
-        final EventHubClient ehClient = EventHubClient.createSync(connStr.toString(), executorService);
+        final EventHubClient ehClient = EventHubClient.createFromConnectionStringSync(connStr.toString(), executorService);
 
         final EventHubRuntimeInformation eventHubInfo = ehClient.getRuntimeInformation().get();
         final String partitionId = eventHubInfo.getPartitionIds()[0]; // get first partition's id

diff --git a/samples/Java/Basic/SendBatch/pom.xml b/samples/Java/Basic/SendBatch/pom.xml
@@ -47,7 +47,7 @@
 	    <dependency>
 	  		<groupId>com.microsoft.azure</groupId>
 	  		<artifactId>azure-eventhubs</artifactId>
-	  		<version>2.3.0</version>
+	  		<version>3.0.0</version>
 	 	</dependency>
          <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/...ic/SendBatch/src/main/java/com/microsoft/azure/eventhubs/samples/sendbatch/SendBatch.java b/...ic/SendBatch/src/main/java/com/microsoft/azure/eventhubs/samples/sendbatch/SendBatch.java
@@ -31,7 +31,7 @@ public static void main(String[] args)
 
         final Gson gson = new GsonBuilder().create();
         final ScheduledExecutorService executorService = Executors.newScheduledThreadPool(4);
-        final EventHubClient sender = EventHubClient.createSync(connStr.toString(), executorService);
+        final EventHubClient sender = EventHubClient.createFromConnectionStringSync(connStr.toString(), executorService);
 
         try {
             for (int batchNumber = 0; batchNumber < 10; batchNumber++) {

diff --git a/samples/Java/Basic/SimpleProxy/pom.xml b/samples/Java/Basic/SimpleProxy/pom.xml
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure-eventhubs</artifactId>
-            <version>2.3.0</version>
+            <version>3.0.0</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/...pleProxy/src/main/java/com.microsoft.azure.eventhubs.samples.SimpleProxy/SimpleProxy.java b/...pleProxy/src/main/java/com.microsoft.azure.eventhubs.samples.SimpleProxy/SimpleProxy.java
diff --git a/samples/Java/Basic/SimpleSend/pom.xml b/samples/Java/Basic/SimpleSend/pom.xml
@@ -47,7 +47,7 @@
 	<dependency>
 	  		<groupId>com.microsoft.azure</groupId>
 	  		<artifactId>azure-eventhubs</artifactId>
-	  		<version>2.3.0</version>
+	  		<version>3.0.0</version>
 	 	</dependency>
          <dependency>
             <groupId>com.google.code.gson</groupId>

diff --git a/...SimpleSend/src/main/java/com/microsoft/azure/eventhubs/samples/SimpleSend/SimpleSend.java b/...SimpleSend/src/main/java/com/microsoft/azure/eventhubs/samples/SimpleSend/SimpleSend.java
@@ -40,7 +40,7 @@ public static void main(String[] args)
 
         // Each EventHubClient instance spins up a new TCP/SSL connection, which is expensive.
         // It is always a best practice to reuse these instances. The following sample shows this.
-        final EventHubClient ehClient = EventHubClient.createSync(connStr.toString(), executorService);
+        final EventHubClient ehClient = EventHubClient.createFromConnectionStringSync(connStr.toString(), executorService);
 
         try {
             for (int i = 0; i < 100; i++) {

diff --git a/samples/Java/Benchmarks/AutoScaleOnIngress/pom.xml b/samples/Java/Benchmarks/AutoScaleOnIngress/pom.xml
@@ -47,7 +47,7 @@
 	<dependency>
 	  		<groupId>com.microsoft.azure</groupId>
 	  		<artifactId>azure-eventhubs</artifactId>
-	  		<version>2.3.0</version>
+	  		<version>3.0.0</version>
 	 	</dependency>	 	
 	</dependencies>
 </project>
diff --git a/...ain/java/com/microsoft/azure/eventhubs/samples/autoscaleoningress/EventHubClientPool.java b/...ain/java/com/microsoft/azure/eventhubs/samples/autoscaleoningress/EventHubClientPool.java
@@ -34,7 +34,7 @@ public CompletableFuture<Void> initialize() throws IOException, EventHubExceptio
         final CompletableFuture[] createSenders = new CompletableFuture[this.poolSize];
         for (int count = 0; count < poolSize; count++) {
             final int clientsIndex = count;
-            createSenders[count] = EventHubClient.create(this.connectionString, executorService).thenAccept(new Consumer<EventHubClient>() {
+            createSenders[count] = EventHubClient.createFromConnectionString(this.connectionString, executorService).thenAccept(new Consumer<EventHubClient>() {
                 @Override
                 public void accept(EventHubClient eventHubClient) {
                     clients[clientsIndex] = eventHubClient;

diff --git a/samples/Java/Benchmarks/IngressBenchmark/pom.xml b/samples/Java/Benchmarks/IngressBenchmark/pom.xml
@@ -47,7 +47,7 @@
 	<dependency>
 	  		<groupId>com.microsoft.azure</groupId>
 	  		<artifactId>azure-eventhubs</artifactId>
-	  		<version>2.3.0</version>
+	  		<version>3.0.0</version>
 	 	</dependency>
 	</dependencies>
 </project>
diff --git a/.../main/java/com/microsoft/azure/eventhubs/samples/ingressbenchmark/EventHubClientPool.java b/.../main/java/com/microsoft/azure/eventhubs/samples/ingressbenchmark/EventHubClientPool.java
@@ -34,7 +34,7 @@ public CompletableFuture<Void> initialize() throws IOException, EventHubExceptio
         final CompletableFuture[] createSenders = new CompletableFuture[this.poolSize];
         for (int count = 0; count < poolSize; count++) {
             final int clientsIndex = count;
-            createSenders[count] = EventHubClient.create(this.connectionString, executorService).thenAccept(new Consumer<EventHubClient>() {
+            createSenders[count] = EventHubClient.createFromConnectionString(this.connectionString, executorService).thenAccept(new Consumer<EventHubClient>() {
                 @Override
                 public void accept(EventHubClient eventHubClient) {
                     clients[clientsIndex] = eventHubClient;