You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2020/01/24 09:32:53 UTC
svn commit: r1873093 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/c14n/
main/java/org/apache/xml/security/c14n/implementations/
test/java/org/apache/xml/security/test/dom/c14n/implementations/
Author: coheigea
Date: Fri Jan 24 09:32:53 2020
New Revision: 1873093
URL: http://svn.apache.org/viewvc?rev=1873093&view=rev
Log:
SANTUARIO-521 - Remove unused method
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java Fri Jan 24 09:32:53 2020
@@ -62,12 +62,6 @@ public abstract class CanonicalizerSpi {
public abstract String engineGetURI();
/**
- * Returns true if comments are included
- * @return true if comments are included
- */
- public abstract boolean engineGetIncludeComments();
-
- /**
* C14n a nodeset
*
* @param xpathNodeSet
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java Fri Jan 24 09:32:53 2020
@@ -32,7 +32,4 @@ public class Canonicalizer11_OmitComment
return Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
}
- public final boolean engineGetIncludeComments() {
- return false;
- }
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java Fri Jan 24 09:32:53 2020
@@ -32,7 +32,4 @@ public class Canonicalizer11_WithComment
return Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS;
}
- public final boolean engineGetIncludeComments() {
- return true;
- }
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java Fri Jan 24 09:32:53 2020
@@ -34,8 +34,4 @@ public class Canonicalizer20010315ExclOm
return Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return false;
- }
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java Fri Jan 24 09:32:53 2020
@@ -38,8 +38,4 @@ public class Canonicalizer20010315ExclWi
return Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return true;
- }
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java Fri Jan 24 09:32:53 2020
@@ -37,8 +37,4 @@ public class Canonicalizer20010315OmitCo
return Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return false;
- }
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java Fri Jan 24 09:32:53 2020
@@ -36,8 +36,4 @@ public class Canonicalizer20010315WithCo
return Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return true;
- }
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java Fri Jan 24 09:32:53 2020
@@ -80,9 +80,9 @@ public abstract class CanonicalizerBase
private static final byte[] AMP = {'&','a','m','p',';'};
private static final byte[] EQUALS_STR = {'=','\"'};
+ private boolean includeComments;
private List<NodeFilter> nodeFilter;
- private boolean includeComments;
private Set<Node> xpathNodeSet;
/**
@@ -95,7 +95,7 @@ public abstract class CanonicalizerBase
*
* @param includeComments
*/
- public CanonicalizerBase(boolean includeComments) {
+ protected CanonicalizerBase(boolean includeComments) {
this.includeComments = includeComments;
}
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java Fri Jan 24 09:32:53 2020
@@ -166,11 +166,6 @@ public class CanonicalizerPhysical exten
return Canonicalizer.ALGO_ID_C14N_PHYSICAL;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return true;
- }
-
@Override
protected void outputPItoWriter(ProcessingInstruction currentPI,
OutputStream writer, int position) throws IOException {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java?rev=1873093&r1=1873092&r2=1873093&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java Fri Jan 24 09:32:53 2020
@@ -62,10 +62,6 @@ public class MockCanonicalizationMethod
_impl.engineCanonicalizeXPathNodeSet(xpathNodeSet, inclusiveNamespaces, writer);
}
- public boolean engineGetIncludeComments() {
- return _impl.engineGetIncludeComments();
- }
-
public String engineGetURI() {
return MOCK_CANONICALIZATION_METHOD;
}