avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cutt...@apache.org
Subject svn commit: r798646 - in /hadoop/avro/trunk: ./ lib/ src/java/ src/java/org/apache/avro/ src/java/org/apache/avro/file/ src/java/org/apache/avro/generic/ src/java/org/apache/avro/io/ src/java/org/apache/avro/io/parsing/ src/java/org/apache/avro/ipc/ sr...
Date Tue, 28 Jul 2009 18:44:53 GMT
Author: cutting
Date: Tue Jul 28 18:44:51 2009
New Revision: 798646

URL: http://svn.apache.org/viewvc?rev=798646&view=rev
Log:
AVRO-82.  Add checkstyle to Java compilation.  Contributed by Thiruvalluvan M. G.

Added:
    hadoop/avro/trunk/src/java/checkstyle.xml
Removed:
    hadoop/avro/trunk/lib/testng-5.8-LICENSE.txt
Modified:
    hadoop/avro/trunk/CHANGES.txt
    hadoop/avro/trunk/build.xml
    hadoop/avro/trunk/ivy.xml
    hadoop/avro/trunk/src/java/org/apache/avro/AvroRuntimeException.java
    hadoop/avro/trunk/src/java/org/apache/avro/AvroTypeException.java
    hadoop/avro/trunk/src/java/org/apache/avro/Protocol.java
    hadoop/avro/trunk/src/java/org/apache/avro/Schema.java
    hadoop/avro/trunk/src/java/org/apache/avro/SchemaParseException.java
    hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileReader.java
    hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileWriter.java
    hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableFileInput.java
    hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableInput.java
    hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericArray.java
    hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericData.java
    hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericDatumReader.java
    hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericFixed.java
    hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRecord.java
    hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRequestor.java
    hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericResponder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryDecoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryEncoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/BlockingBinaryEncoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/DatumWriter.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/Decoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/Encoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/JsonDecoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/JsonEncoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingDecoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingEncoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/ResolvingDecoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingDecoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingEncoder.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/JsonGrammarGenerator.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Parser.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/SkipParser.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Symbol.java
    hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ValidatingGrammarGenerator.java
    hadoop/avro/trunk/src/java/org/apache/avro/ipc/AvroRemoteException.java
    hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferInputStream.java
    hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferOutputStream.java
    hadoop/avro/trunk/src/java/org/apache/avro/ipc/Requestor.java
    hadoop/avro/trunk/src/java/org/apache/avro/ipc/Responder.java
    hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketServer.java
    hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketTransceiver.java
    hadoop/avro/trunk/src/java/org/apache/avro/ipc/Transceiver.java
    hadoop/avro/trunk/src/java/org/apache/avro/reflect/FixedSize.java
    hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectData.java
    hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumReader.java
    hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumWriter.java
    hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectRequestor.java
    hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectResponder.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/ProtocolTask.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SchemaTask.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificCompiler.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumReader.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumWriter.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificExceptionBase.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificFixed.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecord.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecordBase.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRequestor.java
    hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificResponder.java
    hadoop/avro/trunk/src/java/org/apache/avro/util/Utf8.java

Modified: hadoop/avro/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/CHANGES.txt?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/CHANGES.txt (original)
+++ hadoop/avro/trunk/CHANGES.txt Tue Jul 28 18:44:51 2009
@@ -19,6 +19,9 @@
 
     AVRO-54. Re-upgrade to testng 5.9 and re-enable listeners. (cutting)
 
+    AVRO-82. Add checkstyle to java compilation.  (Thiruvalluvan
+    M. G. via cutting)
+
   OPTIMIZATIONS
 
   BUG FIXES

Modified: hadoop/avro/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/build.xml?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/build.xml (original)
+++ hadoop/avro/trunk/build.xml Tue Jul 28 18:44:51 2009
@@ -79,6 +79,7 @@
 	    value="http://repo2.maven.org/maven2/org/apache/ivy/ivy" />
   <property name="ivy.home" value="${user.home}/.ant" />
   <property name="ivy.lib" value="${build.dir}/lib"/>
+  <property name="ivy.test.lib" value="${build.dir}/test/lib"/>
 
   <!-- the normal classpath -->
   <path id="java.classpath">
@@ -97,6 +98,9 @@
 
   <path id="test.java.classpath">
     <pathelement location="${test.java.classes}" />
+    <fileset dir="${ivy.test.lib}">
+      <include name="**/*.jar" />
+    </fileset>
     <path refid="java.classpath"/>
   </path>
 
