Skip to content

Commit 4b69099

Browse files
yvgopalbinzywu
yvgopal
authored and
binzywu
committed
Changing version to 1.0.0-RC-1 (#90)
* Fixing javadoc generation errors * Adding dependency to use SLF4J logging instead of java util logging. * More SLF4J migration * Changed all java util logging statements to slf4j. * Checking in the POM that goes with the release to maven reposisory. * Removed unused imports * Instrumented all code with SLF4J logging. * Fixing some log statements * Moving request-response link creation to message factory so we don't create multiple links to the same entity. * Updaing third party notice to include SLF4J license. * Updating distributed POM * Renaming setContent method to setBody. * Fixing a typo in log statement. * Handling the special case of 0 timeout for receives. If there are no prefetched messages, receive call returns immediately with already prefetched messages. * Correcting a log statement * Added javadoc comments for rules package. * Adding javadoc comments. Work in progress. * More javadoc comments added. * Fixing a minor bug in sender and receiver creation. Closes the messaging factory if sender or receiver creation fails. * Fixing the issue of not renewing CBS tokens. Also a concurrency fix. * Fixing a bug in session receiver to not repeatedly attempt accepting the same session on lock lost. * Added some java docs.. And changed default prefetch count, based on receive mode. * Fixing a thread unending wait bug in request-response link. * Fixing AuthorizationFailed exceptions that pop when the conncetion is recreated. * Minor tweaks * Another minor fix * More minor bug fixes and tweaks * Changing version to 1.0.0-RC-1
1 parent ad60ef7 commit 4b69099

File tree

8 files changed

+22
-28
lines changed

8 files changed

+22
-28
lines changed

‎azure-servicebus/azure-servicebus.pom‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.microsoft.azure</groupId>
66
<artifactId>azure-servicebus</artifactId>
7-
<version>1.0.0-PREVIEW-3</version>
7+
<version>1.0.0-RC-1</version>
88
<licenses>
99
<license>
1010
<name>The MIT License (MIT)</name>
@@ -68,11 +68,6 @@
6868
<groupId>org.slf4j</groupId>
6969
<artifactId>slf4j-api</artifactId>
7070
<version>1.8.0-alpha2</version>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.slf4j</groupId>
74-
<artifactId>slf4j-log4j12</artifactId>
75-
<version>1.8.0-alpha2</version>
7671
</dependency>
7772
</dependencies>
7873
</project>

‎azure-servicebus/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>com.microsoft.azure</groupId>
1111
<artifactId>azure-servicebus-parent</artifactId>
12-
<version>1.0.0-PREVIEW</version>
12+
<version>1.0.0-RC</version>
1313
</parent>
1414

1515
<build>

‎azure-servicebus/src/main/java/com/microsoft/azure/servicebus/primitives/CoreMessageReceiver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,7 @@ CompletableFuture<Void> sendSASTokenAndSetRenewTimer(boolean retryOnFailure)
328328
return CompletableFuture.completedFuture(null);
329329
}
330330
else
331-
{
332-
this.cancelSASTokenRenewTimer();
331+
{
333332
CompletableFuture<ScheduledFuture<?>> sendTokenFuture = this.underlyingFactory.sendSASTokenAndSetRenewTimer(this.sasTokenAudienceURI, retryOnFailure, () -> this.sendSASTokenAndSetRenewTimer(true));
334333
return sendTokenFuture.thenAccept((f) -> {this.sasTokenRenewTimerFuture = f;TRACE_LOGGER.debug("Sent SAS Token and set renew timer");});
335334
}
@@ -1116,6 +1115,7 @@ private synchronized CompletableFuture<Void> ensureLinkIsOpen()
11161115
}
11171116
, CoreMessageReceiver.LINK_REOPEN_TIMEOUT
11181117
, TimerType.OneTimeRun);
1118+
this.cancelSASTokenRenewTimer();
11191119
this.sendSASTokenAndSetRenewTimer(false).handleAsync((v, sendTokenEx) -> {
11201120
if(sendTokenEx != null)
11211121
{

‎azure-servicebus/src/main/java/com/microsoft/azure/servicebus/primitives/CoreMessageSender.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,8 +622,7 @@ CompletableFuture<Void> sendSASTokenAndSetRenewTimer(boolean retryOnFailure)
622622
return CompletableFuture.completedFuture(null);
623623
}
624624
else
625-
{
626-
this.cancelSASTokenRenewTimer();
625+
{
627626
CompletableFuture<ScheduledFuture<?>> sendTokenFuture = this.underlyingFactory.sendSASTokenAndSetRenewTimer(this.sasTokenAudienceURI, retryOnFailure, () -> this.sendSASTokenAndSetRenewTimer(true));
628627
return sendTokenFuture.thenAccept((f) -> {this.sasTokenRenewTimerFuture = f; TRACE_LOGGER.debug("Sent SAS Token and set renew timer");});
629628
}
@@ -723,6 +722,7 @@ private synchronized CompletableFuture<Void> ensureLinkIsOpen()
723722
}
724723
, CoreMessageSender.LINK_REOPEN_TIMEOUT
725724
, TimerType.OneTimeRun);
725+
this.cancelSASTokenRenewTimer();
726726
this.sendSASTokenAndSetRenewTimer(false).handleAsync((v, sendTokenEx) -> {
727727
if(sendTokenEx != null)
728728
{

‎azure-servicebus/src/main/java/com/microsoft/azure/servicebus/primitives/MiscRequestResponseOperationHandler.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,7 @@ private CompletableFuture<Void> sendSASTokenAndSetRenewTimer(boolean retryOnFail
8787
return CompletableFuture.completedFuture(null);
8888
}
8989
else
90-
{
91-
this.cancelSASTokenRenewTimer();
90+
{
9291
CompletableFuture<ScheduledFuture<?>> sendTokenFuture = this.underlyingFactory.sendSASTokenAndSetRenewTimer(this.sasTokenAudienceURI, retryOnFailure, () -> this.sendSASTokenAndSetRenewTimer(true));
9392
return sendTokenFuture.thenAccept((f) -> {this.sasTokenRenewTimerFuture = f; TRACE_LOGGER.debug("Set SAS Token renew timer");});
9493
}

‎azure-servicebus/src/main/java/com/microsoft/azure/servicebus/primitives/SASUtil.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ static int getCBSTokenRenewIntervalInSeconds(int tokenValidityInSeconds)
7070
{
7171
if(tokenValidityInSeconds >= 300)
7272
{
73-
return 30;
73+
return tokenValidityInSeconds - 30;
7474
}
7575
else if(tokenValidityInSeconds >= 60)
7676
{
77-
return 10;
77+
return tokenValidityInSeconds - 10;
7878
}
7979
else
80-
{
81-
return 1;
80+
{
81+
return (tokenValidityInSeconds - 1) > 0 ? tokenValidityInSeconds - 1 : 0;
8282
}
8383
}
8484
}

‎azure-servicebus/src/test/java/com/microsoft/azure/servicebus/MessageAndSessionPumpTests.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static void testMessagePumpAutoComplete(IMessageSender sender, IMessageAn
3232
messagePump.registerMessageHandler(messageHandler, new MessageHandlerOptions(DEFAULT_MAX_CONCURRENT_CALLS, autoComplete, Duration.ofMinutes(10)));
3333
if(!messageHandler.getMessageCountDownLatch().await(2, TimeUnit.MINUTES))
3434
{
35-
Assert.assertEquals("All messages not pumped even after waiting for 2 minutes.", numMessages, messageHandler.getMessageCountDownLatch().getCount());
35+
Assert.assertEquals("All messages not pumped even after waiting for 2 minutes.", numMessages, numMessages - messageHandler.getMessageCountDownLatch().getCount());
3636
}
3737

3838
Assert.assertTrue("OnMessage called by maximum of one concurrent thread.", messageHandler.getMaxConcurrencyCounter().getMaxConcurrencyCount() > 1);
@@ -54,7 +54,7 @@ public static void testMessagePumpClientComplete(IMessageSender sender, IMessage
5454
messagePump.registerMessageHandler(messageHandler, new MessageHandlerOptions(DEFAULT_MAX_CONCURRENT_CALLS, autoComplete, Duration.ofMinutes(10)));
5555
if(!messageHandler.getMessageCountDownLatch().await(2, TimeUnit.MINUTES))
5656
{
57-
Assert.assertEquals("All messages not pumped even after waiting for 2 minutes.", numMessages, messageHandler.getMessageCountDownLatch().getCount());
57+
Assert.assertEquals("All messages not pumped even after waiting for 2 minutes.", numMessages, numMessages - messageHandler.getMessageCountDownLatch().getCount());
5858
}
5959
Assert.assertTrue("OnMessage called by maximum of one concurrent thread.", messageHandler.getMaxConcurrencyCounter().getMaxConcurrencyCount() > 1);
6060
Assert.assertTrue("OnMessage called by more than maxconcurrentcalls threads.", messageHandler.getMaxConcurrencyCounter().getMaxConcurrencyCount() <= DEFAULT_MAX_CONCURRENT_CALLS);
@@ -70,9 +70,9 @@ public static void testMessagePumpAbandonOnException(IMessageSender sender, IMes
7070
boolean autoComplete = false;
7171
CountingMessageHandler messageHandler = new CountingMessageHandler(messagePump, !autoComplete, numMessages, true);
7272
messagePump.registerMessageHandler(messageHandler, new MessageHandlerOptions(DEFAULT_MAX_CONCURRENT_CALLS, autoComplete, Duration.ofMinutes(10)));
73-
if(!messageHandler.getMessageCountDownLatch().await(2, TimeUnit.MINUTES))
73+
if(!messageHandler.getMessageCountDownLatch().await(4, TimeUnit.MINUTES))
7474
{
75-
Assert.assertEquals("All messages not pumped even after waiting for 2 minutes.", numMessages * 2, messageHandler.getMessageCountDownLatch().getCount());
75+
Assert.assertEquals("All messages not pumped even after waiting for 4 minutes.", numMessages * 2, numMessages * 2 - messageHandler.getMessageCountDownLatch().getCount());
7676
}
7777
Assert.assertTrue("OnMessage called by maximum of one concurrent thread.", messageHandler.getMaxConcurrencyCounter().getMaxConcurrencyCount() > 1);
7878
Assert.assertTrue("OnMessage called by more than maxconcurrentcalls threads.", messageHandler.getMaxConcurrencyCounter().getMaxConcurrencyCount() <= DEFAULT_MAX_CONCURRENT_CALLS);
@@ -92,7 +92,7 @@ public static void testMessagePumpRenewLock(IMessageSender sender, IMessageAndSe
9292
int waitMinutes = 2 * sleepMinutes;
9393
if(!messageHandler.getMessageCountDownLatch().await(waitMinutes, TimeUnit.MINUTES))
9494
{
95-
Assert.assertEquals("All messages not pumped even after waiting for " + waitMinutes + " minutes.", numMessages, messageHandler.getMessageCountDownLatch().getCount());
95+
Assert.assertEquals("All messages not pumped even after waiting for " + waitMinutes + " minutes.", numMessages, numMessages - messageHandler.getMessageCountDownLatch().getCount());
9696
}
9797
Assert.assertTrue("OnMessage called by maximum of one concurrent thread.", messageHandler.getMaxConcurrencyCounter().getMaxConcurrencyCount() > 1);
9898
Assert.assertTrue("OnMessage called by more than maxconcurrentcalls threads.", messageHandler.getMaxConcurrencyCounter().getMaxConcurrencyCount() <= numMessages);
@@ -184,7 +184,7 @@ private static void testSessionPumpAutoComplete(IMessageSender sender, IMessageA
184184
sessionPump.registerSessionHandler(sessionHandler, new SessionHandlerOptions(DEFAULT_MAX_CONCURRENT_SESSIONS, maxConcurrentCallsPerSession, autoComplete, Duration.ofMinutes(10)));
185185
if(!sessionHandler.getMessageCountDownLatch().await(5, TimeUnit.MINUTES))
186186
{
187-
Assert.assertEquals("All messages not pumped even after waiting for 5 minutes.", numSessions * numMessagePerSession, sessionHandler.getMessageCountDownLatch().getCount());
187+
Assert.assertEquals("All messages not pumped even after waiting for 5 minutes.", numSessions * numMessagePerSession, numSessions * numMessagePerSession - sessionHandler.getMessageCountDownLatch().getCount());
188188
}
189189

190190
Assert.assertTrue("All sessions not received by session pump", sessionHandler.getReceivedSessions().containsAll(sessionIds));
@@ -217,7 +217,7 @@ public static void testSessionPumpClientComplete(IMessageSender sender, IMessage
217217
sessionPump.registerSessionHandler(sessionHandler, new SessionHandlerOptions(DEFAULT_MAX_CONCURRENT_SESSIONS, DEFAULT_MAX_CONCURRENT_CALLS_PER_SESSION, autoComplete, Duration.ofMinutes(10)));
218218
if(!sessionHandler.getMessageCountDownLatch().await(5, TimeUnit.MINUTES))
219219
{
220-
Assert.assertEquals("All messages not pumped even after waiting for 5 minutes.", numSessions * numMessagePerSession, sessionHandler.getMessageCountDownLatch().getCount());
220+
Assert.assertEquals("All messages not pumped even after waiting for 5 minutes.", numSessions * numMessagePerSession, numSessions * numMessagePerSession - sessionHandler.getMessageCountDownLatch().getCount());
221221
}
222222

223223
Assert.assertTrue("All sessions not received by session pump", sessionHandler.getReceivedSessions().containsAll(sessionIds));
@@ -248,7 +248,7 @@ public static void testSessionPumpAbandonOnException(IMessageSender sender, IMes
248248
sessionPump.registerSessionHandler(sessionHandler, new SessionHandlerOptions(DEFAULT_MAX_CONCURRENT_SESSIONS, DEFAULT_MAX_CONCURRENT_CALLS_PER_SESSION, autoComplete, Duration.ofMinutes(10)));
249249
if(!sessionHandler.getMessageCountDownLatch().await(5, TimeUnit.MINUTES))
250250
{
251-
Assert.assertEquals("All messages not pumped even after waiting for 5 minutes.", 2 * numSessions * numMessagePerSession, sessionHandler.getMessageCountDownLatch().getCount());
251+
Assert.assertEquals("All messages not pumped even after waiting for 5 minutes.", 2 * numSessions * numMessagePerSession, 2 * numSessions * numMessagePerSession - sessionHandler.getMessageCountDownLatch().getCount());
252252
}
253253

254254
Assert.assertTrue("All sessions not received by session pump", sessionHandler.getReceivedSessions().containsAll(sessionIds));
@@ -283,7 +283,7 @@ public static void testSessionPumpRenewLock(IMessageSender sender, IMessageAndSe
283283
int waitMinutes = 5 * sleepMinutes;
284284
if(!sessionHandler.getMessageCountDownLatch().await(waitMinutes, TimeUnit.MINUTES))
285285
{
286-
Assert.assertEquals("All messages not pumped even after waiting for" + waitMinutes + " minutes.", numSessions * numMessagePerSession, sessionHandler.getMessageCountDownLatch().getCount());
286+
Assert.assertEquals("All messages not pumped even after waiting for" + waitMinutes + " minutes.", numSessions * numMessagePerSession, numSessions * numMessagePerSession - sessionHandler.getMessageCountDownLatch().getCount());
287287
}
288288

289289
Assert.assertTrue("All sessions not received by session pump", sessionHandler.getReceivedSessions().containsAll(sessionIds));

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>com.microsoft.azure</groupId>
66
<artifactId>azure-servicebus-parent</artifactId>
7-
<version>1.0.0-PREVIEW</version>
7+
<version>1.0.0-RC</version>
88
<packaging>pom</packaging>
99

1010
<url>https://github.com/Azure/azure-service-bus-java</url>
@@ -13,7 +13,7 @@
1313
<proton-j-version>0.13.1</proton-j-version>
1414
<junit-version>4.12</junit-version>
1515
<slf4j-version>1.8.0-alpha2</slf4j-version>
16-
<client-current-version>1.0.0-PREVIEW-3</client-current-version>
16+
<client-current-version>1.0.0-RC-1</client-current-version>
1717
</properties>
1818

1919
<modules>

0 commit comments

Comments
 (0)