Skip to content

Commit

Permalink
#984 local variable inference changes (#1025)
Browse files Browse the repository at this point in the history 
* #984 Fix for abstract-document, abstract-factory, acyclic-visitor, adapter, aggregator-microservices

* #984 Fix for abstract-document, abstract-factory, acyclic-visitor, adapter, aggregator-microservices
  • Loading branch information
@Anurag870 @iluwatar
Anurag870 authored and iluwatar committed Oct 20, 2019
1 parent 2217fbc commit f00ebe1
Show file tree
Hide file tree
Showing 12 changed files with 33 additions and 52 deletions.
2 changes: 1 addition & 1 deletion abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public <T> Stream<T> children(String key, Function<Map<String, Object>, T> const

@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("]");
Expand Down
9 changes: 4 additions & 5 deletions abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -52,23 +51,23 @@ public class App {
public App() {
LOGGER.info("Constructing parts and car");

Map<String, Object> carProperties = new HashMap<>();
var carProperties = new HashMap<String, Object>();
carProperties.put(Property.MODEL.toString(), "300SL");
carProperties.put(Property.PRICE.toString(), 10000L);

Map<String, Object> wheelProperties = new HashMap<>();
var wheelProperties = new HashMap<String, Object>();
wheelProperties.put(Property.TYPE.toString(), "wheel");
wheelProperties.put(Property.MODEL.toString(), "15C");
wheelProperties.put(Property.PRICE.toString(), 100L);

Map<String, Object> doorProperties = new HashMap<>();
var doorProperties = new HashMap<String, Object>();
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());
Expand Down
8 changes: 4 additions & 4 deletions acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/App.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 2 additions & 10 deletions acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,10 @@

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;

Expand All @@ -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);

Expand Down
4 changes: 2 additions & 2 deletions acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ public void clearLoggers() {

@Test
public void testVisitForZoom() {
ConfigureForUnixVisitor conUnix = new ConfigureForUnixVisitor();
Zoom zoom = new Zoom();
var conUnix = new ConfigureForUnixVisitor();
var zoom = new Zoom();

conUnix.visit(zoom);

Expand Down
13 changes: 4 additions & 9 deletions acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,24 @@

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
*/
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));
}

@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);

Expand Down
13 changes: 4 additions & 9 deletions acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,29 +29,24 @@

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
*/
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));
}

@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));
Expand Down
2 changes: 1 addition & 1 deletion adapter/src/main/java/com/iluwatar/adapter/App.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
6 changes: 3 additions & 3 deletions adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public void setup() {
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);
}
Expand All @@ -66,13 +66,13 @@ public void setup() {
*/
@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();
}
}
2 changes: 1 addition & 1 deletion ...es/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions ...ice/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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);
Expand Down
8 changes: 4 additions & 4 deletions ...rvice/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<String> 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);
Expand Down

0 comments on commit f00ebe1

Please sign in to comment.