You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/10/24 22:45:05 UTC
svn commit: r1401872 - in /maven/shared/trunk/maven-shared-utils/src:
main/java/org/apache/maven/shared/utils/cli/
main/java/org/apache/maven/shared/utils/io/
main/java/org/apache/maven/shared/utils/xml/
main/java/org/apache/maven/shared/utils/xml/pull...
Author: krosenvold
Date: Wed Oct 24 20:45:04 2012
New Revision: 1401872
URL: http://svn.apache.org/viewvc?rev=1401872&view=rev
Log:
o Removed deprecated methods
Modified:
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java
maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java
maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java?rev=1401872&r1=1401871&r2=1401872&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/cli/Commandline.java Wed Oct 24 20:45:04 2012
@@ -411,23 +411,6 @@ public class Commandline
return shell;
}
- /**
- * @deprecated Use {@link CommandLineUtils#translateCommandline(String)} instead.
- */
- public static String[] translateCommandline( String toProcess )
- throws Exception
- {
- return CommandLineUtils.translateCommandline( toProcess );
- }
-
- /**
- * @deprecated Use {@link CommandLineUtils#toString(String[])} instead.
- */
- public static String toString( String[] line )
- {
- return CommandLineUtils.toString( line );
- }
-
public static class Argument
implements Arg
{
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java?rev=1401872&r1=1401871&r2=1401872&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/io/IOUtil.java Wed Oct 24 20:45:04 2012
@@ -461,27 +461,6 @@ public final class IOUtil
output.write( input );
}
- /**
- * Copy bytes from an <code>InputStream</code> to an
- * <code>OutputStream</code>, with buffering.
- * This is equivalent to passing a
- * {@link java.io.BufferedInputStream} and
- * {@link java.io.BufferedOutputStream} to {@link #copy(InputStream, OutputStream)},
- * and flushing the output stream afterwards. The streams are not closed
- * after the copy.
- *
- * @deprecated Buffering streams is actively harmful! See the class description as to why. Use
- * {@link #copy(InputStream, OutputStream)} instead.
- */
- public static void bufferedCopy( @Nonnull final InputStream input, @Nonnull final OutputStream output )
- throws IOException
- {
- final BufferedInputStream in = new BufferedInputStream( input );
- final BufferedOutputStream out = new BufferedOutputStream( output );
- copy( in, out );
- out.flush();
- }
-
///////////////////////////////////////////////////////////////
// String -> byte[]
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java?rev=1401872&r1=1401871&r2=1401872&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/Xpp3DomWriter.java Wed Oct 24 20:45:04 2012
@@ -39,12 +39,12 @@ public class Xpp3DomWriter
write( new PrettyPrintXMLWriter( writer ), dom );
}
- public static void write( PrettyPrintXMLWriter xmlWriter, Xpp3Dom dom )
+ public static void write( XMLWriter xmlWriter, Xpp3Dom dom )
{
write( xmlWriter, dom, true );
}
- public static void write( PrettyPrintXMLWriter xmlWriter, Xpp3Dom dom, boolean escape )
+ public static void write( XMLWriter xmlWriter, Xpp3Dom dom, boolean escape )
{
xmlWriter.startElement( dom.getName() );
String[] attributeNames = dom.getAttributeNames();
Modified: maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java?rev=1401872&r1=1401871&r2=1401872&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/main/java/org/apache/maven/shared/utils/xml/pull/XmlPullParserException.java Wed Oct 24 20:45:04 2012
@@ -32,5 +32,10 @@ public class XmlPullParserException exte
public XmlPullParserException(SAXException e) {
super(e);
}
+
+ public XmlPullParserException( String message )
+ {
+ super(message);
+ }
}
Modified: maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java?rev=1401872&r1=1401871&r2=1401872&view=diff
==============================================================================
--- maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java (original)
+++ maven/shared/trunk/maven-shared-utils/src/test/java/org/apache/maven/shared/utils/io/IOUtilTest.java Wed Oct 24 20:45:04 2012
@@ -1162,45 +1162,6 @@ public class IOUtilTest
IOUtil.toString( nullInputStream(), "utf-16", 0 );
}
- @Test( expected = IOException.class )
- public void bufferedCopyNullInputStreamNullOutputStream()
- throws Exception
- {
- IOUtil.bufferedCopy( nullInputStream(), nullOutputStream() );
- }
-
- @Test( expected = IOException.class )
- public void bufferedCopyNullInputStreamValidOutputStream()
- throws Exception
- {
- IOUtil.bufferedCopy( nullInputStream(), new DontCloseByteArrayOutputStream() );
- }
-
- @Test( expected = NullPointerException.class )
- public void bufferedCopyEmptyInputStreamNullOutputStream()
- throws Exception
- {
- IOUtil.bufferedCopy( new DontCloseByteArrayInputStream( emptyByteArray() ), nullOutputStream() );
- }
-
- @Test
- public void bufferedCopyEmptyInputStreamValidOutputStream()
- throws Exception
- {
- IOUtil.bufferedCopy( new DontCloseByteArrayInputStream( emptyByteArray() ),
- new DontCloseByteArrayOutputStream() );
- }
-
- @Test
- public void bufferedCopyInputStreamValidOutputStream()
- throws Exception
- {
- ByteArrayOutputStream outputStream = new DontCloseByteArrayOutputStream();
- byte[] input = { 1, 2, 3, 4, 5, 6 };
- IOUtil.bufferedCopy( new DontCloseByteArrayInputStream( input ), outputStream );
- assertThat( outputStream.toByteArray(), is( input ) );
- }
-
/*
* copy(InputStream,Writer)
*/