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 2016/04/29 20:07:16 UTC
svn commit: r1741675 - in /webservices/axiom/trunk/axiom-api/src:
main/java/org/apache/axiom/attachments/ main/java/org/apache/axiom/blob/
test/java/org/apache/axiom/blob/ test/java/org/apache/axiom/blob/suite/
Author: veithen
Date: Fri Apr 29 18:07:15 2016
New Revision: 1741675
URL: http://svn.apache.org/viewvc?rev=1741675&view=rev
Log:
Add a type parameter to WritableBlobFactory.
Modified:
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlobFactory.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/Blobs.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/OverflowableBlobImpl.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/TempFileBlobFactory.java
webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlobFactory.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/OverflowableBlobTest.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/SizeSensitiveWritableBlobTestCase.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestAvailable.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetInputStreamIllegalState.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetOutputStreamIllegalState.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetSizeIllegalState.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestRandomReadWrite.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromIllegalState.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromSupport.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromWithError.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReleaseTwice.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestSkip.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteAfterCommit.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToIllegalState.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithError.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java
webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/Attachments.java Fri Apr 29 18:07:15 2016
@@ -23,6 +23,7 @@ import org.apache.axiom.attachments.life
import org.apache.axiom.attachments.lifecycle.LifecycleManager;
import org.apache.axiom.attachments.lifecycle.impl.LifecycleManagerImpl;
import org.apache.axiom.blob.Blobs;
+import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.blob.WritableBlob;
import org.apache.axiom.blob.WritableBlobFactory;
import org.apache.axiom.ext.activation.SizeAwareDataSource;
@@ -99,11 +100,11 @@ public class Attachments {
} else {
fileStorageThreshold = 0;
}
- WritableBlobFactory attachmentBlobFactory;
+ WritableBlobFactory<?> attachmentBlobFactory;
if (fileCacheEnable) {
- final WritableBlobFactory tempFileBlobFactory = new LegacyTempFileBlobFactory(this, attachmentRepoDir);
+ final WritableBlobFactory<?> tempFileBlobFactory = new LegacyTempFileBlobFactory(this, attachmentRepoDir);
if (fileStorageThreshold > 0) {
- attachmentBlobFactory = new WritableBlobFactory() {
+ attachmentBlobFactory = new WritableBlobFactory<WritableBlob>() {
public WritableBlob createBlob() {
return Blobs.createOverflowableBlob(fileStorageThreshold, tempFileBlobFactory);
}
@@ -112,8 +113,8 @@ public class Attachments {
attachmentBlobFactory = tempFileBlobFactory;
}
} else {
- attachmentBlobFactory = new WritableBlobFactory() {
- public WritableBlob createBlob() {
+ attachmentBlobFactory = new WritableBlobFactory<MemoryBlob>() {
+ public MemoryBlob createBlob() {
return Blobs.createMemoryBlob();
}
};
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlobFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlobFactory.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlobFactory.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/LegacyTempFileBlobFactory.java Fri Apr 29 18:07:15 2016
@@ -18,10 +18,9 @@
*/
package org.apache.axiom.attachments;
-import org.apache.axiom.blob.WritableBlob;
import org.apache.axiom.blob.WritableBlobFactory;
-final class LegacyTempFileBlobFactory implements WritableBlobFactory {
+final class LegacyTempFileBlobFactory implements WritableBlobFactory<LegacyTempFileBlob> {
private final Attachments attachments;
private final String attachmentDir;
@@ -30,7 +29,7 @@ final class LegacyTempFileBlobFactory im
this.attachmentDir = attachmentDir;
}
- public WritableBlob createBlob() {
+ public LegacyTempFileBlob createBlob() {
return new LegacyTempFileBlob(attachments.getLifecycleManager(), attachmentDir);
}
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessage.java Fri Apr 29 18:07:15 2016
@@ -31,7 +31,7 @@ import java.util.Set;
import javax.activation.DataHandler;
import org.apache.axiom.blob.Blobs;
-import org.apache.axiom.blob.WritableBlob;
+import org.apache.axiom.blob.MemoryBlob;
import org.apache.axiom.blob.WritableBlobFactory;
import org.apache.axiom.mime.ContentType;
import org.apache.axiom.mime.Header;
@@ -53,8 +53,8 @@ import org.apache.james.mime4j.stream.Re
class MIMEMessage {
private static final Log log = LogFactory.getLog(MIMEMessage.class);
- private static final WritableBlobFactory rootPartBlobFactory = new WritableBlobFactory() {
- public WritableBlob createBlob() {
+ private static final WritableBlobFactory<MemoryBlob> rootPartBlobFactory = new WritableBlobFactory<MemoryBlob>() {
+ public MemoryBlob createBlob() {
return Blobs.createMemoryBlob();
}
};
@@ -87,10 +87,10 @@ class MIMEMessage {
private PartImpl firstPart;
private PartImpl rootPart;
- private final WritableBlobFactory attachmentBlobFactory;
+ private final WritableBlobFactory<?> attachmentBlobFactory;
MIMEMessage(InputStream inStream, String contentTypeString,
- WritableBlobFactory attachmentBlobFactory) throws OMException {
+ WritableBlobFactory<?> attachmentBlobFactory) throws OMException {
this.attachmentBlobFactory = attachmentBlobFactory;
try {
contentType = new ContentType(contentTypeString);
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/MIMEMessageAdapter.java Fri Apr 29 18:07:15 2016
@@ -45,7 +45,7 @@ final class MIMEMessageAdapter extends A
private final CountingInputStream filterIS;
MIMEMessageAdapter(InputStream inStream, String contentTypeString,
- WritableBlobFactory attachmentBlobFactory, int contentLength) {
+ WritableBlobFactory<?> attachmentBlobFactory, int contentLength) {
this.contentLength = contentLength;
if (log.isDebugEnabled()) {
log.debug("Attachments contentLength=" + contentLength + ", contentTypeString=" + contentTypeString);
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartImpl.java Fri Apr 29 18:07:15 2016
@@ -68,7 +68,7 @@ final class PartImpl implements Part {
private static final Log log = LogFactory.getLog(PartImpl.class);
- private final WritableBlobFactory blobFactory;
+ private final WritableBlobFactory<?> blobFactory;
private final String contentID;
private List<Header> headers;
@@ -90,7 +90,7 @@ final class PartImpl implements Part {
private PartInputStream partInputStream;
- PartImpl(WritableBlobFactory blobFactory, String contentID, List<Header> headers, MimeTokenStream parser) {
+ PartImpl(WritableBlobFactory<?> blobFactory, String contentID, List<Header> headers, MimeTokenStream parser) {
this.blobFactory = blobFactory;
this.contentID = contentID;
this.headers = headers;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/attachments/PartInputStream.java Fri Apr 29 18:07:15 2016
@@ -28,14 +28,14 @@ import org.apache.axiom.blob.WritableBlo
final class PartInputStream extends InputStream {
private WritableBlob content;
private InputStream in;
- private WritableBlobFactory blobFactory;
+ private WritableBlobFactory<?> blobFactory;
PartInputStream(WritableBlob content) throws IOException {
this.content = content;
in = getInputStream(content);
}
- PartInputStream(InputStream in, WritableBlobFactory blobFactory) {
+ PartInputStream(InputStream in, WritableBlobFactory<?> blobFactory) {
this.in = in;
this.blobFactory = blobFactory;
}
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/Blobs.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/Blobs.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/Blobs.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/Blobs.java Fri Apr 29 18:07:15 2016
@@ -44,7 +44,7 @@ public final class Blobs {
* the factory that will be used to create the overflow blob
* @return the blob
*/
- public static OverflowableBlob createOverflowableBlob(int threshold, WritableBlobFactory overflowBlobFactory) {
+ public static OverflowableBlob createOverflowableBlob(int threshold, WritableBlobFactory<?> overflowBlobFactory) {
int numberOfChunks = Math.max(16, Math.min(1, threshold/4096));
int chunkSize = threshold/numberOfChunks;
return new OverflowableBlobImpl(numberOfChunks, chunkSize, overflowBlobFactory);
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/OverflowableBlobImpl.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/OverflowableBlobImpl.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/OverflowableBlobImpl.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/OverflowableBlobImpl.java Fri Apr 29 18:07:15 2016
@@ -184,7 +184,7 @@ final class OverflowableBlobImpl impleme
*/
final int chunkSize;
- final WritableBlobFactory overflowBlobFactory;
+ final WritableBlobFactory<?> overflowBlobFactory;
/**
* Array of <code>byte[]</code> representing the chunks of the buffer.
@@ -215,7 +215,7 @@ final class OverflowableBlobImpl impleme
*/
State state = State.NEW;
- OverflowableBlobImpl(int numberOfChunks, int chunkSize, WritableBlobFactory overflowBlobFactory) {
+ OverflowableBlobImpl(int numberOfChunks, int chunkSize, WritableBlobFactory<?> overflowBlobFactory) {
this.chunkSize = chunkSize;
this.overflowBlobFactory = overflowBlobFactory;
chunks = new byte[numberOfChunks][];
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/TempFileBlobFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/TempFileBlobFactory.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/TempFileBlobFactory.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/TempFileBlobFactory.java Fri Apr 29 18:07:15 2016
@@ -21,7 +21,7 @@ package org.apache.axiom.blob;
import java.io.File;
import java.io.IOException;
-final class TempFileBlobFactory implements WritableBlobFactory {
+final class TempFileBlobFactory implements WritableBlobFactory<WritableBlob> {
private final String tempPrefix;
private final String tempSuffix;
private final File tempDirectory;
Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlobFactory.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlobFactory.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlobFactory.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/blob/WritableBlobFactory.java Fri Apr 29 18:07:15 2016
@@ -23,11 +23,11 @@ import org.apache.axiom.blob.WritableBlo
/**
* A factory for {@link WritableBlob} instances.
*/
-public interface WritableBlobFactory {
+public interface WritableBlobFactory<T extends WritableBlob> {
/**
* Create a new {@link WritableBlob} instance.
*
* @return the newly created instance
*/
- WritableBlob createBlob();
+ T createBlob();
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/MemoryBlobTest.java Fri Apr 29 18:07:15 2016
@@ -25,8 +25,8 @@ import junit.framework.TestSuite;
public class MemoryBlobTest extends TestCase {
public static TestSuite suite() {
- return new WritableBlobTestSuiteBuilder(new WritableBlobFactory() {
- public WritableBlob createBlob() {
+ return new WritableBlobTestSuiteBuilder(new WritableBlobFactory<MemoryBlob>() {
+ public MemoryBlob createBlob() {
return Blobs.createMemoryBlob();
}
}, new int[] { 10000 }, true, false).build();
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/OverflowableBlobTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/OverflowableBlobTest.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/OverflowableBlobTest.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/OverflowableBlobTest.java Fri Apr 29 18:07:15 2016
@@ -25,8 +25,8 @@ import junit.framework.TestSuite;
public class OverflowableBlobTest extends TestCase {
public static TestSuite suite() {
- return new WritableBlobTestSuiteBuilder(new WritableBlobFactory() {
- public WritableBlob createBlob() {
+ return new WritableBlobTestSuiteBuilder(new WritableBlobFactory<OverflowableBlob>() {
+ public OverflowableBlob createBlob() {
return Blobs.createOverflowableBlob(16*1024, "test", ".dat", null);
}
}, new int[] { 10000, 16*1024, 100000 }, true, false).build();
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/SizeSensitiveWritableBlobTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/SizeSensitiveWritableBlobTestCase.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/SizeSensitiveWritableBlobTestCase.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/SizeSensitiveWritableBlobTestCase.java Fri Apr 29 18:07:15 2016
@@ -23,7 +23,7 @@ import org.apache.axiom.blob.WritableBlo
public abstract class SizeSensitiveWritableBlobTestCase extends WritableBlobTestCase {
protected final int size;
- public SizeSensitiveWritableBlobTestCase(WritableBlobFactory factory, State initialState, int size) {
+ public SizeSensitiveWritableBlobTestCase(WritableBlobFactory<?> factory, State initialState, int size) {
super(factory, initialState);
this.size = size;
addTestParameter("size", size);
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestAvailable.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestAvailable.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestAvailable.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestAvailable.java Fri Apr 29 18:07:15 2016
@@ -28,7 +28,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.NullInputStream;
public class TestAvailable extends WritableBlobTestCase {
- public TestAvailable(WritableBlobFactory factory) {
+ public TestAvailable(WritableBlobFactory<?> factory) {
super(factory, State.NEW);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetInputStreamIllegalState.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetInputStreamIllegalState.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetInputStreamIllegalState.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetInputStreamIllegalState.java Fri Apr 29 18:07:15 2016
@@ -22,7 +22,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.axiom.blob.WritableBlobFactory;
public class TestGetInputStreamIllegalState extends WritableBlobTestCase {
- public TestGetInputStreamIllegalState(WritableBlobFactory factory, State state) {
+ public TestGetInputStreamIllegalState(WritableBlobFactory<?> factory, State state) {
super(factory, state);
state.addTestParameters(this);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetOutputStreamIllegalState.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetOutputStreamIllegalState.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetOutputStreamIllegalState.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetOutputStreamIllegalState.java Fri Apr 29 18:07:15 2016
@@ -22,7 +22,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.axiom.blob.WritableBlobFactory;
public class TestGetOutputStreamIllegalState extends WritableBlobTestCase {
- public TestGetOutputStreamIllegalState(WritableBlobFactory factory, State state) {
+ public TestGetOutputStreamIllegalState(WritableBlobFactory<?> factory, State state) {
super(factory, state);
state.addTestParameters(this);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetSizeIllegalState.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetSizeIllegalState.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetSizeIllegalState.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestGetSizeIllegalState.java Fri Apr 29 18:07:15 2016
@@ -22,7 +22,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.axiom.blob.WritableBlobFactory;
public class TestGetSizeIllegalState extends WritableBlobTestCase {
- public TestGetSizeIllegalState(WritableBlobFactory factory, State state) {
+ public TestGetSizeIllegalState(WritableBlobFactory<?> factory, State state) {
super(factory, state);
state.addTestParameters(this);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestMarkReset.java Fri Apr 29 18:07:15 2016
@@ -29,7 +29,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.commons.io.IOUtils;
public class TestMarkReset extends SizeSensitiveWritableBlobTestCase {
- public TestMarkReset(WritableBlobFactory factory, int size) {
+ public TestMarkReset(WritableBlobFactory<?> factory, int size) {
super(factory, State.NEW, size);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestRandomReadWrite.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestRandomReadWrite.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestRandomReadWrite.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestRandomReadWrite.java Fri Apr 29 18:07:15 2016
@@ -30,7 +30,7 @@ import org.apache.axiom.blob.WritableBlo
import com.google.common.collect.Range;
public class TestRandomReadWrite extends SizeSensitiveWritableBlobTestCase {
- public TestRandomReadWrite(WritableBlobFactory factory, int size) {
+ public TestRandomReadWrite(WritableBlobFactory<?> factory, int size) {
super(factory, State.NEW, size);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadEOF.java Fri Apr 29 18:07:15 2016
@@ -28,7 +28,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.NullInputStream;
public class TestReadEOF extends WritableBlobTestCase {
- public TestReadEOF(WritableBlobFactory factory) {
+ public TestReadEOF(WritableBlobFactory<?> factory) {
super(factory, State.NEW);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFrom.java Fri Apr 29 18:07:15 2016
@@ -30,7 +30,7 @@ import org.apache.axiom.testutils.io.Ins
import org.apache.commons.io.IOUtils;
public class TestReadFrom extends SizeSensitiveWritableBlobTestCase {
- public TestReadFrom(WritableBlobFactory factory, int size) {
+ public TestReadFrom(WritableBlobFactory<?> factory, int size) {
super(factory, State.NEW, size);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromIllegalState.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromIllegalState.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromIllegalState.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromIllegalState.java Fri Apr 29 18:07:15 2016
@@ -23,7 +23,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.commons.io.input.NullInputStream;
public class TestReadFromIllegalState extends WritableBlobTestCase {
- public TestReadFromIllegalState(WritableBlobFactory factory, State state) {
+ public TestReadFromIllegalState(WritableBlobFactory<?> factory, State state) {
super(factory, state);
state.addTestParameters(this);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromSupport.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromSupport.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromSupport.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromSupport.java Fri Apr 29 18:07:15 2016
@@ -30,7 +30,7 @@ import org.apache.axiom.ext.io.ReadFromS
import org.apache.commons.io.IOUtils;
public class TestReadFromSupport extends WritableBlobTestCase {
- public TestReadFromSupport(WritableBlobFactory factory) {
+ public TestReadFromSupport(WritableBlobFactory<?> factory) {
super(factory, State.NEW);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromWithError.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromWithError.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromWithError.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadFromWithError.java Fri Apr 29 18:07:15 2016
@@ -27,7 +27,7 @@ import org.apache.axiom.testutils.io.Exc
import org.apache.commons.io.input.NullInputStream;
public class TestReadFromWithError extends WritableBlobTestCase {
- public TestReadFromWithError(WritableBlobFactory factory) {
+ public TestReadFromWithError(WritableBlobFactory<?> factory) {
super(factory, State.NEW);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReadZeroLength.java Fri Apr 29 18:07:15 2016
@@ -28,7 +28,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.commons.io.input.NullInputStream;
public class TestReadZeroLength extends WritableBlobTestCase {
- public TestReadZeroLength(WritableBlobFactory factory) {
+ public TestReadZeroLength(WritableBlobFactory<?> factory) {
super(factory, State.NEW);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReleaseTwice.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReleaseTwice.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReleaseTwice.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestReleaseTwice.java Fri Apr 29 18:07:15 2016
@@ -22,7 +22,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.axiom.blob.WritableBlobFactory;
public class TestReleaseTwice extends WritableBlobTestCase {
- public TestReleaseTwice(WritableBlobFactory factory) {
+ public TestReleaseTwice(WritableBlobFactory<?> factory) {
super(factory, State.RELEASED);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestSkip.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestSkip.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestSkip.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestSkip.java Fri Apr 29 18:07:15 2016
@@ -28,7 +28,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.commons.io.IOUtils;
public class TestSkip extends WritableBlobTestCase {
- public TestSkip(WritableBlobFactory factory) {
+ public TestSkip(WritableBlobFactory<?> factory) {
super(factory, State.NEW);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteAfterCommit.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteAfterCommit.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteAfterCommit.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteAfterCommit.java Fri Apr 29 18:07:15 2016
@@ -27,7 +27,7 @@ import org.apache.axiom.ext.io.ReadFromS
import org.apache.commons.io.input.NullInputStream;
public class TestWriteAfterCommit extends WritableBlobTestCase {
- public TestWriteAfterCommit(WritableBlobFactory factory) {
+ public TestWriteAfterCommit(WritableBlobFactory<?> factory) {
super(factory, State.NEW);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteTo.java Fri Apr 29 18:07:15 2016
@@ -29,7 +29,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.axiom.testutils.io.InstrumentedOutputStream;
public class TestWriteTo extends SizeSensitiveWritableBlobTestCase {
- public TestWriteTo(WritableBlobFactory factory, int size) {
+ public TestWriteTo(WritableBlobFactory<?> factory, int size) {
super(factory, State.NEW, size);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToIllegalState.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToIllegalState.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToIllegalState.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToIllegalState.java Fri Apr 29 18:07:15 2016
@@ -23,7 +23,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.commons.io.output.NullOutputStream;
public class TestWriteToIllegalState extends WritableBlobTestCase {
- public TestWriteToIllegalState(WritableBlobFactory factory, State state) {
+ public TestWriteToIllegalState(WritableBlobFactory<?> factory, State state) {
super(factory, state);
state.addTestParameters(this);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithError.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithError.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithError.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithError.java Fri Apr 29 18:07:15 2016
@@ -27,7 +27,7 @@ import org.apache.axiom.testutils.io.Exc
import org.apache.commons.io.input.NullInputStream;
public class TestWriteToWithError extends SizeSensitiveWritableBlobTestCase {
- public TestWriteToWithError(WritableBlobFactory factory, int size) {
+ public TestWriteToWithError(WritableBlobFactory<?> factory, int size) {
super(factory, State.NEW, size);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/TestWriteToWithReadFromSupport.java Fri Apr 29 18:07:15 2016
@@ -27,7 +27,7 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.axiom.blob.WritableBlobFactory;
public class TestWriteToWithReadFromSupport extends SizeSensitiveWritableBlobTestCase {
- public TestWriteToWithReadFromSupport(WritableBlobFactory factory, int size) {
+ public TestWriteToWithReadFromSupport(WritableBlobFactory<?> factory, int size) {
super(factory, State.NEW, size);
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestCase.java Fri Apr 29 18:07:15 2016
@@ -23,10 +23,10 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.axiom.testutils.suite.MatrixTestCase;
public abstract class WritableBlobTestCase extends MatrixTestCase {
- private final WritableBlobFactory factory;
+ private final WritableBlobFactory<?> factory;
private final State initialState;
- public WritableBlobTestCase(WritableBlobFactory factory, State initialState) {
+ public WritableBlobTestCase(WritableBlobFactory<?> factory, State initialState) {
this.factory = factory;
this.initialState = initialState;
}
Modified: webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java?rev=1741675&r1=1741674&r2=1741675&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/axiom-api/src/test/java/org/apache/axiom/blob/suite/WritableBlobTestSuiteBuilder.java Fri Apr 29 18:07:15 2016
@@ -22,12 +22,12 @@ import org.apache.axiom.blob.WritableBlo
import org.apache.axiom.testutils.suite.MatrixTestSuiteBuilder;
public class WritableBlobTestSuiteBuilder extends MatrixTestSuiteBuilder {
- private final WritableBlobFactory factory;
+ private final WritableBlobFactory<?> factory;
private final int[] sizes;
private final boolean outputStreamHasReadFromSupport;
private final boolean writeToUsesReadFromSupport;
- public WritableBlobTestSuiteBuilder(WritableBlobFactory factory, int[] sizes,
+ public WritableBlobTestSuiteBuilder(WritableBlobFactory<?> factory, int[] sizes,
boolean outputStreamHasReadFromSupport, boolean writeToUsesReadFromSupport) {
this.factory = factory;
this.sizes = sizes;