Skip to content

Commit

Permalink
Consistent codec names
Browse files Browse the repository at this point in the history
  • Loading branch information
kornilova203 committed Aug 20, 2019
1 parent 7f794f4 commit 37f15e8
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 26 deletions.
16 changes: 10 additions & 6 deletions driver/src/main/java/com/dbschema/CassandraJdbcDriver.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down Expand Up @@ -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);
}


Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -11,10 +11,10 @@
/**
* @author Liudmila Kornilova
**/
public class LongCodec extends TypeCodec<BigDecimal> {
public static final LongCodec INSTANCE = new LongCodec();
public class BigintCodec extends TypeCodec<BigDecimal> {
public static final BigintCodec INSTANCE = new BigintCodec();

private LongCodec() {
private BigintCodec() {
super(DataType.bigint(), BigDecimal.class);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -8,11 +8,11 @@
/**
* @author Liudmila Kornilova
**/
public class StringCodec extends TypeCodec<String> {
public static final StringCodec INSTANCE = new StringCodec();
public class DurationCodec extends TypeCodec<String> {
public static final DurationCodec INSTANCE = new DurationCodec();
private final TypeCodec<Duration> durationCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(DataType.duration(), Duration.class);

private StringCodec() {
private DurationCodec() {
super(DataType.duration(), String.class);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -13,11 +13,11 @@
/**
* @author Liudmila Kornilova
**/
public class StringCodec extends TypeCodec<String> {
public static final StringCodec INSTANCE = new StringCodec();
public class InetCodec extends TypeCodec<String> {
public static final InetCodec INSTANCE = new InetCodec();
private final TypeCodec<InetAddress> inetCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(DataType.inet(), InetAddress.class);

private StringCodec() {
private InetCodec() {
super(DataType.inet(), String.class);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -12,11 +12,11 @@
/**
* @author Liudmila Kornilova
**/
public class StringCodec extends TypeCodec<String> {
public static final StringCodec INSTANCE = new StringCodec();
public class TimeuuidCodec extends TypeCodec<String> {
public static final TimeuuidCodec INSTANCE = new TimeuuidCodec();
private final TypeCodec<UUID> timeuuidCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(DataType.timeuuid(), UUID.class);

private StringCodec() {
private TimeuuidCodec() {
super(DataType.timeuuid(), String.class);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -12,11 +12,11 @@
/**
* @author Liudmila Kornilova
**/
public class StringCodec extends TypeCodec<String> {
public static final StringCodec INSTANCE = new StringCodec();
public class UuidCodec extends TypeCodec<String> {
public static final UuidCodec INSTANCE = new UuidCodec();
private final TypeCodec<UUID> uuidCodec = CodecRegistry.DEFAULT_INSTANCE.codecFor(DataType.uuid(), UUID.class);

private StringCodec() {
private UuidCodec() {
super(DataType.uuid(), String.class);
}

Expand Down

0 comments on commit 37f15e8

Please sign in to comment.