[java-metadata-aggregator] branch master updated: MDA-248 - Remove Serializable support from Item and ItemMetadata
Ian Young
ian at iay.org.uk
Mon Jun 15 13:42:44 UTC 2020
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch master
in repository java-metadata-aggregator.
View the commit online:
http://git.shibboleth.net/view/?p=java-metadata-aggregator.git;a=commit;h=72dd3337894811211baaa2d5379cd0b558eaef7c
The following commit(s) were added to refs/heads/master by this push:
new 72dd333 MDA-248 - Remove Serializable support from Item and ItemMetadata
72dd333 is described below
commit 72dd3337894811211baaa2d5379cd0b558eaef7c
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Mon Jun 15 14:42:39 2020 +0100
MDA-248 - Remove Serializable support from Item and ItemMetadata
https://issues.shibboleth.net/jira/browse/MDA-248
---
.../src/main/java/net/shibboleth/metadata/AbstractItem.java | 3 ---
.../src/main/java/net/shibboleth/metadata/ErrorStatus.java | 5 +----
.../src/main/java/net/shibboleth/metadata/InfoStatus.java | 5 +----
aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java | 4 +---
.../src/main/java/net/shibboleth/metadata/ItemId.java | 5 +----
.../src/main/java/net/shibboleth/metadata/ItemMetadata.java | 4 +---
.../src/main/java/net/shibboleth/metadata/ItemTag.java | 5 +----
.../src/main/java/net/shibboleth/metadata/StatusMetadata.java | 5 +----
.../src/main/java/net/shibboleth/metadata/WarningStatus.java | 5 +----
.../src/main/java/net/shibboleth/metadata/dom/DOMElementItem.java | 5 +----
.../shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthority.java | 5 -----
.../main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java | 3 ---
.../src/test/java/net/shibboleth/metadata/MockItem.java | 5 +----
.../metadata/dom/MultiOutputXSLTransformationStageTest.java | 4 +---
.../net/shibboleth/metadata/dom/XSLTtransformationStageTest.java | 2 --
.../java/net/shibboleth/metadata/dom/XSLValidationStageTest.java | 4 +---
16 files changed, 12 insertions(+), 57 deletions(-)
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java
index b2625c7..5fddd97 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/AbstractItem.java
@@ -31,9 +31,6 @@ import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
@ThreadSafe
public abstract class AbstractItem<T> implements Item<T> {
- /** Serial version UID. */
- private static final long serialVersionUID = -3694943988855243697L;
-
/** The actual data held by the item. */
private T data;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ErrorStatus.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ErrorStatus.java
index 2a7916f..6a030fc 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ErrorStatus.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ErrorStatus.java
@@ -24,9 +24,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
/** A type of {@link StatusMetadata} that indicates something is definitely wrong with the Item. */
public class ErrorStatus extends StatusMetadata {
- /** Serial version UID. */
- private static final long serialVersionUID = -559355929721764600L;
-
/**
* Constructor.
*
@@ -36,4 +33,4 @@ public class ErrorStatus extends StatusMetadata {
public ErrorStatus(@Nonnull @NotEmpty final String componentId, @Nonnull @NotEmpty final String statusMessage) {
super(componentId, statusMessage);
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/InfoStatus.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/InfoStatus.java
index 936d9d6..c6543c5 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/InfoStatus.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/InfoStatus.java
@@ -27,9 +27,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
*/
public class InfoStatus extends StatusMetadata {
- /** Serial version UID. */
- private static final long serialVersionUID = 4418261627233729537L;
-
/**
* Constructor.
*
@@ -39,4 +36,4 @@ public class InfoStatus extends StatusMetadata {
public InfoStatus(@Nonnull @NotEmpty final String componentId, @Nonnull @NotEmpty final String statusMessage) {
super(componentId, statusMessage);
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java
index 770c7d1..5f119d8 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/Item.java
@@ -17,8 +17,6 @@
package net.shibboleth.metadata;
-import java.io.Serializable;
-
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -29,7 +27,7 @@ import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
*
* @param <T> type of metadata element
*/
-public interface Item<T> extends Serializable {
+public interface Item<T> {
/**
* Gets the wrapped item data.
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java
index 538d84c..911f90a 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemId.java
@@ -36,9 +36,6 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
@ThreadSafe
public class ItemId implements ItemMetadata, Comparable<ItemId> {
- /** Serial version UID. */
- private static final long serialVersionUID = -3907907112463674533L;
-
/** Unique ID for the Item. */
private final String id;
@@ -85,4 +82,4 @@ public class ItemId implements ItemMetadata, Comparable<ItemId> {
@Override public int compareTo(final ItemId o) {
return id.compareTo(o.id);
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemMetadata.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemMetadata.java
index 33de559..cf9dcb9 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemMetadata.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemMetadata.java
@@ -17,8 +17,6 @@
package net.shibboleth.metadata;
-import java.io.Serializable;
-
import javax.annotation.concurrent.ThreadSafe;
/**
@@ -28,6 +26,6 @@ import javax.annotation.concurrent.ThreadSafe;
* reference the same {@link ItemMetadata} objects as the original.
*/
@ThreadSafe
-public interface ItemMetadata extends Serializable {
+public interface ItemMetadata {
}
\ No newline at end of file
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemTag.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemTag.java
index ef2ac78..aad9775 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemTag.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/ItemTag.java
@@ -28,9 +28,6 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
@ThreadSafe
public class ItemTag implements ItemMetadata {
- /** Serial version UID. */
- private static final long serialVersionUID = 4727990464411083511L;
-
/** Item tag. */
private final String tag;
@@ -51,4 +48,4 @@ public class ItemTag implements ItemMetadata {
@Nonnull public String getTag() {
return tag;
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java
index 8058b0e..3464cdd 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/StatusMetadata.java
@@ -26,9 +26,6 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** A {@link ItemMetadata} implementation that carries status information about an {@link Item}. */
public class StatusMetadata implements ItemMetadata {
- /** Serial version UID. */
- private static final long serialVersionUID = 9058387763020864155L;
-
/** The component that generated this status information. */
private final String component;
@@ -65,4 +62,4 @@ public class StatusMetadata implements ItemMetadata {
@Nonnull public String getStatusMessage() {
return message;
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/WarningStatus.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/WarningStatus.java
index 842b190..b4c6ea6 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/WarningStatus.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/WarningStatus.java
@@ -30,9 +30,6 @@ import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
*/
public class WarningStatus extends StatusMetadata {
- /** Serial version UID. */
- private static final long serialVersionUID = -586972544551282634L;
-
/**
* Constructor.
*
@@ -42,4 +39,4 @@ public class WarningStatus extends StatusMetadata {
public WarningStatus(@Nonnull @NotEmpty final String componentId, @Nonnull @NotEmpty final String statusMessage) {
super(componentId, statusMessage);
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementItem.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementItem.java
index 1a5a8e5..c788814 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementItem.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/DOMElementItem.java
@@ -39,9 +39,6 @@ import org.w3c.dom.Element;
@ThreadSafe
public class DOMElementItem extends AbstractItem<Element> {
- /** Serial version UID. */
- private static final long serialVersionUID = -5122481126094725529L;
-
/**
* Constructor. The document element of the given document becomes the {@link Element} value for this item.
*
@@ -85,4 +82,4 @@ public class DOMElementItem extends AbstractItem<Element> {
ItemMetadataSupport.addAll(clone, getItemMetadata().values());
return clone;
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthority.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthority.java
index 90a124a..32c7db5 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthority.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/mdrpi/RegistrationAuthority.java
@@ -34,11 +34,6 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
@ThreadSafe
public class RegistrationAuthority implements ItemMetadata {
- /**
- * Serial version UID for the class.
- */
- private static final long serialVersionUID = -4485180950229424894L;
-
/** Registration authority URI. */
private final String registrationAuthority;
diff --git a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java
index 06fa5ff..38511bf 100644
--- a/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java
+++ b/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/ComponentInfo.java
@@ -30,9 +30,6 @@ import net.shibboleth.utilities.java.support.primitive.StringSupport;
/** Some basic information related to a component's processing of an {@link net.shibboleth.metadata.Item}. */
public class ComponentInfo implements ItemMetadata {
- /** Serial version UID. */
- private static final long serialVersionUID = -2181091708008092869L;
-
/** ID of the component that operated on the element. */
private String componentId;
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java
index 31a08f0..c0a6c3d 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/MockItem.java
@@ -25,9 +25,6 @@ import net.shibboleth.utilities.java.support.collection.ClassToInstanceMultiMap;
/** A mock implementation of {@link Item}. */
public class MockItem extends AbstractItem<String> {
- /** Serial version UID. */
- private static final long serialVersionUID = 0L;
-
/**
* Constructor.
*
@@ -80,4 +77,4 @@ public class MockItem extends AbstractItem<String> {
}
return false;
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java
index 465e41d..2f5e91c 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/MultiOutputXSLTransformationStageTest.java
@@ -257,8 +257,6 @@ public class MultiOutputXSLTransformationStageTest extends BaseDOMTest {
/** Simple marker object to test correct passage of {@link ItemMetadata} through pipeline stages. */
private static class TestInfo implements ItemMetadata {
- /** Serial version UIDs. */
- private static final long serialVersionUID = -4133926323393787487L;
}
-}
\ No newline at end of file
+}
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
index bf18847..75f8146 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLTtransformationStageTest.java
@@ -246,8 +246,6 @@ public class XSLTtransformationStageTest extends BaseDOMTest {
/** Simple marker object to test correct passage of {@link ItemMetadata} through pipeline stages. */
private static class TestInfo implements ItemMetadata {
- /** Serial version UIDs. */
- private static final long serialVersionUID = -4133926323393787487L;
}
@Test
diff --git a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java
index 05f173c..7c9f55e 100644
--- a/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java
+++ b/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/XSLValidationStageTest.java
@@ -139,7 +139,5 @@ public class XSLValidationStageTest extends BaseDOMTest {
/** Simple marker object to test correct passage of {@link ItemMetadata} through pipeline stages. */
private static class TestInfo implements ItemMetadata {
- /** Serial version UIDs. */
- private static final long serialVersionUID = -4133926323393787487L;
}
-}
\ No newline at end of file
+}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list