[java-shib-metadata] branch main updated: Add a couple of asserts.
Scott Cantor
cantor.2 at osu.edu
Tue Mar 7 21:18:35 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-metadata.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=d9f20486f50d37f03a3f870fec2aea1cffb84c80
The following commit(s) were added to refs/heads/main by this push:
new d9f20486 Add a couple of asserts.
d9f20486 is described below
commit d9f20486f50d37f03a3f870fec2aea1cffb84c80
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 7 16:18:32 2023 -0500
Add a couple of asserts.
---
.../src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java | 3 +++
.../spring/metadata/filter/EntityAttributesFilterParser.java | 2 ++
2 files changed, 5 insertions(+)
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java
index a4819118..68a64e55 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/ScriptTypeBeanParser.java
@@ -61,6 +61,9 @@ public final class ScriptTypeBeanParser {
builder.addPropertyReference("customObject", customRef);
}
final Element scriptChild = ElementSupport.getFirstChildElement(element);
+ // By virtue of schema...
+ assert scriptChild != null;
+
builder.addConstructorArgValue(ElementSupport.getElementContentAsString(scriptChild));
if (ElementSupport.isElementNamed(scriptChild, element.getNamespaceURI(), "Script")) {
builder.setFactoryMethod("inlineScript");
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java
index 55e506ac..2b3dfd7b 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/filter/EntityAttributesFilterParser.java
@@ -84,6 +84,8 @@ public class EntityAttributesFilterParser extends AbstractCustomBeanDefinitionPa
ManagedSet<String> entitySet = new ManagedSet<>();
Element child = ElementSupport.getFirstChildElement(element);
+ // By virtue of schema...
+ assert child != null;
// Check for Predicate at the top.
if (ElementSupport.isElementNamed(child, AbstractMetadataProviderParser.METADATA_NAMESPACE,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list