[284307] Add support for streaming of large byte arrays / BLOB

https://bugs.eclipse.org/bugs/show_bug.cgi?id=284307

16 files changed, 29 insertions, 29 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOBlob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOBlob.java
index ca424d730a..d82317c611 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOBlob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOBlob.java
@@ -21,7 +21,7 @@ import java.io.InputStream;
  * @author Eike Stepper
  * @since 4.0
  */
-public final class CDOBlob extends CDOLob<byte[], InputStream>
+public final class CDOBlob extends CDOLob<InputStream>
 {
   public CDOBlob(InputStream contents) throws IOException
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOClob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOClob.java
index 18ebb65c68..9e39f66eb5 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOClob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOClob.java
@@ -21,7 +21,7 @@ import java.io.Reader;
  * @author Eike Stepper
  * @since 4.0
  */
-public final class CDOClob extends CDOLob<char[], Reader>
+public final class CDOClob extends CDOLob<Reader>
 {
   public CDOClob(Reader contents) throws IOException
   {
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOLob.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOLob.java
index 538fa6ef9c..97333926e8 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOLob.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOLob.java
@@ -19,7 +19,7 @@ import java.io.IOException;
  * @author Eike Stepper
  * @since 4.0
  */
-public abstract class CDOLob<ARRAY, IO> extends CDOLobInfo
+public abstract class CDOLob<IO> extends CDOLobInfo
 {
   private CDOLobStore store;
 
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOLobUtil.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOLobUtil.java
index 774534e471..64c8870850 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOLobUtil.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/model/lob/CDOLobUtil.java
@@ -35,7 +35,7 @@ public final class CDOLobUtil
     return new CDOClob(in);
   }
 
-  public static void write(ExtendedDataOutput out, CDOLob<?, ?> lob) throws IOException
+  public static void write(ExtendedDataOutput out, CDOLob<?> lob) throws IOException
   {
     lob.write(out);
   }
@@ -50,7 +50,7 @@ public final class CDOLobUtil
     return new CDOClob(id, size);
   }
 
-  public static void setStore(CDOLobStore store, CDOLob<?, ?> lob) throws IOException
+  public static void setStore(CDOLobStore store, CDOLob<?> lob) throws IOException
   {
     lob.setStore(store);
   }
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/protocol/CDODataInputImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/protocol/CDODataInputImpl.java
index 08b0bdd830..0db244b70a 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/protocol/CDODataInputImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/protocol/CDODataInputImpl.java
@@ -443,9 +443,9 @@ public abstract class CDODataInputImpl extends ExtendedDataInput.Delegating impl
   {
     CDOType type = CDOModelUtil.getType(feature);
     Object value = type.readValue(this);
-    if (value instanceof CDOLob<?, ?>)
+    if (value instanceof CDOLob<?>)
     {
-      CDOLob<?, ?> lob = (CDOLob<?, ?>)value;
+      CDOLob<?> lob = (CDOLob<?>)value;
       CDOLobUtil.setStore(getLobStore(), lob);
     }
 
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java
index d32cd0a61f..37f9801987 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CDOClientProtocol.java
@@ -283,14 +283,14 @@ public class CDOClientProtocol extends SignalProtocol<CDOSession> implements CDO
   }
 
   public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks,
-      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?, ?>> lobs, OMMonitor monitor)
+      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     return send(new CommitTransactionRequest(this, transactionID, comment, releaseLocks, idProvider, commitData, lobs),
         monitor);
   }
 
   public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment,
