Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

relocated things appropriately

Browse Source
This commit is contained in:
Matthew Adams
2013-11-19 16:16:09 -06:00
parent c52b36d2a6
commit 37de816c2d
21 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/cassandra/cql/CqlStringUtils.java → src/main/java/org/springframework/cassandra/core/cql/CqlStringUtils.java
View File

@@ -1,4 +1,4 @@
package org.springframework.data.cassandra.cql;
package org.springframework.cassandra.core.cql;
import java.util.regex.Pattern;

12
src/main/java/org/springframework/data/cassandra/cql/builder/AbstractTableBuilder.java → src/main/java/org/springframework/cassandra/core/cql/builder/AbstractTableBuilder.java
View File

@@ -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.

4
src/main/java/org/springframework/data/cassandra/cql/builder/AddColumn.java → src/main/java/org/springframework/cassandra/core/cql/builder/AddColumn.java
View File

@@ -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;

4
src/main/java/org/springframework/data/cassandra/cql/builder/AlterColumn.java → src/main/java/org/springframework/cassandra/core/cql/builder/AlterColumn.java
View File

@@ -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;

4
src/main/java/org/springframework/data/cassandra/cql/builder/AlterTableBuilder.java → src/main/java/org/springframework/cassandra/core/cql/builder/AlterTableBuilder.java
View File

@@ -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;

8
src/main/java/org/springframework/data/cassandra/cql/builder/ColumnBuilder.java → src/main/java/org/springframework/cassandra/core/cql/builder/ColumnBuilder.java
View File

@@ -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;

6
src/main/java/org/springframework/data/cassandra/cql/builder/ColumnChange.java → src/main/java/org/springframework/cassandra/core/cql/builder/ColumnChange.java
View File

@@ -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 {

2
src/main/java/org/springframework/data/cassandra/cql/builder/ColumnTypeChange.java → src/main/java/org/springframework/cassandra/core/cql/builder/ColumnTypeChange.java
View File

@@ -1,4 +1,4 @@
package org.springframework.data.cassandra.cql.builder;
package org.springframework.cassandra.core.cql.builder;
import org.springframework.util.Assert;

2
src/main/java/org/springframework/data/cassandra/cql/builder/CqlBuilder.java → src/main/java/org/springframework/cassandra/core/cql/builder/CqlBuilder.java
View File

@@ -1,4 +1,4 @@
package org.springframework.data.cassandra.cql.builder;
package org.springframework.cassandra.core.cql.builder;
public class CqlBuilder {

4
src/main/java/org/springframework/data/cassandra/cql/builder/CreateTableBuilder.java → src/main/java/org/springframework/cassandra/core/cql/builder/CreateTableBuilder.java
View File

@@ -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;

6
src/main/java/org/springframework/data/cassandra/cql/builder/DefaultOption.java → src/main/java/org/springframework/cassandra/core/cql/builder/DefaultOption.java
View File

@@ -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;

4
src/main/java/org/springframework/data/cassandra/cql/builder/DropColumn.java → src/main/java/org/springframework/cassandra/core/cql/builder/DropColumn.java
View File

@@ -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 {

8
src/main/java/org/springframework/data/cassandra/cql/builder/DropTableBuilder.java → src/main/java/org/springframework/cassandra/core/cql/builder/DropTableBuilder.java
View File

@@ -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 {

2
src/main/java/org/springframework/data/cassandra/cql/builder/MapBuilder.java → src/main/java/org/springframework/cassandra/core/cql/builder/MapBuilder.java
View File

@@ -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;

2
src/main/java/org/springframework/data/cassandra/cql/builder/Option.java → src/main/java/org/springframework/cassandra/core/cql/builder/Option.java
View File

@@ -1,4 +1,4 @@
package org.springframework.data.cassandra.cql.builder;
package org.springframework.cassandra.core.cql.builder;
/**
* Interface to represent option types.

2
src/main/java/org/springframework/data/cassandra/cql/builder/TableOption.java → src/main/java/org/springframework/cassandra/core/cql/builder/TableOption.java
View File

@@ -1,4 +1,4 @@
package org.springframework.data.cassandra.cql.builder;
package org.springframework.cassandra.core.cql.builder;
import java.util.Map;

6
src/test/java/org/springframework/data/cassandra/cql/CqlStringUtilsTest.java → src/test/java/org/springframework/cassandra/cql/CqlStringUtilsTest.java
View File

@@ -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;

4
src/test/java/org/springframework/data/cassandra/cql/builder/AlterTableBuilderTest.java → src/test/java/org/springframework/cassandra/cql/builder/AlterTableBuilderTest.java
View File

@@ -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;

19
src/test/java/org/springframework/data/cassandra/cql/builder/CreateTableBuilderTest.java → src/test/java/org/springframework/cassandra/cql/builder/CreateTableBuilderTest.java
View File

@@ -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;

4
src/test/java/org/springframework/data/cassandra/cql/builder/DropTableBuilderTest.java → src/test/java/org/springframework/cassandra/cql/builder/DropTableBuilderTest.java
View File

@@ -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;

4
src/test/java/org/springframework/data/cassandra/cql/builder/OptionTest.java → src/test/java/org/springframework/cassandra/cql/builder/OptionTest.java
View File

@@ -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 {