[java-metadata-aggregator] branch main updated: MDA-272 - Move CRDetectionStage to the dom.saml package
Ian Young
ian at iay.org.uk
Thu Oct 20 13:13:57 UTC 2022
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=9e7d56411b5df43ca1d9b7f23427503d95018370
The following commit(s) were added to refs/heads/main by this push:
new 9e7d564 MDA-272 - Move CRDetectionStage to the dom.saml package
9e7d564 is described below
commit 9e7d56411b5df43ca1d9b7f23427503d95018370
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Oct 20 14:13:55 2022 +0100
MDA-272 - Move CRDetectionStage to the dom.saml package
https://shibboleth.atlassian.net/browse/MDA-272
---
.../net/shibboleth/metadata/dom/{ => saml}/CRDetectionStage.java | 9 +++++----
.../src/main/resources/net/shibboleth/metadata/beans.xml | 6 +++---
.../shibboleth/metadata/dom/{ => saml}/CRDetectionStageTest.java | 3 ++-
.../metadata/dom/{ => saml}/CRDetectionStage-assumptions.xml | 0
.../metadata/dom/{ => saml}/CRDetectionStage-attribute.xml | 0
.../metadata/dom/{ => saml}/CRDetectionStage-comment.xml | 0
.../metadata/dom/{ => saml}/CRDetectionStage-element.xml | 0
.../metadata/dom/{ => saml}/CRDetectionStage-multiple.xml | 0
.../dom/{ => saml}/CRDetectionStage-nested-attribute.xml | 0
.../metadata/dom/{ => saml}/CRDetectionStage-nested-element.xml | 0
.../shibboleth/metadata/dom/{ => saml}/CRDetectionStage-ok.xml | 0
11 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/mda-framework/src/main/java/net/shibboleth/metadata/dom/CRDetectionStage.java b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/CRDetectionStage.java
similarity index 93%
rename from mda-framework/src/main/java/net/shibboleth/metadata/dom/CRDetectionStage.java
rename to mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/CRDetectionStage.java
index 6e27fb8..e091b98 100644
--- a/mda-framework/src/main/java/net/shibboleth/metadata/dom/CRDetectionStage.java
+++ b/mda-framework/src/main/java/net/shibboleth/metadata/dom/saml/CRDetectionStage.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.metadata.dom;
+package net.shibboleth.metadata.dom.saml;
import javax.annotation.Nonnull;
import javax.annotation.concurrent.ThreadSafe;
@@ -25,7 +25,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import net.shibboleth.metadata.Item;
-import net.shibboleth.metadata.dom.saml.AbstractSAMLTraversalStage;
+import net.shibboleth.metadata.dom.SimpleDOMTraversalContext;
import net.shibboleth.metadata.pipeline.StageProcessingException;
/**
@@ -86,7 +86,8 @@ public class CRDetectionStage extends AbstractSAMLTraversalStage<CRDetectionStag
}
@Override
- protected void visit(final Element element, final Context context) throws StageProcessingException {
+ protected void visit(@Nonnull final Element element, @Nonnull final Context context)
+ throws StageProcessingException {
// Only permit one error; short-circuit any further examinations
if (context.hasError()) {
return;
@@ -121,7 +122,7 @@ public class CRDetectionStage extends AbstractSAMLTraversalStage<CRDetectionStag
}
@Override
- protected Context buildContext(@Nonnull final Item<Element> item) {
+ protected @Nonnull Context buildContext(@Nonnull final Item<Element> item) {
return new Context(item);
}
diff --git a/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
index f02b918..67c5ad1 100644
--- a/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
+++ b/mda-framework/src/main/resources/net/shibboleth/metadata/beans.xml
@@ -49,9 +49,6 @@
net.shibboleth.metadata.dom
-->
- <bean id="mda.CRDetectionStage" abstract="true" parent="mda.stage_parent"
- class="net.shibboleth.metadata.dom.CRDetectionStage"/>
-
<bean id="mda.DOMElementSerializer" abstract="true"
class="net.shibboleth.metadata.dom.DOMElementSerializer"/>
@@ -120,6 +117,9 @@
<bean id="mda.ContactPersonFilterStage" abstract="true" parent="mda.stage_parent"
class="net.shibboleth.metadata.dom.saml.ContactPersonFilterStage"/>
+ <bean id="mda.CRDetectionStage" abstract="true" parent="mda.stage_parent"
+ class="net.shibboleth.metadata.dom.saml.CRDetectionStage"/>
+
<bean id="mda.DiscoFeedCollectionSerializer" abstract="true" parent="mda.component_parent"
class="net.shibboleth.metadata.dom.saml.DiscoFeedCollectionSerializer"/>
diff --git a/mda-framework/src/test/java/net/shibboleth/metadata/dom/CRDetectionStageTest.java b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/CRDetectionStageTest.java
similarity index 98%
rename from mda-framework/src/test/java/net/shibboleth/metadata/dom/CRDetectionStageTest.java
rename to mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/CRDetectionStageTest.java
index 6a2f992..43f0975 100644
--- a/mda-framework/src/test/java/net/shibboleth/metadata/dom/CRDetectionStageTest.java
+++ b/mda-framework/src/test/java/net/shibboleth/metadata/dom/saml/CRDetectionStageTest.java
@@ -16,7 +16,7 @@
*/
-package net.shibboleth.metadata.dom;
+package net.shibboleth.metadata.dom.saml;
import java.io.InputStream;
import java.util.ArrayList;
@@ -32,6 +32,7 @@ import net.shibboleth.metadata.ErrorStatus;
import net.shibboleth.metadata.InfoStatus;
import net.shibboleth.metadata.Item;
import net.shibboleth.metadata.WarningStatus;
+import net.shibboleth.metadata.dom.BaseDOMTest;
import net.shibboleth.utilities.java.support.xml.BasicParserPool;
public class CRDetectionStageTest extends BaseDOMTest {
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-assumptions.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-assumptions.xml
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-assumptions.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-assumptions.xml
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-attribute.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-attribute.xml
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-attribute.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-attribute.xml
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-comment.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-comment.xml
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-comment.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-comment.xml
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-element.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-element.xml
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-element.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-element.xml
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-multiple.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-multiple.xml
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-multiple.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-multiple.xml
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-attribute.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-nested-attribute.xml
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-attribute.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-nested-attribute.xml
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-element.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-nested-element.xml
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-nested-element.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-nested-element.xml
diff --git a/mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-ok.xml b/mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-ok.xml
similarity index 100%
rename from mda-framework/src/test/resources/net/shibboleth/metadata/dom/CRDetectionStage-ok.xml
rename to mda-framework/src/test/resources/net/shibboleth/metadata/dom/saml/CRDetectionStage-ok.xml
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list