@@ -108,6 +112,7 @@
     <mkdir dir="${test.java.classes}"/>
 
     <mkdir dir="${ivy.lib}"/>
+    <mkdir dir="${ivy.test.lib}"/>
     <condition property="ivy.jar.exists">
       <available file="${lib.dir}/ivy-${ivy.version}.jar"/>
     </condition>
@@ -115,7 +120,7 @@
 
   <target name="compile" depends="compile-java,compile-c"/>
 
-  <target name="compile-java" depends="init,schemata,ivy-retrieve">
+  <target name="compile-java" depends="schemata,ivy-retrieve">
     <java-compiler excludes="**/ipc/** **/*Requestor.java **/*Responder.java"/>
     <java-avro-compiler/>
     <java-compiler/>
@@ -133,8 +138,14 @@
              uri="antlib:org.apache.ivy.ant" classpathref="java.classpath"/>
   </target>
 
-  <target name="ivy-retrieve" depends="ivy-init">
-    <ivy:retrieve type="jar" pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+  <target name="ivy-retrieve" depends="init,ivy-init">
+    <ivy:retrieve type="jar" conf="default"
+		  pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
+  </target>
+
+  <target name="ivy-retrieve-test" depends="init,ivy-init">
+    <ivy:retrieve type="jar" conf="test"
+		  pattern="${ivy.test.lib}/[artifact]-[revision].[ext]"/>
   </target>
 
   <macrodef name="java-compiler">
@@ -184,7 +195,19 @@
     </jar>
   </target>
   
-  <target name="compile-test-java" depends="compile-java">
+  <target name="checkstyle-java" depends="compile-java">
+    <taskdef resource="checkstyletask.properties">
+      <classpath refid="test.java.classpath" />
+    </taskdef>
+    <checkstyle config="${java.src.dir}/checkstyle.xml"
+		classpathref="test.java.classpath">
+	<fileset dir="${java.src.dir}">
+        <include name="**/*.java"/>
+    </fileset>
+    </checkstyle>
+  </target>
+
+  <target name="compile-test-java" depends="ivy-retrieve-test,compile-java">
     <java-avro-compiler src="${test.schemata.dir}"
 			generated="${test.java.generated.dir}"
 			dest="${test.java.classes}"
@@ -192,7 +215,7 @@
     <java-compiler src="${test.java.src.dir}"
 		   dest="${test.java.classes}"
 		   classpath="test.java.classpath"/>
-    <taskdef resource="testngtasks" classpathref="java.classpath"/>
+    <taskdef resource="testngtasks" classpathref="test.java.classpath"/>
   </target>
 
   <macrodef name="java-avro-compiler">
@@ -237,7 +260,7 @@
 
   <target name="test" depends="test-java,test-py,test-c,test-interop"/>
 
-  <target name="test-java" depends="compile-test-java"
+  <target name="test-java" depends="compile-test-java,checkstyle-java"
           description="Run java unit tests with TestNG">
 
     <testng classpathref="test.java.classpath"

Modified: hadoop/avro/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/ivy.xml?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/ivy.xml (original)
+++ hadoop/avro/trunk/ivy.xml Tue Jul 28 18:44:51 2009
@@ -25,6 +25,15 @@
     <description>Avro</description>
   </info>
 
+  <configurations defaultconfmapping="default">
+    <conf name="default" extends="master,runtime"/>
+    <conf name="master" description="artifact but no dependencies"/>
+    <conf name="runtime" description="runtime but not artifact"
+	  extends="mandatory"/>
+    <conf name="mandatory" description="contains the critical dependencies"/>
+    <conf name="test" description="the classpath needed to run tests"/>
+  </configurations>
+
   <dependencies>
     <dependency org="org.codehaus.jackson" name="jackson-mapper-asl"
 		rev="1.0.1"/>
@@ -34,9 +43,12 @@
 		rev="1.5"/>
     <dependency org="com.thoughtworks.paranamer" name="paranamer-ant"
 		rev="1.5"/>
-    <dependency org="org.testng" name="testng" rev="5.9" transitive="false">
+    <dependency org="org.testng" name="testng" rev="5.9"
+		transitive="false" conf="test->default">
       <artifact name="testng" type="jar" ext="jar" e:classifier="jdk15"/>
     </dependency>
+    <dependency org="checkstyle" name="checkstyle" rev="5.0"
+		conf="test->default"/>
   </dependencies>
 
 </ivy-module>

