Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing checkstyle errors that had crept in

Change-Id: I3b96ab48943c1670f6f2c5de534d7c8ea4a3e260
Reviewed-on: http://review.couchbase.org/21500
Tested-by: Raghavan N. Srinivas <raghavan.srinivas@gmail.com>
Reviewed-by: Matt Ingenthron <matt@couchbase.com>
Tested-by: Matt Ingenthron <matt@couchbase.com>
  • Loading branch information...
commit caf1f9f9acaf83cfeb854e1f903bfcc98141f283 1 parent a0b7d0e
@ragsns ragsns authored ingenthr committed
View
3  src/main/java/com/couchbase/client/CouchbaseClient.java
@@ -177,7 +177,8 @@ public void reconfigure(Bucket bucket) {
CouchbaseConnection cbConn = (CouchbaseConnection) mconn;
cbConn.reconfigure(bucket);
} else {
- CouchbaseMemcachedConnection cbMConn= (CouchbaseMemcachedConnection) mconn;
+ CouchbaseMemcachedConnection cbMConn =
+ (CouchbaseMemcachedConnection) mconn;
cbMConn.reconfigure(bucket);
}
} catch (IllegalArgumentException ex) {
View
2  src/main/java/com/couchbase/client/CouchbaseConnectionFactory.java
@@ -308,7 +308,7 @@ public void run() {
if (!doingResubscribe.compareAndSet(true, false)) {
assert false : "Could not reset from doing a resubscribe.";
}
- Thread.currentThread().setName(threadNameBase + "complete");
+ Thread.currentThread().setName(threadNameBase + "complete");
}
}
View
4 src/main/java/com/couchbase/client/CouchbaseMemcachedConnection.java
@@ -53,8 +53,8 @@
* This class provides that functionality by extending the MemcachedConnection
* and adding a method to handle reconfiguration of a bucket.
*/
-public class CouchbaseMemcachedConnection extends MemcachedConnection implements
- Reconfigurable {
+public class CouchbaseMemcachedConnection extends MemcachedConnection
+ implements Reconfigurable {
protected volatile boolean reconfiguring = false;
private final CouchbaseConnectionFactory cf;
View
3  src/main/java/com/couchbase/client/vbucket/ConfigurationProviderHTTP.java
@@ -236,7 +236,8 @@ public void subscribe(String bucketName, Reconfigurable rec) {
/* @TODO: refactor all of this bucket and subscription behind the
* node locator
*/
- if (null == bucketName || (null != reSubBucket && !bucketName.equals(reSubBucket))) {
+ if (null == bucketName || (null != reSubBucket
+ && !bucketName.equals(reSubBucket))) {
throw new IllegalArgumentException("Bucket name cannot be null and must"
+ " never be re-set to a new object.");
}
View
4 src/test/java/com/couchbase/client/FailInjectingCouchbaseConnectionFactory.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2012 Couchbase, Inc.
+ * Copyright (C) 2011-2012 Couchbase, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -45,7 +45,7 @@
public FailInjectingCouchbaseConnectionFactory(final List<URI> baseList,
final String bucketName, final String password)
- throws IOException {
+ throws IOException {
super(baseList, bucketName, password);
}
View
2  src/test/java/com/couchbase/client/TestingCouchbaseClient.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2012 Couchbase, Inc.
+ * Copyright (C) 2011-2012 Couchbase, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
View
7 src/test/java/com/couchbase/client/vbucket/NMVInjectingVBucketNodeLocator.java
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2012 Couchbase, Inc.
+ * Copyright (C) 2011-2012 Couchbase, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -32,7 +32,8 @@
*/
public class NMVInjectingVBucketNodeLocator extends VBucketNodeLocator {
- ArrayList<String> bogused; // chosen for size over speed, only 20 ops needed
+ // chosen for size over speed, only 20 ops needed
+ private ArrayList<String> bogused;
public NMVInjectingVBucketNodeLocator(List<MemcachedNode> nodes,
Config jsonConfig) {
@@ -59,7 +60,7 @@ public int getVBucketIndex(String key) {
if (key.startsWith("bogus")) {
vBucketIndex = 1025; // make the vbucket index bogus first time through
- System.err.println("BOGUS!!!!! " + key );
+ System.err.println("BOGUS!!!!! " + key);
bogused.add(key);
}
Please sign in to comment.
Something went wrong with that request. Please try again.