Skip to content

Commit

Permalink
AVRO-87. Fix broken links in javadoc introduced by AVRO-82.
Browse files Browse the repository at this point in the history
git-svn-id: https://svn.apache.org/repos/asf/hadoop/avro/trunk@803592 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
cutting committed Aug 12, 2009
1 parent 127800a commit 79d5718
Show file tree
Hide file tree
Showing 10 changed files with 35 additions and 13 deletions.
4 changes: 4 additions & 0 deletions CHANGES.txt
Expand Up @@ -39,6 +39,10 @@ Trunk (unreleased changes)
AVRO-79. Specify format for default fixed values, and implement
correctly in Java. (Thiruvalluvan M. G. via cutting)

AVRO-87. Fix broken links in javadoc introduced by AVRO-82. Also
change test-java build target to fail on javadoc warnings.
(Thiruvalluvan M. G. and cutting)

Avro 1.0.0 -- 9 July 2009

INCOMPATIBLE CHANGES
Expand Down
15 changes: 12 additions & 3 deletions build.xml
Expand Up @@ -43,6 +43,7 @@
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.doc" value="${build.dir}/doc"/>
<property name="build.javadoc" value="${build.doc}/api/java"/>
<property name="build.javadoc.log" value="${build.dir}/javadoc.log"/>
<property name="build.cdoc" value="${build.doc}/api/c"/>

<exec executable="sed" inputstring="${os.name}" outputproperty="nonspace.os">
Expand Down Expand Up @@ -284,7 +285,7 @@
</sequential>
</macrodef>

<target name="test-java" depends="compile-test-java,checkstyle-java"
<target name="test-java" depends="compile-test-java,checkstyle-java,javadoc"
description="Run java unit tests">
<test-runner files.location="${test.java.src.dir}" tests.pattern="**/${test.java.include}.java"/>
</target>
Expand Down Expand Up @@ -440,8 +441,9 @@
<fail message="'java5.home' is not defined. Forrest requires Java 5. Please pass -Djava5.home=&lt;base of Java 5 distribution&gt; to Ant on the command-line." />
</target>

<target name="javadoc" depends="compile" description="Generate javadoc">
<target name="javadoc" depends="compile-java" description="Generate javadoc">
<mkdir dir="${build.javadoc}"/>
<record name="${build.javadoc.log}" action="start"/>
<javadoc
overview="${java.src.dir}/overview.html"
packagenames="org.${org}.${name}.*"
Expand All @@ -463,7 +465,14 @@
</classpath>

</javadoc>
</target>
<record name="${build.javadoc.log}" action="stop"/>
<condition property="javadoc.warnings">
<isfileselected file="${build.javadoc.log}">
<contains text=": warning - "/>
</isfileselected>
</condition>
<fail if="javadoc.warnings">Javadoc warnings!</fail>
</target>

<target name="package" depends="jar, doc, package-c"
description="Build distribution">
Expand Down
6 changes: 3 additions & 3 deletions src/java/org/apache/avro/file/SeekableInput.java
Expand Up @@ -22,16 +22,16 @@
/** An InputStream that supports seek and tell. */
public interface SeekableInput {

/** Set the position for the next {@link #read(byte[],int,int) read()}. */
/** Set the position for the next {@link java.io.InputStream#read(byte[],int,int) read()}. */
void seek(long p) throws IOException;

/** Return the position of the next {@link #read(byte[],int,int) read()}. */
/** Return the position of the next {@link java.io.InputStream#read(byte[],int,int) read()}. */
long tell() throws IOException;

/** Return the length of the file. */
long length() throws IOException;

/** Equivalent to {@link InputStream#read(byte[],int,int)}. */
/** Equivalent to {@link java.io.InputStream#read(byte[],int,int)}. */
int read(byte[] b, int off, int len) throws IOException;
}

5 changes: 4 additions & 1 deletion src/java/org/apache/avro/reflect/FixedSize.java
Expand Up @@ -23,7 +23,10 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/** Declares the size of implementations of {@link GenericFixed}. */
/**
* Declares the size of implementations of
* {@link org.apache.avro.generic.GenericFixed GenericFixed}.
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
@Documented
Expand Down
5 changes: 4 additions & 1 deletion src/java/org/apache/avro/reflect/ReflectDatumReader.java
Expand Up @@ -25,7 +25,10 @@
import org.apache.avro.Schema;
import org.apache.avro.generic.GenericDatumReader;

/** {@link DatumReader} for existing classes via Java reflection. */
/**
* {@link org.apache.avro.io.DatumReader DatumReader} for existing classes via
* Java reflection.
*/
public class ReflectDatumReader extends GenericDatumReader<Object> {
protected String packageName;

Expand Down
5 changes: 4 additions & 1 deletion src/java/org/apache/avro/reflect/ReflectDatumWriter.java
Expand Up @@ -25,7 +25,10 @@
import org.apache.avro.generic.GenericDatumWriter;
import org.apache.avro.io.Encoder;

/** {@link DatumWriter} for existing classes via Java reflection. */
/**
* {@link org.apache.avro.io.DatumWriter DatumWriter} for existing classes
* via Java reflection.
*/
public class ReflectDatumWriter extends GenericDatumWriter<Object> {
public ReflectDatumWriter() {}

Expand Down
2 changes: 1 addition & 1 deletion src/java/org/apache/avro/specific/SpecificDatumReader.java
Expand Up @@ -20,7 +20,7 @@
import org.apache.avro.Schema;
import org.apache.avro.reflect.ReflectDatumReader;

/** {@link DatumReader} for generated Java classes. */
/** {@link org.apache.avro.io.DatumReader DatumReader} for generated Java classes. */
public class SpecificDatumReader extends ReflectDatumReader {
public SpecificDatumReader(String packageName) {
super(packageName);
Expand Down
2 changes: 1 addition & 1 deletion src/java/org/apache/avro/specific/SpecificDatumWriter.java
Expand Up @@ -20,7 +20,7 @@
import org.apache.avro.Schema;
import org.apache.avro.reflect.ReflectDatumWriter;

/** {@link DatumWriter} for generated Java classes. */
/** {@link org.apache.avro.io.DatumWriter DatumWriter} for generated Java classes. */
public class SpecificDatumWriter extends ReflectDatumWriter {
public SpecificDatumWriter() {}

Expand Down
2 changes: 1 addition & 1 deletion src/java/org/apache/avro/specific/SpecificRequestor.java
Expand Up @@ -29,7 +29,7 @@
import org.apache.avro.reflect.ReflectData;
import org.apache.avro.reflect.ReflectRequestor;

/** {@link Requestor} for generated interfaces. */
/** {@link org.apache.avro.ipc.Requestor Requestor} for generated interfaces. */
public class SpecificRequestor extends ReflectRequestor {

public SpecificRequestor(Class<?> iface, Transceiver transceiver)
Expand Down
2 changes: 1 addition & 1 deletion src/java/org/apache/avro/specific/SpecificResponder.java
Expand Up @@ -23,7 +23,7 @@
import org.apache.avro.io.DatumWriter;
import org.apache.avro.reflect.ReflectResponder;

/** {@link Responder} for generated interfaces.*/
/** {@link org.apache.avro.ipc.Responder Responder} for generated interfaces.*/
public class SpecificResponder extends ReflectResponder {
public SpecificResponder(Class iface, Object impl) {
super(iface, impl);
Expand Down

0 comments on commit 79d5718

Please sign in to comment.