You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2017/06/04 19:11:52 UTC
svn commit: r1797604 - in /webservices/axiom/trunk/axiom-api: ./
src/main/java/org/apache/axiom/om/ src/main/java/org/apache/axiom/om/util/
src/main/java/org/apache/axiom/util/stax/dialect/
src/test/java/org/apache/axiom/util/stax/dialect/
Author: veithen
Date: Sun Jun 4 19:11:52 2017
New Revision: 1797604
URL: http://svn.apache.org/viewvc?rev=1797604&view=rev
Log:
Deprecate StAXUtils.createXMLStreamWriter and related APIs; we now use our own serializer.
Modified:
webservices/axiom/trunk/axiom-api/pom.xml
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXWriterConfiguration.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/StAXImplementation.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamWriterThreadSafety.java
Modified: webservices/axiom/trunk/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/pom.xml?rev=1797604&r1=1797603&r2=1797604&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/axiom-api/pom.xml Sun Jun 4 19:11:52 2017
@@ -329,7 +329,6 @@
<!-- TODO -->
org.apache.axiom.om.impl.OMMultipartWriter -> org.apache.axiom.om.util.CommonUtils,
<!-- Incorrect layering -->
- org.apache.axiom.om.util.StAXWriterConfiguration -> org.apache.axiom.util.stax.dialect.StAXDialect,
org.apache.axiom.om.util.StAXParserConfiguration -> org.apache.axiom.util.stax.dialect.StAXDialect
</ignore>
</configuration>
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java?rev=1797604&r1=1797603&r2=1797604&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMOutputFormat.java Sun Jun 4 19:11:52 2017
@@ -68,6 +68,7 @@ public class OMOutputFormat {
public static final String ACTION_PROPERTY = "action";
+ @SuppressWarnings("deprecation")
private StAXWriterConfiguration writerConfiguration;
// The value of this property is a Boolean.
@@ -457,6 +458,7 @@ public class OMOutputFormat {
*
* @return the current configuration; {@link StAXWriterConfiguration#DEFAULT} if none has been
* set explicitly
+ * @deprecated
*/
public StAXWriterConfiguration getStAXWriterConfiguration() {
return writerConfiguration == null ? StAXWriterConfiguration.DEFAULT : writerConfiguration;
@@ -468,6 +470,7 @@ public class OMOutputFormat {
*
* @param writerConfiguration
* the configuration
+ * @deprecated
*/
public void setStAXWriterConfiguration(StAXWriterConfiguration writerConfiguration) {
this.writerConfiguration = writerConfiguration;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java?rev=1797604&r1=1797603&r2=1797604&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXUtils.java Sun Jun 4 19:11:52 2017
@@ -86,6 +86,7 @@ public class StAXUtils {
private static final Map<StAXParserConfiguration,XMLInputFactory> inputFactoryMap
= Collections.synchronizedMap(new WeakHashMap<StAXParserConfiguration,XMLInputFactory>());
+ @SuppressWarnings("deprecation")
private static final Map<StAXWriterConfiguration,XMLOutputFactory> outputFactoryMap
= Collections.synchronizedMap(new WeakHashMap<StAXWriterConfiguration,XMLOutputFactory>());
@@ -202,6 +203,7 @@ public class StAXUtils {
* configuration.
*
* @return an {@link XMLOutputFactory} instance.
+ * @deprecated
*/
public static XMLOutputFactory getXMLOutputFactory() {
return getXMLOutputFactory(null);
@@ -257,12 +259,18 @@ public class StAXUtils {
}
}
+ /**
+ * @deprecated
+ */
public static XMLStreamWriter createXMLStreamWriter(OutputStream out)
throws XMLStreamException {
return createXMLStreamWriter(null, out);
}
+ /**
+ * @deprecated
+ */
public static XMLStreamWriter createXMLStreamWriter(StAXWriterConfiguration configuration,
OutputStream out) throws XMLStreamException {
XMLStreamWriter writer = getXMLOutputFactory(configuration).createXMLStreamWriter(out, "utf-8");
@@ -272,12 +280,18 @@ public class StAXUtils {
return writer;
}
+ /**
+ * @deprecated
+ */
public static XMLStreamWriter createXMLStreamWriter(OutputStream out, String encoding)
throws XMLStreamException {
return createXMLStreamWriter(null, out, encoding);
}
+ /**
+ * @deprecated
+ */
public static XMLStreamWriter createXMLStreamWriter(StAXWriterConfiguration configuration,
OutputStream out, String encoding) throws XMLStreamException {
XMLStreamWriter writer = getXMLOutputFactory(configuration).createXMLStreamWriter(out, encoding);
@@ -287,12 +301,18 @@ public class StAXUtils {
return writer;
}
+ /**
+ * @deprecated
+ */
public static XMLStreamWriter createXMLStreamWriter(final Writer out)
throws XMLStreamException {
return createXMLStreamWriter(null, out);
}
+ /**
+ * @deprecated
+ */
public static XMLStreamWriter createXMLStreamWriter(StAXWriterConfiguration configuration,
Writer out) throws XMLStreamException {
XMLStreamWriter writer = getXMLOutputFactory(configuration).createXMLStreamWriter(out);
@@ -419,6 +439,9 @@ public class StAXUtils {
return f;
}
+ /**
+ * @deprecated
+ */
private static XMLOutputFactory newXMLOutputFactory(final ClassLoader classLoader,
final StAXWriterConfiguration configuration) {
return AccessController.doPrivileged(new PrivilegedAction<XMLOutputFactory>() {
@@ -462,6 +485,7 @@ public class StAXUtils {
* @param configuration
* the configuration applied to the requested factory
* @return an {@link XMLOutputFactory} instance.
+ * @deprecated
*/
public static XMLOutputFactory getXMLOutputFactory(StAXWriterConfiguration configuration) {
if (configuration == null) {
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXWriterConfiguration.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXWriterConfiguration.java?rev=1797604&r1=1797603&r2=1797604&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXWriterConfiguration.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/util/StAXWriterConfiguration.java Sun Jun 4 19:11:52 2017
@@ -35,6 +35,7 @@ import org.apache.axiom.util.stax.dialec
* cache keys.
*
* @see StAXParserConfiguration
+ * @deprecated
*/
public interface StAXWriterConfiguration {
/**
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java?rev=1797604&r1=1797603&r2=1797604&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialect.java Sun Jun 4 19:11:52 2017
@@ -250,6 +250,7 @@ public interface StAXDialect {
* @param factory
* the factory to make thread safe
* @return the thread safe factory
+ * @deprecated
*/
XMLOutputFactory makeThreadSafe(XMLOutputFactory factory);
@@ -270,6 +271,7 @@ public interface StAXDialect {
* @param factory
* the factory to normalize
* @return the normalized factory
+ * @deprecated
*/
XMLOutputFactory normalize(XMLOutputFactory factory);
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java?rev=1797604&r1=1797603&r2=1797604&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/util/stax/dialect/StAXDialectDetector.java Sun Jun 4 19:11:52 2017
@@ -133,6 +133,7 @@ public class StAXDialectDetector {
* @return the normalized factory
*
* @see StAXDialect#normalize(XMLOutputFactory)
+ * @deprecated
*/
public static XMLOutputFactory normalize(XMLOutputFactory factory) {
return getDialect(factory).normalize(factory);
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/StAXImplementation.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/StAXImplementation.java?rev=1797604&r1=1797603&r2=1797604&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/StAXImplementation.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/StAXImplementation.java Sun Jun 4 19:11:52 2017
@@ -95,6 +95,7 @@ public final class StAXImplementation {
return newFactory(XMLOutputFactory.class);
}
+ @SuppressWarnings("deprecation")
public XMLOutputFactory newNormalizedXMLOutputFactory() {
XMLOutputFactory factory = newXMLOutputFactory();
if (dialect == null) {
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamWriterThreadSafety.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamWriterThreadSafety.java?rev=1797604&r1=1797603&r2=1797604&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamWriterThreadSafety.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestCreateXMLStreamWriterThreadSafety.java Sun Jun 4 19:11:52 2017
@@ -31,6 +31,7 @@ public class TestCreateXMLStreamWriterTh
super(staxImpl);
}
+ @SuppressWarnings("deprecation")
protected void runTest() throws Throwable {
final XMLOutputFactory factory = staxImpl.getDialect().makeThreadSafe(staxImpl.newNormalizedXMLOutputFactory());
ConcurrentTestUtils.testThreadSafety(new Action() {