diff --git a/.gitignore b/.gitignore
index 863c2a5c9f..133735f7be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,9 +13,9 @@ target
pom.xml.*
release.properties
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/libraries
+.idea
+*.iml
+classes
obj
diff --git a/android/pom.xml b/android/pom.xml
index 0425911742..69016e007e 100644
--- a/android/pom.xml
+++ b/android/pom.xml
@@ -28,4 +28,24 @@
test
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ../checkstyle.xml
+
+
+
+ verify
+
+ checkstyle
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/src/main/java/retrofit/android/ShakeDetector.java b/android/src/main/java/retrofit/android/ShakeDetector.java
index f86bb2a191..ba5b63c843 100644
--- a/android/src/main/java/retrofit/android/ShakeDetector.java
+++ b/android/src/main/java/retrofit/android/ShakeDetector.java
@@ -154,8 +154,8 @@ void clear() {
/** Purges samples with timestamps older than cutoff. */
void purge(long cutoff) {
- while (sampleCount >= MIN_QUEUE_SIZE &&
- oldest != null && cutoff - oldest.timestamp > 0) {
+ while (sampleCount >= MIN_QUEUE_SIZE
+ && oldest != null && cutoff - oldest.timestamp > 0) {
// Remove sample.
Sample removed = oldest;
if (removed.accelerating) acceleratingCount--;
diff --git a/android/src/main/java/retrofit/io/QueueFile.java b/android/src/main/java/retrofit/io/QueueFile.java
index ebfe8eae71..f5ae7f7e4e 100644
--- a/android/src/main/java/retrofit/io/QueueFile.java
+++ b/android/src/main/java/retrofit/io/QueueFile.java
@@ -50,7 +50,7 @@
* @author Bob Lee (bob@squareup.com)
*/
public class QueueFile {
- private static final Logger logger =
+ private static final Logger LOGGER =
Logger.getLogger(QueueFile.class.getName());
/** Initial file size in bytes. */
@@ -501,7 +501,8 @@ public synchronized void remove() throws IOException {
public synchronized void clear() throws IOException {
writeHeader(INITIAL_LENGTH, 0, 0, 0);
elementCount = 0;
- first = last = Element.NULL;
+ first = Element.NULL;
+ last = Element.NULL;
fileLength = INITIAL_LENGTH;
if (fileLength > INITIAL_LENGTH) setLength(INITIAL_LENGTH);
}
@@ -533,7 +534,7 @@ public synchronized void close() throws IOException {
}
});
} catch (IOException e) {
- logger.log(Level.WARNING, "read error", e);
+ LOGGER.log(Level.WARNING, "read error", e);
}
builder.append("]]");
return builder.toString();
@@ -590,6 +591,6 @@ public interface ElementReader {
* which case it reads all the remaining bytes. Not buffered.
* @param length of element data in bytes
*/
- public void read(InputStream in, int length) throws IOException;
+ void read(InputStream in, int length) throws IOException;
}
}
diff --git a/checkstyle.xml b/checkstyle.xml
new file mode 100644
index 0000000000..be932b6721
--- /dev/null
+++ b/checkstyle.xml
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/core/pom.xml b/core/pom.xml
index 297bcc540e..d3a81f9f7a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,4 +22,24 @@
test
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ../checkstyle.xml
+
+
+
+ verify
+
+ checkstyle
+
+
+
+
+
+
\ No newline at end of file
diff --git a/http/pom.xml b/http/pom.xml
index 11811862e1..a7d21b2175 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -53,6 +53,22 @@
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ../checkstyle.xml
+
+
+
+ verify
+
+ checkstyle
+
+
+
+
+
org.sonatype.plugins
jarjar-maven-plugin
diff --git a/http/src/main/java/retrofit/http/CallbackResponseHandler.java b/http/src/main/java/retrofit/http/CallbackResponseHandler.java
index 025569ea43..ef6b397222 100644
--- a/http/src/main/java/retrofit/http/CallbackResponseHandler.java
+++ b/http/src/main/java/retrofit/http/CallbackResponseHandler.java
@@ -21,7 +21,7 @@
public abstract class CallbackResponseHandler
implements ResponseHandler {
- private static final Logger logger =
+ private static final Logger LOGGER =
Logger.getLogger(CallbackResponseHandler.class.getName());
private static final int UNAUTHORIZED = 401;
@@ -66,13 +66,13 @@ public Void handleResponse(HttpResponse response) throws IOException {
int statusCode = statusLine.getStatusCode();
if (statusCode == UNAUTHORIZED) {
- logger.fine("Session expired.");
+ LOGGER.fine("Session expired.");
callback.sessionExpired();
return null;
}
if (statusCode == FORBIDDEN) {
- logger.fine("Account disabled.");
+ LOGGER.fine("Account disabled.");
callback.sessionExpired();
return null;
}
@@ -82,7 +82,7 @@ public Void handleResponse(HttpResponse response) throws IOException {
// 2XX == successful request
if (statusCode >= 200 && statusCode < 300) {
if (entity == null) {
- logger.fine("Missing entity for " + statusCode + " response.");
+ LOGGER.fine("Missing entity for " + statusCode + " response.");
callback.serverError(null, statusCode);
return null;
}
@@ -90,7 +90,7 @@ public Void handleResponse(HttpResponse response) throws IOException {
try {
callback.call(parse(entity));
} catch (ServerException e) {
- logger.log(Level.WARNING, e.getMessage(), e);
+ LOGGER.log(Level.WARNING, e.getMessage(), e);
callback.serverError(null, statusCode);
}
return null;
@@ -101,11 +101,11 @@ public Void handleResponse(HttpResponse response) throws IOException {
if (entity != null) {
// TODO: Use specified encoding.
String body = new String(HttpClients.entityToBytes(entity), "UTF-8");
- logger.fine("Server returned " + statusCode + ", "
+ LOGGER.fine("Server returned " + statusCode + ", "
+ statusLine.getReasonPhrase() + ". Body: " + body);
callback.serverError(parseServerMessage(statusCode, body), statusCode);
} else {
- logger.fine("Server returned " + statusCode + ", "
+ LOGGER.fine("Server returned " + statusCode + ", "
+ statusLine.getReasonPhrase() + ".");
callback.serverError(null, statusCode);
}
@@ -119,16 +119,16 @@ public Void handleResponse(HttpResponse response) throws IOException {
// TODO: Use specified encoding.
String body = new String(HttpClients.entityToBytes(bufferedEntity),
"UTF-8");
- logger.fine("Server returned " + statusCode + ", "
+ LOGGER.fine("Server returned " + statusCode + ", "
+ statusLine.getReasonPhrase() + ". Body: " + body);
try {
callback.clientError(parse(bufferedEntity), statusCode);
} catch (ServerException e) {
- logger.log(Level.WARNING, e.getMessage(), e);
+ LOGGER.log(Level.WARNING, e.getMessage(), e);
callback.serverError(null, statusCode);
}
} else {
- logger.fine("Server returned " + statusCode + ", "
+ LOGGER.fine("Server returned " + statusCode + ", "
+ statusLine.getReasonPhrase() + ".");
callback.clientError(null, statusCode);
}
@@ -146,7 +146,7 @@ private String parseServerMessage(int statusCode, String body) {
if (serverError != null) return serverError.message;
} catch (Throwable t) {
// The server error takes precedence.
- logger.log(Level.WARNING, t.getMessage(), t);
+ LOGGER.log(Level.WARNING, t.getMessage(), t);
}
}
return null;
diff --git a/http/src/main/java/retrofit/http/Fetcher.java b/http/src/main/java/retrofit/http/Fetcher.java
index 1b19673b67..6268349b90 100644
--- a/http/src/main/java/retrofit/http/Fetcher.java
+++ b/http/src/main/java/retrofit/http/Fetcher.java
@@ -25,7 +25,7 @@
* @author Bob Lee (bob@squareup.com)
*/
public class Fetcher {
- private static final Logger logger =
+ private static final Logger LOGGER =
Logger.getLogger(Fetcher.class.getName());
// TODO: Support conditional get.
@@ -62,7 +62,7 @@ public void run() {
httpClientProvider.get().execute(get, new DownloadHandler(gson, destination,
uiCallback, progressListener, mainThread));
} catch (IOException e) {
- logger.log(Level.WARNING, "fetch exception", e);
+ LOGGER.log(Level.WARNING, "fetch exception", e);
uiCallback.networkError();
} catch (Throwable t) {
uiCallback.unexpectedError(t);
diff --git a/http/src/main/java/retrofit/http/GsonResponseHandler.java b/http/src/main/java/retrofit/http/GsonResponseHandler.java
index 19622581da..9a61568e32 100644
--- a/http/src/main/java/retrofit/http/GsonResponseHandler.java
+++ b/http/src/main/java/retrofit/http/GsonResponseHandler.java
@@ -15,7 +15,7 @@
* Callback#call(T)}.
*/
class GsonResponseHandler extends CallbackResponseHandler {
- private static final Logger logger =
+ private static final Logger LOGGER =
Logger.getLogger(GsonResponseHandler.class.getName());
private final Gson gson;
@@ -40,7 +40,7 @@ static GsonResponseHandler create(Gson gson, Type type, Callback callb
@Override protected T parse(HttpEntity entity) throws IOException,
ServerException {
try {
- if (logger.isLoggable(Level.FINE)) {
+ if (LOGGER.isLoggable(Level.FINE)) {
entity = HttpClients.copyAndLog(entity, url, startTime);
}
diff --git a/http/src/main/java/retrofit/http/Headers.java b/http/src/main/java/retrofit/http/Headers.java
index da926e4917..968518b570 100644
--- a/http/src/main/java/retrofit/http/Headers.java
+++ b/http/src/main/java/retrofit/http/Headers.java
@@ -11,5 +11,5 @@
public interface Headers {
/** Sets headers on the given message, with the specified MIME type */
- public void setOn(HttpMessage message, String mimeType);
+ void setOn(HttpMessage message, String mimeType);
}
diff --git a/http/src/main/java/retrofit/http/HttpClients.java b/http/src/main/java/retrofit/http/HttpClients.java
index fd0fcc711c..48056a58d8 100644
--- a/http/src/main/java/retrofit/http/HttpClients.java
+++ b/http/src/main/java/retrofit/http/HttpClients.java
@@ -16,7 +16,7 @@
* @author Bob Lee (bob@squareup.com)
*/
public class HttpClients {
- private static final Logger logger =
+ private static final Logger LOGGER =
Logger.getLogger(HttpClients.class.getName());
/**
@@ -42,7 +42,7 @@ public static IOException responseToException(HttpResponse response) {
if (entity != null) body = new String(entityToBytes(entity));
} catch (Throwable t) {
// The original error takes precedence.
- logger.log(Level.WARNING, "Response entity to String conversion.", t);
+ LOGGER.log(Level.WARNING, "Response entity to String conversion.", t);
}
return new IOException("Unexpected response."
+ " Code: " + statusLine.getStatusCode()
@@ -57,15 +57,15 @@ public static HttpEntity copyAndLog(HttpEntity entity, String url, String startT
throws IOException {
byte[] bytes = entityToBytes(entity);
// TODO: Use correct encoding.
- if (logger.isLoggable(Level.FINE)) {
+ if (LOGGER.isLoggable(Level.FINE)) {
final int chunkSize = 4000;
- logger.fine("----Response from " + url + " at " + startTime + ":");
+ LOGGER.fine("----Response from " + url + " at " + startTime + ":");
for (int i = 0; i < bytes.length; i += chunkSize) {
int end = i + chunkSize;
- logger.fine(((end > bytes.length) ? new String(bytes, i, bytes.length - i)
+ LOGGER.fine(((end > bytes.length) ? new String(bytes, i, bytes.length - i)
: new String(bytes, i, chunkSize)));
}
- logger.fine("----end response.");
+ LOGGER.fine("----end response.");
}
return new ByteArrayEntity(bytes);
diff --git a/http/src/main/java/retrofit/http/HttpRequestBuilder.java b/http/src/main/java/retrofit/http/HttpRequestBuilder.java
index d8537543e2..ebbf0d9e72 100644
--- a/http/src/main/java/retrofit/http/HttpRequestBuilder.java
+++ b/http/src/main/java/retrofit/http/HttpRequestBuilder.java
@@ -33,7 +33,7 @@
*
*/
final class HttpRequestBuilder {
- private static final Logger logger = Logger.getLogger(HttpRequestBuilder.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(HttpRequestBuilder.class.getName());
private final Gson gson;
diff --git a/http/src/main/java/retrofit/http/RestAdapter.java b/http/src/main/java/retrofit/http/RestAdapter.java
index 44073708b7..f07fd8f7ea 100644
--- a/http/src/main/java/retrofit/http/RestAdapter.java
+++ b/http/src/main/java/retrofit/http/RestAdapter.java
@@ -31,7 +31,7 @@
* @author Bob Lee (bob@squareup.com)
*/
@Singleton public class RestAdapter {
- private static final Logger logger = Logger.getLogger(RestAdapter.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(RestAdapter.class.getName());
@Inject private Server server;
@Inject private Provider httpClientProvider;
@@ -108,7 +108,7 @@ private class RestHandler implements InvocationHandler {
// The last parameter should be of type Callback. Determine T.
Type[] genericParameterTypes = method.getGenericParameterTypes();
final Type resultType = getCallbackParameterType(method, genericParameterTypes);
- logger.fine("Sending " + request.getMethod() + " to " + request.getURI());
+ LOGGER.fine("Sending " + request.getMethod() + " to " + request.getURI());
final Date start = new Date();
startTime = dateFormat.get().format(start);
@@ -128,7 +128,7 @@ private class RestHandler implements InvocationHandler {
}
});
} catch (Throwable t) {
- logger.log(Level.WARNING, t.getMessage() + " from " + url + " at " + startTime, t);
+ LOGGER.log(Level.WARNING, t.getMessage() + " from " + url + " at " + startTime, t);
callback.unexpectedError(t);
}
@@ -141,10 +141,10 @@ private void backgroundInvoke(HttpUriRequest request, ResponseHandler rh,
try {
httpClientProvider.get().execute(request, rh);
} catch (IOException e) {
- logger.log(Level.WARNING, e.getMessage() + " from " + url + " at " + startTime, e);
+ LOGGER.log(Level.WARNING, e.getMessage() + " from " + url + " at " + startTime, e);
callback.networkError();
} catch (Throwable t) {
- logger.log(Level.WARNING, t.getMessage() + " from " + url + " at " + startTime, t);
+ LOGGER.log(Level.WARNING, t.getMessage() + " from " + url + " at " + startTime, t);
callback.unexpectedError(t);
}
}
diff --git a/http/src/main/java/retrofit/http/TypedBytesEntity.java b/http/src/main/java/retrofit/http/TypedBytesEntity.java
index 249a6de5fe..3f490e02c0 100644
--- a/http/src/main/java/retrofit/http/TypedBytesEntity.java
+++ b/http/src/main/java/retrofit/http/TypedBytesEntity.java
@@ -31,7 +31,7 @@ public TypedBytesEntity(TypedBytes typedBytes) {
return typedBytes.length();
}
- @Override public InputStream getContent() throws IOException, IllegalStateException {
+ @Override public InputStream getContent() throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
typedBytes.writeTo(out);
return new ByteArrayInputStream(out.toByteArray());
diff --git a/io/pom.xml b/io/pom.xml
index 187a3f6427..b0071219d7 100644
--- a/io/pom.xml
+++ b/io/pom.xml
@@ -43,6 +43,22 @@
android-maven-plugin
true
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ../checkstyle.xml
+
+
+
+ verify
+
+ checkstyle
+
+
+
+
\ No newline at end of file
diff --git a/io/src/main/java/retrofit/io/Files.java b/io/src/main/java/retrofit/io/Files.java
index 503f19d5f2..29a957397e 100644
--- a/io/src/main/java/retrofit/io/Files.java
+++ b/io/src/main/java/retrofit/io/Files.java
@@ -62,8 +62,7 @@ public static void makeDirectory(File directory) {
}
} else {
if (!directory.isDirectory()) {
- throw new IllegalArgumentException("File " + directory +
- " is not a directory");
+ throw new IllegalArgumentException("File " + directory + " is not a directory");
}
}
}
diff --git a/pom.xml b/pom.xml
index 2064fc9346..87dfc8e840 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,6 +150,15 @@
${java.version}
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ 2.9.1
+
+ true
+
+
diff --git a/sample-android/pom.xml b/sample-android/pom.xml
index 86a4b1bc46..94785200bb 100644
--- a/sample-android/pom.xml
+++ b/sample-android/pom.xml
@@ -40,6 +40,22 @@
android-maven-plugin
true
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+
+ ../checkstyle.xml
+
+
+
+ verify
+
+ checkstyle
+
+
+
+
\ No newline at end of file