[exo-jcr-commits] exo-jcr SVN: r4084 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: dataflow/persistent/infinispan and 1 other directory.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2011-03-14 11:53:55 -0400 (Mon, 14 Mar 2011)
New Revision: 4084

Modified:
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ChangesKey.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexInfosKey.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexUpdateKey.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheId.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheKey.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheNodesId.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CachePropsId.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheQPath.java
   jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheRefsId.java
Log:
EXOJCR-834: Make ChangesKey to be Externalizable

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ChangesKey.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ChangesKey.java	2011-03-14 15:43:30 UTC (rev 4083)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/ChangesKey.java	2011-03-14 15:53:55 UTC (rev 4084)
@@ -20,6 +20,10 @@
 
 import org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan.CacheKey;
 
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
 /**
  * Created by The eXo Platform SAS.
  *
@@ -30,9 +34,12 @@
  */
 public class ChangesKey extends CacheKey
 {
-   private static final long serialVersionUID = 8597037282459379392L;
+   private int wsId;
 
-   private final int wsId;
+   ChangesKey()
+   {
+      super();
+   }
 
    ChangesKey(int wsId, String id)
    {
@@ -52,6 +59,26 @@
     * {@inheritDoc}
     */
    @Override
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      super.writeExternal(out);
+      out.writeInt(wsId);
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+   {
+      super.readExternal(in);
+      wsId = in.readInt();
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
    public boolean equals(Object obj)
    {
       if (obj instanceof ChangesKey)

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexInfosKey.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexInfosKey.java	2011-03-14 15:43:30 UTC (rev 4083)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexInfosKey.java	2011-03-14 15:53:55 UTC (rev 4084)
@@ -30,6 +30,10 @@
  */
 public class IndexInfosKey extends CacheKey
 {
+   IndexInfosKey()
+   {
+      super();
+   }
 
    IndexInfosKey(String id)
    {

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexUpdateKey.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexUpdateKey.java	2011-03-14 15:43:30 UTC (rev 4083)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/query/ispn/IndexUpdateKey.java	2011-03-14 15:53:55 UTC (rev 4084)
@@ -31,6 +31,11 @@
 public class IndexUpdateKey extends CacheKey
 {
 
+   IndexUpdateKey()
+   {
+      super();
+   }
+
    IndexUpdateKey(String id)
    {
       super(id);

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheId.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheId.java	2011-03-14 15:43:30 UTC (rev 4083)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheId.java	2011-03-14 15:53:55 UTC (rev 4084)
@@ -18,6 +18,7 @@
  */
 package org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan;
 
+
 /**
  * 
  * @author <a href="anatoliy.bazko at exoplatform.org">Anatoliy Bazko</a>
@@ -26,11 +27,11 @@
 public class CacheId extends CacheKey
 {
 
-   /**
-    * CacheId constructor.
-    * 
-    * @param id
-    */
+   CacheId()
+   {
+      super();
+   }
+
    CacheId(String id)
    {
       super(id);

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheKey.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheKey.java	2011-03-14 15:43:30 UTC (rev 4083)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheKey.java	2011-03-14 15:53:55 UTC (rev 4084)
@@ -18,8 +18,13 @@
  */
 package org.exoplatform.services.jcr.impl.dataflow.persistent.infinispan;
 
-import java.io.Serializable;
+import org.exoplatform.services.jcr.impl.Constants;
 
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
 /**
  * Created by The eXo Platform SAS. <br/>
  * RE
@@ -30,13 +35,17 @@
  * @author <a href="mailto:peter.nedonosko at exoplatform.com.ua">Peter Nedonosko</a>
  * @version $Id: CacheKey.java 2845 2010-07-30 13:29:37Z tolusha $
  */
-public abstract class CacheKey implements Serializable, Comparable<CacheKey>
+public abstract class CacheKey implements Externalizable, Comparable<CacheKey>
 {
 
-   protected final String fullId;
+   protected String fullId;
 
-   protected final int hash;
+   protected int hash;
 
+   public CacheKey()
+   {
+   }
+
    public CacheKey(String id)
    {
       this.fullId = this.getClass().getSimpleName() + "-" + id;
@@ -46,7 +55,7 @@
    public CacheKey(String id, int hash)
    {
       this.fullId = this.getClass().getSimpleName() + "-" + id;
-      this.hash = this.fullId.hashCode();
+      this.hash = hash;
    }
 
    /**
@@ -74,6 +83,33 @@
    {
       return fullId.compareTo(o.fullId);
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public void writeExternal(ObjectOutput out) throws IOException
+   {
+      out.writeInt(hash);
+
+      byte[] buf = fullId.getBytes(Constants.DEFAULT_ENCODING);
+      out.writeInt(buf.length);
+      out.write(buf);
+
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   @Override
+   public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
+   {
+      hash = in.readInt();
+
+      byte[] buf = new byte[in.readInt()];
+      in.readFully(buf);
+      fullId = new String(buf, Constants.DEFAULT_ENCODING);
+   }
    
    /**
     * {@inheritDoc}

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheNodesId.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheNodesId.java	2011-03-14 15:43:30 UTC (rev 4083)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheNodesId.java	2011-03-14 15:53:55 UTC (rev 4084)
@@ -31,6 +31,11 @@
 public class CacheNodesId extends CacheKey
 {
 
+   CacheNodesId()
+   {
+      super();
+   }
+
    CacheNodesId(String id)
    {
       super(id);

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CachePropsId.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CachePropsId.java	2011-03-14 15:43:30 UTC (rev 4083)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CachePropsId.java	2011-03-14 15:53:55 UTC (rev 4084)
@@ -31,6 +31,11 @@
 public class CachePropsId extends CacheKey
 {
 
+   CachePropsId()
+   {
+      super();
+   }
+
    CachePropsId(String id)
    {
       super(id);

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheQPath.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheQPath.java	2011-03-14 15:43:30 UTC (rev 4083)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheQPath.java	2011-03-14 15:53:55 UTC (rev 4084)
@@ -35,6 +35,11 @@
  */
 class CacheQPath extends CacheKey
 {
+   CacheQPath()
+   {
+      super();
+   }
+
    CacheQPath(String parentId, QPath path, ItemType itemType)
    {
       this(parentId, path.getEntries()[path.getEntries().length - 1], itemType);

Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheRefsId.java
===================================================================
--- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheRefsId.java	2011-03-14 15:43:30 UTC (rev 4083)
+++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/persistent/infinispan/CacheRefsId.java	2011-03-14 15:53:55 UTC (rev 4084)
@@ -30,6 +30,10 @@
  */
 public class CacheRefsId extends CacheKey
 {
+   CacheRefsId()
+   {
+      super();
+   }
 
    CacheRefsId(String id)
    {