Permalink
Browse files

Merge pull request #526 from edgurgel/fix-indentation

Fix indentation and coding style done by pull request #523
  • Loading branch information...
2 parents 2272e6b + f5c490c commit 655dd508123de0c238d2c096d1d6d8dfde1c4643 @zznate zznate committed Sep 18, 2012
@@ -21,16 +21,16 @@
private ColumnType columnType = ColumnType.STANDARD;
private ComparatorType comparatorType = ComparatorType.BYTESTYPE;
private ComparatorType subComparatorType;
- private String comparatorTypeAlias = "";
- private String subComparatorTypeAlias = "";
+ private String comparatorTypeAlias = "";
+ private String subComparatorTypeAlias = "";
private String comment;
private double rowCacheSize;
private double keyCacheSize;
private double readRepairChance;
private int gcGraceSeconds;
private String defaultValidationClass;
private String keyValidationClass;
- private String keyValidationAlias = "";
+ private String keyValidationAlias = "";
private int id;
private int maxCompactionThreshold;
private int minCompactionThreshold;
@@ -66,8 +66,8 @@ public BasicColumnFamilyDefinition(ColumnFamilyDefinition columnFamilyDefinition
columnType = columnFamilyDefinition.getColumnType();
comparatorType = columnFamilyDefinition.getComparatorType();
subComparatorType = columnFamilyDefinition.getSubComparatorType();
- comparatorTypeAlias = columnFamilyDefinition.getComparatorTypeAlias();
- subComparatorTypeAlias = columnFamilyDefinition.getSubComparatorTypeAlias();
+ comparatorTypeAlias = columnFamilyDefinition.getComparatorTypeAlias();
+ subComparatorTypeAlias = columnFamilyDefinition.getSubComparatorTypeAlias();
comment = columnFamilyDefinition.getComment();
rowCacheSize = columnFamilyDefinition.getRowCacheSize();
rowCacheSavePeriodInSeconds = columnFamilyDefinition.getRowCacheSavePeriodInSeconds();
@@ -117,9 +117,13 @@ public void setSubComparatorType(ComparatorType subComparitorType) {
this.subComparatorType = subComparitorType;
}
- public void setComparatorTypeAlias(String alias) { this.comparatorTypeAlias = alias; }
+ public void setComparatorTypeAlias(String alias) {
+ this.comparatorTypeAlias = alias;
+ }
- public void setSubComparatorTypeAlias(String alias) { this.subComparatorTypeAlias = alias; }
+ public void setSubComparatorTypeAlias(String alias) {
+ this.subComparatorTypeAlias = alias;
+ }
public void setComment(String comment) {
this.comment = comment;
@@ -189,9 +193,9 @@ public void setKeyValidationClass(String keyValidationClass){
this.keyValidationClass = keyValidationClass;
}
- public void setKeyValidationAlias(String keyValidationAlias) {
- this.keyValidationAlias = keyValidationAlias;
- }
+ public void setKeyValidationAlias(String keyValidationAlias) {
+ this.keyValidationAlias = keyValidationAlias;
+ }
/**
* SHOULD THIS BE HERE? A COLUMN DEFINITION IS PART OF A KEYSPACE BY VIRTUE
@@ -222,9 +226,13 @@ public ComparatorType getSubComparatorType() {
return this.subComparatorType;
}
- public String getComparatorTypeAlias() { return this.comparatorTypeAlias; }
+ public String getComparatorTypeAlias() {
+ return this.comparatorTypeAlias;
+ }
- public String getSubComparatorTypeAlias() { return this.subComparatorTypeAlias; }
+ public String getSubComparatorTypeAlias() {
+ return this.subComparatorTypeAlias;
+ }
@Override
public String getComment() {
@@ -306,13 +314,13 @@ public int getKeyCacheSavePeriodInSeconds() {
@Override
public String getKeyValidationClass() {
- return keyValidationClass;
+ return keyValidationClass;
}
- @Override
- public String getKeyValidationAlias() {
- return keyValidationAlias;
- }
+ @Override
+ public String getKeyValidationAlias() {
+ return keyValidationAlias;
+ }
@Override
public String getCompactionStrategy() {
@@ -24,8 +24,8 @@
private ColumnType columnType;
private ComparatorType comparatorType;
private ComparatorType subComparatorType;
- private String comparatorTypeAlias = "";
- private String subComparatorTypeAlias = "";
+ private String comparatorTypeAlias = "";
+ private String subComparatorTypeAlias = "";
private String comment;
private double rowCacheSize;
private int rowCacheSavePeriodInSeconds;
@@ -34,7 +34,7 @@
private List<ColumnDefinition> columnMetadata;
private int gcGraceSeconds;
private String keyValidationClass;
- private String keyValidationAlias = "";
+ private String keyValidationAlias = "";
private String defaultValidationClass;
private int id;
private int maxCompactionThreshold;
@@ -99,15 +99,15 @@ public ThriftCfDef(ColumnFamilyDefinition columnFamilyDefinition) {
columnType = columnFamilyDefinition.getColumnType();
comparatorType = columnFamilyDefinition.getComparatorType();
subComparatorType = columnFamilyDefinition.getSubComparatorType();
- comparatorTypeAlias = columnFamilyDefinition.getComparatorTypeAlias();
- subComparatorTypeAlias = columnFamilyDefinition.getSubComparatorTypeAlias();
+ comparatorTypeAlias = columnFamilyDefinition.getComparatorTypeAlias();
+ subComparatorTypeAlias = columnFamilyDefinition.getSubComparatorTypeAlias();
comment = columnFamilyDefinition.getComment();
rowCacheSize = columnFamilyDefinition.getRowCacheSize();
rowCacheSavePeriodInSeconds = columnFamilyDefinition.getRowCacheSavePeriodInSeconds();
keyCacheSize = columnFamilyDefinition.getKeyCacheSize();
keyCacheSavePeriodInSeconds = columnFamilyDefinition.getKeyCacheSavePeriodInSeconds();
keyValidationClass = columnFamilyDefinition.getKeyValidationClass();
- keyValidationAlias = columnFamilyDefinition.getKeyValidationAlias();
+ keyValidationAlias = columnFamilyDefinition.getKeyValidationAlias();
readRepairChance = columnFamilyDefinition.getReadRepairChance();
columnMetadata = columnFamilyDefinition.getColumnMetadata();
gcGraceSeconds = columnFamilyDefinition.getGcGraceSeconds();
@@ -205,9 +205,13 @@ public ComparatorType getSubComparatorType() {
return subComparatorType;
}
- public String getComparatorTypeAlias() { return this.comparatorTypeAlias; }
+ public String getComparatorTypeAlias() {
+ return this.comparatorTypeAlias;
+ }
- public String getSubComparatorTypeAlias() { return this.subComparatorTypeAlias; }
+ public String getSubComparatorTypeAlias() {
+ return this.subComparatorTypeAlias;
+ }
@Override
public String getComment() {
@@ -268,12 +272,12 @@ public CfDef toThrift() {
d.setKey_cache_size(keyCacheSize);
d.setKey_cache_save_period_in_seconds(keyCacheSavePeriodInSeconds);
- if(false || keyValidationClass != null) {
- d.setKey_validation_class(keyValidationClass + keyValidationAlias);
- } else {
- d.setKey_validation_class(keyValidationClass);
- }
-
+ if(false || keyValidationClass != null) {
+ d.setKey_validation_class(keyValidationClass + keyValidationAlias);
+ } else {
+ d.setKey_validation_class(keyValidationClass);
+ }
+
d.setMax_compaction_threshold(maxCompactionThreshold);
d.setMin_compaction_threshold(minCompactionThreshold);
d.setRead_repair_chance(readRepairChance);
@@ -303,14 +307,14 @@ public String getDefaultValidationClass() {
@Override
public String getKeyValidationClass(){
- return keyValidationClass;
+ return keyValidationClass;
+ }
+
+ @Override
+ public String getKeyValidationAlias() {
+ return keyValidationAlias;
}
- @Override
- public String getKeyValidationAlias() {
- return keyValidationAlias;
- }
-
@Override
public int getId() {
return id;
@@ -338,9 +342,13 @@ public void setSubComparatorType(ComparatorType subComparatorType) {
this.subComparatorType = subComparatorType;
}
- public void setComparatorTypeAlias(String alias) { this.comparatorTypeAlias = alias; }
+ public void setComparatorTypeAlias(String alias) {
+ this.comparatorTypeAlias = alias;
+ }
- public void setSubComparatorTypeAlias(String alias) { this.subComparatorTypeAlias = alias; }
+ public void setSubComparatorTypeAlias(String alias) {
+ this.subComparatorTypeAlias = alias;
+ }
public void setComment(String comment) {
this.comment = comment;
@@ -380,13 +388,13 @@ public void setDefaultValidationClass(String defaultValidationClass) {
}
public void setKeyValidationClass(String keyValidationClass){
- this.keyValidationClass = keyValidationClass;
+ this.keyValidationClass = keyValidationClass;
+ }
+
+ public void setKeyValidationAlias(String keyValidationAlias) {
+ this.keyValidationAlias = keyValidationAlias;
}
- public void setKeyValidationAlias(String keyValidationAlias) {
- this.keyValidationAlias = keyValidationAlias;
- }
-
public void setId(int id) {
this.id = id;
}

0 comments on commit 655dd50

Please sign in to comment.