Remove carriage return

4 files changed, 160 insertions, 160 deletions

diff --git a/application/src/test/java/com/yahoo/application/container/MockClient.java b/application/src/test/java/com/yahoo/application/container/MockClient.java
index 1f885cfb737..eee12478592 100644
--- a/application/src/test/java/com/yahoo/application/container/MockClient.java
+++ b/application/src/test/java/com/yahoo/application/container/MockClient.java
@@ -1,43 +1,43 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.application.container;

-

-import com.yahoo.jdisc.Request;

-import com.yahoo.jdisc.Response;

-import com.yahoo.jdisc.handler.CompletionHandler;

-import com.yahoo.jdisc.handler.ContentChannel;

-import com.yahoo.jdisc.handler.ResponseHandler;

-import com.yahoo.jdisc.service.AbstractClientProvider;

-

-import java.util.concurrent.atomic.AtomicInteger;

-

-/**

- *

- * @author Christian Andersen

- */

-public class MockClient extends AbstractClientProvider {

-    private final AtomicInteger counter = new AtomicInteger();

-

-    @Override

-    public ContentChannel handleRequest(Request request, ResponseHandler handler) {

-        counter.incrementAndGet();

-        final ContentChannel responseContentChannel = handler.handleResponse(new Response(200));

-        responseContentChannel.close(NOOP_COMPLETION_HANDLER);

-        return null;

-    }

-

-    public int getCounter() {

-        return counter.get();

-    }

-

-    private static final CompletionHandler NOOP_COMPLETION_HANDLER = new CompletionHandler() {

-        @Override

-        public void completed() {

-            // Ignored

-        }

-

-        @Override

-        public void failed(Throwable t) {

-            // Ignored

-        }

-    };

-}

+package com.yahoo.application.container;
+
+import com.yahoo.jdisc.Request;
+import com.yahoo.jdisc.Response;
+import com.yahoo.jdisc.handler.CompletionHandler;
+import com.yahoo.jdisc.handler.ContentChannel;
+import com.yahoo.jdisc.handler.ResponseHandler;
+import com.yahoo.jdisc.service.AbstractClientProvider;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ *
+ * @author Christian Andersen
+ */
+public class MockClient extends AbstractClientProvider {
+    private final AtomicInteger counter = new AtomicInteger();
+
+    @Override
+    public ContentChannel handleRequest(Request request, ResponseHandler handler) {
+        counter.incrementAndGet();
+        final ContentChannel responseContentChannel = handler.handleResponse(new Response(200));
+        responseContentChannel.close(NOOP_COMPLETION_HANDLER);
+        return null;
+    }
+
+    public int getCounter() {
+        return counter.get();
+    }
+
+    private static final CompletionHandler NOOP_COMPLETION_HANDLER = new CompletionHandler() {
+        @Override
+        public void completed() {
+            // Ignored
+        }
+
+        @Override
+        public void failed(Throwable t) {
+            // Ignored
+        }
+    };
+}
diff --git a/application/src/test/java/com/yahoo/application/container/MockServer.java b/application/src/test/java/com/yahoo/application/container/MockServer.java
index bc79671c13a..932f95647e7 100644
--- a/application/src/test/java/com/yahoo/application/container/MockServer.java
+++ b/application/src/test/java/com/yahoo/application/container/MockServer.java
@@ -1,31 +1,31 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.application.container;

-

-import com.yahoo.jdisc.service.AbstractServerProvider;

-import com.yahoo.jdisc.service.CurrentContainer;

-

-/**

- *

- * @author Christian Andersen

- */

-public class MockServer extends AbstractServerProvider {

-    private boolean started = false;

-

-    public MockServer(CurrentContainer container) {

-        super(container);

-    }

-

-    @Override

-    public void start() {

-        started = true;

-    }

-

-    @Override

-    public void close() {

-

-    }

-

-    public boolean isStarted() {

-        return started;

-    }

-}

