[java-metadata-aggregator] branch main updated: Stricter nullability
Ian Young
ian at iay.org.uk
Wed Apr 5 15:46:43 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=7bcc34ce5d7fc4c4543eb9314b5d6639a66db03d
The following commit(s) were added to refs/heads/main by this push:
new 7bcc34c Stricter nullability
7bcc34c is described below
commit 7bcc34ce5d7fc4c4543eb9314b5d6639a66db03d
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Wed Apr 5 16:46:05 2023 +0100
Stricter nullability
---
.../main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java | 5 +++++
.../src/test/java/net/shibboleth/metadata/ItemIdTest.java | 4 +++-
.../src/test/java/net/shibboleth/metadata/ItemTagTest.java | 4 +++-
.../src/test/java/net/shibboleth/metadata/MockItemTest.java | 4 +++-
.../test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java | 7 +++++--
.../net/shibboleth/metadata/dom/XMLSignatureSigningStageTest.java | 4 +++-
.../shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java | 4 +++-
.../net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java | 4 +++-
8 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/mda-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java b/mda-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
index d4facf8..eb6f555 100644
--- a/mda-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
+++ b/mda-cli/src/main/java/net/shibboleth/metadata/cli/SimpleCommandLine.java
@@ -140,11 +140,16 @@ public final class SimpleCommandLine {
*/
private static void process(@Nonnull final SimpleCommandLineArguments cli) throws ErrorException {
final String fileUri = new File(cli.getInputFile()).toURI().toString();
+ assert fileUri != null;
log.debug("Initializing Spring context with configuration file {}", fileUri);
+
try (FileSystemXmlApplicationContext appCtx = new FileSystemXmlApplicationContext(fileUri)) {
log.debug("Retrieving pipeline from Spring context");
final String pipelineName = cli.getPipelineName();
+ // Guaranteed by parseCommandLineArguments
+ assert pipelineName != null;
+
final Pipeline<?> pipeline = appCtx.getBean(pipelineName, Pipeline.class);
try {
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/ItemIdTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/ItemIdTest.java
index 837685f..9a61e23 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/ItemIdTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/ItemIdTest.java
@@ -36,11 +36,13 @@ public class ItemIdTest {
}
}
+ private static String noString;
+
@SuppressWarnings("null")
@Test
public void testNull() {
try {
- new ItemId(null);
+ new ItemId(noString);
} catch (ConstraintViolationException e) {
// expected this
}
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/ItemTagTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/ItemTagTest.java
index 467d65d..c8a839d 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/ItemTagTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/ItemTagTest.java
@@ -37,11 +37,13 @@ public class ItemTagTest {
}
}
+ private static String nothing;
+
@SuppressWarnings("null")
@Test
public void testNull() {
try {
- new ItemTag(null);
+ new ItemTag(nothing);
} catch (ConstraintViolationException e) {
// expected this
}
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/MockItemTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/MockItemTest.java
index 6b425e5..ed7a553 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/MockItemTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/MockItemTest.java
@@ -7,10 +7,12 @@ import net.shibboleth.shared.logic.ConstraintViolationException;
public class MockItemTest {
+ private static String noString;
+
@SuppressWarnings("null")
@Test(expectedExceptions=ConstraintViolationException.class)
public void testNull() {
- new MockItem(null);
+ new MockItem(noString);
}
}
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java
index 0d957d4..38234d6 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/DOMElementItemTest.java
@@ -16,16 +16,19 @@ public class DOMElementItemTest extends BaseDOMTest {
super(DOMElementItem.class);
}
+ private static Document noDocument;
+ private static Element noElement;
+
@SuppressWarnings("null")
@Test(expectedExceptions=ConstraintViolationException.class)
public void testNullDocument() {
- new DOMElementItem((Document)null);
+ new DOMElementItem(noDocument);
}
@SuppressWarnings("null")
@Test(expectedExceptions=ConstraintViolationException.class)
public void testNullElement() {
- new DOMElementItem((Element)null);
+ new DOMElementItem(noElement);
}
@Test
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 5c2f75f..5fb454f 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
@@ -158,13 +158,15 @@ public class XMLSignatureSigningStageTest extends BaseDOMTest {
assertXMLIdentical(expected, result.unwrap());
}
+ private static List<QName> noQNames;
+
@SuppressWarnings("null")
@Test
public void testSetIdAttributeNamesNull() throws Exception {
final XMLSignatureSigningStage stage = new XMLSignatureSigningStage();
stage.setId("test");
try {
- stage.setIdAttributeNames(null);
+ stage.setIdAttributeNames(noQNames);
Assert.fail("expected a constraint exception");
} catch (ConstraintViolationException e) {
// expected
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 b0541b9..8036a18 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
@@ -186,6 +186,8 @@ public class SetCacheDurationStageTest extends BaseDOMTest {
}
}
+ private static Duration noDuration;
+
/** Tests that the stage properly rejects null durations. */
@SuppressWarnings("null")
@Test
@@ -194,7 +196,7 @@ public class SetCacheDurationStageTest extends BaseDOMTest {
stage.setId("test");
try {
- stage.setCacheDuration(null);
+ stage.setCacheDuration(noDuration);
Assert.fail();
} catch (ConstraintViolationException e) {
// expected this
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 03357b2..ddbedbd 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
@@ -175,6 +175,8 @@ public class SetValidUntilStageTest extends BaseDOMTest {
}
}
+ private static Duration noDuration;
+
/** Tests that the stage properly rejects null durations. */
@SuppressWarnings("null")
@Test
@@ -183,7 +185,7 @@ public class SetValidUntilStageTest extends BaseDOMTest {
stage.setId("test");
try {
- stage.setValidityDuration(null);
+ stage.setValidityDuration(noDuration);
Assert.fail();
} catch (ConstraintViolationException e) {
// expected this
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list