From f00ebe1a8de224dadcc1526e1771825522be8c15 Mon Sep 17 00:00:00 2001 From: Anurag870 Date: Sun, 20 Oct 2019 21:31:02 +0530 Subject: [PATCH] #984 local variable inference changes (#1025) * #984 Fix for abstract-document, abstract-factory, acyclic-visitor, adapter, aggregator-microservices * #984 Fix for abstract-document, abstract-factory, acyclic-visitor, adapter, aggregator-microservices --- .../iluwatar/abstractdocument/AbstractDocument.java | 2 +- .../java/com/iluwatar/abstractdocument/App.java | 9 ++++----- .../main/java/com/iluwatar/acyclicvisitor/App.java | 8 ++++---- .../acyclicvisitor/ConfigureForDosVisitorTest.java | 12 ++---------- .../acyclicvisitor/ConfigureForUnixVisitorTest.java | 4 ++-- .../java/com/iluwatar/acyclicvisitor/HayesTest.java | 13 ++++--------- .../java/com/iluwatar/acyclicvisitor/ZoomTest.java | 13 ++++--------- adapter/src/main/java/com/iluwatar/adapter/App.java | 2 +- .../com/iluwatar/adapter/AdapterPatternTest.java | 6 +++--- .../aggregator/microservices/Aggregator.java | 2 +- .../microservices/ProductInformationClientImpl.java | 6 +++--- .../microservices/ProductInventoryClientImpl.java | 8 ++++---- 12 files changed, 33 insertions(+), 52 deletions(-) diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java index ec5ff822e..dee8302c1 100644 --- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java +++ b/abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java @@ -61,7 +61,7 @@ public abstract class AbstractDocument implements Document { @Override public String toString() { - StringBuilder builder = new StringBuilder(); + var builder = new StringBuilder(); builder.append(getClass().getName()).append("["); properties.forEach((key, value) -> builder.append("[").append(key).append(" : ").append(value).append("]")); builder.append("]"); diff --git a/abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java b/abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java index 1566b32f1..e8b2410a8 100644 --- a/abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java +++ b/abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java @@ -24,7 +24,6 @@ package com.iluwatar.abstractdocument; import java.util.Arrays; import java.util.HashMap; -import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -52,23 +51,23 @@ public class App { public App() { LOGGER.info("Constructing parts and car"); - Map carProperties = new HashMap<>(); + var carProperties = new HashMap(); carProperties.put(Property.MODEL.toString(), "300SL"); carProperties.put(Property.PRICE.toString(), 10000L); - Map wheelProperties = new HashMap<>(); + var wheelProperties = new HashMap(); wheelProperties.put(Property.TYPE.toString(), "wheel"); wheelProperties.put(Property.MODEL.toString(), "15C"); wheelProperties.put(Property.PRICE.toString(), 100L); - Map doorProperties = new HashMap<>(); + var doorProperties = new HashMap(); doorProperties.put(Property.TYPE.toString(), "door"); doorProperties.put(Property.MODEL.toString(), "Lambo"); doorProperties.put(Property.PRICE.toString(), 300L); carProperties.put(Property.PARTS.toString(), Arrays.asList(wheelProperties, doorProperties)); - Car car = new Car(carProperties); + var car = new Car(carProperties); LOGGER.info("Here is our car:"); LOGGER.info("-> model: {}", car.getModel().get()); diff --git a/acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/App.java b/acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/App.java index 19a48ef61..be96f3a60 100644 --- a/acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/App.java +++ b/acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/App.java @@ -41,11 +41,11 @@ public class App { */ public static void main(String[] args) { - ConfigureForUnixVisitor conUnix = new ConfigureForUnixVisitor(); - ConfigureForDosVisitor conDos = new ConfigureForDosVisitor(); + var conUnix = new ConfigureForUnixVisitor(); + var conDos = new ConfigureForDosVisitor(); - Zoom zoom = new Zoom(); - Hayes hayes = new Hayes(); + var zoom = new Zoom(); + var hayes = new Hayes(); hayes.accept(conDos); // Hayes modem with Dos configurator zoom.accept(conDos); // Zoom modem with Dos configurator diff --git a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java index db7856b7c..b90bafb0f 100644 --- a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java +++ b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java @@ -24,18 +24,10 @@ package com.iluwatar.acyclicvisitor; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.groups.Tuple.tuple; -import static org.mockito.Mockito.mock; import static uk.org.lidalia.slf4jext.Level.INFO; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Test; - -import com.iluwatar.acyclicvisitor.ConfigureForDosVisitor; -import com.iluwatar.acyclicvisitor.Hayes; -import com.iluwatar.acyclicvisitor.HayesVisitor; -import com.iluwatar.acyclicvisitor.Zoom; -import com.iluwatar.acyclicvisitor.ZoomVisitor; - import uk.org.lidalia.slf4jtest.TestLogger; import uk.org.lidalia.slf4jtest.TestLoggerFactory; @@ -48,8 +40,8 @@ public class ConfigureForDosVisitorTest { @Test public void testVisitForZoom() { - ConfigureForDosVisitor conDos = new ConfigureForDosVisitor(); - Zoom zoom = new Zoom(); + var conDos = new ConfigureForDosVisitor(); + var zoom = new Zoom(); conDos.visit(zoom); diff --git a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java index 394bd9558..ef6fd4d8e 100644 --- a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java +++ b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java @@ -46,8 +46,8 @@ public class ConfigureForUnixVisitorTest { @Test public void testVisitForZoom() { - ConfigureForUnixVisitor conUnix = new ConfigureForUnixVisitor(); - Zoom zoom = new Zoom(); + var conUnix = new ConfigureForUnixVisitor(); + var zoom = new Zoom(); conUnix.visit(zoom); diff --git a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java index d18b7a34f..477354b13 100644 --- a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java +++ b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java @@ -29,11 +29,6 @@ import static org.mockito.Mockito.verifyZeroInteractions; import org.junit.jupiter.api.Test; -import com.iluwatar.acyclicvisitor.ConfigureForDosVisitor; -import com.iluwatar.acyclicvisitor.ConfigureForUnixVisitor; -import com.iluwatar.acyclicvisitor.Hayes; -import com.iluwatar.acyclicvisitor.HayesVisitor; - /** * Hayes test class */ @@ -41,8 +36,8 @@ public class HayesTest { @Test public void testAcceptForDos() { - Hayes hayes = new Hayes(); - ConfigureForDosVisitor mockVisitor = mock(ConfigureForDosVisitor.class); + var hayes = new Hayes(); + var mockVisitor = mock(ConfigureForDosVisitor.class); hayes.accept(mockVisitor); verify((HayesVisitor)mockVisitor).visit(eq(hayes)); @@ -50,8 +45,8 @@ public class HayesTest { @Test public void testAcceptForUnix() { - Hayes hayes = new Hayes(); - ConfigureForUnixVisitor mockVisitor = mock(ConfigureForUnixVisitor.class); + var hayes = new Hayes(); + var mockVisitor = mock(ConfigureForUnixVisitor.class); hayes.accept(mockVisitor); diff --git a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java index 924d97b2e..ff24d526d 100644 --- a/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java +++ b/acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java @@ -29,11 +29,6 @@ import static org.mockito.Mockito.mock; import org.junit.jupiter.api.Test; -import com.iluwatar.acyclicvisitor.ConfigureForDosVisitor; -import com.iluwatar.acyclicvisitor.ConfigureForUnixVisitor; -import com.iluwatar.acyclicvisitor.Zoom; -import com.iluwatar.acyclicvisitor.ZoomVisitor; - /** * Zoom test class */ @@ -41,8 +36,8 @@ public class ZoomTest { @Test public void testAcceptForDos() { - Zoom zoom = new Zoom(); - ConfigureForDosVisitor mockVisitor = mock(ConfigureForDosVisitor.class); + var zoom = new Zoom(); + var mockVisitor = mock(ConfigureForDosVisitor.class); zoom.accept(mockVisitor); verify((ZoomVisitor)mockVisitor).visit(eq(zoom)); @@ -50,8 +45,8 @@ public class ZoomTest { @Test public void testAcceptForUnix() { - Zoom zoom = new Zoom(); - ConfigureForUnixVisitor mockVisitor = mock(ConfigureForUnixVisitor.class); + var zoom = new Zoom(); + var mockVisitor = mock(ConfigureForUnixVisitor.class); zoom.accept(mockVisitor); verify((ZoomVisitor)mockVisitor).visit(eq(zoom)); diff --git a/adapter/src/main/java/com/iluwatar/adapter/App.java b/adapter/src/main/java/com/iluwatar/adapter/App.java index f04e26e76..4f31af795 100644 --- a/adapter/src/main/java/com/iluwatar/adapter/App.java +++ b/adapter/src/main/java/com/iluwatar/adapter/App.java @@ -54,7 +54,7 @@ public class App { */ public static void main(String[] args) { // The captain can only operate rowing boats but with adapter he is able to use fishing boats as well - Captain captain = new Captain(new FishingBoatAdapter()); + var captain = new Captain(new FishingBoatAdapter()); captain.row(); } } diff --git a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java index d76f37403..b5164c68d 100644 --- a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java +++ b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java @@ -53,7 +53,7 @@ public class AdapterPatternTest { FishingBoatAdapter fishingBoatAdapter = spy(new FishingBoatAdapter()); beans.put(FISHING_BEAN, fishingBoatAdapter); - Captain captain = new Captain(); + var captain = new Captain(); captain.setRowingBoat((FishingBoatAdapter) beans.get(FISHING_BEAN)); beans.put(ROWING_BEAN, captain); } @@ -66,13 +66,13 @@ public class AdapterPatternTest { */ @Test public void testAdapter() { - Captain captain = (Captain) beans.get(ROWING_BEAN); + var captain = (Captain) beans.get(ROWING_BEAN); // when captain moves captain.row(); // the captain internally calls the battleship object to move - RowingBoat adapter = (RowingBoat) beans.get(FISHING_BEAN); + var adapter = (RowingBoat) beans.get(FISHING_BEAN); verify(adapter).row(); } } diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java index ccbe6f2fe..593d83e13 100644 --- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java +++ b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java @@ -50,7 +50,7 @@ public class Aggregator { */ @RequestMapping(path = "/product", method = RequestMethod.GET) public Product getProduct() { - Product product = new Product(); + var product = new Product(); product.setTitle(informationClient.getProductTitle()); product.setProductInventories(inventoryClient.getProductInventories()); return product; diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java index b42b5b55a..f04906b47 100644 --- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java +++ b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java @@ -43,10 +43,10 @@ public class ProductInformationClientImpl implements ProductInformationClient { @Override public String getProductTitle() { String response = null; - HttpRequest request = HttpRequest.newBuilder().GET().uri(URI.create("http://localhost:51515/information")).build(); - HttpClient client = HttpClient.newHttpClient(); + var request = HttpRequest.newBuilder().GET().uri(URI.create("http://localhost:51515/information")).build(); + var client = HttpClient.newHttpClient(); try { - HttpResponse httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString()); + var httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString()); response = httpResponse.body(); } catch (IOException ioe) { LOGGER.error("IOException Occurred", ioe); diff --git a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java index 59a050c9e..c92eb678c 100644 --- a/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java +++ b/aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java @@ -42,12 +42,12 @@ public class ProductInventoryClientImpl implements ProductInventoryClient { @Override public int getProductInventories() { - String response = "0"; + var response = "0"; - HttpRequest request = HttpRequest.newBuilder().GET().uri(URI.create("http://localhost:51516/inventories")).build(); - HttpClient client = HttpClient.newHttpClient(); + var request = HttpRequest.newBuilder().GET().uri(URI.create("http://localhost:51516/inventories")).build(); + var client = HttpClient.newHttpClient(); try { - HttpResponse httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString()); + var httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString()); response = httpResponse.body(); } catch (IOException ioe) { LOGGER.error("IOException Occurred", ioe);