Skip to content

Commit 81617ad

Browse files
Alexandre Dutraolim7t
authored andcommitted
JAVA-932: Limit visibility of codec internals.
- do not expose default codec classes - remove "utility" codecs from public API (Enum*Codec, MappingCodec, StringParsingCodec). - remove setObject method from SettableBy*Data.
1 parent 51e563d commit 81617ad

40 files changed

Lines changed: 1233 additions & 950 deletions

changelog/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
- [bug] Make table metadata options class visible (JAVA-946)
1313
- [bug] Add crcCheckChance to TableOptionsMetadata#equals/hashCode (JAVA-939)
1414
- [bug] Make TypeCodec return mutable collections (JAVA-922)
15+
- [improvement] Limit visibility of codec internals (JAVA-932)
1516

1617

1718
### 3.0.0-alpha3

driver-core/src/main/java/com/datastax/driver/core/AbstractAddressableByIndexData.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,6 @@ public T setTupleValue(int i, TupleValue v) {
265265
return setValue(i, codecFor(i, TupleValue.class).serialize(v, protocolVersion));
266266
}
267267

268-
@Override
269-
public <V> T setObject(int i, V v) {
270-
TypeCodec<V> codec = v == null ? this.<V>codecFor(i) : codecFor(i, v);
271-
return set(i, v, codec);
272-
}
273-
274268
@Override
275269
public <V> T set(int i, V v, Class<V> targetClass) {
276270
return set(i, v, codecFor(i, targetClass));

driver-core/src/main/java/com/datastax/driver/core/AbstractData.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -509,20 +509,6 @@ public T setTupleValue(String name, TupleValue v) {
509509
return wrapped;
510510
}
511511

512-
@Override
513-
public <V> T setObject(int i, V v) {
514-
TypeCodec<V> codec = v == null ? this.<V>codecFor(i) : codecFor(i, v);
515-
return set(i, v, codec);
516-
}
517-
518-
@Override
519-
public <V> T setObject(String name, V v) {
520-
for (int i : getAllIndexesOf(name)) {
521-
setObject(i, v);
522-
}
523-
return wrapped;
524-
}
525-
526512
@Override
527513
public <V> T set(int i, V v, Class<V> targetClass) {
528514
return set(i, v, codecFor(i, targetClass));

driver-core/src/main/java/com/datastax/driver/core/ArrayBackedResultSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,6 @@ private static boolean checkWasApplied(List<ByteBuffer> firstRow, ColumnDefiniti
442442
if (value == null || value.remaining() == 0)
443443
return false;
444444

445-
return TypeCodec.BooleanCodec.instance.deserializeNoBoxing(value, protocolVersion);
445+
return TypeCodec.cboolean().deserializeNoBoxing(value, protocolVersion);
446446
}
447447
}

driver-core/src/main/java/com/datastax/driver/core/BoundStatement.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -838,22 +838,6 @@ public BoundStatement setTupleValue(String name, TupleValue v) {
838838
return wrapper.setTupleValue(name, v);
839839
}
840840

841-
/**
842-
* {@inheritDoc}
843-
*/
844-
@Override
845-
public <V> BoundStatement setObject(int i, V v) {
846-
return wrapper.setObject(i, v);
847-
}
848-
849-
/**
850-
* {@inheritDoc}
851-
*/
852-
@Override
853-
public <V> BoundStatement setObject(String name, V v) {
854-
return wrapper.setObject(name, v);
855-
}
856-
857841
/**
858842
* {@inheritDoc}
859843
*/

driver-core/src/main/java/com/datastax/driver/core/CassandraTypeParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static DataType parseOne(String className, ProtocolVersion protocolVersion, Code
105105

106106
String keyspace = parser.readOne();
107107
parser.skipBlankAndComma();
108-
String typeName = TypeCodec.VarcharCodec.instance.deserialize(Bytes.fromHexString("0x" + parser.readOne()), protocolVersion);
108+
String typeName = TypeCodec.varchar().deserialize(Bytes.fromHexString("0x" + parser.readOne()), protocolVersion);
109109
parser.skipBlankAndComma();
110110
Map<String, String> rawFields = parser.getNameAndTypeParameters();
111111
List<UserType.Field> fields = new ArrayList<UserType.Field>(rawFields.size());
@@ -319,7 +319,7 @@ public Map<String, String> getNameAndTypeParameters() {
319319
String bbHex = readNextIdentifier();
320320
String name = null;
321321
try {
322-
name = TypeCodec.VarcharCodec.instance.deserialize(Bytes.fromHexString("0x" + bbHex), ProtocolVersion.NEWEST_SUPPORTED);
322+
name = TypeCodec.varchar().deserialize(Bytes.fromHexString("0x" + bbHex), ProtocolVersion.NEWEST_SUPPORTED);
323323
} catch (NumberFormatException e) {
324324
throwSyntaxError(e.getMessage());
325325
}

0 commit comments

Comments
 (0)