From 37de816c2d1fb4c092fc2f52c28cbdee8059460d Mon Sep 17 00:00:00 2001 From: Matthew Adams Date: Tue, 19 Nov 2013 16:16:09 -0600 Subject: [PATCH] relocated things appropriately --- .../core}/cql/CqlStringUtils.java | 2 +- .../cql/builder/AbstractTableBuilder.java | 12 ++++++------ .../core}/cql/builder/AddColumn.java | 4 ++-- .../core}/cql/builder/AlterColumn.java | 4 ++-- .../core}/cql/builder/AlterTableBuilder.java | 4 ++-- .../core}/cql/builder/ColumnBuilder.java | 8 ++++---- .../core}/cql/builder/ColumnChange.java | 6 +++--- .../core}/cql/builder/ColumnTypeChange.java | 2 +- .../core}/cql/builder/CqlBuilder.java | 2 +- .../core}/cql/builder/CreateTableBuilder.java | 4 ++-- .../core}/cql/builder/DefaultOption.java | 6 +++--- .../core}/cql/builder/DropColumn.java | 4 ++-- .../core}/cql/builder/DropTableBuilder.java | 8 ++++---- .../core}/cql/builder/MapBuilder.java | 2 +- .../core}/cql/builder/Option.java | 2 +- .../core}/cql/builder/TableOption.java | 2 +- .../cassandra/cql/CqlStringUtilsTest.java | 6 +++--- .../cql/builder/AlterTableBuilderTest.java | 4 ++-- .../cql/builder/CreateTableBuilderTest.java | 19 ++++++++++--------- .../cql/builder/DropTableBuilderTest.java | 4 ++-- .../cassandra/cql/builder/OptionTest.java | 4 +++- 21 files changed, 56 insertions(+), 53 deletions(-) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/CqlStringUtils.java (98%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/AbstractTableBuilder.java (91%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/AddColumn.java (74%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/AlterColumn.java (74%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/AlterTableBuilder.java (94%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/ColumnBuilder.java (94%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/ColumnChange.java (72%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/ColumnTypeChange.java (87%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/CqlBuilder.java (95%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/CreateTableBuilder.java (97%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/DefaultOption.java (95%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/DropColumn.java (67%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/DropTableBuilder.java (73%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/MapBuilder.java (97%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/Option.java (96%) rename src/main/java/org/springframework/{data/cassandra => cassandra/core}/cql/builder/TableOption.java (99%) rename src/test/java/org/springframework/{data => }/cassandra/cql/CqlStringUtilsTest.java (72%) rename src/test/java/org/springframework/{data => }/cassandra/cql/builder/AlterTableBuilderTest.java (82%) rename src/test/java/org/springframework/{data => }/cassandra/cql/builder/CreateTableBuilderTest.java (71%) rename src/test/java/org/springframework/{data => }/cassandra/cql/builder/DropTableBuilderTest.java (66%) rename src/test/java/org/springframework/{data => }/cassandra/cql/builder/OptionTest.java (94%) diff --git a/src/main/java/org/springframework/data/cassandra/cql/CqlStringUtils.java b/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java similarity index 98% rename from src/main/java/org/springframework/data/cassandra/cql/CqlStringUtils.java rename to src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java index eebaa12d1..614dd14ab 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/CqlStringUtils.java +++ b/src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.cql; +package org.springframework.cassandra.core.cql; import java.util.regex.Pattern; diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/AbstractTableBuilder.java b/src/main/java/org/springframework/cassandra/core/cql/builder/AbstractTableBuilder.java similarity index 91% rename from src/main/java/org/springframework/data/cassandra/cql/builder/AbstractTableBuilder.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/AbstractTableBuilder.java index 3412ee6f6..6f25a10f1 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/AbstractTableBuilder.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/AbstractTableBuilder.java @@ -1,14 +1,14 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.noNull; -import static org.springframework.data.cassandra.cql.CqlStringUtils.escapeSingle; -import static org.springframework.data.cassandra.cql.CqlStringUtils.identifize; -import static org.springframework.data.cassandra.cql.CqlStringUtils.singleQuote; +import static org.springframework.cassandra.core.cql.CqlStringUtils.escapeSingle; +import static org.springframework.cassandra.core.cql.CqlStringUtils.identifize; +import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull; +import static org.springframework.cassandra.core.cql.CqlStringUtils.singleQuote; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.data.cassandra.cql.CqlStringUtils; +import org.springframework.cassandra.core.cql.CqlStringUtils; /** * Base class that contains behavior common to table operations. diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/AddColumn.java b/src/main/java/org/springframework/cassandra/core/cql/builder/AddColumn.java similarity index 74% rename from src/main/java/org/springframework/data/cassandra/cql/builder/AddColumn.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/AddColumn.java index a8373365e..497e4fc3a 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/AddColumn.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/AddColumn.java @@ -1,6 +1,6 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.noNull; +import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull; import com.datastax.driver.core.DataType; diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/AlterColumn.java b/src/main/java/org/springframework/cassandra/core/cql/builder/AlterColumn.java similarity index 74% rename from src/main/java/org/springframework/data/cassandra/cql/builder/AlterColumn.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/AlterColumn.java index 60a42e1ab..d04d3c1a6 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/AlterColumn.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/AlterColumn.java @@ -1,6 +1,6 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.noNull; +import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull; import com.datastax.driver.core.DataType; diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/AlterTableBuilder.java b/src/main/java/org/springframework/cassandra/core/cql/builder/AlterTableBuilder.java similarity index 94% rename from src/main/java/org/springframework/data/cassandra/cql/builder/AlterTableBuilder.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/AlterTableBuilder.java index 29ba093f4..511009dcb 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/AlterTableBuilder.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/AlterTableBuilder.java @@ -1,6 +1,6 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.noNull; +import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/ColumnBuilder.java b/src/main/java/org/springframework/cassandra/core/cql/builder/ColumnBuilder.java similarity index 94% rename from src/main/java/org/springframework/data/cassandra/cql/builder/ColumnBuilder.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/ColumnBuilder.java index 48db1fde7..49a51ab30 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/ColumnBuilder.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/ColumnBuilder.java @@ -1,8 +1,8 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.checkIdentifier; -import static org.springframework.data.cassandra.cql.CqlStringUtils.identifize; -import static org.springframework.data.cassandra.cql.CqlStringUtils.noNull; +import static org.springframework.cassandra.core.cql.CqlStringUtils.checkIdentifier; +import static org.springframework.cassandra.core.cql.CqlStringUtils.identifize; +import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull; import static org.springframework.data.cassandra.mapping.KeyType.PARTITION; import static org.springframework.data.cassandra.mapping.KeyType.PRIMARY; import static org.springframework.data.cassandra.mapping.Ordering.ASCENDING; diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/ColumnChange.java b/src/main/java/org/springframework/cassandra/core/cql/builder/ColumnChange.java similarity index 72% rename from src/main/java/org/springframework/data/cassandra/cql/builder/ColumnChange.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/ColumnChange.java index e6e35b4b9..497ddec2a 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/ColumnChange.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/ColumnChange.java @@ -1,7 +1,7 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.checkIdentifier; -import static org.springframework.data.cassandra.cql.CqlStringUtils.identifize; +import static org.springframework.cassandra.core.cql.CqlStringUtils.checkIdentifier; +import static org.springframework.cassandra.core.cql.CqlStringUtils.identifize; public abstract class ColumnChange { diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/ColumnTypeChange.java b/src/main/java/org/springframework/cassandra/core/cql/builder/ColumnTypeChange.java similarity index 87% rename from src/main/java/org/springframework/data/cassandra/cql/builder/ColumnTypeChange.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/ColumnTypeChange.java index a4ca0234c..9d0238554 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/ColumnTypeChange.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/ColumnTypeChange.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; import org.springframework.util.Assert; diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/CqlBuilder.java b/src/main/java/org/springframework/cassandra/core/cql/builder/CqlBuilder.java similarity index 95% rename from src/main/java/org/springframework/data/cassandra/cql/builder/CqlBuilder.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/CqlBuilder.java index 140512587..f6d1a8dbb 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/CqlBuilder.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/CqlBuilder.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; public class CqlBuilder { diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/CreateTableBuilder.java b/src/main/java/org/springframework/cassandra/core/cql/builder/CreateTableBuilder.java similarity index 97% rename from src/main/java/org/springframework/data/cassandra/cql/builder/CreateTableBuilder.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/CreateTableBuilder.java index 69ddfecf1..84e828246 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/CreateTableBuilder.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/CreateTableBuilder.java @@ -1,6 +1,6 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.noNull; +import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull; import static org.springframework.data.cassandra.mapping.KeyType.PARTITION; import static org.springframework.data.cassandra.mapping.KeyType.PRIMARY; import static org.springframework.data.cassandra.mapping.Ordering.ASCENDING; diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/DefaultOption.java b/src/main/java/org/springframework/cassandra/core/cql/builder/DefaultOption.java similarity index 95% rename from src/main/java/org/springframework/data/cassandra/cql/builder/DefaultOption.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/DefaultOption.java index 1e843de47..290b80756 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/DefaultOption.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/DefaultOption.java @@ -1,7 +1,7 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.escapeSingle; -import static org.springframework.data.cassandra.cql.CqlStringUtils.singleQuote; +import static org.springframework.cassandra.core.cql.CqlStringUtils.escapeSingle; +import static org.springframework.cassandra.core.cql.CqlStringUtils.singleQuote; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/DropColumn.java b/src/main/java/org/springframework/cassandra/core/cql/builder/DropColumn.java similarity index 67% rename from src/main/java/org/springframework/data/cassandra/cql/builder/DropColumn.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/DropColumn.java index e3b20dcab..d8db7ab79 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/DropColumn.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/DropColumn.java @@ -1,6 +1,6 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.noNull; +import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull; public class DropColumn extends ColumnChange { diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/DropTableBuilder.java b/src/main/java/org/springframework/cassandra/core/cql/builder/DropTableBuilder.java similarity index 73% rename from src/main/java/org/springframework/data/cassandra/cql/builder/DropTableBuilder.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/DropTableBuilder.java index 9b3432881..f5546af62 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/DropTableBuilder.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/DropTableBuilder.java @@ -1,8 +1,8 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; -import static org.springframework.data.cassandra.cql.CqlStringUtils.checkIdentifier; -import static org.springframework.data.cassandra.cql.CqlStringUtils.noNull; -import static org.springframework.data.cassandra.cql.CqlStringUtils.identifize; +import static org.springframework.cassandra.core.cql.CqlStringUtils.checkIdentifier; +import static org.springframework.cassandra.core.cql.CqlStringUtils.identifize; +import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull; public class DropTableBuilder { diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/MapBuilder.java b/src/main/java/org/springframework/cassandra/core/cql/builder/MapBuilder.java similarity index 97% rename from src/main/java/org/springframework/data/cassandra/cql/builder/MapBuilder.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/MapBuilder.java index 8bebc8095..342c61dda 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/MapBuilder.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/MapBuilder.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; import java.util.Collection; import java.util.LinkedHashMap; diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/Option.java b/src/main/java/org/springframework/cassandra/core/cql/builder/Option.java similarity index 96% rename from src/main/java/org/springframework/data/cassandra/cql/builder/Option.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/Option.java index 34839351d..25e9e8163 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/Option.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/Option.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; /** * Interface to represent option types. diff --git a/src/main/java/org/springframework/data/cassandra/cql/builder/TableOption.java b/src/main/java/org/springframework/cassandra/core/cql/builder/TableOption.java similarity index 99% rename from src/main/java/org/springframework/data/cassandra/cql/builder/TableOption.java rename to src/main/java/org/springframework/cassandra/core/cql/builder/TableOption.java index 5e73a5f42..97469a3c4 100644 --- a/src/main/java/org/springframework/data/cassandra/cql/builder/TableOption.java +++ b/src/main/java/org/springframework/cassandra/core/cql/builder/TableOption.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.core.cql.builder; import java.util.Map; diff --git a/src/test/java/org/springframework/data/cassandra/cql/CqlStringUtilsTest.java b/src/test/java/org/springframework/cassandra/cql/CqlStringUtilsTest.java similarity index 72% rename from src/test/java/org/springframework/data/cassandra/cql/CqlStringUtilsTest.java rename to src/test/java/org/springframework/cassandra/cql/CqlStringUtilsTest.java index dfbc60b02..7b2dfd8ac 100644 --- a/src/test/java/org/springframework/data/cassandra/cql/CqlStringUtilsTest.java +++ b/src/test/java/org/springframework/cassandra/cql/CqlStringUtilsTest.java @@ -1,9 +1,9 @@ -package org.springframework.data.cassandra.cql; +package org.springframework.cassandra.cql; import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertTrue; -import static org.springframework.data.cassandra.cql.CqlStringUtils.isQuotedIdentifier; -import static org.springframework.data.cassandra.cql.CqlStringUtils.isUnquotedIdentifier; +import static org.springframework.cassandra.core.cql.CqlStringUtils.isQuotedIdentifier; +import static org.springframework.cassandra.core.cql.CqlStringUtils.isUnquotedIdentifier; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/cassandra/cql/builder/AlterTableBuilderTest.java b/src/test/java/org/springframework/cassandra/cql/builder/AlterTableBuilderTest.java similarity index 82% rename from src/test/java/org/springframework/data/cassandra/cql/builder/AlterTableBuilderTest.java rename to src/test/java/org/springframework/cassandra/cql/builder/AlterTableBuilderTest.java index 93837984c..38f097cce 100644 --- a/src/test/java/org/springframework/data/cassandra/cql/builder/AlterTableBuilderTest.java +++ b/src/test/java/org/springframework/cassandra/cql/builder/AlterTableBuilderTest.java @@ -1,6 +1,6 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.cql.builder; -import static org.springframework.data.cassandra.cql.builder.CqlBuilder.alterTable; +import static org.springframework.cassandra.core.cql.builder.CqlBuilder.alterTable; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/cassandra/cql/builder/CreateTableBuilderTest.java b/src/test/java/org/springframework/cassandra/cql/builder/CreateTableBuilderTest.java similarity index 71% rename from src/test/java/org/springframework/data/cassandra/cql/builder/CreateTableBuilderTest.java rename to src/test/java/org/springframework/cassandra/cql/builder/CreateTableBuilderTest.java index fa59954f8..7596d0a49 100644 --- a/src/test/java/org/springframework/data/cassandra/cql/builder/CreateTableBuilderTest.java +++ b/src/test/java/org/springframework/cassandra/cql/builder/CreateTableBuilderTest.java @@ -1,16 +1,17 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.cql.builder; import static junit.framework.Assert.assertEquals; -import static org.springframework.data.cassandra.cql.builder.CqlBuilder.createTable; -import static org.springframework.data.cassandra.cql.builder.MapBuilder.map; -import static org.springframework.data.cassandra.cql.builder.TableOption.BLOOM_FILTER_FP_CHANCE; -import static org.springframework.data.cassandra.cql.builder.TableOption.CACHING; -import static org.springframework.data.cassandra.cql.builder.TableOption.COMMENT; -import static org.springframework.data.cassandra.cql.builder.TableOption.COMPACTION; -import static org.springframework.data.cassandra.cql.builder.TableOption.CompactionOption.TOMBSTONE_THRESHOLD; +import static org.springframework.cassandra.core.cql.builder.CqlBuilder.createTable; +import static org.springframework.cassandra.core.cql.builder.MapBuilder.map; +import static org.springframework.cassandra.core.cql.builder.TableOption.BLOOM_FILTER_FP_CHANCE; +import static org.springframework.cassandra.core.cql.builder.TableOption.CACHING; +import static org.springframework.cassandra.core.cql.builder.TableOption.COMMENT; +import static org.springframework.cassandra.core.cql.builder.TableOption.COMPACTION; +import static org.springframework.cassandra.core.cql.builder.TableOption.CompactionOption.TOMBSTONE_THRESHOLD; import org.junit.Test; -import org.springframework.data.cassandra.cql.builder.TableOption.CachingOption; +import org.springframework.cassandra.core.cql.builder.CreateTableBuilder; +import org.springframework.cassandra.core.cql.builder.TableOption.CachingOption; import com.datastax.driver.core.DataType; diff --git a/src/test/java/org/springframework/data/cassandra/cql/builder/DropTableBuilderTest.java b/src/test/java/org/springframework/cassandra/cql/builder/DropTableBuilderTest.java similarity index 66% rename from src/test/java/org/springframework/data/cassandra/cql/builder/DropTableBuilderTest.java rename to src/test/java/org/springframework/cassandra/cql/builder/DropTableBuilderTest.java index 0982b3c40..276cf9abf 100644 --- a/src/test/java/org/springframework/data/cassandra/cql/builder/DropTableBuilderTest.java +++ b/src/test/java/org/springframework/cassandra/cql/builder/DropTableBuilderTest.java @@ -1,6 +1,6 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.cql.builder; -import static org.springframework.data.cassandra.cql.builder.CqlBuilder.dropTable; +import static org.springframework.cassandra.core.cql.builder.CqlBuilder.dropTable; import org.junit.Test; diff --git a/src/test/java/org/springframework/data/cassandra/cql/builder/OptionTest.java b/src/test/java/org/springframework/cassandra/cql/builder/OptionTest.java similarity index 94% rename from src/test/java/org/springframework/data/cassandra/cql/builder/OptionTest.java rename to src/test/java/org/springframework/cassandra/cql/builder/OptionTest.java index 34569262f..2f4baed50 100644 --- a/src/test/java/org/springframework/data/cassandra/cql/builder/OptionTest.java +++ b/src/test/java/org/springframework/cassandra/cql/builder/OptionTest.java @@ -1,4 +1,4 @@ -package org.springframework.data.cassandra.cql.builder; +package org.springframework.cassandra.cql.builder; import static junit.framework.Assert.assertEquals; import static junit.framework.Assert.assertFalse; @@ -7,6 +7,8 @@ import static junit.framework.Assert.assertTrue; import java.lang.annotation.RetentionPolicy; import org.junit.Test; +import org.springframework.cassandra.core.cql.builder.DefaultOption; +import org.springframework.cassandra.core.cql.builder.Option; public class OptionTest {