Skip to content

JAVA-715: Make NativeColumnType a top-level class #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olim7t merged 1 commit into from
Jun 9, 2015
Merged

JAVA-715: Make NativeColumnType a top-level class #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

### 2.1.7 (in progress)

- [improvement] Make NativeColumnType a top-level class (JAVA-715)
- [improvement] Unify "Target" enum for schema elements (JAVA-782)


Expand Down
2 changes: 1 addition & 1 deletion ...er-core/src/main/java/com/datastax/driver/core/schemabuilder/AbstractCreateStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public T addColumn(String columnName, DataType dataType) {
validateNotEmpty(columnName, "Column name");
validateNotNull(dataType, "Column type");
validateNotKeyWord(columnName, String.format("The column name '%s' is not allowed because it is a reserved keyword", columnName));
simpleColumns.put(columnName, new ColumnType.NativeColumnType(dataType));
simpleColumns.put(columnName, new NativeColumnType(dataType));
return self;
}

Expand Down
12 changes: 0 additions & 12 deletions driver-core/src/main/java/com/datastax/driver/core/schemabuilder/ColumnType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,4 @@
*/
interface ColumnType {
String asCQLString();

class NativeColumnType implements ColumnType {
private final String asCQLString;

NativeColumnType(DataType nativeType) {
asCQLString = nativeType.toString();
}

@Override public String asCQLString() {
return asCQLString;
}
}
}
6 changes: 3 additions & 3 deletions driver-core/src/main/java/com/datastax/driver/core/schemabuilder/Create.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public Create addPartitionKey(String columnName, DataType dataType) {
validateNotEmpty(columnName, "Partition key name");
validateNotNull(dataType, "Partition key type");
validateNotKeyWord(columnName, String.format("The partition key name '%s' is not allowed because it is a reserved keyword", columnName));
partitionColumns.put(columnName, new ColumnType.NativeColumnType(dataType));
partitionColumns.put(columnName, new NativeColumnType(dataType));
return this;
}

Expand Down Expand Up @@ -104,7 +104,7 @@ public Create addClusteringColumn(String columnName, DataType dataType) {
validateNotEmpty(columnName, "Clustering column name");
validateNotNull(dataType, "Clustering column type");
validateNotKeyWord(columnName, String.format("The clustering column name '%s' is not allowed because it is a reserved keyword", columnName));
clusteringColumns.put(columnName, new ColumnType.NativeColumnType(dataType));
clusteringColumns.put(columnName, new NativeColumnType(dataType));
return this;
}

Expand Down Expand Up @@ -138,7 +138,7 @@ public Create addStaticColumn(String columnName, DataType dataType) {
validateNotEmpty(columnName, "Column name");
validateNotNull(dataType, "Column type");
validateNotKeyWord(columnName, String.format("The static column name '%s' is not allowed because it is a reserved keyword", columnName));
staticColumns.put(columnName, new ColumnType.NativeColumnType(dataType));
staticColumns.put(columnName, new NativeColumnType(dataType));
return this;
}

Expand Down
33 changes: 33 additions & 0 deletions driver-core/src/main/java/com/datastax/driver/core/schemabuilder/NativeColumnType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright (C) 2012-2015 DataStax Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.datastax.driver.core.schemabuilder;

import com.datastax.driver.core.DataType;

/**
* Represents a native CQL type in a SchemaBuilder statement.
*/
class NativeColumnType implements ColumnType {
private final String asCQLString;

NativeColumnType(DataType nativeType) {
asCQLString = nativeType.toString();
}

@Override public String asCQLString() {
return asCQLString;
}
}