From 37f15e86b9604f4b61335858902d59e8f73b8da8 Mon Sep 17 00:00:00 2001 From: Liudmila Kornilova Date: Tue, 20 Aug 2019 16:55:19 +0800 Subject: [PATCH] Consistent codec names --- .../java/com/dbschema/CassandraJdbcDriver.java | 16 ++++++++++------ .../BigintCodec.java} | 8 ++++---- .../DurationCodec.java} | 8 ++++---- .../StringCodec.java => jstring/InetCodec.java} | 8 ++++---- .../TimeuuidCodec.java} | 8 ++++---- .../StringCodec.java => jstring/UuidCodec.java} | 8 ++++---- 6 files changed, 30 insertions(+), 26 deletions(-) rename driver/src/main/java/com/dbschema/codec/{jbiginteger/LongCodec.java => jbigdecimal/BigintCodec.java} (91%) rename driver/src/main/java/com/dbschema/codec/{jduration/StringCodec.java => jstring/DurationCodec.java} (86%) rename driver/src/main/java/com/dbschema/codec/{jinet/StringCodec.java => jstring/InetCodec.java} (89%) rename driver/src/main/java/com/dbschema/codec/{jtimeuuid/StringCodec.java => jstring/TimeuuidCodec.java} (87%) rename driver/src/main/java/com/dbschema/codec/{juuid/StringCodec.java => jstring/UuidCodec.java} (88%) diff --git a/driver/src/main/java/com/dbschema/CassandraJdbcDriver.java b/driver/src/main/java/com/dbschema/CassandraJdbcDriver.java index aff5ef7..6598f3e 100644 --- a/driver/src/main/java/com/dbschema/CassandraJdbcDriver.java +++ b/driver/src/main/java/com/dbschema/CassandraJdbcDriver.java @@ -8,11 +8,15 @@ import com.datastax.driver.core.exceptions.AuthenticationException; import com.datastax.driver.core.exceptions.InvalidQueryException; import com.datastax.driver.core.exceptions.NoHostAvailableException; -import com.dbschema.codec.jbiginteger.LongCodec; +import com.dbschema.codec.jbigdecimal.BigintCodec; import com.dbschema.codec.jbytes.BlobCodec; +import com.dbschema.codec.jstring.InetCodec; +import com.dbschema.codec.jstring.DurationCodec; import com.dbschema.codec.jlong.*; import com.dbschema.codec.jsqldate.DateCodec; import com.dbschema.codec.jsqltime.TimeCodec; +import com.dbschema.codec.jstring.UuidCodec; +import com.dbschema.codec.jstring.TimeuuidCodec; import java.net.UnknownHostException; import java.sql.*; @@ -90,11 +94,11 @@ private void registerCodecs(Cluster cluster) { myCodecRegistry.register(com.dbschema.codec.jdouble.DecimalCodec.INSTANCE); myCodecRegistry.register(DateCodec.INSTANCE); myCodecRegistry.register(TimeCodec.INSTANCE); - myCodecRegistry.register(LongCodec.INSTANCE); - myCodecRegistry.register(com.dbschema.codec.juuid.StringCodec.INSTANCE); - myCodecRegistry.register(com.dbschema.codec.jduration.StringCodec.INSTANCE); - myCodecRegistry.register(com.dbschema.codec.jtimeuuid.StringCodec.INSTANCE); - myCodecRegistry.register(com.dbschema.codec.jinet.StringCodec.INSTANCE); + myCodecRegistry.register(BigintCodec.INSTANCE); + myCodecRegistry.register(UuidCodec.INSTANCE); + myCodecRegistry.register(DurationCodec.INSTANCE); + myCodecRegistry.register(TimeuuidCodec.INSTANCE); + myCodecRegistry.register(InetCodec.INSTANCE); } diff --git a/driver/src/main/java/com/dbschema/codec/jbiginteger/LongCodec.java b/driver/src/main/java/com/dbschema/codec/jbigdecimal/BigintCodec.java similarity index 91% rename from driver/src/main/java/com/dbschema/codec/jbiginteger/LongCodec.java rename to driver/src/main/java/com/dbschema/codec/jbigdecimal/BigintCodec.java index 708280e..c02d825 100644 --- a/driver/src/main/java/com/dbschema/codec/jbiginteger/LongCodec.java +++ b/driver/src/main/java/com/dbschema/codec/jbigdecimal/BigintCodec.java @@ -1,4 +1,4 @@ -package com.dbschema.codec.jbiginteger; +package com.dbschema.codec.jbigdecimal; import com.datastax.driver.core.DataType; import com.datastax.driver.core.ProtocolVersion; @@ -11,10 +11,10 @@ /** * @author Liudmila Kornilova **/ -public class LongCodec extends TypeCodec { - public static final LongCodec INSTANCE = new LongCodec(); +public class BigintCodec extends TypeCodec { + public static final BigintCodec INSTANCE = new BigintCodec(); - private LongCodec() { + private BigintCodec() { super(DataType.bigint(), BigDecimal.class); } diff --git a/driver/src/main/java/com/dbschema/codec/jduration/StringCodec.java b/driver/src/main/java/com/dbschema/codec/jstring/DurationCodec.java similarity index 86% rename from driver/src/main/java/com/dbschema/codec/jduration/StringCodec.java rename to driver/src/main/java/com/dbschema/codec/jstring/DurationCodec.java index b92c6ea..670ab73 100644 --- a/driver/src/main/java/com/dbschema/codec/jduration/StringCodec.java +++ b/driver/src/main/java/com/dbschema/codec/jstring/DurationCodec.java @@ -1,4 +1,4 @@ -package com.dbschema.codec.jduration; +package com.dbschema.codec.jstring; import com.datastax.driver.core.*; import com.datastax.driver.core.exceptions.InvalidTypeException; @@ -8,11 +8,11 @@ /** * @author Liudmila Kornilova **/ -public class StringCodec extends TypeCodec { - public static final StringCodec INSTANCE = new StringCodec(); +public class DurationCodec extends TypeCodec { + public static final DurationCodec INSTANCE = new DurationCodec(); private final TypeCodec durationCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(DataType.duration(), Duration.class); - private StringCodec() { + private DurationCodec() { super(DataType.duration(), String.class); } diff --git a/driver/src/main/java/com/dbschema/codec/jinet/StringCodec.java b/driver/src/main/java/com/dbschema/codec/jstring/InetCodec.java similarity index 89% rename from driver/src/main/java/com/dbschema/codec/jinet/StringCodec.java rename to driver/src/main/java/com/dbschema/codec/jstring/InetCodec.java index b84a6e8..1493091 100644 --- a/driver/src/main/java/com/dbschema/codec/jinet/StringCodec.java +++ b/driver/src/main/java/com/dbschema/codec/jstring/InetCodec.java @@ -1,4 +1,4 @@ -package com.dbschema.codec.jinet; +package com.dbschema.codec.jstring; import com.datastax.driver.core.CodecRegistry; import com.datastax.driver.core.DataType; @@ -13,11 +13,11 @@ /** * @author Liudmila Kornilova **/ -public class StringCodec extends TypeCodec { - public static final StringCodec INSTANCE = new StringCodec(); +public class InetCodec extends TypeCodec { + public static final InetCodec INSTANCE = new InetCodec(); private final TypeCodec inetCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(DataType.inet(), InetAddress.class); - private StringCodec() { + private InetCodec() { super(DataType.inet(), String.class); } diff --git a/driver/src/main/java/com/dbschema/codec/jtimeuuid/StringCodec.java b/driver/src/main/java/com/dbschema/codec/jstring/TimeuuidCodec.java similarity index 87% rename from driver/src/main/java/com/dbschema/codec/jtimeuuid/StringCodec.java rename to driver/src/main/java/com/dbschema/codec/jstring/TimeuuidCodec.java index 0e013de..f9d95c3 100644 --- a/driver/src/main/java/com/dbschema/codec/jtimeuuid/StringCodec.java +++ b/driver/src/main/java/com/dbschema/codec/jstring/TimeuuidCodec.java @@ -1,4 +1,4 @@ -package com.dbschema.codec.jtimeuuid; +package com.dbschema.codec.jstring; import com.datastax.driver.core.CodecRegistry; import com.datastax.driver.core.DataType; @@ -12,11 +12,11 @@ /** * @author Liudmila Kornilova **/ -public class StringCodec extends TypeCodec { - public static final StringCodec INSTANCE = new StringCodec(); +public class TimeuuidCodec extends TypeCodec { + public static final TimeuuidCodec INSTANCE = new TimeuuidCodec(); private final TypeCodec timeuuidCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(DataType.timeuuid(), UUID.class); - private StringCodec() { + private TimeuuidCodec() { super(DataType.timeuuid(), String.class); } diff --git a/driver/src/main/java/com/dbschema/codec/juuid/StringCodec.java b/driver/src/main/java/com/dbschema/codec/jstring/UuidCodec.java similarity index 88% rename from driver/src/main/java/com/dbschema/codec/juuid/StringCodec.java rename to driver/src/main/java/com/dbschema/codec/jstring/UuidCodec.java index 507339b..9d2f185 100644 --- a/driver/src/main/java/com/dbschema/codec/juuid/StringCodec.java +++ b/driver/src/main/java/com/dbschema/codec/jstring/UuidCodec.java @@ -1,4 +1,4 @@ -package com.dbschema.codec.juuid; +package com.dbschema.codec.jstring; import com.datastax.driver.core.CodecRegistry; import com.datastax.driver.core.DataType; @@ -12,11 +12,11 @@ /** * @author Liudmila Kornilova **/ -public class StringCodec extends TypeCodec { - public static final StringCodec INSTANCE = new StringCodec(); +public class UuidCodec extends TypeCodec { + public static final UuidCodec INSTANCE = new UuidCodec(); private final TypeCodec uuidCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(DataType.uuid(), UUID.class); - private StringCodec() { + private UuidCodec() { super(DataType.uuid(), String.class); }