-      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?, ?>> lobs, OMMonitor monitor)
+      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     return send(new CommitDelegationRequest(this, branch, userID, comment, commitData, detachedObjectTypes, lobs),
         monitor);
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitDelegationRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitDelegationRequest.java
index 84ac4d4419..1e8bc4d029 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitDelegationRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitDelegationRequest.java
@@ -40,7 +40,7 @@ public class CommitDelegationRequest extends CommitTransactionRequest
   private Map<CDOID, EClass> detachedObjectTypes;
 
   public CommitDelegationRequest(CDOClientProtocol protocol, CDOBranch branch, String userID, String comment,
-      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?, ?>> lobs)
+      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs)
   {
     super(protocol, CDOProtocolConstants.SIGNAL_COMMIT_DELEGATION, UNKNOWN_TRANSACTION_ID, comment, false,
         CDOIDProvider.NOOP, commitData, lobs);
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
index 3431180e12..9d4f30fa36 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/protocol/CommitTransactionRequest.java
@@ -83,19 +83,19 @@ public class CommitTransactionRequest extends RequestWithMonitoring<CommitTransa
 
   private CDOCommitData commitData;
 
-  private Collection<CDOLob<?, ?>> lobs;
+  private Collection<CDOLob<?>> lobs;
 
   private ExtendedDataOutputStream stream;
 
   public CommitTransactionRequest(CDOClientProtocol protocol, int transactionID, String comment, boolean releaseLocks,
-      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?, ?>> lobs)
+      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs)
   {
     this(protocol, CDOProtocolConstants.SIGNAL_COMMIT_TRANSACTION, transactionID, comment, releaseLocks, idProvider,
         commitData, lobs);
   }
 
   public CommitTransactionRequest(CDOClientProtocol protocol, short signalID, int transactionID, String comment,
-      boolean releaseLocks, CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?, ?>> lobs)
+      boolean releaseLocks, CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs)
   {
     super(protocol, signalID);
     this.transactionID = transactionID;
@@ -226,7 +226,7 @@ public class CommitTransactionRequest extends RequestWithMonitoring<CommitTransa
   protected void requestingLobs(CDODataOutput out) throws IOException
   {
     out.writeInt(lobs.size());
-    for (CDOLob<?, ?> lob : lobs)
+    for (CDOLob<?> lob : lobs)
     {
       out.writeByteArray(lob.getID());
       long size = lob.getSize();
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
index cd2677bb95..7015411430 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/embedded/EmbeddedClientSessionProtocol.java
@@ -328,7 +328,7 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
   }
 
   public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks,
-      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?, ?>> lobs, OMMonitor monitor)
+      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     monitor.begin(2);
     boolean success = false;
@@ -395,7 +395,7 @@ public class EmbeddedClientSessionProtocol extends Lifecycle implements CDOSessi
   }
 
   public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment,
-      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?, ?>> lobs, OMMonitor monitor)
+      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor)
   {
     throw new UnsupportedOperationException();
   }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
index 48bfa706a8..b598dfe567 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/syncing/SynchronizableRepository.java
@@ -503,7 +503,7 @@ public abstract class SynchronizableRepository extends Repository.Default implem
       String userID = getUserID();
       String comment = getCommitComment();
       CDOCommitData commitData = new CommitContextData(this);
-      Collection<CDOLob<?, ?>> lobs = Collections.emptySet();
+      Collection<CDOLob<?>> lobs = Collections.emptySet();
 
       // Delegate commit to the master
       CDOSessionProtocol sessionProtocol = getSynchronizer().getRemoteSession().getSessionProtocol();
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOCommitContext.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOCommitContext.java
index 7449193ffa..a4f9ee19a3 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOCommitContext.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/transaction/CDOCommitContext.java
@@ -62,7 +62,7 @@ public interface CDOCommitContext
   /**
    * @since 4.0
    */
