Skip to content

Commit f00ebe1

Browse files
Anurag870iluwatar
authored andcommitted
iluwatar#984 local variable inference changes (iluwatar#1025)
* iluwatar#984 Fix for abstract-document, abstract-factory, acyclic-visitor, adapter, aggregator-microservices * iluwatar#984 Fix for abstract-document, abstract-factory, acyclic-visitor, adapter, aggregator-microservices
1 parent 2217fbc commit f00ebe1

File tree

12 files changed

+33
-52
lines changed

12 files changed

+33
-52
lines changed

abstract-document/src/main/java/com/iluwatar/abstractdocument/AbstractDocument.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public <T> Stream<T> children(String key, Function<Map<String, Object>, T> const
6161

6262
@Override
6363
public String toString() {
64-
StringBuilder builder = new StringBuilder();
64+
var builder = new StringBuilder();
6565
builder.append(getClass().getName()).append("[");
6666
properties.forEach((key, value) -> builder.append("[").append(key).append(" : ").append(value).append("]"));
6767
builder.append("]");

abstract-document/src/main/java/com/iluwatar/abstractdocument/App.java

+4-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import java.util.Arrays;
2626
import java.util.HashMap;
27-
import java.util.Map;
2827

2928
import org.slf4j.Logger;
3029
import org.slf4j.LoggerFactory;
@@ -52,23 +51,23 @@ public class App {
5251
public App() {
5352
LOGGER.info("Constructing parts and car");
5453

55-
Map<String, Object> carProperties = new HashMap<>();
54+
var carProperties = new HashMap<String, Object>();
5655
carProperties.put(Property.MODEL.toString(), "300SL");
5756
carProperties.put(Property.PRICE.toString(), 10000L);
5857

59-
Map<String, Object> wheelProperties = new HashMap<>();
58+
var wheelProperties = new HashMap<String, Object>();
6059
wheelProperties.put(Property.TYPE.toString(), "wheel");
6160
wheelProperties.put(Property.MODEL.toString(), "15C");
6261
wheelProperties.put(Property.PRICE.toString(), 100L);
6362

64-
Map<String, Object> doorProperties = new HashMap<>();
63+
var doorProperties = new HashMap<String, Object>();
6564
doorProperties.put(Property.TYPE.toString(), "door");
6665
doorProperties.put(Property.MODEL.toString(), "Lambo");
6766
doorProperties.put(Property.PRICE.toString(), 300L);
6867

6968
carProperties.put(Property.PARTS.toString(), Arrays.asList(wheelProperties, doorProperties));
7069

71-
Car car = new Car(carProperties);
70+
var car = new Car(carProperties);
7271

7372
LOGGER.info("Here is our car:");
7473
LOGGER.info("-> model: {}", car.getModel().get());

acyclic-visitor/src/main/java/com/iluwatar/acyclicvisitor/App.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public class App {
4141
*/
4242

4343
public static void main(String[] args) {
44-
ConfigureForUnixVisitor conUnix = new ConfigureForUnixVisitor();
45-
ConfigureForDosVisitor conDos = new ConfigureForDosVisitor();
44+
var conUnix = new ConfigureForUnixVisitor();
45+
var conDos = new ConfigureForDosVisitor();
4646

47-
Zoom zoom = new Zoom();
48-
Hayes hayes = new Hayes();
47+
var zoom = new Zoom();
48+
var hayes = new Hayes();
4949

5050
hayes.accept(conDos); // Hayes modem with Dos configurator
5151
zoom.accept(conDos); // Zoom modem with Dos configurator

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForDosVisitorTest.java

+2-10
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,10 @@
2424

2525
import static org.assertj.core.api.Assertions.assertThat;
2626
import static org.assertj.core.groups.Tuple.tuple;
27-
import static org.mockito.Mockito.mock;
2827
import static uk.org.lidalia.slf4jext.Level.INFO;
2928

3029
import org.junit.jupiter.api.AfterEach;
3130
import org.junit.jupiter.api.Test;
32-
33-
import com.iluwatar.acyclicvisitor.ConfigureForDosVisitor;
34-
import com.iluwatar.acyclicvisitor.Hayes;
35-
import com.iluwatar.acyclicvisitor.HayesVisitor;
36-
import com.iluwatar.acyclicvisitor.Zoom;
37-
import com.iluwatar.acyclicvisitor.ZoomVisitor;
38-
3931
import uk.org.lidalia.slf4jtest.TestLogger;
4032
import uk.org.lidalia.slf4jtest.TestLoggerFactory;
4133

@@ -48,8 +40,8 @@ public class ConfigureForDosVisitorTest {
4840

4941
@Test
5042
public void testVisitForZoom() {
51-
ConfigureForDosVisitor conDos = new ConfigureForDosVisitor();
52-
Zoom zoom = new Zoom();
43+
var conDos = new ConfigureForDosVisitor();
44+
var zoom = new Zoom();
5345

5446
conDos.visit(zoom);
5547

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public void clearLoggers() {
4646

4747
@Test
4848
public void testVisitForZoom() {
49-
ConfigureForUnixVisitor conUnix = new ConfigureForUnixVisitor();
50-
Zoom zoom = new Zoom();
49+
var conUnix = new ConfigureForUnixVisitor();
50+
var zoom = new Zoom();
5151

5252
conUnix.visit(zoom);
5353

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/HayesTest.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,24 @@
2929

3030
import org.junit.jupiter.api.Test;
3131

32-
import com.iluwatar.acyclicvisitor.ConfigureForDosVisitor;
33-
import com.iluwatar.acyclicvisitor.ConfigureForUnixVisitor;
34-
import com.iluwatar.acyclicvisitor.Hayes;
35-
import com.iluwatar.acyclicvisitor.HayesVisitor;
36-
3732
/**
3833
* Hayes test class
3934
*/
4035
public class HayesTest {
4136

4237
@Test
4338
public void testAcceptForDos() {
44-
Hayes hayes = new Hayes();
45-
ConfigureForDosVisitor mockVisitor = mock(ConfigureForDosVisitor.class);
39+
var hayes = new Hayes();
40+
var mockVisitor = mock(ConfigureForDosVisitor.class);
4641

4742
hayes.accept(mockVisitor);
4843
verify((HayesVisitor)mockVisitor).visit(eq(hayes));
4944
}
5045

5146
@Test
5247
public void testAcceptForUnix() {
53-
Hayes hayes = new Hayes();
54-
ConfigureForUnixVisitor mockVisitor = mock(ConfigureForUnixVisitor.class);
48+
var hayes = new Hayes();
49+
var mockVisitor = mock(ConfigureForUnixVisitor.class);
5550

5651
hayes.accept(mockVisitor);
5752

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ZoomTest.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -29,29 +29,24 @@
2929

3030
import org.junit.jupiter.api.Test;
3131

32-
import com.iluwatar.acyclicvisitor.ConfigureForDosVisitor;
33-
import com.iluwatar.acyclicvisitor.ConfigureForUnixVisitor;
34-
import com.iluwatar.acyclicvisitor.Zoom;
35-
import com.iluwatar.acyclicvisitor.ZoomVisitor;
36-
3732
/**
3833
* Zoom test class
3934
*/
4035
public class ZoomTest {
4136

4237
@Test
4338
public void testAcceptForDos() {
44-
Zoom zoom = new Zoom();
45-
ConfigureForDosVisitor mockVisitor = mock(ConfigureForDosVisitor.class);
39+
var zoom = new Zoom();
40+
var mockVisitor = mock(ConfigureForDosVisitor.class);
4641

4742
zoom.accept(mockVisitor);
4843
verify((ZoomVisitor)mockVisitor).visit(eq(zoom));
4944
}
5045

5146
@Test
5247
public void testAcceptForUnix() {
53-
Zoom zoom = new Zoom();
54-
ConfigureForUnixVisitor mockVisitor = mock(ConfigureForUnixVisitor.class);
48+
var zoom = new Zoom();
49+
var mockVisitor = mock(ConfigureForUnixVisitor.class);
5550

5651
zoom.accept(mockVisitor);
5752
verify((ZoomVisitor)mockVisitor).visit(eq(zoom));

adapter/src/main/java/com/iluwatar/adapter/App.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class App {
5454
*/
5555
public static void main(String[] args) {
5656
// The captain can only operate rowing boats but with adapter he is able to use fishing boats as well
57-
Captain captain = new Captain(new FishingBoatAdapter());
57+
var captain = new Captain(new FishingBoatAdapter());
5858
captain.row();
5959
}
6060
}

adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void setup() {
5353
FishingBoatAdapter fishingBoatAdapter = spy(new FishingBoatAdapter());
5454
beans.put(FISHING_BEAN, fishingBoatAdapter);
5555

56-
Captain captain = new Captain();
56+
var captain = new Captain();
5757
captain.setRowingBoat((FishingBoatAdapter) beans.get(FISHING_BEAN));
5858
beans.put(ROWING_BEAN, captain);
5959
}
@@ -66,13 +66,13 @@ public void setup() {
6666
*/
6767
@Test
6868
public void testAdapter() {
69-
Captain captain = (Captain) beans.get(ROWING_BEAN);
69+
var captain = (Captain) beans.get(ROWING_BEAN);
7070

7171
// when captain moves
7272
captain.row();
7373

7474
// the captain internally calls the battleship object to move
75-
RowingBoat adapter = (RowingBoat) beans.get(FISHING_BEAN);
75+
var adapter = (RowingBoat) beans.get(FISHING_BEAN);
7676
verify(adapter).row();
7777
}
7878
}

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/Aggregator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class Aggregator {
5050
*/
5151
@RequestMapping(path = "/product", method = RequestMethod.GET)
5252
public Product getProduct() {
53-
Product product = new Product();
53+
var product = new Product();
5454
product.setTitle(informationClient.getProductTitle());
5555
product.setProductInventories(inventoryClient.getProductInventories());
5656
return product;

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInformationClientImpl.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ public class ProductInformationClientImpl implements ProductInformationClient {
4343
@Override
4444
public String getProductTitle() {
4545
String response = null;
46-
HttpRequest request = HttpRequest.newBuilder().GET().uri(URI.create("http://localhost:51515/information")).build();
47-
HttpClient client = HttpClient.newHttpClient();
46+
var request = HttpRequest.newBuilder().GET().uri(URI.create("http://localhost:51515/information")).build();
47+
var client = HttpClient.newHttpClient();
4848
try {
49-
HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
49+
var httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
5050
response = httpResponse.body();
5151
} catch (IOException ioe) {
5252
LOGGER.error("IOException Occurred", ioe);

aggregator-microservices/aggregator-service/src/main/java/com/iluwatar/aggregator/microservices/ProductInventoryClientImpl.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public class ProductInventoryClientImpl implements ProductInventoryClient {
4242

4343
@Override
4444
public int getProductInventories() {
45-
String response = "0";
45+
var response = "0";
4646

47-
HttpRequest request = HttpRequest.newBuilder().GET().uri(URI.create("http://localhost:51516/inventories")).build();
48-
HttpClient client = HttpClient.newHttpClient();
47+
var request = HttpRequest.newBuilder().GET().uri(URI.create("http://localhost:51516/inventories")).build();
48+
var client = HttpClient.newHttpClient();
4949
try {
50-
HttpResponse<String> httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
50+
var httpResponse = client.send(request, HttpResponse.BodyHandlers.ofString());
5151
response = httpResponse.body();
5252
} catch (IOException ioe) {
5353
LOGGER.error("IOException Occurred", ioe);

0 commit comments

Comments
 (0)