Skip to content

Commit ee059e4

Browse files
author
Gary Keim
committed
TAB-7730: Java 11
svn path=/tc-messaging/trunk/; revision=27872
1 parent 35edebb commit ee059e4

28 files changed

+71
-89
lines changed

‎pom.xml

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
Apache Maven 2 POM generated by Apache Ivy
33
http://ant.apache.org/ivy/
44
Apache Ivy version: 2.2.0 20100923230623
5-
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
5+
-->
6+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
67

78
<modelVersion>4.0.0</modelVersion>
89

910
<parent>
1011
<groupId>org.terracotta.forge</groupId>
1112
<artifactId>forge-parent</artifactId>
12-
<version>3.23</version>
13+
<version>4.10</version>
1314
</parent>
1415

1516
<groupId>org.terracotta</groupId>
@@ -25,26 +26,7 @@
2526
<dependency>
2627
<groupId>com.terracottatech</groupId>
2728
<artifactId>search</artifactId>
28-
<version>1.4.8</version>
29-
</dependency>
30-
31-
<dependency>
32-
<groupId>junit</groupId>
33-
<artifactId>junit</artifactId>
34-
<version>4.11</version>
35-
<scope>test</scope>
36-
</dependency>
37-
<dependency>
38-
<groupId>org.mockito</groupId>
39-
<artifactId>mockito-all</artifactId>
40-
<version>1.9.5</version>
41-
<scope>test</scope>
42-
</dependency>
43-
<dependency>
44-
<groupId>org.hamcrest</groupId>
45-
<artifactId>hamcrest-all</artifactId>
46-
<version>1.3</version>
47-
<scope>test</scope>
29+
<version>1.5.9</version>
4830
</dependency>
4931
</dependencies>
5032

@@ -110,4 +92,4 @@
11092
<url>http://www.terracotta.org/download/reflector/releases</url>
11193
</pluginRepository>
11294
</pluginRepositories>
113-
</project>
95+
</project>