-  public Collection<CDOLob<?, ?>> getLobs();
+  public Collection<CDOLob<?>> getLobs();
 
   /**
    * @since 4.0
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
index 0f78c0288d..bd3655e126 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/session/CDOSessionImpl.java
@@ -1699,7 +1699,7 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
     }
 
     public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks,
-        CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?, ?>> lobs, OMMonitor monitor)
+        CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs, OMMonitor monitor)
     {
       int attempt = 0;
       for (;;)
@@ -1717,7 +1717,7 @@ public abstract class CDOSessionImpl extends Container<CDOView> implements Inter
     }
 
     public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment,
-        CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?, ?>> lobs,
+        CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs,
         OMMonitor monitor)
     {
       int attempt = 0;
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java
index aca696f5f3..aa51a585ce 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOSingleTransactionStrategyImpl.java
@@ -63,7 +63,7 @@ public class CDOSingleTransactionStrategyImpl implements CDOTransactionStrategy
     commitContext.preCommit();
 
     CDOCommitData commitData = commitContext.getCommitData();
-    Collection<CDOLob<?, ?>> lobs = commitContext.getLobs();
+    Collection<CDOLob<?>> lobs = commitContext.getLobs();
     InternalCDOSession session = transaction.getSession();
     CommitTransactionResult result = null;
 
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index bd69a420f1..29ec9c2d5c 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -2067,7 +2067,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
      */
     private boolean isPartialCommit;
 
-    private Map<byte[], CDOLob<?, ?>> lobs = new HashMap<byte[], CDOLob<?, ?>>();
+    private Map<byte[], CDOLob<?>> lobs = new HashMap<byte[], CDOLob<?>>();
 
     public CDOCommitContextImpl(InternalCDOTransaction transaction)
     {
@@ -2167,7 +2167,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
       return revisionDeltas;
     }
 
-    public Collection<CDOLob<?, ?>> getLobs()
+    public Collection<CDOLob<?>> getLobs()
     {
       return lobs.values();
     }
@@ -2363,7 +2363,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
       return commitInfoManager.createCommitInfo(branch, timeStamp, userID, comment, commitData);
     }
 
-    private void preCommit(Map<CDOID, CDOObject> objects, Map<byte[], CDOLob<?, ?>> lobs)
+    private void preCommit(Map<CDOID, CDOObject> objects, Map<byte[], CDOLob<?>> lobs)
     {
       if (!objects.isEmpty())
       {
@@ -2381,7 +2381,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
       }
     }
 
-    private void collectLobs(InternalCDORevision revision, Map<byte[], CDOLob<?, ?>> lobs)
+    private void collectLobs(InternalCDORevision revision, Map<byte[], CDOLob<?>> lobs)
     {
       EStructuralFeature[] features = revision.getClassInfo().getAllPersistentFeatures();
       for (int i = 0; i < features.length; i++)
@@ -2389,7 +2389,7 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
         EStructuralFeature feature = features[i];
         if (CDOModelUtil.isLob(feature.getEType()))
         {
-          CDOLob<?, ?> lob = (CDOLob<?, ?>)revision.getValue(feature);
+          CDOLob<?> lob = (CDOLob<?>)revision.getValue(feature);
           if (lob != null)
           {
             lobs.put(lob.getID(), lob);
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXACommitContextImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXACommitContextImpl.java
index 5bc0d85138..bad473315e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXACommitContextImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOXACommitContextImpl.java
@@ -136,7 +136,7 @@ public class CDOXACommitContextImpl implements InternalCDOXACommitContext
     return delegateCommitContext.getCommitData();
   }
 
-  public Collection<CDOLob<?, ?>> getLobs()
+  public Collection<CDOLob<?>> getLobs()
   {
     return delegateCommitContext.getLobs();
   }
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
index 82abaddefe..347499b673 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/CDOSessionProtocol.java
@@ -151,13 +151,13 @@ public interface CDOSessionProtocol extends CDOProtocol, PackageLoader, BranchLo
    * @since 4.0
    */
   public CommitTransactionResult commitTransaction(int transactionID, String comment, boolean releaseLocks,
-      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?, ?>> lobs, OMMonitor monitor);
+      CDOIDProvider idProvider, CDOCommitData commitData, Collection<CDOLob<?>> lobs, OMMonitor monitor);
 
   /**
    * @since 4.0
    */
   public CommitTransactionResult commitDelegation(CDOBranch branch, String userID, String comment,
-      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?, ?>> lobs, OMMonitor monitor);
+      CDOCommitData commitData, Map<CDOID, EClass> detachedObjectTypes, Collection<CDOLob<?>> lobs, OMMonitor monitor);
 
   /**
    * @since 3.0