@@ -61,5 +61,29 @@
         <module name="RedundantImport"/>
         <module name="UnusedImports"/>
         <module name="ArrayTypeStyle"/>
+        <module name="CommentsIndentation"/>
+        <!-- Comparing this with null (i.e. this == null and this != null): -->
+        <module name="DescendantToken">
+            <property name="tokens" value="EQUAL,NOT_EQUAL"/>
+            <property name="limitedTokens" value="LITERAL_THIS,LITERAL_NULL"/>
+            <property name="maximumNumber" value="1"/>
+            <property name="maximumDepth" value="1"/>
+            <property name="sumTokenCounts" value="true"/>
+        </module>
+        <!--The initialiser in for performs no setup (where a while statement could be used instead): -->
+        <module name="DescendantToken">
+            <property name="tokens" value="FOR_INIT"/>
+            <property name="limitedTokens" value="EXPR"/>
+            <property name="minimumNumber" value="1"/>
+        </module>
+        <module name="Indentation"/>
+        <module name="OuterTypeFilename"/>
+        <module name="UpperEll"/>
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+    </module>
+    <module name="NewlineAtEndOfFile">
+        <property name="lineSeparator" value="lf"/>
     </module>
+    <module name="UniqueProperties"/>
 </module>
@@ -15,5 +15,5 @@ public interface AccessTokenExtractor {
      * @param response the contents of the response
      * @return OAuth access token
      */
-    public Token extract(String response);
+    Token extract(String response);
 }
@@ -15,5 +15,5 @@ public interface RequestTokenExtractor {
      * @param response the contents of the response
      * @return OAuth access token
      */
-    public Token extract(String response);
+    Token extract(String response);
 }
@@ -14,12 +14,12 @@ public interface TimestampService {
      *
      * @return timestamp
      */
-    public String getTimestampInSeconds();
+    String getTimestampInSeconds();
 
     /**
      * Returns a nonce (unique value for each request)
      *
      * @return nonce
      */
-    public String getNonce();
+    String getNonce();
 }
@@ -49,7 +49,7 @@ public void shouldHandleAConnectionWithErrors() throws Exception {
 
     private static class FaultyConnection extends ConnectionStub {
 
-        public FaultyConnection() throws Exception {
+        private FaultyConnection() throws Exception {
             super();
         }
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ public interface AccessTokenExtractor {`
`15`	`15`	`* @param response the contents of the response`
`16`	`16`	`* @return OAuth access token`
`17`	`17`	`*/`
`18`		`- public Token extract(String response);`
	`18`	`+ Token extract(String response);`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,5 +15,5 @@ public interface RequestTokenExtractor {`
`15`	`15`	`* @param response the contents of the response`
`16`	`16`	`* @return OAuth access token`
`17`	`17`	`*/`
`18`		`- public Token extract(String response);`
	`18`	`+ Token extract(String response);`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,12 @@ public interface TimestampService {`
`14`	`14`	`*`
`15`	`15`	`* @return timestamp`
`16`	`16`	`*/`
`17`		`- public String getTimestampInSeconds();`
	`17`	`+ String getTimestampInSeconds();`
`18`	`18`
`19`	`19`	`/**`
`20`	`20`	`* Returns a nonce (unique value for each request)`
`21`	`21`	`*`
`22`	`22`	`* @return nonce`
`23`	`23`	`*/`
`24`		`- public String getNonce();`
	`24`	`+ String getNonce();`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void shouldHandleAConnectionWithErrors() throws Exception {`
`49`	`49`
`50`	`50`	`private static class FaultyConnection extends ConnectionStub {`
`51`	`51`
`52`		`- public FaultyConnection() throws Exception {`
	`52`	`+ private FaultyConnection() throws Exception {`
`53`	`53`	`super();`
`54`	`54`	`}`
`55`	`55`