[java-metadata-aggregator] branch main updated: Remove Java assert statements
Ian Young
ian at iay.org.uk
Fri Nov 6 10:01:46 UTC 2020
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=e05bea330e79bec4e3dd7f66d0826917754b37f6
The following commit(s) were added to refs/heads/main by this push:
new e05bea3 Remove Java assert statements
e05bea3 is described below
commit e05bea330e79bec4e3dd7f66d0826917754b37f6
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Fri Nov 6 10:01:43 2020 +0000
Remove Java assert statements
Not obvious why these were present: they are disabled by default, were only guarding NPEs (i.e., enforcing @Nonnull) and are somewhat incompatible with profiling (as by definition you can't exercise both sides of the branch).
---
.../java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java | 3 ---
.../src/main/java/net/shibboleth/metadata/dom/Container.java | 3 ---
.../src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java | 1 -
.../java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitor.java | 2 --
.../net/shibboleth/metadata/dom/impl/XMLSignatureValidator.java | 6 ------
.../shibboleth/metadata/dom/saml/AbstractSAMLTraversalStage.java | 1 -
.../metadata/dom/saml/SAMLStringElementCheckingStage.java | 2 --
.../shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java | 2 --
.../main/java/net/shibboleth/metadata/pipeline/FutureSupport.java | 1 -
9 files changed, 21 deletions(-)
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
index a4851dd..a87a3db 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/AbstractDOMTraversalStage.java
@@ -132,9 +132,6 @@ public abstract class AbstractDOMTraversalStage<C extends DOMTraversalContext>
*/
protected void addError(@Nonnull final Item<Element> item, @Nonnull final Element element,
@Nonnull final String error) {
- assert item != null;
- assert element != null;
- assert error != null;
final ClassToInstanceMultiMap<ItemMetadata> metadata = item.getItemMetadata();
final String prefix = errorPrefix(element);
metadata.put(new ErrorStatus(getId(), prefix + error));
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java
index 6cfd1c5..59f1880 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/Container.java
@@ -278,9 +278,6 @@ public class Container {
public Container locateChild(@Nonnull final Predicate<Element> matcher,
@Nonnull final Function<Container, Element> maker,
@Nonnull final ChildAddingStrategy adder) {
- assert matcher != null;
- assert maker != null;
- assert adder != null;
// Return an existing child if one exists
final Container existing = findChild(matcher);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java
index dc47fc4..2342aa7 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/ElementMatcher.java
@@ -45,7 +45,6 @@ public class ElementMatcher implements Predicate<Element> {
* @param qnameToMatch qualified name ({@link QName}) to match
*/
public ElementMatcher(@Nullable final QName qnameToMatch) {
- assert qnameToMatch != null;
qname = qnameToMatch;
}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitor.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitor.java
index 325da6d..7b57c25 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitor.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/WhitespaceTrimmingVisitor.java
@@ -37,8 +37,6 @@ class WhitespaceTrimmingVisitor implements NodeVisitor, ElementVisitor, AttrVisi
@Override
public void visitNode(@Nonnull final Node visited, @Nonnull final Item<Element> item) {
- assert visited != null;
- assert item != null;
final String originalText = visited.getTextContent();
final String newText = originalText.trim();
visited.setTextContent(newText);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureValidator.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureValidator.java
index 98e33e3..e600274 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureValidator.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/impl/XMLSignatureValidator.java
@@ -164,9 +164,6 @@ public final class XMLSignatureValidator {
private void markIdAttribute(@Nonnull final Element docElement, @Nonnull final Reference reference)
throws ValidationException {
- assert docElement != null;
- assert reference != null;
-
final String referenceURI = reference.getURI();
/*
@@ -227,9 +224,6 @@ public final class XMLSignatureValidator {
public void verifySignature(@Nonnull final Element docElement, @Nonnull final Element signatureElement)
throws ValidationException {
- assert docElement != null;
- assert signatureElement != null;
-
log.debug("Creating XML security library XMLSignature object");
XMLSignature signature = null;
try {
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AbstractSAMLTraversalStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AbstractSAMLTraversalStage.java
index e0c9404..f8aaafc 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AbstractSAMLTraversalStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/AbstractSAMLTraversalStage.java
@@ -55,7 +55,6 @@ public abstract class AbstractSAMLTraversalStage <C extends DOMTraversalContext>
* @return ancestor EntityDescriptor {@link Element}, or null.
*/
private Element ancestorEntity(@Nonnull final Element element) {
- assert element != null;
for (Element e = element; e != null; e = (Element) e.getParentNode()) {
if (SAMLMetadataSupport.isEntityDescriptor(e)) {
return e;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage.java
index bcf3b54..407690c 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SAMLStringElementCheckingStage.java
@@ -50,7 +50,6 @@ public class SAMLStringElementCheckingStage extends AbstractElementVisitingStage
* @return ancestor EntityDescriptor {@link Element}, or null.
*/
private Element ancestorEntity(@Nonnull final Element element) {
- assert element != null;
for (Element e = element; e != null; e = (Element) e.getParentNode()) {
if (SAMLMetadataSupport.isEntityDescriptor(e)) {
return e;
@@ -69,7 +68,6 @@ public class SAMLStringElementCheckingStage extends AbstractElementVisitingStage
* @return <code>true</code> if the {@link Node}'s value matches
*/
private static boolean match(@Nonnull final Node visited) {
- assert visited != null;
final String textContent = visited.getTextContent();
final Matcher matcher = ALL_WHITE_SPACE_PATTERN.matcher(textContent);
return matcher.matches();
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
index 61e4be7..65fc6e8 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdui/IPHintValidationStage.java
@@ -67,8 +67,6 @@ public class IPHintValidationStage extends AbstractDOMTraversalStage<DOMTraversa
@Override
protected void visit(@Nonnull final Element ipHint, @Nonnull final DOMTraversalContext context) {
- assert ipHint != null;
- assert context != null;
final String hint = ipHint.getTextContent();
try {
final IPRange range = IPRange.parseCIDRBlock(hint);
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java
index 44b8048..792d790 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/FutureSupport.java
@@ -120,7 +120,6 @@ public final class FutureSupport {
*/
@Nonnull public static <T> List<Item<T>> futureItems(
@Nonnull final Future<List<Item<T>>> future) throws StageProcessingException {
- assert future != null;
try {
final List<Item<T>> value = future.get();
if (value == null) {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list