[java-metadata-aggregator] branch main updated: Nullability
Ian Young
ian at iay.org.uk
Fri Mar 24 17:31:38 UTC 2023
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=a11ced1d6131f06ea1ee48edf300ed3b49a3ec1f
The following commit(s) were added to refs/heads/main by this push:
new a11ced1 Nullability
a11ced1 is described below
commit a11ced1d6131f06ea1ee48edf300ed3b49a3ec1f
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Mar 24 17:31:31 2023 +0000
Nullability
---
.../net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java | 4 ++--
.../java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java | 2 +-
.../net/shibboleth/metadata/dom/NamespaceStrippingStage.java | 3 +--
.../metadata/pipeline/MultiOutputSerializationStage.java | 5 ++---
.../java/net/shibboleth/metadata/pipeline/ScriptletStage.java | 2 +-
.../net/shibboleth/metadata/pipeline/SerializationStage.java | 3 +--
.../src/test/java/net/shibboleth/metadata/dom/ContainerTest.java | 4 ++--
.../shibboleth/metadata/dom/XMLSignatureSigningStageTest.java | 1 +
.../metadata/dom/saml/PullUpCacheDurationStageTest.java | 6 +++---
.../shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java | 9 ++++++---
.../shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java | 2 +-
.../net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java | 6 ++++--
.../dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java | 4 ++++
.../dom/saml/mdattr/EntityCategoryMatcherSpringTest.java | 2 ++
14 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
index c6d2447..464b220 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMFilesystemSourceStage.java
@@ -95,7 +95,7 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
*
* @return pool of DOM parsers used to parse the XML file in to a DOM
*/
- @Nullable public final synchronized ParserPool getParserPool() {
+ public final synchronized @NonnullAfterInit ParserPool getParserPool() {
return parserPool;
}
@@ -114,7 +114,7 @@ public class DOMFilesystemSourceStage extends AbstractStage<Element> {
*
* @return path to the DOM material provided by this source
*/
- @Nullable public final synchronized File getSource() {
+ public final synchronized @NonnullAfterInit File getSource() {
return sourceFile;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
index ec1721c..6d0672b 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/DOMResourceSourceStage.java
@@ -96,7 +96,7 @@ public class DOMResourceSourceStage extends AbstractStage<Element> {
*
* @return pool of DOM parsers used to parse the XML file in to a DOM
*/
- @Nullable public final synchronized ParserPool getParserPool() {
+ public final synchronized @NonnullAfterInit ParserPool getParserPool() {
return parserPool;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
index 24e68df..479cd4f 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/NamespaceStrippingStage.java
@@ -18,7 +18,6 @@
package net.shibboleth.metadata.dom;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe;
@@ -47,7 +46,7 @@ public class NamespaceStrippingStage extends AbstractNamespacesStrippingStage {
*
* @return namespace URI
*/
- @Nullable public final synchronized String getNamespace() {
+ public final synchronized @NonnullAfterInit String getNamespace() {
return namespace;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
index f0a2d66..1dda2b1 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/MultiOutputSerializationStage.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.OutputStream;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe;
@@ -106,7 +105,7 @@ public class MultiOutputSerializationStage<T> extends AbstractIteratingStage<T>
*
* @return the output strategy function
*/
- @Nullable public final synchronized OutputStrategy<T> getOutputStrategy() {
+ public final synchronized @NonnullAfterInit OutputStrategy<T> getOutputStrategy() {
return outputStrategy;
}
@@ -125,7 +124,7 @@ public class MultiOutputSerializationStage<T> extends AbstractIteratingStage<T>
*
* @return serializer used to write item to the output file
*/
- @Nullable public final synchronized ItemSerializer<T> getSerializer() {
+ public final synchronized @NonnullAfterInit ItemSerializer<T> getSerializer() {
return serializer;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
index 73190b9..be121f5 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/ScriptletStage.java
@@ -91,7 +91,7 @@ public class ScriptletStage<T> extends AbstractStage<T> {
*
* @return the script executed by this stage
*/
- @Nullable public final synchronized EvaluableScript getScript() {
+ public final synchronized @NonnullAfterInit EvaluableScript getScript() {
return script;
}
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
index 4355202..8ac6f10 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/pipeline/SerializationStage.java
@@ -24,7 +24,6 @@ import java.io.OutputStream;
import java.util.List;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.annotation.concurrent.GuardedBy;
import javax.annotation.concurrent.ThreadSafe;
@@ -111,7 +110,7 @@ public class SerializationStage<T> extends AbstractStage<T> {
*
* @return serializer used to write item to the output file
*/
- @Nullable public final synchronized ItemCollectionSerializer<T> getSerializer() {
+ public final synchronized @NonnullAfterInit ItemCollectionSerializer<T> getSerializer() {
return serializer;
}
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
index 5c7fb9b..d524b06 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/ContainerTest.java
@@ -36,7 +36,7 @@ public class ContainerTest extends BaseDOMTest {
final Element e2 = doc.createElementNS("ns", "el2");
e1.insertBefore(e2, e1.getFirstChild());
final Container c2 = c1.findChild(x -> true);
- Assert.assertNotNull(c2);
+ assert c2 != null;
c2.prime();
Assert.assertEquals(e2.getTextContent(), "\n ");
@@ -193,7 +193,7 @@ public class ContainerTest extends BaseDOMTest {
}
});
- Assert.assertNotNull(child);
+ assert child != null;
Assert.assertEquals(child.unwrap().getTextContent(), "find me 1");
}
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
index fcf6e31..42f3ba2 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java
@@ -321,6 +321,7 @@ public class XMLSignatureSigningStageTest extends BaseDOMTest {
private Element extractKeyInfo(@Nonnull final Element root) {
final var signature = ElementSupport.getFirstChildElement(root, XMLDSIGSupport.SIGNATURE_NAME);
+ assert signature != null;
final var keyInfos = signature.getElementsByTagNameNS(XMLSignature.XMLNS, "KeyInfo");
Assert.assertNotNull(keyInfos);
if (keyInfos.getLength() != 0) {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
index 9d11e57..8ae3ac7 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpCacheDurationStageTest.java
@@ -59,7 +59,7 @@ public class PullUpCacheDurationStageTest extends BaseDOMTest {
Element entitiesDescriptor = metadataCollection.get(0).unwrap();
Attr durationAttr = AttributeSupport
.getAttribute(entitiesDescriptor, SAMLMetadataSupport.CACHE_DURATION_ATTRIB_NAME);
- Assert.assertNotNull(durationAttr);
+ assert durationAttr != null;
final var duration = AttributeSupport.getDurationAttributeValue(durationAttr);
Assert.assertEquals(duration, Duration.ofHours(1));
@@ -94,7 +94,7 @@ public class PullUpCacheDurationStageTest extends BaseDOMTest {
Element entitiesDescriptor = metadataCollection.get(0).unwrap();
Attr durationAttr = AttributeSupport
.getAttribute(entitiesDescriptor, SAMLMetadataSupport.CACHE_DURATION_ATTRIB_NAME);
- Assert.assertNotNull(durationAttr);
+ assert durationAttr != null;
final var duration = AttributeSupport.getDurationAttributeValue(durationAttr);
Assert.assertEquals(duration, Duration.ofHours(2));
@@ -120,7 +120,7 @@ public class PullUpCacheDurationStageTest extends BaseDOMTest {
Element entitiesDescriptor = metadataCollection.get(0).unwrap();
Attr durationAttr = AttributeSupport
.getAttribute(entitiesDescriptor, SAMLMetadataSupport.CACHE_DURATION_ATTRIB_NAME);
- Assert.assertNotNull(durationAttr);
+ assert durationAttr != null;
final var duration = AttributeSupport.getDurationAttributeValue(durationAttr);
Assert.assertEquals(duration, Duration.ofMinutes(30));
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
index d88ed2c..0a064cc 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/PullUpValidUntilStageTest.java
@@ -60,9 +60,10 @@ public class PullUpValidUntilStageTest extends BaseDOMTest {
Element entitiesDescriptor = metadataCollection.get(0).unwrap();
Attr validUntilAttr = AttributeSupport
.getAttribute(entitiesDescriptor, SAMLMetadataSupport.VALID_UNTIL_ATTRIB_NAME);
- Assert.assertNotNull(validUntilAttr);
+ assert validUntilAttr != null;
final var validUntil = AttributeSupport.getDateTimeAttribute(validUntilAttr);
+ assert validUntil != null;
Assert.assertEquals(validUntil.toEpochMilli(), 2429913600000L);
List<Element> entityDescriptors = ElementSupport.getChildElements(entitiesDescriptor,
@@ -97,9 +98,10 @@ public class PullUpValidUntilStageTest extends BaseDOMTest {
Element entitiesDescriptor = metadataCollection.get(0).unwrap();
Attr validUntilAttr = AttributeSupport
.getAttribute(entitiesDescriptor, SAMLMetadataSupport.VALID_UNTIL_ATTRIB_NAME);
- Assert.assertNotNull(validUntilAttr);
+ assert validUntilAttr != null;
var validUntil = AttributeSupport.getDateTimeAttribute(validUntilAttr);
+ assert validUntil != null;
Assert.assertTrue(validUntil.isAfter(Instant.now().plus(hundredYears).minus(Duration.ofMinutes(1))));
}
@@ -126,9 +128,10 @@ public class PullUpValidUntilStageTest extends BaseDOMTest {
Element entitiesDescriptor = metadataCollection.get(0).unwrap();
Attr validUntilAttr = AttributeSupport
.getAttribute(entitiesDescriptor, SAMLMetadataSupport.VALID_UNTIL_ATTRIB_NAME);
- Assert.assertNotNull(validUntilAttr);
+ assert validUntilAttr != null;
final var validUntil = AttributeSupport.getDateTimeAttribute(validUntilAttr);
+ assert validUntil != null;
final var delta = Duration.ofSeconds(10); // ten seconds permitted either side to allow for test execution time
Assert.assertTrue(validUntil.isBefore(twoYearsFromNow.plus(delta)));
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
index c03bd49..055e104 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
@@ -58,7 +58,7 @@ public class SetCacheDurationStageTest extends BaseDOMTest {
final DatatypeFactory dtf = DatatypeFactory.newInstance();
final Attr cacheDurationAttr = AttributeSupport.getAttribute(descriptor,
SAMLMetadataSupport.CACHE_DURATION_ATTRIB_NAME);
- Assert.assertNotNull(cacheDurationAttr);
+ assert cacheDurationAttr != null;
return Duration.ofMillis(dtf.newDuration(cacheDurationAttr.getValue()).getTimeInMillis(baseDate));
}
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
index c07caf0..3f6555b 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java
@@ -69,9 +69,10 @@ public class SetValidUntilStageTest extends BaseDOMTest {
stage.execute(metadataCollection);
Attr validUntilAttr = AttributeSupport.getAttribute(metadataCollection.iterator().next().unwrap(), SAMLMetadataSupport.VALID_UNTIL_ATTRIB_NAME);
- Assert.assertNotNull(validUntilAttr);
+ assert validUntilAttr != null;
final var validUntil = AttributeSupport.getDateTimeAttribute(validUntilAttr);
+ assert validUntil != null;
Assert.assertTrue(validUntil.isAfter(now.plus(duration).minus(Duration.ofMillis(100))));
Assert.assertTrue(validUntil.isBefore(now.plus(duration).plus(Duration.ofMillis(100))));
}
@@ -100,9 +101,10 @@ public class SetValidUntilStageTest extends BaseDOMTest {
stage.execute(metadataCollection);
Attr validUntilAttr = AttributeSupport.getAttribute(metadataCollection.iterator().next().unwrap(), SAMLMetadataSupport.VALID_UNTIL_ATTRIB_NAME);
- Assert.assertNotNull(validUntilAttr);
+ assert validUntilAttr != null;
final var validUntil = AttributeSupport.getDateTimeAttribute(validUntilAttr);
+ assert validUntil != null;
Assert.assertTrue(validUntil.isAfter(now.plus(duration).minus(Duration.ofMillis(100))));
Assert.assertTrue(validUntil.isBefore(now.plus(duration).plus(Duration.ofMillis(100))));
}
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java
index ebaa12f..088caca 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/AssuranceCertificationMatcherSpringTest.java
@@ -50,7 +50,9 @@ public class AssuranceCertificationMatcherSpringTest extends AbstractTestNGSprin
@Test
@SuppressWarnings("unchecked")
public void testNoRA() {
+ assert applicationContext != null;
final var matcher = applicationContext.getBean("certificationMatcherNoRA", Predicate.class);
+ assert applicationContext != null;
final var oldMatcher = applicationContext.getBean("oldMatcherNoRA", Predicate.class);
// all four components match
@@ -78,7 +80,9 @@ public class AssuranceCertificationMatcherSpringTest extends AbstractTestNGSprin
@Test
@SuppressWarnings("unchecked")
public void testWithRA() {
+ assert applicationContext != null;
final var matcher = applicationContext.getBean("certificationMatcherWithRA", Predicate.class);
+ assert applicationContext != null;
final var oldMatcher = applicationContext.getBean("oldMatcherWithRA", Predicate.class);
// all four components match
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java
index 670572f..4ac0de3 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/mdattr/EntityCategoryMatcherSpringTest.java
@@ -45,6 +45,7 @@ public class EntityCategoryMatcherSpringTest extends AbstractTestNGSpringContext
@Test
@SuppressWarnings("unchecked")
public void testNoRA() {
+ assert applicationContext != null;
final var matcher = applicationContext.getBean("categoryMatcherNoRA", Predicate.class);
// all four components match
@@ -67,6 +68,7 @@ public class EntityCategoryMatcherSpringTest extends AbstractTestNGSpringContext
@Test
@SuppressWarnings("unchecked")
public void testWithRA() {
+ assert applicationContext != null;
final var matcher = applicationContext.getBean("categoryMatcherWithRA", Predicate.class);
// all four components match
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list