/**
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.apache.cassandra.db;

import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;

import org.apache.cassandra.io.ICompactSerializer;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;

public class Row
{
    private static RowSerializer serializer = new RowSerializer();

    public static RowSerializer serializer()
    {
        return serializer;
    }

    public final DecoratedKey<?> key;
    public final ColumnFamily cf;

    public Row(DecoratedKey<?> key, ColumnFamily cf)
    {
        assert key != null;
        // cf may be null, indicating no data
        this.key = key;
        this.cf = cf;
    }

    @Override
    public String toString()
    {
        return "Row(" +
               "key=" + key +
               ", cf=" + cf +
               ')';
    }
}

class RowSerializer implements ICompactSerializer<Row>
{
    public void serialize(Row row, DataOutputStream dos, int version) throws IOException
    {
        ByteBufferUtil.writeWithShortLength(row.key.key, dos);
        ColumnFamily.serializer().serialize(row.cf, dos);
    }

    public Row deserialize(DataInputStream dis, int version, boolean fromRemote) throws IOException
    {
        return new Row(StorageService.getPartitioner().decorateKey(ByteBufferUtil.readWithShortLength(dis)),
                       ColumnFamily.serializer().deserialize(dis, false, fromRemote));
    }

    public Row deserialize(DataInputStream dis, int version) throws IOException
    {
        return deserialize(dis, version, false);
    }
}

@@ -1673,19 +1673,35 @@
 ;%0A    %7D%0A
-%7D%0A%0A
+%0A    public static 
 class Ro
@@ -1747,18 +1747,26 @@
 er%3CRow%3E%0A
-%7B%0A
+    %7B%0A    
     publ
@@ -1838,32 +1838,36 @@
 ows IOException%0A
+    
     %7B%0A        By
@@ -1864,16 +1864,20 @@
         
+ 
+   
 ByteBuff
@@ -1923,32 +1923,36 @@
 , dos);%0A        
+    
 ColumnFamily.ser
@@ -1985,27 +1985,35 @@
 , dos);%0A    
+   
+ 
 %7D%0A%0A
+    
     public R
@@ -2100,34 +2100,40 @@
 ception%0A    
-%7B%0A
+    %7B%0A  
         
 return new R
@@ -2116,24 +2116,26 @@
 %7B%0A          
+  
 return new R
@@ -2238,32 +2238,36 @@
                 
+    
 ColumnFamily.ser
@@ -2314,16 +2314,20 @@
 mote));%0A
+    
     %7D%0A%0A 
@@ -2325,24 +2325,28 @@
      %7D%0A%0A    
+ 
+   
 public Row d
@@ -2409,26 +2409,34 @@
 ception%0A    
-%7B%0A
+    %7B%0A    
         retu
@@ -2476,12 +2476,21 @@
 e);%0A
+        %7D%0A
     %7D%0A%7D
-%0A

move RowSerializer to static inner class