‎src/main/java/com/tc/io/TCByteBufferOutputStream.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -458,8 +458,6 @@ public void write(int b) {
458458

459459
/**
460460
* Copy (by invoking write() on the destination stream) the given length of bytes starting at this mark
461-
*
462-
* @throws IOException
463461
*/
464462
public void copyTo(TCByteBufferOutput dest, int length) {
465463
copyTo(dest, 0, length);
@@ -469,7 +467,7 @@ public void copyTo(TCByteBufferOutput dest, int length) {
469467
* Copy (by invoking write() on the destination stream) the given length of bytes starting from an offset to this
470468
* mark
471469
*
472-
* @throws IOException
470+
* @throws IllegalArgumentException
473471
*/
474472
public void copyTo(TCByteBufferOutput dest, int offset, int length) {
475473
if (length < 0) { throw new IllegalArgumentException("length: " + length); }

‎src/main/java/com/tc/io/TCDataOutput.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,6 @@ public interface TCDataOutput extends DataOutput {
112112
*
113113
* @param value Value
114114
*/
115-
public void writeString(String string);
115+
public void writeString(String value);
116116

117117
}

‎src/main/java/com/tc/io/serializer/TCObjectInputStream.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public TCObjectInputStream(InputStream in) {
4444
* This method is the reason I am writing this class. This implementation only can handle Literal Objects and is
4545
* designed to be used where readObject() is called only for literal objects. Example : Sleepycat Serialization.
4646
*
47-
* @see LiteralValues, DNAEncoding
47+
* @see com.tc.object.LiteralValues
48+
* @see com.tc.object.dna.api.DNAEncoding
4849
*/
4950
@Override
5051
public Object readObject() throws ClassNotFoundException, IOException {
@@ -189,7 +190,7 @@ public String readLine() {
189190
}
190191

191192
/**
192-
* This implemetation of writeUTF differes from the DataOutputStream's implementation in the following ways. 1) It
193+
* This implementation of writeUTF differs from the DataOutputStream's implementation in the following ways. 1) It
193194
* handles null strings. 2) It handles long strings (no 65K limit that UTF Encoding poses) 3) Data should have been
194195
* written by TCObjectOutputStream.
195196
*/
@@ -202,7 +203,7 @@ public String readUTF() throws IOException {
202203
* This reads a 4 byte length and then the UTF String itself. If the length is negative, then it is a null string.
203204
*
204205
* @throws IOException
205-
* @see writeUTF();
206+
* @see TCObjectOutputStream#writeUTF(String)
206207
*/
207208
@Override
208209
public String readString() throws IOException {

‎src/main/java/com/tc/io/serializer/TCObjectOutputStream.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ public TCObjectOutputStream(OutputStream out) {
4343
/**
4444
* This method is the reason I am writing this class. This implementation only can handle Literal Objects and is
4545
* designed to be used where writeObject() is called only for literal objects. Example : Sleepycat Serialization.
46-
*
47-
* @see LiteralValues, DNAEncoding
46+
*
47+
* @see com.tc.object.LiteralValues
48+
* @see com.tc.object.dna.api.DNAEncoding
4849
*/
4950
@Override
5051
public void writeObject(Object obj) {
@@ -58,8 +59,7 @@ public void writeObject(Object obj) {
5859
/**
5960
* This writes a 4 byte length and then the UTF String itself. If the length is negative, then it is a null string.
6061
*
61-
* @throws IOException
62-
* @see writeUTF();
62+
* @see #writeUTF(String)
6363
*/
6464
@Override
6565
public void writeString(String string) {

‎src/main/java/com/tc/net/groups/GroupToStripeMapSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.Map;
1515

1616
/**
17-
* helper class to hide the serialization and de-serialization of Map<GroupID, StripeID> implementations from external
17+
* helper class to hide the serialization and de-serialization of Map&lt;GroupID, StripeID&gt; implementations from external
1818
* world.
1919
*/
2020
public class GroupToStripeMapSerializer implements TCSerializable {

‎src/main/java/com/tc/object/LiteralValues.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ public String getMethodNameForPrimitives() {
395395
* Calculate a stable hash code for the object. Many literals (like Integer) have stable
396396
* hash codes already, but some (like Class) do not.
397397
*
398-
* @param value must refer to an object for which {@link #isLiteralInstance()} returns true.
398+
* @param value must refer to an object for which {@link #isLiteralInstance(Object)} returns true.
399399
* This implies that value must be non-null.
400400
*/
401401
public int calculateDsoHashCodeForLiteral(Object value) {
@@ -495,7 +495,7 @@ public static boolean isLiteral(String className) {
495495

496496
/**
497497
* Determine whether the instance is a literal
498-
* <p />
498+
* <br>
499499
* Returns false if the parameter is null
500500
*
501501
* @param obj Instance object, may be null
@@ -516,7 +516,7 @@ public static Collection<String> getTypes() {
516516
* Calculate a stable hash code for the object. Many literals (like Integer) have stable
517517
* hash codes already, but some (like Class) do not.
518518
*
519-
* @param value must refer to an object for which {@link #isLiteralInstance()} returns true.
519+
* @param value must refer to an object for which {@link #isLiteralInstance(Object)} returns true.
520520
* This implies that value must be non-null.
521521
*/
522522
public static int calculateDsoHashCode(Object value) {

‎src/main/java/com/tc/object/ObjectID.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class ObjectID extends AbstractIdentifier implements Serializable {
2525
/**
2626
* Create an ObjectID with the specified ID
2727
*
28-
* @param id The id value, >= 0
28+
* @param id The id value, &gt;= 0
2929
*/
3030
public ObjectID(long id) {
3131
super(id);

‎src/main/java/com/tc/object/TCObject.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,10 @@ public interface TCObject extends Cacheable {
170170

171171
/**
172172
* Takes a DNA strand and hydrates the object with it.
173-
*
173+
*
174+
* @param from
174175
* @param force true if the DNA should be applied w/o any version checking
175-
* @param weakReference
176+
* @param peer
176177
* @throws ClassNotFoundException If class not found
177178
*/
178179
public void hydrate(DNA from, boolean force, WeakReference peer) throws ClassNotFoundException;
@@ -208,7 +209,7 @@ public interface TCObject extends Cacheable {
208209
*
209210
* @param fieldName Field in this object
210211
* @param id New reference for this field
211-
* @returns Old mapping if present
212+
* @return Old mapping if present
212213
*/
213214
public ObjectID setReference(String fieldName, ObjectID id);
214215

@@ -257,7 +258,7 @@ public interface TCObject extends Cacheable {
257258
/**
258259
* Invoke logical method
259260
*
260-
* @param method Method indicator, as defined in {@link com.tc.object.SerializationUtil}
261+
* @param method Method indicator
261262
* @param params The parameter values
262263
*/
263264
public void logicalInvoke(LogicalOperation method, Object[] params);

‎src/main/java/com/tc/object/TraversedReferences.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ public interface TraversedReferences {
2525

2626
/**
2727
* Add a named reference traversal, usually in a physical applicator
28-
* @param fullyQualifiedFieldName Full field name, which can be split into class and field
28+
*
29+
* @param fullyQualifiedFieldname Full field name, which can be split into class and field
2930
* @param value Object value in field
3031
*/
3132
public void addNamedReference(String fullyQualifiedFieldname, Object value);
3233

3334
/**
3435
* Walk through the references traversed
35-
* @return Iterator<TraversedReference>
36+
* @return Iterator&lt;TraversedReference&gt;
3637
*/
3738
public Iterator<TraversedReference> iterator();
3839
}

0 commit comments

Comments
 (0)