+package com.yahoo.application.container;
+
+import com.yahoo.jdisc.service.AbstractServerProvider;
+import com.yahoo.jdisc.service.CurrentContainer;
+
+/**
+ *
+ * @author Christian Andersen
+ */
+public class MockServer extends AbstractServerProvider {
+    private boolean started = false;
+
+    public MockServer(CurrentContainer container) {
+        super(container);
+    }
+
+    @Override
+    public void start() {
+        started = true;
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+    public boolean isStarted() {
+        return started;
+    }
+}
diff --git a/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java b/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java
index 3c11cbdad8a..41266c46ce7 100644
--- a/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java
+++ b/application/src/test/java/com/yahoo/application/container/docprocs/MockDispatchDocproc.java
@@ -1,65 +1,65 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.application.container.docprocs;

-

-import com.google.common.util.concurrent.ListenableFuture;

-import com.yahoo.docproc.DocumentProcessor;

-import com.yahoo.docproc.Processing;

-import com.yahoo.document.Document;

-import com.yahoo.document.DocumentOperation;

-import com.yahoo.document.DocumentPut;

-import com.yahoo.documentapi.messagebus.protocol.DocumentMessage;

-import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage;

-import com.yahoo.jdisc.Request;

-import com.yahoo.jdisc.Response;

-import com.yahoo.jdisc.handler.RequestDispatch;

-import com.yahoo.jdisc.service.CurrentContainer;

-import com.yahoo.messagebus.jdisc.MbusRequest;

-import com.yahoo.messagebus.routing.Route;

-

-import java.net.URI;

-import java.util.ArrayList;

-import java.util.List;

-import java.util.concurrent.ExecutionException;

-

-/**

- * @author Christian Andersen

- */

-public class MockDispatchDocproc extends DocumentProcessor {

-    private final Route route;

-    private final URI uri;

-    private final CurrentContainer currentContainer;

-    private final List<Response> responses = new ArrayList<>();

-

-    public MockDispatchDocproc(CurrentContainer currentContainer) {

-        this.route = Route.parse("default");

-        this.uri = URI.create("mbus://remotehost/source");

-        this.currentContainer = currentContainer;

-    }

-

-    @Override

-    public Progress process(Processing processing) {

-        for (DocumentOperation op : processing.getDocumentOperations()) {

-            PutDocumentMessage message = new PutDocumentMessage((DocumentPut)op);

-            ListenableFuture<Response> future = createRequest(message).dispatch();

-            try {

-                responses.add(future.get());

-            } catch (ExecutionException | InterruptedException e) {

-                throw new RuntimeException(e);

-            }

-        }

-        return Progress.DONE;

-    }

-

-    private RequestDispatch createRequest(final DocumentMessage message) {

-        return new RequestDispatch() {

-            @Override

-            protected Request newRequest() {

-                return new MbusRequest(currentContainer, uri, message.setRoute(route)).setServerRequest(false);

-            }

-        };

-    }

-

-    public List<Response> getResponses() {

-        return responses;

-    }

-}

+package com.yahoo.application.container.docprocs;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import com.yahoo.docproc.DocumentProcessor;
+import com.yahoo.docproc.Processing;
+import com.yahoo.document.Document;
+import com.yahoo.document.DocumentOperation;
+import com.yahoo.document.DocumentPut;
+import com.yahoo.documentapi.messagebus.protocol.DocumentMessage;
+import com.yahoo.documentapi.messagebus.protocol.PutDocumentMessage;
+import com.yahoo.jdisc.Request;
+import com.yahoo.jdisc.Response;
+import com.yahoo.jdisc.handler.RequestDispatch;
+import com.yahoo.jdisc.service.CurrentContainer;
+import com.yahoo.messagebus.jdisc.MbusRequest;
+import com.yahoo.messagebus.routing.Route;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * @author Christian Andersen
+ */
+public class MockDispatchDocproc extends DocumentProcessor {
+    private final Route route;
+    private final URI uri;
+    private final CurrentContainer currentContainer;
+    private final List<Response> responses = new ArrayList<>();
+
+    public MockDispatchDocproc(CurrentContainer currentContainer) {
+        this.route = Route.parse("default");
+        this.uri = URI.create("mbus://remotehost/source");
+        this.currentContainer = currentContainer;
+    }
+
+    @Override
+    public Progress process(Processing processing) {
+        for (DocumentOperation op : processing.getDocumentOperations()) {
+            PutDocumentMessage message = new PutDocumentMessage((DocumentPut)op);
+            ListenableFuture<Response> future = createRequest(message).dispatch();
+            try {
+                responses.add(future.get());
+            } catch (ExecutionException | InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return Progress.DONE;
+    }
+
+    private RequestDispatch createRequest(final DocumentMessage message) {
+        return new RequestDispatch() {
+            @Override
+            protected Request newRequest() {
+                return new MbusRequest(currentContainer, uri, message.setRoute(route)).setServerRequest(false);
+            }
+        };
+    }
+
+    public List<Response> getResponses() {
+        return responses;
+    }
+}
diff --git a/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java b/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java
index 106d68f6644..da1970e7522 100644
--- a/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java
+++ b/application/src/test/java/com/yahoo/application/container/searchers/MockSearcher.java
@@ -1,24 +1,24 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.

-package com.yahoo.application.container.searchers;

-

-import com.yahoo.search.Query;

-import com.yahoo.search.Result;

-import com.yahoo.search.Searcher;

-import com.yahoo.search.result.Hit;

-import com.yahoo.search.result.HitGroup;

-import com.yahoo.search.searchchain.Execution;

-

-/**

- *

- * @author Christian Andersen

- */

-public class MockSearcher extends Searcher {

-

-    @Override

-    public Result search(Query query, Execution execution) {

-        HitGroup hits = new HitGroup();

-        hits.add(new Hit("foo", query));

-        return new Result(query, hits);

-    }

-

-}

+// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.application.container.searchers;
+
+import com.yahoo.search.Query;
+import com.yahoo.search.Result;
+import com.yahoo.search.Searcher;
+import com.yahoo.search.result.Hit;
+import com.yahoo.search.result.HitGroup;
+import com.yahoo.search.searchchain.Execution;
+
+/**
+ *
+ * @author Christian Andersen
+ */
+public class MockSearcher extends Searcher {
+
+    @Override
+    public Result search(Query query, Execution execution) {
+        HitGroup hits = new HitGroup();
+        hits.add(new Hit("foo", query));
+        return new Result(query, hits);
+    }
+
+}