Added: hadoop/avro/trunk/src/java/checkstyle.xml
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/checkstyle.xml?rev=798646&view=auto
==============================================================================
--- hadoop/avro/trunk/src/java/checkstyle.xml (added)
+++ hadoop/avro/trunk/src/java/checkstyle.xml Tue Jul 28 18:44:51 2009
@@ -0,0 +1,59 @@
+<?xml version="1.0"?>
+
+<!--
+   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.
+-->
+
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<module name="Checker">
+    <module name="FileTabCharacter"/>
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
+    </module>
+
+    <module name="TreeWalker">
+        <module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+        <module name="AvoidStarImport"/>
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+        <module name="RedundantModifier"/>
+
+        <module name="EmptyStatement"/>
+        <module name="IllegalInstantiation"/>
+        <module name="RedundantThrows"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <module name="InterfaceIsType"/>
+
+        <module name="ArrayTypeStyle"/>
+        <module name="UpperEll"/>
+
+    </module>
+</module>

Modified: hadoop/avro/trunk/src/java/org/apache/avro/AvroRuntimeException.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/AvroRuntimeException.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/AvroRuntimeException.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/AvroRuntimeException.java Tue Jul 28 18:44:51 2009
@@ -22,3 +22,4 @@
   public AvroRuntimeException(Throwable cause) { super(cause); }
   public AvroRuntimeException(String message) { super(message); }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/AvroTypeException.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/AvroTypeException.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/AvroTypeException.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/AvroTypeException.java Tue Jul 28 18:44:51 2009
@@ -23,3 +23,4 @@
 public class AvroTypeException extends AvroRuntimeException {
   public AvroTypeException(String message) { super(message); }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/Protocol.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/Protocol.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/Protocol.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/Protocol.java Tue Jul 28 18:44:51 2009
@@ -332,8 +332,9 @@
                        Schema.createUnion(errs));
   }
 
