[infinispan-commits] Infinispan SVN: r1962 - in trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl: transport and 1 other directories.

[infinispan-commits at lists.jboss.org]

Author: mircea.markus
Date: 2010-07-02 08:32:10 -0400 (Fri, 02 Jul 2010)
New Revision: 1962

Modified:
   trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java
   trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsHelper.java
   trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java
   trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java
   trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TransportObjectFactory.java
Log:
Migrated r1961 from 4.1.x

Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java	2010-07-02 11:21:44 UTC (rev 1961)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java	2010-07-02 12:32:10 UTC (rev 1962)
@@ -1,5 +1,7 @@
 package org.infinispan.client.hotrod.impl.protocol;
 
+import java.nio.charset.Charset;
+
 /**
  * Defines constants defined by Hotrod specifications.
  *
@@ -58,4 +60,5 @@
    public static final byte CLIENT_INTELLIGENCE_BASIC = 0x01;
    public static final byte CLIENT_INTELLIGENCE_TOPOLOGY_AWARE = 0x02;
    public static final byte CLIENT_INTELLIGENCE_HASH_DISTRIBUTION_AWARE = 0x03;
+   Charset STRING_CHARSET = Charset.forName("UTF-8");
 }

Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsHelper.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsHelper.java	2010-07-02 11:21:44 UTC (rev 1961)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsHelper.java	2010-07-02 12:32:10 UTC (rev 1962)
@@ -24,13 +24,13 @@
    static final AtomicLong MSG_ID = new AtomicLong();
    final static byte CLIENT_INTELLIGENCE = HotRodConstants.CLIENT_INTELLIGENCE_HASH_DISTRIBUTION_AWARE;
 
-   public static long writeHeader(Transport transport, short operationCode, String cacheName, AtomicInteger topologyId, Flag... flags) {
+   public static long writeHeader(Transport transport, short operationCode, byte[] cacheName, AtomicInteger topologyId, Flag... flags) {
       transport.writeByte(HotRodConstants.REQUEST_MAGIC);
       long messageId = MSG_ID.incrementAndGet();
       transport.writeVLong(messageId);
       transport.writeByte(HotRodConstants.HOTROD_VERSION);
       transport.writeByte(operationCode);
-      transport.writeString(cacheName);
+      transport.writeArray(cacheName);
 
       int flagInt = 0;
       if (flags != null) {

Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java	2010-07-02 11:21:44 UTC (rev 1961)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperationsImpl.java	2010-07-02 12:32:10 UTC (rev 1962)
@@ -23,12 +23,12 @@
 
    private static Log log = LogFactory.getLog(HotRodOperationsImpl.class);
 
-   private final String cacheName;
+   private final byte[] cacheName;
    private TransportFactory transportFactory;
    private final AtomicInteger topologyId;
 
    public HotRodOperationsImpl(String cacheName, TransportFactory transportFactory, AtomicInteger topologyId) {
-      this.cacheName = cacheName;
+      this.cacheName = cacheName.getBytes(STRING_CHARSET);
       this.transportFactory = transportFactory;
       this.topologyId = topologyId;
    }

Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java	2010-07-02 11:21:44 UTC (rev 1961)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java	2010-07-02 12:32:10 UTC (rev 1962)
@@ -1,10 +1,9 @@
 package org.infinispan.client.hotrod.impl.transport;
 
+import org.infinispan.client.hotrod.impl.protocol.HotRodConstants;
 import org.infinispan.util.logging.Log;
 import org.infinispan.util.logging.LogFactory;
 
-import java.nio.charset.Charset;
-
 /**
  * Support class for transport implementations.
  *
@@ -15,8 +14,6 @@
 
    private static Log log = LogFactory.getLog(AbstractTransport.class);
 
-   private static final Charset CHARSET = Charset.forName("UTF-8");
-   
    private final TransportFactory transportFactory;
 
    protected AbstractTransport(TransportFactory transportFactory) {
@@ -31,7 +28,7 @@
    @Override
    public String readString() {
       byte[] strContent = readArray();
-      String readString = new String(strContent, CHARSET);
+      String readString = new String(strContent, HotRodConstants.STRING_CHARSET);
       if (log.isTraceEnabled()) {
          log.trace("Read string is: " + readString);
       }
@@ -83,7 +80,7 @@
    @Override
    public void writeString(String string) {
       if (!string.isEmpty()) {
-         writeArray(string.getBytes(CHARSET));
+         writeArray(string.getBytes(HotRodConstants.STRING_CHARSET));
       } else {
          writeVInt(0);
       }

Modified: trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TransportObjectFactory.java
===================================================================
--- trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TransportObjectFactory.java	2010-07-02 11:21:44 UTC (rev 1961)
+++ trunk/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TransportObjectFactory.java	2010-07-02 12:32:10 UTC (rev 1962)
@@ -19,6 +19,7 @@
    private static final Log log = LogFactory.getLog(TransportObjectFactory.class);
    private final TcpTransportFactory tcpTransportFactory;
    private final AtomicInteger topologyId;
+   private static final byte[] DEFAULT_CACHE_NAME_BYTES = new byte[]{};
 
    public TransportObjectFactory(TcpTransportFactory tcpTransportFactory, AtomicInteger topologyId) {
       this.tcpTransportFactory = tcpTransportFactory;
@@ -45,7 +46,7 @@
          if (log.isTraceEnabled()) {
             log.trace("About to validate(ping) connection to server " + key + ". TcpTransport is " + transport);
          }
-         long messageId = HotRodOperationsHelper.writeHeader(transport, HotRodConstants.PING_REQUEST, "", topologyId);
+         long messageId = HotRodOperationsHelper.writeHeader(transport, HotRodConstants.PING_REQUEST, DEFAULT_CACHE_NAME_BYTES, topologyId);
          short respStatus = HotRodOperationsHelper.readHeaderAndValidate(transport, messageId, HotRodConstants.PING_RESPONSE, topologyId);
          if (respStatus == HotRodConstants.NO_ERROR_STATUS) {
             if (log.isTraceEnabled())