[knox] branch master updated: KNOX-2340 - Fix DefaultTokenStateServiceTest timeouts (#312)
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 0e04e5c KNOX-2340 - Fix DefaultTokenStateServiceTest timeouts (#312)
0e04e5c is described below
commit 0e04e5c005e9cc7d3f0f811633477a5067deb0aa
Author: Kevin Risden
AuthorDate: Fri Apr 10 23:43:23 2020 -0400
KNOX-2340 - Fix DefaultTokenStateServiceTest timeouts (#312)
Fix DefaultTokenStateServiceTest timeouts to be more
reasonable. I used TimeUnit every where to ensure we
are doing things with the correct unit of time.
Previously there were issues where milliseconds and
seconds were being mixed. This caused race conditions
in AliasBasedTokenStateServiceTest which extends
DefaultTokenStateServiceTest.
Signed-off-by: Kevin Risden
---
.../token/impl/DefaultTokenStateService.java | 2 +-
.../token/impl/DefaultTokenStateServiceTest.java | 44 +++---
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
index 575213c..7397a68 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
@@ -252,7 +252,7 @@ public class DefaultTokenStateService implements
TokenStateService {
protected boolean hasRemainingRenewals(final String tokenId, long
renewInterval) {
// Is the current time + 30-second buffer + the renewal interval is less
than the max lifetime for the token?
-return ((System.currentTimeMillis() + 3 + renewInterval) <
getMaxLifetime(tokenId));
+return ((System.currentTimeMillis() + TimeUnit.SECONDS.toMillis(30) +
renewInterval) < getMaxLifetime(tokenId));
}
protected long getMaxLifetime(final String tokenId) {
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateServiceTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateServiceTest.java
index e6ad1fc..d7306f2 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateServiceTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateServiceTest.java
@@ -45,7 +45,6 @@ import static org.junit.Assert.fail;
public class DefaultTokenStateServiceTest {
- private static long EVICTION_INTERVAL = 2L;
private static RSAPrivateKey privateKey;
@BeforeClass
@@ -59,7 +58,7 @@ public class DefaultTokenStateServiceTest {
@Test
public void testGetExpiration() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() + 6);
+final JWTToken token = createMockToken(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(60));
final TokenStateService tss = createTokenStateService();
tss.addToken(token, System.currentTimeMillis());
@@ -81,7 +80,7 @@ public class DefaultTokenStateServiceTest {
@Test(expected = UnknownTokenException.class)
public void testGetExpiration_InvalidToken() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() + 6);
+final JWTToken token = createMockToken(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(60));
// Expecting an UnknownTokenException because the token is not known to
the TokenStateService
createTokenStateService().getTokenExpiration(TokenUtils.getTokenId(token));
@@ -89,7 +88,7 @@ public class DefaultTokenStateServiceTest {
@Test
public void testGetExpiration_AfterRenewal() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() + 6);
+final JWTToken token = createMockToken(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(60));
final TokenStateService tss = createTokenStateService();
tss.addToken(token, System.currentTimeMillis());
@@ -103,7 +102,7 @@ public class DefaultTokenStateServiceTest {
@Test
public void testIsExpired_Negative() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() + 6);
+final JWTToken token = createMockToken(System.currentTimeMillis() +
TimeUnit.SECONDS.toMillis(60));
final TokenStateService tss = createTokenStateService();
tss.addToken(token, System.currentTimeMillis());
@@ -112,7 +111,7 @@ public class DefaultTokenStateServiceTest {
@Test
public void testIsExpired_Positive() throws Exception {
-final JWTToken token = createMockToken(System.currentTimeMillis() - 6);
+final JWTToken token =
[knox] branch master updated: KNOX-2338 - Upgrade apacheds.directory.server.version to 2.0.0.AM26 (#309)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new b5d97a1 KNOX-2338 - Upgrade apacheds.directory.server.version to 2.0.0.AM26 (#309) b5d97a1 is described below commit b5d97a197d22da5900715b5a84a7e3b22c03cea9 Author: Kevin Risden AuthorDate: Fri Apr 10 21:41:01 2020 -0400 KNOX-2338 - Upgrade apacheds.directory.server.version to 2.0.0.AM26 (#309) Signed-off-by: Kevin Risden --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 99413f0..5d72690 100644 --- a/pom.xml +++ b/pom.xml @@ -150,8 +150,8 @@ 8 - 2.0.0.AM1 - 2.0.0.AM25 +2.0.0 + 2.0.0.AM26 2.0.0-M5 0.13 1.8.1
[knox] branch master updated (4ef3311 -> dc71011)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. discard 4ef3311 Revert "Revert "KNOX-2335 - Upgrade java-support to 8.0.0"" This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/master (dc71011) \ O -- O -- O (4ef3311) Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[knox] branch master updated: Revert "Revert "KNOX-2335 - Upgrade java-support to 8.0.0""
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new 4ef3311 Revert "Revert "KNOX-2335 - Upgrade java-support to 8.0.0"" 4ef3311 is described below commit 4ef33117d0fc82f09ce3192c0ac35057b5960b7a Author: Kevin Risden AuthorDate: Fri Apr 10 19:59:24 2020 -0400 Revert "Revert "KNOX-2335 - Upgrade java-support to 8.0.0"" This reverts commit dc71011ff48d5d0205472fa26ead937d7ddc717b. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 99413f0..2c2b6cc 100644 --- a/pom.xml +++ b/pom.xml @@ -214,7 +214,7 @@ 2.3.0 2.3.2 2.3.2 -7.5.1 +8.0.0 3.4 2.6 9.4.27.v20200227
[knox] branch master updated: Revert "KNOX-2335 - Upgrade java-support to 8.0.0"
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git The following commit(s) were added to refs/heads/master by this push: new dc71011 Revert "KNOX-2335 - Upgrade java-support to 8.0.0" dc71011 is described below commit dc71011ff48d5d0205472fa26ead937d7ddc717b Author: Kevin Risden AuthorDate: Fri Apr 10 19:57:22 2020 -0400 Revert "KNOX-2335 - Upgrade java-support to 8.0.0" This reverts commit e6aaf40301dafc9cdce617c19a558be52c0cccbe. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c2b6cc..99413f0 100644 --- a/pom.xml +++ b/pom.xml @@ -214,7 +214,7 @@ 2.3.0 2.3.2 2.3.2 -8.0.0 +7.5.1 3.4 2.6 9.4.27.v20200227
[knox] branch master updated (e3079b2 -> 7a8b459)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from e3079b2 KNOX-2324 - Upgrade metrics to 4.1.6 new 94ce397 KNOX-2322 - Upgrade nimbus-jose-jwt to 8.14.1 new 31df513 KNOX-2333 - Upgrade rest-assured to 4.3.0 new 7f8a5a0 KNOX-2330 - Upgrade spring-core to 5.2.5.RELEASE new 8f39d03 KNOX-2331 - Upgrade spotbugs to 4.0.1 new 7a8b459 KNOX-2332 - Upgrade spotbugs-maven-plugin to 4.0.0 The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-)
[knox] 03/05: KNOX-2330 - Upgrade spring-core to 5.2.5.RELEASE
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 7f8a5a0712f423b13ed96b1ea5c8277c628fd944 Author: Kevin Risden AuthorDate: Fri Apr 10 15:38:02 2020 -0400 KNOX-2330 - Upgrade spring-core to 5.2.5.RELEASE Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1847857..a7be0dd 100644 --- a/pom.xml +++ b/pom.xml @@ -248,7 +248,7 @@ 1.7.30 4.0.0 3.1.12.2 -5.2.4.RELEASE +5.2.5.RELEASE 2.2.2.RELEASE 4.2 1.2.5
[knox] 02/05: KNOX-2333 - Upgrade rest-assured to 4.3.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 31df513cdee1bf58845268477226a6b680bda1dc Author: Kevin Risden AuthorDate: Fri Apr 10 15:37:27 2020 -0400 KNOX-2333 - Upgrade rest-assured to 4.3.0 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c59420..1847857 100644 --- a/pom.xml +++ b/pom.xml @@ -241,7 +241,7 @@ 3.4.3 3.8.3 3.11.4 -4.2.0 +4.3.0 1.4.2 1.2.6 2.0.0
[knox] 04/05: KNOX-2331 - Upgrade spotbugs to 4.0.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 8f39d033272742472cb29293650a416ddf53c84b Author: Kevin Risden AuthorDate: Fri Apr 10 15:38:36 2020 -0400 KNOX-2331 - Upgrade spotbugs to 4.0.1 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a7be0dd..5a6f3d6 100644 --- a/pom.xml +++ b/pom.xml @@ -246,7 +246,7 @@ 1.2.6 2.0.0 1.7.30 -4.0.0 +4.0.1 3.1.12.2 5.2.5.RELEASE 2.2.2.RELEASE
[knox] 01/05: KNOX-2322 - Upgrade nimbus-jose-jwt to 8.14.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 94ce397316ac743f18454028112cad6f05a3e8db Author: Kevin Risden AuthorDate: Fri Apr 10 15:36:51 2020 -0400 KNOX-2322 - Upgrade nimbus-jose-jwt to 8.14.1 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 195c190..5c59420 100644 --- a/pom.xml +++ b/pom.xml @@ -235,7 +235,7 @@ 3.12.0 4.1.6 2.0.21 -8.9 +8.14.1 v12.14.1 2.7.5 3.4.3
[knox] 05/05: KNOX-2332 - Upgrade spotbugs-maven-plugin to 4.0.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 7a8b459ef503c87f9b6bb7c441dbf8f08d52c302 Author: Kevin Risden AuthorDate: Fri Apr 10 15:39:14 2020 -0400 KNOX-2332 - Upgrade spotbugs-maven-plugin to 4.0.0 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a6f3d6..2c2b6cc 100644 --- a/pom.xml +++ b/pom.xml @@ -247,7 +247,7 @@ 2.0.0 1.7.30 4.0.1 -3.1.12.2 +4.0.0 5.2.5.RELEASE 2.2.2.RELEASE 4.2
[knox] 05/10: KNOX-2329 - Upgrade dependency-check-maven to 5.3.2
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit b146ae746a1c215c8f7bdfa835c51488f52869b7 Author: Kevin Risden AuthorDate: Fri Apr 10 15:07:51 2020 -0400 KNOX-2329 - Upgrade dependency-check-maven to 5.3.2 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e0b7c58..2a9aeb1 100644 --- a/pom.xml +++ b/pom.xml @@ -181,7 +181,7 @@ 2.9 1.2.4 4.3.0 -5.3.0 +5.3.2 10.14.2.0 1.4.13 2.1.1
[knox] 03/10: KNOX-2328 - Upgrade checkstyle to 8.31
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
commit 060ba836487af2a97d6e72bb30fe375324739535
Author: Kevin Risden
AuthorDate: Fri Apr 10 15:06:35 2020 -0400
KNOX-2328 - Upgrade checkstyle to 8.31
Signed-off-by: Kevin Risden
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d28b7ba..34b26c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,7 +161,7 @@
2.8.1
1.4
3.3.0
-8.30
+8.31
7.0.3
${cloudera-manager.version}
1.9.4
[knox] 08/10: KNOX-2335 - Upgrade java-support to 8.0.0
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit e6aaf40301dafc9cdce617c19a558be52c0cccbe Author: Kevin Risden AuthorDate: Fri Apr 10 15:09:36 2020 -0400 KNOX-2335 - Upgrade java-support to 8.0.0 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3bca99f..367ca30 100644 --- a/pom.xml +++ b/pom.xml @@ -214,7 +214,7 @@ 2.3.0 2.3.2 2.3.2 -7.5.1 +8.0.0 3.4 2.6 9.4.27.v20200227
[knox] 01/10: KNOX-2325 - Upgrade asm to 8.0.1
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit f857f7cf2424b95c1f7d6e209327452208ab3e55 Author: Kevin Risden AuthorDate: Fri Apr 10 15:05:25 2020 -0400 KNOX-2325 - Upgrade asm to 8.0.1 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc21d42..e5f8e86 100644 --- a/pom.xml +++ b/pom.xml @@ -155,7 +155,7 @@ 2.0.0-M5 0.13 1.8.1 -7.3.1 +8.0.1 1.9.5 1.64 2.8.1
[knox] 02/10: KNOX-2326 - Upgrade bcprov-jdk15on to 1.65
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 4dc04c531b4d97265f7da0fff509fbda7250cc59 Author: Kevin Risden AuthorDate: Fri Apr 10 15:06:05 2020 -0400 KNOX-2326 - Upgrade bcprov-jdk15on to 1.65 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5f8e86..d28b7ba 100644 --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ 1.8.1 8.0.1 1.9.5 -1.64 +1.65 2.8.1 1.4 3.3.0
[knox] 07/10: KNOX-2336 - Upgrade httpclient to 4.5.12
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit 0449ee64d7590e61c7aa0121d52c1c15db497cb9 Author: Kevin Risden AuthorDate: Fri Apr 10 15:09:00 2020 -0400 KNOX-2336 - Upgrade httpclient to 4.5.12 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd3c2bf..3bca99f 100644 --- a/pom.xml +++ b/pom.xml @@ -198,7 +198,7 @@ 3.2.1 2.2 0.2 -4.5.11 +4.5.12 4.4.13 4.1.0 2.10.3
[knox] 04/10: KNOX-2327 - Upgrade commons-lang3 to 3.10
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit fe2dc0e9110052044b011774ca1f6d9571263e93 Author: Kevin Risden AuthorDate: Fri Apr 10 15:07:18 2020 -0400 KNOX-2327 - Upgrade commons-lang3 to 3.10 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34b26c0..e0b7c58 100644 --- a/pom.xml +++ b/pom.xml @@ -173,7 +173,7 @@ 3.2 2.6 2.6 -3.9 +3.10 1.2 3.6.1 3.6
[knox] 10/10: KNOX-2324 - Upgrade metrics to 4.1.6
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit e3079b201a2a547862475b20b803c5979f4b0148 Author: Kevin Risden AuthorDate: Fri Apr 10 15:10:48 2020 -0400 KNOX-2324 - Upgrade metrics to 4.1.6 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 09fc7a0..195c190 100644 --- a/pom.xml +++ b/pom.xml @@ -233,7 +233,7 @@ 3.1.2 3.0.0-M3 3.12.0 -4.1.4 +4.1.6 2.0.21 8.9 v12.14.1
[knox] 09/10: KNOX-2334 - Upgrade maven-dependency-plugin to 3.1.2
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit d35f3de3c6957e88248fa02e53199a928b4e1569 Author: Kevin Risden AuthorDate: Fri Apr 10 15:10:06 2020 -0400 KNOX-2334 - Upgrade maven-dependency-plugin to 3.1.2 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 367ca30..09fc7a0 100644 --- a/pom.xml +++ b/pom.xml @@ -230,7 +230,7 @@ 2.13.1 3.1.1 3.8.1 - 3.1.1 + 3.1.2 3.0.0-M3 3.12.0 4.1.4
[knox] 06/10: KNOX-2323 - Upgrade groovy to 3.0.3
This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git commit b174138caf8e6ac0e1c4ef77e347030137ab2147 Author: Kevin Risden AuthorDate: Fri Apr 10 15:08:26 2020 -0400 KNOX-2323 - Upgrade groovy to 3.0.3 Signed-off-by: Kevin Risden --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2a9aeb1..bd3c2bf 100644 --- a/pom.xml +++ b/pom.xml @@ -193,7 +193,7 @@ 2.7 1.9.1 2.8.6 -3.0.1 +3.0.3 28.2-jre 3.2.1 2.2
[knox] branch master updated (7a93dd4 -> e3079b2)
This is an automated email from the ASF dual-hosted git repository. krisden pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/knox.git. from 7a93dd4 Minor javadoc fixes new f857f7c KNOX-2325 - Upgrade asm to 8.0.1 new 4dc04c5 KNOX-2326 - Upgrade bcprov-jdk15on to 1.65 new 060ba83 KNOX-2328 - Upgrade checkstyle to 8.31 new fe2dc0e KNOX-2327 - Upgrade commons-lang3 to 3.10 new b146ae7 KNOX-2329 - Upgrade dependency-check-maven to 5.3.2 new b174138 KNOX-2323 - Upgrade groovy to 3.0.3 new 0449ee6 KNOX-2336 - Upgrade httpclient to 4.5.12 new e6aaf40 KNOX-2335 - Upgrade java-support to 8.0.0 new d35f3de KNOX-2334 - Upgrade maven-dependency-plugin to 3.1.2 new e3079b2 KNOX-2324 - Upgrade metrics to 4.1.6 The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: pom.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-)
[knox] branch master updated: Minor javadoc fixes
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 7a93dd4 Minor javadoc fixes
7a93dd4 is described below
commit 7a93dd4037477585607057f6a632163448eb564a
Author: Kevin Risden
AuthorDate: Fri Apr 10 13:35:59 2020 -0400
Minor javadoc fixes
Signed-off-by: Kevin Risden
---
.../model/cm/ClouderaManagerAPIServiceModelGenerator.java | 12 ++--
.../services/token/impl/DefaultTokenStateService.java | 8
.../org/apache/knox/gateway/util/TopologyToDescriptor.java | 7 +++
.../gateway/service/knoxtoken/TokenServiceResourceTest.java | 4 +---
.../gateway/services/security/token/TokenStateService.java | 13 -
.../knox/gateway/services/topology/TopologyService.java | 4 ++--
6 files changed, 32 insertions(+), 16 deletions(-)
diff --git
a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/cm/ClouderaManagerAPIServiceModelGenerator.java
b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/cm/ClouderaManagerAPIServiceModelGenerator.java
index 0978362..49559f0 100644
---
a/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/cm/ClouderaManagerAPIServiceModelGenerator.java
+++
b/gateway-discovery-cm/src/main/java/org/apache/knox/gateway/topology/discovery/cm/model/cm/ClouderaManagerAPIServiceModelGenerator.java
@@ -62,12 +62,12 @@ public class ClouderaManagerAPIServiceModelGenerator
* discovery client and uses the CM url used by the driver (which was
* populated by the descriptor).
*
- * @param service
- * @param serviceConfig
- * @param role
- * @param roleConfig
- * @return
- * @throws ApiException
+ * @param service Service.
+ * @param serviceConfig Service config.
+ * @param role Role.
+ * @param roleConfig Role config.
+ * @return ServiceModel for given service and role.
+ * @throws ApiException Exception interacting with CM.
*/
@Override
public ServiceModel generateService(ApiService service,
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
index aad7b99..575213c 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenStateService.java
@@ -26,13 +26,13 @@ import
org.apache.knox.gateway.services.security.token.impl.JWT;
import org.apache.knox.gateway.services.security.token.impl.JWTToken;
import java.time.Instant;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
/**
* In-Memory authentication token state management implementation.
@@ -311,6 +311,7 @@ public class DefaultTokenStateService implements
TokenStateService {
* Method that checks if a token's state is a candidate for eviction.
*
* @param tokenId A unique token identifier
+ * @throws UnknownTokenException Exception if token is not found.
*
* @return true, if the associated token state can be evicted; Otherwise,
false.
*/
@@ -325,10 +326,9 @@ public class DefaultTokenStateService implements
TokenStateService {
/**
* Get a list of tokens
*
- * @return
+ * @return List of tokens
*/
protected List getTokens() {
-return tokenExpirations.keySet().stream().collect(Collectors.toList());
+return new ArrayList<>(tokenExpirations.keySet());
}
-
}
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/util/TopologyToDescriptor.java
b/gateway-server/src/main/java/org/apache/knox/gateway/util/TopologyToDescriptor.java
index 852d937..3166901 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/util/TopologyToDescriptor.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/util/TopologyToDescriptor.java
@@ -118,6 +118,9 @@ public class TopologyToDescriptor {
/**
* Validate topology
+ *
+ * @throws IOException Exception on validating file.
+ * @throws SAXException Exception on parsing XML.
*/
public void validate() throws IOException, SAXException {
validateTopology(SCHEMA_FILE, topologyPath);
@@ -125,6 +128,10 @@ public class TopologyToDescriptor {
/**
* Convert topology to provider and descriptor
+ *
+ * @throws IOException Exception on validating file.
+ * @throws JAXBException Exception on parsing XML.
+ * @throws SAXException Exception on parsing XML.
*/
