Skip to content

Commit 375db09

Browse files
jyeminjyemin
committed
Lower-casing UUID in all class names to match UuidRepresentation.
1 parent 1cabf7f commit 375db09

12 files changed

+40
-40
lines changed

‎driver-core/src/main/com/mongodb/codecs/BinaryToUUIDTransformer.java renamed to ‎driver-core/src/main/com/mongodb/codecs/BinaryToUuidTransformer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,21 +24,21 @@
2424

2525
import java.util.UUID;
2626

27-
import static com.mongodb.codecs.UUIDCodecHelper.reverseByteArray;
27+
import static com.mongodb.codecs.UuidCodecHelper.reverseByteArray;
2828

2929
/**
3030
* A transformer from {@code BsonBinary} to {@code UUID}.
3131
*
3232
* @since 3.0
3333
*/
34-
public class BinaryToUUIDTransformer implements BinaryTransformer<UUID> {
34+
public class BinaryToUuidTransformer implements BinaryTransformer<UUID> {
3535

3636
private UuidRepresentation uuidRepresentation = UuidRepresentation.JAVA_LEGACY;
3737

38-
public BinaryToUUIDTransformer() {
38+
public BinaryToUuidTransformer() {
3939
}
4040

41-
public BinaryToUUIDTransformer(final UuidRepresentation uuidRepresentation) {
41+
public BinaryToUuidTransformer(final UuidRepresentation uuidRepresentation) {
4242
this.uuidRepresentation = uuidRepresentation;
4343
}
4444

‎driver-core/src/main/com/mongodb/codecs/DocumentCodecProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ private void addCodecs() {
102102
addCodec(new SymbolCodec());
103103
addCodec(new BsonTimestampCodec());
104104
addCodec(new BsonUndefinedCodec());
105-
addCodec(new UUIDCodec());
105+
addCodec(new UuidCodec());
106106
}
107107

108108
private <T> void addCodec(final Codec<T> codec) {

‎driver-core/src/main/com/mongodb/codecs/TransformingBinaryDecoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class TransformingBinaryDecoder implements Decoder<Object> {
3939
subTypeTransformerMap = new HashMap<Byte, BinaryTransformer<?>>();
4040
subTypeTransformerMap.put(BsonBinarySubType.BINARY.getValue(), new BinaryToByteArrayTransformer());
4141
subTypeTransformerMap.put(BsonBinarySubType.OLD_BINARY.getValue(), new BinaryToByteArrayTransformer());
42-
subTypeTransformerMap.put(BsonBinarySubType.UUID_LEGACY.getValue(), new BinaryToUUIDTransformer());
42+
subTypeTransformerMap.put(BsonBinarySubType.UUID_LEGACY.getValue(), new BinaryToUuidTransformer());
4343
}
4444

4545
@Override

‎driver-core/src/main/com/mongodb/codecs/UUIDCodec.java renamed to ‎driver-core/src/main/com/mongodb/codecs/UuidCodec.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828

2929
import java.util.UUID;
3030

31-
import static com.mongodb.codecs.UUIDCodecHelper.reverseByteArray;
31+
import static com.mongodb.codecs.UuidCodecHelper.reverseByteArray;
3232

3333
/**
3434
* Encodes and decodes {@code UUID} objects.
3535
*
3636
* @since 3.0
3737
*/
38-
public class UUIDCodec implements Codec<UUID> {
38+
public class UuidCodec implements Codec<UUID> {
3939

4040
private final UuidRepresentation encoderUuidRepresentation;
4141
private final UuidRepresentation decoderUuidRepresentation;
@@ -48,15 +48,15 @@ public class UUIDCodec implements Codec<UUID> {
4848
* @since 3.0
4949
* @see org.bson.UuidRepresentation
5050
*/
51-
public UUIDCodec(final UuidRepresentation uuidRepresentation) {
51+
public UuidCodec(final UuidRepresentation uuidRepresentation) {
5252
this.encoderUuidRepresentation = uuidRepresentation;
5353
this.decoderUuidRepresentation = uuidRepresentation;
5454
}
5555

5656
/**
5757
* The constructor for UUIDCodec, default is JAVA_LEGACY
5858
*/
59-
public UUIDCodec() {
59+
public UuidCodec() {
6060
this.encoderUuidRepresentation = UuidRepresentation.JAVA_LEGACY;
6161
this.decoderUuidRepresentation = UuidRepresentation.JAVA_LEGACY;
6262
}
@@ -93,7 +93,7 @@ public void encode(final BsonWriter writer, final UUID value, final EncoderConte
9393
@Override
9494
public UUID decode(final BsonReader reader, final DecoderContext decoderContext) {
9595
BsonBinary binaryData = reader.readBinaryData();
96-
BinaryToUUIDTransformer transformer = new BinaryToUUIDTransformer(decoderUuidRepresentation);
96+
BinaryToUuidTransformer transformer = new BinaryToUuidTransformer(decoderUuidRepresentation);
9797
return transformer.transform(binaryData);
9898
}
9999

‎driver-core/src/main/com/mongodb/codecs/UUIDCodecHelper.java renamed to ‎driver-core/src/main/com/mongodb/codecs/UuidCodecHelper.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package com.mongodb.codecs;
2020

21-
final class UUIDCodecHelper {
21+
final class UuidCodecHelper {
2222
// reverse elements in the subarray data[start:start+length]
2323
public static void reverseByteArray(final byte[] data, final int start, final int length) {
2424
for (int left = start, right = start + length - 1; left < right; left++, right--) {
@@ -29,6 +29,6 @@ public static void reverseByteArray(final byte[] data, final int start, final in
2929
}
3030
}
3131

32-
private UUIDCodecHelper() {
32+
private UuidCodecHelper() {
3333
}
3434
}

‎driver-core/src/main/com/mongodb/codecs/UUIDCodecProvider.java renamed to ‎driver-core/src/main/com/mongodb/codecs/UuidCodecProvider.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*
3131
* @since 3.0
3232
*/
33-
public class UUIDCodecProvider implements CodecProvider {
33+
public class UuidCodecProvider implements CodecProvider {
3434

3535
private UuidRepresentation uuidRepresentation;
3636

@@ -43,15 +43,15 @@ public class UUIDCodecProvider implements CodecProvider {
4343
* @since 3.0
4444
* @see org.bson.UuidRepresentation
4545
*/
46-
public UUIDCodecProvider(final UuidRepresentation uuidRepresentation) {
46+
public UuidCodecProvider(final UuidRepresentation uuidRepresentation) {
4747
this.uuidRepresentation = uuidRepresentation;
4848
}
4949

5050
@Override
5151
@SuppressWarnings("unchecked")
5252
public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
5353
if (clazz == UUID.class) {
54-
return (Codec<T>) (new UUIDCodec(uuidRepresentation));
54+
return (Codec<T>) (new UuidCodec(uuidRepresentation));
5555
}
5656
return null;
5757
}

‎driver-core/src/test/unit/com/mongodb/codecs/BinaryToUUIDTransformerSpecification.groovy renamed to ‎driver-core/src/test/unit/com/mongodb/codecs/BinaryToUuidTransformerSpecification.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import spock.lang.Subject
2525

2626
import static java.nio.ByteBuffer.wrap
2727

28-
class BinaryToUUIDTransformerSpecification extends Specification {
28+
class BinaryToUuidTransformerSpecification extends Specification {
2929

3030
@Subject
31-
private final BinaryToUUIDTransformer binaryToUUIDTransformer = new BinaryToUUIDTransformer();
31+
private final BinaryToUuidTransformer binaryToUUIDTransformer = new BinaryToUuidTransformer();
3232

3333
def 'should read big endian encoded longs'() {
3434
given:

‎driver-core/src/test/unit/com/mongodb/codecs/TransformingBinaryDecoderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void testDecode() {
4242
writer.writeBinaryData("subtype2", new BsonBinary(BsonBinarySubType.OLD_BINARY, new byte[]{2}));
4343

4444
writer.writeName("subtype3");
45-
new UUIDCodec().encode(writer, UUID.randomUUID(), EncoderContext.builder().build());
45+
new UuidCodec().encode(writer, UUID.randomUUID(), EncoderContext.builder().build());
4646

4747
writer.writeBinaryData("subtype4", new BsonBinary(BsonBinarySubType.UUID_STANDARD, new byte[]{4}));
4848
writer.writeBinaryData("subtype5", new BsonBinary(BsonBinarySubType.MD5, new byte[]{5}));

‎driver-core/src/test/unit/com/mongodb/codecs/UUIDCodecSpecification.groovy renamed to ‎driver-core/src/test/unit/com/mongodb/codecs/UuidCodecSpecification.groovy

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import org.bson.ByteBufNIO
2424
import org.bson.UuidRepresentation
2525
import org.bson.codecs.DecoderContext
2626
import org.bson.codecs.EncoderContext
27-
import org.bson.io.ByteBufferBsonInput
2827
import org.bson.io.BasicOutputBuffer
28+
import org.bson.io.ByteBufferBsonInput
2929
import spock.lang.Shared
3030
import spock.lang.Specification
3131

@@ -34,17 +34,17 @@ import java.nio.ByteBuffer
3434
/**
3535
*
3636
*/
37-
class UUIDCodecSpecification extends Specification {
37+
class UuidCodecSpecification extends Specification {
3838

39-
@Shared private UUIDCodec uuidCodec;
39+
@Shared private UuidCodec uuidCodec;
4040
@Shared private BasicOutputBuffer outputBuffer;
4141

4242
def setup() {
43-
uuidCodec = new UUIDCodec();
43+
uuidCodec = new UuidCodec();
4444
outputBuffer = new BasicOutputBuffer();
4545
}
4646

47-
def 'should decode different types of UUID'(UUIDCodec codec, byte[] list) throws IOException {
47+
def 'should decode different types of UUID'(UuidCodec codec, byte[] list) throws IOException {
4848

4949
given:
5050

@@ -67,10 +67,10 @@ class UUIDCodecSpecification extends Specification {
6767
where:
6868

6969
codec << [
70-
new UUIDCodec(),
71-
new UUIDCodec(UuidRepresentation.STANDARD),
72-
new UUIDCodec(UuidRepresentation.PYTHON_LEGACY),
73-
new UUIDCodec(UuidRepresentation.C_SHARP_LEGACY),
70+
new UuidCodec(),
71+
new UuidCodec(UuidRepresentation.STANDARD),
72+
new UuidCodec(UuidRepresentation.PYTHON_LEGACY),
73+
new UuidCodec(UuidRepresentation.C_SHARP_LEGACY),
7474
]
7575

7676
list << [
@@ -110,7 +110,7 @@ class UUIDCodecSpecification extends Specification {
110110
}
111111

112112
def 'should encode different types of UUIDs'(Byte bsonSubType,
113-
UUIDCodec codec,
113+
UuidCodec codec,
114114
UUID uuid) throws IOException {
115115
given:
116116

@@ -142,10 +142,10 @@ class UUIDCodecSpecification extends Specification {
142142
bsonSubType << [3, 4, 3, 3]
143143

144144
codec << [
145-
new UUIDCodec(),
146-
new UUIDCodec(UuidRepresentation.STANDARD),
147-
new UUIDCodec(UuidRepresentation.PYTHON_LEGACY),
148-
new UUIDCodec(UuidRepresentation.C_SHARP_LEGACY),
145+
new UuidCodec(),
146+
new UuidCodec(UuidRepresentation.STANDARD),
147+
new UuidCodec(UuidRepresentation.PYTHON_LEGACY),
148+
new UuidCodec(UuidRepresentation.C_SHARP_LEGACY),
149149
]
150150

151151
uuid << [

‎driver/src/main/com/mongodb/DBObjectCodec.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.mongodb;
1818

1919
import com.mongodb.codecs.BinaryToByteArrayTransformer;
20-
import com.mongodb.codecs.BinaryToUUIDTransformer;
20+
import com.mongodb.codecs.BinaryToUuidTransformer;
2121
import com.mongodb.codecs.CollectibleCodec;
2222
import com.mongodb.codecs.IdGenerator;
2323
import com.mongodb.codecs.ObjectIdGenerator;
@@ -269,7 +269,7 @@ private Object readBinary(final BsonReader reader) {
269269
return new BinaryToByteArrayTransformer().transform(binary);
270270
} else if (binary.getType() == BsonBinarySubType.UUID_LEGACY.getValue()
271271
|| binary.getType() == BsonBinarySubType.UUID_STANDARD.getValue()) {
272-
return new BinaryToUUIDTransformer().transform(binary);
272+
return new BinaryToUuidTransformer().transform(binary);
273273
} else {
274274
return new Binary(binary.getType(), binary.getData());
275275
}

‎driver/src/main/com/mongodb/DBObjectCodecProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.mongodb.codecs.PatternCodec;
2828
import com.mongodb.codecs.ShortCodec;
2929
import com.mongodb.codecs.StringCodec;
30-
import com.mongodb.codecs.UUIDCodec;
30+
import com.mongodb.codecs.UuidCodec;
3131
import org.bson.BsonDbPointer;
3232
import org.bson.BsonType;
3333
import org.bson.BsonUndefined;
@@ -120,7 +120,7 @@ private void addCodecs() {
120120
addCodec(new ShortCodec());
121121
addCodec(new ByteArrayCodec());
122122
addCodec(new FloatCodec());
123-
addCodec(new UUIDCodec());
123+
addCodec(new UuidCodec());
124124
}
125125

126126
private <T> void addCodec(final Codec<T> codec) {

‎driver/src/main/com/mongodb/util/JSONSerializers.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static ClassMapBasedObjectSerializer addCommonSerializers() {
104104
serializer.addObjectSerializer(ObjectId.class, new ObjectIdSerializer(serializer));
105105
serializer.addObjectSerializer(Pattern.class, new PatternSerializer(serializer));
106106
serializer.addObjectSerializer(String.class, new StringSerializer());
107-
serializer.addObjectSerializer(UUID.class, new UUIDSerializer(serializer));
107+
serializer.addObjectSerializer(UUID.class, new UuidSerializer(serializer));
108108
serializer.addObjectSerializer(BsonUndefined.class, new UndefinedSerializer(serializer));
109109
return serializer;
110110
}
@@ -389,9 +389,9 @@ public void serialize(final Object obj, final StringBuilder buf) {
389389
}
390390
}
391391

392-
private static class UUIDSerializer extends CompoundObjectSerializer {
392+
private static class UuidSerializer extends CompoundObjectSerializer {
393393

394-
UUIDSerializer(final ObjectSerializer serializer) {
394+
UuidSerializer(final ObjectSerializer serializer) {
395395
super(serializer);
396396
}
397397

0 commit comments

Comments
 (0)