Skip to content

Commit c37b59b

Browse files
committed
Merge pull request #250 from twitter/ianoc/docTest
Ianoc/doc test
2 parents 99cf096 + a09da87 commit c37b59b

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ jdk:
77
- openjdk6
88
- oraclejdk7
99
- oraclejdk8
10+
script: ./sbt ++$TRAVIS_SCALA_VERSION clean test doc
11+

chill-java/src/main/java/com/twitter/chill/Base64.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* <p>Example:</p>
77
*
88
* <code>String encoded = Base64.encode( myByteArray );</code>
9-
* <br />
9+
* <br>
1010
* <code>byte[] myByteArray = Base64.decode( encoded );</code>
1111
*
1212
* <p>The <tt>options</tt> parameter, which appears in a few places, is used to pass
@@ -1668,7 +1668,7 @@ public InputStream( java.io.InputStream in ) {
16681668
* Valid options:<pre>
16691669
* ENCODE or DECODE: Encode or Decode as data is read.
16701670
* DO_BREAK_LINES: break lines at 76 characters
1671-
* (only meaningful when encoding)</i>
1671+
* <i>(only meaningful when encoding)</i>
16721672
* </pre>
16731673
* <p>
16741674
* Example: <code>new Base64.InputStream( in, Base64.DECODE )</code>
@@ -1881,7 +1881,7 @@ public OutputStream( java.io.OutputStream out ) {
18811881
* Valid options:<pre>
18821882
* ENCODE or DECODE: Encode or Decode as data is read.
18831883
* DO_BREAK_LINES: don't break lines at 76 characters
1884-
* (only meaningful when encoding)</i>
1884+
* <i>(only meaningful when encoding)</i>
18851885
* </pre>
18861886
* <p>
18871887
* Example: <code>new Base64.OutputStream( out, Base64.ENCODE )</code>

chill-java/src/main/java/com/twitter/chill/config/ConfiguredInstantiator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class ConfiguredInstantiator extends KryoInstantiator {
4040
protected final KryoInstantiator delegate;
4141

4242
/** Key we use to configure this class.
43-
* Format: <class of KryoInstantiator>(:<base64 serialized instantiator>)
43+
* Format: {@literal<class of KryoInstantiator>(:<base64 serialized instantiator>)}
4444
* if there is no serialized instantiator, we use the reflected instance
4545
* as the delegate
4646
*/

0 commit comments

Comments
 (0)