Refactor code to use lombok

aplotnikov · aplotnikov · commit 8defbb3bcbfa · 2018-10-28T18:12:43.000+01:00
diff --git a/src/main/java/io/github/aplotnikov/batch/processing/reactor/ClientProcessor.java b/src/main/java/io/github/aplotnikov/batch/processing/reactor/ClientProcessor.java
@@ -1,21 +1,23 @@
 package io.github.aplotnikov.batch.processing.reactor;
 
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
+
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static io.github.aplotnikov.batch.processing.reactor.Response.Status.FAILED;
 import static io.github.aplotnikov.batch.processing.reactor.Response.Status.SUCCESS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.concurrent.locks.LockSupport.parkNanos;
+import static lombok.AccessLevel.PRIVATE;
 
+@FieldDefaults(level = PRIVATE, makeFinal = true)
+@RequiredArgsConstructor
 class ClientProcessor {
 
-    private final AtomicBoolean isLastResponseSuccessful = new AtomicBoolean();
-
-    private final int pause;
+    AtomicBoolean isLastResponseSuccessful = new AtomicBoolean();
 
-    ClientProcessor(int pause) {
-        this.pause = pause;
-    }
+    int pause;
 
     Response process(Client client) {
         parkNanos(SECONDS.toNanos(pause));
diff --git a/src/main/java/io/github/aplotnikov/batch/processing/reactor/ReactorFileProcessor.java b/src/main/java/io/github/aplotnikov/batch/processing/reactor/ReactorFileProcessor.java
@@ -1,20 +1,20 @@
 package io.github.aplotnikov.batch.processing.reactor;
 
 import io.github.aplotnikov.batch.processing.reactor.source.XmlFileSource;
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
 
-class ReactorFileProcessor implements Runnable {
+import static lombok.AccessLevel.PRIVATE;
 
-    private final XmlFileSource fileSource;
+@FieldDefaults(level = PRIVATE, makeFinal = true)
+@RequiredArgsConstructor
+class ReactorFileProcessor implements Runnable {
 
-    private final XmlFileReader reader;
+    XmlFileSource fileSource;
 
-    private final ClientProcessor processor;
+    XmlFileReader reader;
 
-    ReactorFileProcessor(XmlFileSource fileSource, XmlFileReader reader, ClientProcessor processor) {
-        this.fileSource = fileSource;
-        this.reader = reader;
-        this.processor = processor;
-    }
+    ClientProcessor processor;
 
     @Override
     public void run() {
diff --git a/src/main/java/io/github/aplotnikov/batch/processing/reactor/Response.java b/src/main/java/io/github/aplotnikov/batch/processing/reactor/Response.java
@@ -1,53 +1,13 @@
 package io.github.aplotnikov.batch.processing.reactor;
 
-import java.util.Objects;
+import lombok.Value;
 
+@Value
 class Response {
 
-    private final long clientId;
+    long clientId;
 
-    private final Status status;
-
-    Response(long clientId, Status status) {
-        this.clientId = clientId;
-        this.status = status;
-    }
-
-    long getClientId() {
-        return clientId;
-    }
-
-    Status getStatus() {
-        return status;
-    }
-
-    @Override
-    public boolean equals(Object other) {
-        if (this == other) {
-            return true;
-        }
-
-        if (other == null || getClass() != other.getClass()) {
-            return false;
-        }
-
-        Response that = (Response) other;
-        return clientId == that.clientId
-                && status == that.status;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(clientId, status);
-    }
-
-    @Override
-    public String toString() {
-        return "ClientResponse{"
-                + "clientId=" + clientId
-                + ", status=" + status
-                + '}';
-    }
+    Status status;
 
     enum Status {
         SUCCESS,
diff --git a/src/main/java/io/github/aplotnikov/batch/processing/reactor/source/Queue.java b/src/main/java/io/github/aplotnikov/batch/processing/reactor/source/Queue.java
@@ -1,22 +1,22 @@
 package io.github.aplotnikov.batch.processing.reactor.source;
 
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
 import reactor.core.publisher.Flux;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.concurrent.locks.LockSupport.parkNanos;
+import static lombok.AccessLevel.PRIVATE;
 
+@FieldDefaults(level = PRIVATE, makeFinal = true)
+@RequiredArgsConstructor
 class Queue {
 
-    private final int processedFileNumber;
+    int processedFileNumber;
 
-    private final int pause;
-
-    Queue(int processedFileNumber, int pause) {
-        this.processedFileNumber = processedFileNumber;
-        this.pause = pause;
-    }
+    int pause;
 
     Flux<String> poll() {
         AtomicInteger processedFiles = new AtomicInteger(0);
diff --git a/src/main/java/io/github/aplotnikov/batch/processing/reactor/source/Repository.java b/src/main/java/io/github/aplotnikov/batch/processing/reactor/source/Repository.java
@@ -1,21 +1,21 @@
 package io.github.aplotnikov.batch.processing.reactor.source;
 
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
 import reactor.core.publisher.Flux;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static java.util.concurrent.locks.LockSupport.parkNanos;
 import static java.util.stream.IntStream.range;
+import static lombok.AccessLevel.PRIVATE;
 
+@FieldDefaults(level = PRIVATE, makeFinal = true)
+@RequiredArgsConstructor
 class Repository {
 
-    private final int processedFileNumber;
+    int processedFileNumber;
 
-    private final int pause;
-
-    Repository(int processedFileNumber, int pause) {
-        this.processedFileNumber = processedFileNumber;
-        this.pause = pause;
-    }
+    int pause;
 
     Flux<String> readAll() {
         return Flux.generate(
diff --git a/src/main/java/io/github/aplotnikov/batch/processing/reactor/source/XmlFileSource.java b/src/main/java/io/github/aplotnikov/batch/processing/reactor/source/XmlFileSource.java
@@ -1,17 +1,18 @@
 package io.github.aplotnikov.batch.processing.reactor.source;
 
+import lombok.RequiredArgsConstructor;
+import lombok.experimental.FieldDefaults;
 import reactor.core.publisher.Flux;
 
-public class XmlFileSource {
+import static lombok.AccessLevel.PRIVATE;
 
-    private final Repository repository;
+@FieldDefaults(level = PRIVATE, makeFinal = true)
+@RequiredArgsConstructor
+public class XmlFileSource {
 
-    private final Queue queue;
+    Repository repository;
 
-    public XmlFileSource(Repository repository, Queue queue) {
-        this.repository = repository;
-        this.queue = queue;
-    }
+    Queue queue;
 
     public Flux<String> readAll() {
         return Flux.merge(repository.readAll(), queue.poll());