-  public static void main(String args[]) throws Exception {
+  public static void main(String[] args) throws Exception {
     System.out.println(Protocol.parse(new File(args[0])));
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/Schema.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/Schema.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/Schema.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/Schema.java Tue Jul 28 18:44:51 2009
@@ -723,3 +723,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/SchemaParseException.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/SchemaParseException.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/SchemaParseException.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/SchemaParseException.java Tue Jul 28 18:44:51 2009
@@ -22,3 +22,4 @@
   public SchemaParseException(Throwable cause) { super(cause); }
   public SchemaParseException(String message) { super(message); }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileReader.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileReader.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileReader.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileReader.java Tue Jul 28 18:44:51 2009
@@ -173,7 +173,7 @@
         this.in = in;
       }
       public int read() { throw new UnsupportedOperationException(); }
-      public int read(byte b[], int off, int len) throws IOException {
+      public int read(byte[] b, int off, int len) throws IOException {
         int value = in.read(b, off, len);
         if (value > 0) position += value;         // update on read
         return value;
@@ -216,3 +216,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileWriter.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileWriter.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileWriter.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/file/DataFileWriter.java Tue Jul 28 18:44:51 2009
@@ -176,7 +176,7 @@
 
     private class PositionFilter extends FilterOutputStream {
       public PositionFilter(OutputStream out) throws IOException { super(out); }
-      public void write(byte b[], int off, int len) throws IOException {
+      public void write(byte[] b, int off, int len) throws IOException {
         out.write(b, off, len);
         position += len;                           // update on write
       }
@@ -191,3 +191,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableFileInput.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableFileInput.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableFileInput.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableFileInput.java Tue Jul 28 18:44:51 2009
@@ -17,7 +17,9 @@
  */
 package org.apache.avro.file;
 
-import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
 
 /** A {@link FileInputStream} that implements {@link SeekableInput}. */
 public class SeekableFileInput
@@ -30,3 +32,4 @@
   public long length() throws IOException { return getChannel().size(); }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableInput.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableInput.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableInput.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/file/SeekableInput.java Tue Jul 28 18:44:51 2009
@@ -17,7 +17,7 @@
  */
 package org.apache.avro.file;
 
-import java.io.*;
+import java.io.IOException;
 
 /** An InputStream that supports seek and tell. */
 public interface SeekableInput {
@@ -32,5 +32,6 @@
   long length() throws IOException;
 
   /** Equivalent to {@link InputStream#read(byte[],int,int)}. */
-  int read(byte b[], int off, int len) throws IOException;
+  int read(byte[] b, int off, int len) throws IOException;
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericArray.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericArray.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericArray.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericArray.java Tue Jul 28 18:44:51 2009
@@ -34,3 +34,4 @@
    * without allocating new objects. */
   T peek();
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericData.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericData.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericData.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericData.java Tue Jul 28 18:44:51 2009
@@ -277,3 +277,4 @@
     else throw new AvroTypeException("Can't create schema for: "+datum);
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericDatumReader.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericDatumReader.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericDatumReader.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericDatumReader.java Tue Jul 28 18:44:51 2009
@@ -460,3 +460,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericFixed.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericFixed.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericFixed.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericFixed.java Tue Jul 28 18:44:51 2009
@@ -20,5 +20,5 @@
 /** Fixed-size data. */
 public interface GenericFixed {
   /** Return the data. */
-  public byte[] bytes();
+  byte[] bytes();
 }

Modified: hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRecord.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRecord.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRecord.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRecord.java Tue Jul 28 18:44:51 2009
@@ -17,7 +17,7 @@
  */
 package org.apache.avro.generic;
 
-import java.util.*;
+import java.util.Map;
 
 import org.apache.avro.Schema;
 
@@ -26,3 +26,4 @@
   /** The schema of this instance. */
   Schema getSchema();
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRequestor.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRequestor.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRequestor.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericRequestor.java Tue Jul 28 18:44:51 2009
@@ -55,3 +55,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericResponder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericResponder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericResponder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/generic/GenericResponder.java Tue Jul 28 18:44:51 2009
@@ -52,3 +52,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryDecoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryDecoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryDecoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryDecoder.java Tue Jul 28 18:44:51 2009
@@ -198,7 +198,7 @@
     return readInt();
   }
   
-  private void doSkipBytes(long length) throws IOException, EOFException {
+  private void doSkipBytes(long length) throws IOException {
     while (length > 0) {
       long n = in.skip(length);
       if (n <= 0) {
@@ -298,3 +298,4 @@
     return readInt();
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryEncoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryEncoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryEncoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/BinaryEncoder.java Tue Jul 28 18:44:51 2009
@@ -46,7 +46,7 @@
   protected OutputStream out;
   
   private interface ByteWriter {
-    public void write(ByteBuffer bytes) throws IOException;
+    void write(ByteBuffer bytes) throws IOException;
   }
   
   private static final class SimpleByteWriter implements ByteWriter {
@@ -145,7 +145,7 @@
   
   @Override
   public void writeFixed(byte[] bytes, int start, int len) throws IOException {
-	  out.write(bytes, start, len);
+    out.write(bytes, start, len);
   }
 
   @Override
@@ -248,3 +248,4 @@
     return pos;
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/BlockingBinaryEncoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/BlockingBinaryEncoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/BlockingBinaryEncoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/BlockingBinaryEncoder.java Tue Jul 28 18:44:51 2009
@@ -179,7 +179,7 @@
    */
   private BlockedValue[] blockStack;
   private int stackTop = -1;
-  private static int STACK_STEP = 10;
+  private static final int STACK_STEP = 10;
 
   private static final class EncoderBuffer extends ByteArrayOutputStream {
     public byte[] buffer() {
@@ -538,7 +538,7 @@
     assert check();
   }
 
-  private void write(byte b[], int off, int len) throws IOException {
+  private void write(byte[] b, int off, int len) throws IOException {
     if (blockStack[stackTop].state == BlockedValue.State.ROOT) {
       out.write(b, off, len);
     } else {
@@ -620,3 +620,4 @@
     assert check();
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/DatumWriter.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/DatumWriter.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/DatumWriter.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/DatumWriter.java Tue Jul 28 18:44:51 2009
@@ -33,3 +33,4 @@
    * in the schema from the datum to the output. */
   void write(D datum, Encoder out) throws IOException;
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/Decoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/Decoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/Decoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/Decoder.java Tue Jul 28 18:44:51 2009
@@ -21,7 +21,6 @@
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 
-import org.apache.avro.AvroTypeException;
 import org.apache.avro.util.Utf8;
 
 /**
@@ -278,3 +277,4 @@
    */
   public abstract int readIndex() throws IOException;
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/Encoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/Encoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/Encoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/Encoder.java Tue Jul 28 18:44:51 2009
@@ -21,7 +21,6 @@
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
 
-import org.apache.avro.AvroTypeException;
 import org.apache.avro.util.Utf8;
 
 /**
@@ -273,3 +272,4 @@
    */
   public abstract void writeIndex(int unionIndex) throws IOException;
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/JsonDecoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/JsonDecoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/JsonDecoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/JsonDecoder.java Tue Jul 28 18:44:51 2009
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 
 import org.apache.avro.AvroTypeException;
@@ -29,15 +28,15 @@
 import org.apache.avro.io.parsing.Symbol;
 import org.apache.avro.util.Utf8;
 import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonParseException;
 import org.codehaus.jackson.JsonParser;
 import org.codehaus.jackson.JsonToken;
+
 /** A {@link Decoder} for Avro's JSON data encoding. */
 public class JsonDecoder extends ParsingDecoder
   implements Parser.ActionHandler {
   private JsonParser in;
   
-  static String CHARSET = "ISO-8859-1";
+  static final String CHARSET = "ISO-8859-1";
 
   JsonDecoder(Symbol root, InputStream in) throws IOException {
     super(root);
@@ -171,8 +170,7 @@
     }
   }
 
-  private byte[] readByteArray() throws UnsupportedEncodingException,
-      IOException, JsonParseException {
+  private byte[] readByteArray() throws IOException {
     byte[] result = in.getText().getBytes(CHARSET);
     return result;
   }
@@ -219,7 +217,7 @@
     doSkipFixed(length);
   }
 
-  private void doSkipFixed(int length) throws IOException, JsonParseException {
+  private void doSkipFixed(int length) throws IOException {
     if (in.getCurrentToken() == JsonToken.VALUE_STRING) {
       byte[] result = readByteArray();
       in.nextToken();
@@ -273,7 +271,7 @@
     return doArrayNext();
   }
 
-  private long doArrayNext() throws IOException, JsonParseException {
+  private long doArrayNext() throws IOException {
     if (in.getCurrentToken() == JsonToken.END_ARRAY) {
       parser.advance(Symbol.ARRAY_END);
       in.nextToken();
@@ -313,7 +311,7 @@
     return doMapNext();
   }
 
-  private long doMapNext() throws IOException, JsonParseException {
+  private long doMapNext() throws IOException {
     if (in.getCurrentToken() == JsonToken.END_OBJECT) {
       in.nextToken();
       parser.advance(Symbol.MAP_END);
@@ -395,3 +393,4 @@
   public void setItemCount(long itemCount) throws IOException {
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/JsonEncoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/JsonEncoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/JsonEncoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/JsonEncoder.java Tue Jul 28 18:44:51 2009
@@ -19,7 +19,6 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.util.BitSet;
 
@@ -31,7 +30,6 @@
 import org.apache.avro.util.Utf8;
 import org.codehaus.jackson.JsonEncoding;
 import org.codehaus.jackson.JsonFactory;
-import org.codehaus.jackson.JsonGenerationException;
 import org.codehaus.jackson.JsonGenerator;
 
 /** An {@link Encoder} for Avro's JSON data encoding. */
@@ -136,7 +134,7 @@
   }
 
   private void writeByteArray(byte[] bytes, int start, int len)
-      throws IOException, JsonGenerationException, UnsupportedEncodingException {
+    throws IOException {
     out.writeString(
         new String(bytes, start, len, JsonDecoder.CHARSET));
   }
@@ -237,3 +235,4 @@
     return Symbol.CONTINUE;
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingDecoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingDecoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingDecoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingDecoder.java Tue Jul 28 18:44:51 2009
@@ -72,3 +72,4 @@
   }
   
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingEncoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingEncoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingEncoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/ParsingEncoder.java Tue Jul 28 18:44:51 2009
@@ -50,3 +50,4 @@
     return pos;
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/ResolvingDecoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/ResolvingDecoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/ResolvingDecoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/ResolvingDecoder.java Tue Jul 28 18:44:51 2009
@@ -201,3 +201,4 @@
     }
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingDecoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingDecoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingDecoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingDecoder.java Tue Jul 28 18:44:51 2009
@@ -227,3 +227,4 @@
     return Symbol.CONTINUE;
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingEncoder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingEncoder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingEncoder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/ValidatingEncoder.java Tue Jul 28 18:44:51 2009
@@ -200,3 +200,4 @@
     return isEmpty.get(pos);
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/JsonGrammarGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/JsonGrammarGenerator.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/JsonGrammarGenerator.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/JsonGrammarGenerator.java Tue Jul 28 18:44:51 2009
@@ -100,3 +100,4 @@
     }
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Parser.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Parser.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Parser.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Parser.java Tue Jul 28 18:44:51 2009
@@ -34,7 +34,7 @@
    * provide this help.
    */
   public interface ActionHandler {
-    public Symbol doAction(Symbol input, Symbol top) throws IOException;
+    Symbol doAction(Symbol input, Symbol top) throws IOException;
   }
 
   protected final ActionHandler symbolHandler;
@@ -52,7 +52,7 @@
   /**
    * If there is no sufficient room in the stack, use this expand it.
    */
-  private final void expandStack() {
+  private void expandStack() {
     stack = Arrays.copyOf(stack, stack.length+Math.max(stack.length,1024));
   }
 
@@ -142,3 +142,4 @@
     pos = 1;
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ResolvingGrammarGenerator.java Tue Jul 28 18:44:51 2009
@@ -335,3 +335,4 @@
      }
    }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/SkipParser.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/SkipParser.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/SkipParser.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/SkipParser.java Tue Jul 28 18:44:51 2009
@@ -32,12 +32,12 @@
     /**
      * Skips the action at the top of the stack.
      */
-    public void skipAction() throws IOException;
+    void skipAction() throws IOException;
 
     /**
      * Skips the symbol at the top of the stack.
      */
-    public void skipTopSymbol() throws IOException;
+    void skipTopSymbol() throws IOException;
   }
   
   private final SkipHandler skipHandler;
@@ -92,3 +92,4 @@
     skipTo(target);
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Symbol.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Symbol.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Symbol.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/Symbol.java Tue Jul 28 18:44:51 2009
@@ -380,3 +380,4 @@
   public static final Symbol MAP_KEY_MARKER =
     new Symbol.Terminal("map-key-marker");
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ValidatingGrammarGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ValidatingGrammarGenerator.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ValidatingGrammarGenerator.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/io/parsing/ValidatingGrammarGenerator.java Tue Jul 28 18:44:51 2009
@@ -136,3 +136,4 @@
     }
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/ipc/AvroRemoteException.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/ipc/AvroRemoteException.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/ipc/AvroRemoteException.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/ipc/AvroRemoteException.java Tue Jul 28 18:44:51 2009
@@ -38,3 +38,4 @@
   
   public Object getValue() { return value; }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferInputStream.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferInputStream.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferInputStream.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferInputStream.java Tue Jul 28 18:44:51 2009
@@ -41,7 +41,7 @@
 
   /** @see InputStream#read(byte[], int, int)
    * @throws EOFException if EOF is reached before reading all the bytes. */
-  public int read(byte b[], int off, int len) throws IOException {
+  public int read(byte[] b, int off, int len) throws IOException {
     if (len == 0) return 0;
     ByteBuffer buffer = getBuffer();
     int remaining = buffer.remaining();
@@ -84,3 +84,4 @@
     throw new EOFException();
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferOutputStream.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferOutputStream.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferOutputStream.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/ipc/ByteBufferOutputStream.java Tue Jul 28 18:44:51 2009
@@ -18,9 +18,12 @@
 
 package org.apache.avro.ipc;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /** Utility to collect data written to an {@link OutputStream} in {@link
  * ByteBuffer}s.*/
@@ -59,7 +62,7 @@
     buffer.put((byte)b);
   }
 
-  public void write(byte b[], int off, int len) {
+  public void write(byte[] b, int off, int len) {
     ByteBuffer buffer = buffers.get(buffers.size()-1);
     int remaining = buffer.remaining();
     while (len > remaining) {
@@ -85,3 +88,4 @@
     buffer.position(buffer.limit());              // mark data as consumed
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/ipc/Requestor.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/ipc/Requestor.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/ipc/Requestor.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/ipc/Requestor.java Tue Jul 28 18:44:51 2009
@@ -181,3 +181,4 @@
   public abstract AvroRemoteException readError(Schema schema, Decoder in)
     throws IOException;
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/ipc/Responder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/ipc/Responder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/ipc/Responder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/ipc/Responder.java Tue Jul 28 18:44:51 2009
@@ -18,20 +18,31 @@
 
 package org.apache.avro.ipc;
 
-import java.io.*;
+import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.*;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.avro.*;
+import org.apache.avro.AvroRuntimeException;
+import org.apache.avro.Protocol;
+import org.apache.avro.Schema;
 import org.apache.avro.Protocol.Message;
-import org.apache.avro.util.*;
+import org.apache.avro.util.Utf8;
 import org.apache.avro.generic.GenericDatumReader;
 import org.apache.avro.generic.GenericDatumWriter;
-import org.apache.avro.io.*;
-import org.apache.avro.specific.*;
+import org.apache.avro.io.BinaryDecoder;
+import org.apache.avro.io.BinaryEncoder;
+import org.apache.avro.io.Decoder;
+import org.apache.avro.io.Encoder;
+import org.apache.avro.specific.SpecificDatumReader;
+import org.apache.avro.specific.SpecificDatumWriter;
 
 /** Base class for the server side of a protocol interaction. */
 public abstract class Responder {
@@ -172,3 +183,4 @@
                                   Encoder out) throws IOException;
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketServer.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketServer.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketServer.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketServer.java Tue Jul 28 18:44:51 2009
@@ -102,9 +102,10 @@
 
   }
   
-  public static void main(String arg[]) throws Exception {
+  public static void main(String[] arg) throws Exception {
     SocketServer server = new SocketServer(null, new InetSocketAddress(0));
     System.out.println("started");
     server.join();
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketTransceiver.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketTransceiver.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketTransceiver.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/ipc/SocketTransceiver.java Tue Jul 28 18:44:51 2009
@@ -18,11 +18,12 @@
 
 package org.apache.avro.ipc;
 
-import java.io.*;
+import java.io.IOException;
 import java.net.SocketAddress;
 import java.nio.channels.SocketChannel;
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,3 +92,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/ipc/Transceiver.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/ipc/Transceiver.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/ipc/Transceiver.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/ipc/Transceiver.java Tue Jul 28 18:44:51 2009
@@ -18,9 +18,9 @@
 
 package org.apache.avro.ipc;
 
-import java.io.*;
+import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.List;
 
 /** Base class for transmitters and recievers of raw binary messages. */
 public abstract class Transceiver {
@@ -40,3 +40,4 @@
 
   public void close() throws IOException {}
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/reflect/FixedSize.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/reflect/FixedSize.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/reflect/FixedSize.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/reflect/FixedSize.java Tue Jul 28 18:44:51 2009
@@ -17,8 +17,11 @@
  */
 package org.apache.avro.reflect;
 
-import org.apache.avro.generic.GenericFixed;
-import java.lang.annotation.*;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
 /** Declares the size of implementations of {@link GenericFixed}. */
 @Retention(RetentionPolicy.RUNTIME)
@@ -28,3 +31,4 @@
   /** The declared size of instances of classes with this annotation. */
   int value();
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectData.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectData.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectData.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectData.java Tue Jul 28 18:44:51 2009
@@ -224,7 +224,7 @@
     return protocol;
   }
 
-  private static Paranamer PARANAMER = new CachingParanamer();
+  private static final Paranamer PARANAMER = new CachingParanamer();
 
   private static Message getMessage(Method method, Protocol protocol) {
     Map<String,Schema> names = protocol.getTypes();
@@ -250,3 +250,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumReader.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumReader.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumReader.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumReader.java Tue Jul 28 18:44:51 2009
@@ -18,14 +18,12 @@
 package org.apache.avro.reflect;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 import org.apache.avro.generic.GenericDatumReader;
-import org.apache.avro.io.DatumReader;
 
 /** {@link DatumReader} for existing classes via Java reflection. */
 public class ReflectDatumReader extends GenericDatumReader<Object> {
@@ -114,3 +112,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumWriter.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumWriter.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumWriter.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectDatumWriter.java Tue Jul 28 18:44:51 2009
@@ -18,13 +18,11 @@
 package org.apache.avro.reflect;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 
 import org.apache.avro.AvroRuntimeException;
 import org.apache.avro.Schema;
 import org.apache.avro.Schema.Type;
 import org.apache.avro.generic.GenericDatumWriter;
-import org.apache.avro.io.DatumWriter;
 import org.apache.avro.io.Encoder;
 
 /** {@link DatumWriter} for existing classes via Java reflection. */

Modified: hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectRequestor.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectRequestor.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectRequestor.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectRequestor.java Tue Jul 28 18:44:51 2009
@@ -83,3 +83,4 @@
                                   new ReflectRequestor(protocol, transciever));
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectResponder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectResponder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectResponder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/reflect/ReflectResponder.java Tue Jul 28 18:44:51 2009
@@ -122,3 +122,4 @@
 
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/ProtocolTask.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/ProtocolTask.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/ProtocolTask.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/ProtocolTask.java Tue Jul 28 18:44:51 2009
@@ -46,7 +46,7 @@
   public void addFileset(FileSet set) { filesets.add(set); }
   
   /** Run the compiler. */
-  public void execute() throws BuildException {
+  public void execute() {
     if (src == null && filesets.size()==0)
       throw new BuildException("No file or fileset specified.");
 
@@ -69,7 +69,7 @@
     return SpecificCompiler.compileProtocol(file);
   }
 
-  private void compile(File file) throws BuildException {
+  private void compile(File file) {
     try {
       SpecificCompiler compiler = doCompile(file);
       String namespace = compiler.getNamespace();
@@ -103,3 +103,4 @@
     }
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SchemaTask.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SchemaTask.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SchemaTask.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SchemaTask.java Tue Jul 28 18:44:51 2009
@@ -26,3 +26,4 @@
     return SpecificCompiler.compileSchema(file);
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificCompiler.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificCompiler.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificCompiler.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificCompiler.java Tue Jul 28 18:44:51 2009
@@ -262,8 +262,9 @@
     return o.toString().replace("\"", "\\\"");
   }
 
-  public static void main(String args[]) throws Exception {
+  public static void main(String[] args) throws Exception {
     System.out.println(compileProtocol(new File(args[0])).getCode());
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumReader.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumReader.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumReader.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumReader.java Tue Jul 28 18:44:51 2009
@@ -18,7 +18,6 @@
 package org.apache.avro.specific;
 
 import org.apache.avro.Schema;
-import org.apache.avro.io.DatumReader;
 import org.apache.avro.reflect.ReflectDatumReader;
 
 /** {@link DatumReader} for generated Java classes. */
@@ -46,3 +45,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumWriter.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumWriter.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumWriter.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificDatumWriter.java Tue Jul 28 18:44:51 2009
@@ -18,7 +18,6 @@
 package org.apache.avro.specific;
 
 import org.apache.avro.Schema;
-import org.apache.avro.io.DatumWriter;
 import org.apache.avro.reflect.ReflectDatumWriter;
 
 /** {@link DatumWriter} for generated Java classes. */
@@ -34,3 +33,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificExceptionBase.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificExceptionBase.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificExceptionBase.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificExceptionBase.java Tue Jul 28 18:44:51 2009
@@ -38,3 +38,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificFixed.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificFixed.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificFixed.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificFixed.java Tue Jul 28 18:44:51 2009
@@ -26,3 +26,4 @@
     bytes(new byte[getClass().getAnnotation(FixedSize.class).value()]);
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecord.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecord.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecord.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecord.java Tue Jul 28 18:44:51 2009
@@ -26,3 +26,4 @@
   Object get(int field);
   void set(int field, Object value);
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecordBase.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecordBase.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecordBase.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRecordBase.java Tue Jul 28 18:44:51 2009
@@ -62,3 +62,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRequestor.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRequestor.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRequestor.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificRequestor.java Tue Jul 28 18:44:51 2009
@@ -25,7 +25,6 @@
 import org.apache.avro.Schema;
 import org.apache.avro.io.DatumReader;
 import org.apache.avro.io.DatumWriter;
-import org.apache.avro.ipc.Requestor;
 import org.apache.avro.ipc.Transceiver;
 import org.apache.avro.reflect.ReflectData;
 import org.apache.avro.reflect.ReflectRequestor;
@@ -54,3 +53,4 @@
                                   new SpecificRequestor(protocol, transciever));
   }
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificResponder.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificResponder.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificResponder.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/specific/SpecificResponder.java Tue Jul 28 18:44:51 2009
@@ -21,7 +21,6 @@
 import org.apache.avro.Schema;
 import org.apache.avro.io.DatumReader;
 import org.apache.avro.io.DatumWriter;
-import org.apache.avro.ipc.Responder;
 import org.apache.avro.reflect.ReflectResponder;
 
 /** {@link Responder} for generated interfaces.*/
@@ -39,3 +38,4 @@
   }
 
 }
+

Modified: hadoop/avro/trunk/src/java/org/apache/avro/util/Utf8.java
URL: http://svn.apache.org/viewvc/hadoop/avro/trunk/src/java/org/apache/avro/util/Utf8.java?rev=798646&r1=798645&r2=798646&view=diff
==============================================================================
--- hadoop/avro/trunk/src/java/org/apache/avro/util/Utf8.java (original)
+++ hadoop/avro/trunk/src/java/org/apache/avro/util/Utf8.java Tue Jul 28 18:44:51 2009
@@ -17,11 +17,11 @@
  */
 package org.apache.avro.util;
 
-import java.io.*;
+import java.io.UnsupportedEncodingException;
 
 /** A Utf8 string. */
 public class Utf8 {
-  private static byte[] EMPTY = new byte[0];
+  private static final byte[] EMPTY = new byte[0];
 
   byte[] bytes = EMPTY;
   int length;
@@ -78,3 +78,5 @@
   }
 
 }
+
+



Mime
View raw message