Whoa! Reformatting!

Author: neilprosser

Diff for: rest-client-driver/src/main/java/com/github/restdriver/clientdriver/ClientDriver.java

@@ -28,12 +28,12 @@
  * The main class which acts as a facade for the Client Driver.
  */
 public final class ClientDriver {
-
+    
     private final Server jettyServer;
     private final int port;
-
+    
     private final ClientDriverJettyHandler handler;
-
+    
     /**
      * Constructor. This will find a free port, bind to it and start the server
      * up before it returns.
@@ -44,7 +44,7 @@ public final class ClientDriver {
     public ClientDriver(ClientDriverJettyHandler handler) {
         this(handler, getFreePort());
     }
-
+    
     /**
      * Constructor. This will find a free port, bind to it and start the server
      * up before it returns.
@@ -56,28 +56,28 @@ public ClientDriver(ClientDriverJettyHandler handler) {
      *            not free.
      */
     public ClientDriver(ClientDriverJettyHandler handler, int port) {
-
+        
         this.port = port;
         this.handler = handler;
-
+        
         jettyServer = new Server(port);
-
+        
         startJetty();
     }
-
+    
     private void startJetty() {
-
+        
         try {
             jettyServer.setHandler(handler.getJettyHandler());
             jettyServer.start();
-
+            
         } catch (Exception e) {
             throw new ClientDriverSetupException(
                     "Error starting jetty on port " + port, e);
-
+            
         }
     }
-
+    
     /**
      * Get the base URL which the ClientDriver is running on.
      * 
@@ -87,7 +87,7 @@ private void startJetty() {
     public String getBaseUrl() {
         return "http://localhost:" + port;
     }
-
+    
     /**
      * Gets a free port on localhost for binding to.
      * 
@@ -96,24 +96,23 @@ public String getBaseUrl() {
      * @return The port number.
      */
     public static int getFreePort() {
-
+        
         try {
             ServerSocket server = new ServerSocket(0);
             int port = server.getLocalPort();
             server.close();
             return port;
-
+            
         } catch (IOException ioe) {
             throw new ClientDriverSetupException(
                     "IOException finding free port", ioe);
         }
     }
-
+    
     /**
      * Verifies that all expectations have been met and nothing unexpected has been requested.
      * 
-     * If the verification fails, a {@link com.github.restdriver.clientdriver.exception.ClientDriverFailedExpectationException}
-     * is thrown with plenty of detail, and your test will fail!
+     * If the verification fails, a {@link com.github.restdriver.clientdriver.exception.ClientDriverFailedExpectationException} is thrown with plenty of detail, and your test will fail!
      */
     public void verify() {
         handler.checkForUnexpectedRequests();
@@ -130,24 +129,23 @@ public void shutdownQuietly() {
             throw new ClientDriverFailedExpectationException("Error shutting down jetty", e);
         }
     }
-
+    
     /**
      * Shutdown the server and calls {@link #verify()}.
      */
     public void shutdown() {
         shutdownQuietly();
         verify();
     }
-
+    
     /**
-     * Add in an expected {@link ClientDriverRequest}/
-     * {@link ClientDriverResponse} pair.
+     * Add in an expected {@link ClientDriverRequest}/ {@link ClientDriverResponse} pair.
      * 
      * @param request
      *            The expected request
      * @param response
      *            The response to serve to that request
-     *            
+     * 
      * @return The newly added expectation.
      */
     public ClientDriverExpectation addExpectation(ClientDriverRequest request,

Diff for: rest-client-driver/src/main/java/com/github/restdriver/clientdriver/ClientDriverExpectation.java

@@ -21,12 +21,12 @@
  * An expectation made within the client driver.
  */
 public class ClientDriverExpectation {
-
+    
     private final ClientDriverRequestResponsePair pair;
     private int numberOfTimes = 1;
     private int numberOfMatches;
     private boolean matchAnyTimes;
-
+    
     /**
      * Creates a new expectation instance.
      * 
@@ -35,7 +35,7 @@ public class ClientDriverExpectation {
     public ClientDriverExpectation(ClientDriverRequestResponsePair pair) {
         this.pair = pair;
     }
-
+    
     /**
      * Gets the request/response pair this expectation covers.
      * 
@@ -44,7 +44,7 @@ public ClientDriverExpectation(ClientDriverRequestResponsePair pair) {
     public final ClientDriverRequestResponsePair getPair() {
         return pair;
     }
-
+    
     /**
      * Indicate that this expectation should be matched a given number of times.
      * 
@@ -56,21 +56,21 @@ public final void times(int times) {
         }
         numberOfTimes = times;
     }
-
+    
     /**
      * Indicate that this expectation should be matched any number of times.
      */
     public final void anyTimes() {
         matchAnyTimes = true;
     }
-
+    
     /**
      * Indicate that this expectation has been matched.
      */
     public final void match() {
         numberOfMatches += 1;
     }
-
+    
     /**
      * Determine whether this expectation has been satisfied.
      * 
@@ -79,7 +79,7 @@ public final void match() {
     public final boolean isSatisfied() {
         return !matchAnyTimes && numberOfTimes == numberOfMatches;
     }
-
+    
     /**
      * Whether this expectation should match any number of times.
      * 
@@ -88,24 +88,24 @@ public final boolean isSatisfied() {
     public final boolean shouldMatchAnyTimes() {
         return matchAnyTimes;
     }
-
+    
     /**
      * Gets a string giving the status of the expectation.
      * 
      * @return The status string
      */
     public final String getStatusString() {
-
+        
         String expectedString;
-
+        
         if (matchAnyTimes) {
             expectedString = "any";
         } else {
             expectedString = String.valueOf(numberOfTimes);
         }
-
+        
         return "expected: " + expectedString + ", actual: " + numberOfMatches;
-
+        
     }
-
+    
 }

Diff for: rest-client-driver/src/main/java/com/github/restdriver/clientdriver/ClientDriverFactory.java

@@ -21,31 +21,30 @@
  * Main entry point to the Rest Client Driver.
  */
 public final class ClientDriverFactory {
-
+    
     /**
-     * Factory method to create and start a {@link ClientDriver}.  A port will be chosen automatically.
+     * Factory method to create and start a {@link ClientDriver}. A port will be chosen automatically.
      * 
      * @return A new {@link ClientDriver}, which has found a free port, bound to it and started up.
      */
     public ClientDriver createClientDriver() {
-
+        
         return new ClientDriver(new DefaultClientDriverJettyHandler(new DefaultRequestMatcher()));
-
+        
     }
-
+    
     /**
-     * Factory method to create and start a {@link ClientDriver} on a specific port.  This is <em>absolutely</em> not the recommended
-     * way to use the client driver.  The no-arg method will choose a free port, use of this method will fail if the port is not free.
-     *
-     * @param port The port to listen on.  If this port is not available a runtime exception will be thrown.
-     *
+     * Factory method to create and start a {@link ClientDriver} on a specific port. This is <em>absolutely</em> not the recommended
+     * way to use the client driver. The no-arg method will choose a free port, use of this method will fail if the port is not free.
+     * 
+     * @param port The port to listen on. If this port is not available a runtime exception will be thrown.
+     * 
      * @return A new {@link ClientDriver}, which has found a free port, bound to it and started up.
      */
     public ClientDriver createClientDriver(int port) {
-
+        
         return new ClientDriver(new DefaultClientDriverJettyHandler(new DefaultRequestMatcher()), port);
-
+        
     }
-
-
+    
 }