[java-identity-provider] branch master updated: Fix a few long/Duration/Instant stragglers.
Scott Cantor
cantor.2 at osu.edu
Thu Mar 21 12:12:13 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=1c1586cdb3173ca6f10435db8e65d21ab01f6878
The following commit(s) were added to refs/heads/master by this push:
new 1c1586c Fix a few long/Duration/Instant stragglers.
1c1586c is described below
commit 1c1586cdb3173ca6f10435db8e65d21ab01f6878
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Mar 21 12:12:10 2019 -0400
Fix a few long/Duration/Instant stragglers.
---
.../java/net/shibboleth/idp/attribute/PairwiseId.java | 14 ++++++++------
.../idp/attribute/impl/JDBCPairwiseIdStore.java | 17 +++++++++--------
.../idp/attribute/impl/JDBCPairwiseIdStoreTest.java | 3 ++-
.../net/shibboleth/idp/metrics/impl/IdPGaugeSet.java | 8 +++++---
4 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/PairwiseId.java b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/PairwiseId.java
index 36400c1..e4f2a9f 100644
--- a/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/PairwiseId.java
+++ b/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/PairwiseId.java
@@ -17,6 +17,8 @@
package net.shibboleth.idp.attribute;
+import java.time.Instant;
+
import javax.annotation.Nullable;
/**
@@ -45,10 +47,10 @@ public class PairwiseId {
@Nullable private String peerProvidedId;
/** Time the identifier was created. */
- @Nullable private Long creationTime;
+ @Nullable private Instant creationTime;
/** Time the identifier was deactivated. */
- @Nullable private Long deactivationTime;
+ @Nullable private Instant deactivationTime;
/**
* Get the ID of the entity that issued the identifier.
@@ -165,7 +167,7 @@ public class PairwiseId {
*
* @return time the identifier was created
*/
- @Nullable public Long getCreationTime() {
+ @Nullable public Instant getCreationTime() {
return creationTime;
}
@@ -174,7 +176,7 @@ public class PairwiseId {
*
* @param time time the identifier was created
*/
- public void setCreationTime(@Nullable final Long time) {
+ public void setCreationTime(@Nullable final Instant time) {
creationTime = time;
}
@@ -183,7 +185,7 @@ public class PairwiseId {
*
* @return time the identifier was deactivated
*/
- @Nullable public Long getDeactivationTime() {
+ @Nullable public Instant getDeactivationTime() {
return deactivationTime;
}
@@ -192,7 +194,7 @@ public class PairwiseId {
*
* @param time the time the identifier was deactivated
*/
- public void setDeactivationTime(@Nullable final Long time) {
+ public void setDeactivationTime(@Nullable final Instant time) {
deactivationTime = time;
}
diff --git a/idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java b/idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
index cacc4fb..29f3969 100644
--- a/idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
+++ b/idp-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
@@ -25,6 +25,7 @@ import java.sql.SQLException;
import java.sql.Timestamp;
import java.sql.Types;
import java.time.Duration;
+import java.time.Instant;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -570,7 +571,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
log.debug("Getting active and/or last inactive pairwise ID entry");
final List<PairwiseId> entries = buildIdentifierEntries(statement.executeQuery());
if (entries != null && entries.size() > 0 && (entries.get(0).getDeactivationTime() == null
- || entries.get(0).getDeactivationTime() > System.currentTimeMillis())) {
+ || entries.get(0).getDeactivationTime().isAfter(Instant.now()))) {
dbConn.commit();
log.debug("Returning existing active pairwise ID: {}", entries.get(0).getPairwiseId());
return entries.get(0);
@@ -580,7 +581,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
return null;
}
- pid.setCreationTime(System.currentTimeMillis());
+ pid.setCreationTime(Instant.now());
// Circumvent final modifier on parameter.
PairwiseId retValue = pid;
@@ -674,7 +675,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
if (pid.getDeactivationTime() == null) {
deactivationTime = new Timestamp(System.currentTimeMillis());
} else {
- deactivationTime = new Timestamp(pid.getDeactivationTime());
+ deactivationTime = new Timestamp(pid.getDeactivationTime().toEpochMilli());
}
log.debug("Deactivating pairwise ID {} as of {}", pid.getPairwiseId(), deactivationTime);
@@ -781,9 +782,9 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
} else {
statement.setNull(6, Types.VARCHAR);
}
- statement.setTimestamp(7, new Timestamp(entry.getCreationTime()));
+ statement.setTimestamp(7, new Timestamp(entry.getCreationTime().toEpochMilli()));
if (entry.getDeactivationTime() != null) {
- statement.setTimestamp(8, new Timestamp(entry.getDeactivationTime()));
+ statement.setTimestamp(8, new Timestamp(entry.getDeactivationTime().toEpochMilli()));
} else {
statement.setNull(8, Types.TIMESTAMP);
}
@@ -822,7 +823,7 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
newEntry.setRecipientEntityID("http://dummy.com/sp/" + uuid);
newEntry.setSourceSystemId("dummy");
newEntry.setPrincipalName("dummy");
- newEntry.setCreationTime(System.currentTimeMillis());
+ newEntry.setCreationTime(Instant.now());
newEntry.setPairwiseId(uuid);
try (final Connection conn = getConnection(true)) {
@@ -876,11 +877,11 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
entry.setPeerProvidedId(resultSet.getString(peerProvidedIdColumn));
Timestamp ts = resultSet.getTimestamp(creationTimeColumn);
if (ts != null) {
- entry.setCreationTime(ts.getTime());
+ entry.setCreationTime(Instant.ofEpochMilli(ts.getTime()));
}
ts = resultSet.getTimestamp(deactivationTimeColumn);
if (ts != null) {
- entry.setDeactivationTime(ts.getTime());
+ entry.setDeactivationTime(Instant.ofEpochMilli(ts.getTime()));
}
entries.add(entry);
diff --git a/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStoreTest.java b/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStoreTest.java
index 8af5473..b3f21df 100644
--- a/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStoreTest.java
+++ b/idp-attribute-impl/src/test/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStoreTest.java
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.time.Duration;
+import java.time.Instant;
import java.util.Objects;
import java.util.UUID;
@@ -125,7 +126,7 @@ public class JDBCPairwiseIdStoreTest {
id.setSourceSystemId("localID");
id.setPeerProvidedId("PeerprovidedId");
id.setPairwiseId(persistentId);
- id.setCreationTime(System.currentTimeMillis());
+ id.setCreationTime(Instant.now());
try (final Connection conn = testSource.getConnection()) {
store.store(id, conn);
diff --git a/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/IdPGaugeSet.java b/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/IdPGaugeSet.java
index 22d23f7..4569084 100644
--- a/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/IdPGaugeSet.java
+++ b/idp-core/src/main/java/net/shibboleth/idp/metrics/impl/IdPGaugeSet.java
@@ -26,6 +26,7 @@ import net.shibboleth.idp.Version;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import java.time.Duration;
import java.time.Instant;
import java.util.Collections;
import java.util.HashMap;
@@ -76,9 +77,10 @@ public class IdPGaugeSet extends ApplicationObjectSupport implements MetricSet,
gauges.put(
MetricRegistry.name(DEFAULT_METRIC_NAME, "uptime"),
- new Gauge<Long>() {
- public Long getValue() {
- return System.currentTimeMillis() - getApplicationContext().getStartupDate();
+ new Gauge<Duration>() {
+ public Duration getValue() {
+ return Duration.ofMillis(
+ Instant.now().toEpochMilli() - getApplicationContext().getStartupDate());
}
});
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list