From e42ce7361633689c3a50772beda3747927ee7ea4 Mon Sep 17 00:00:00 2001 From: Jon Cook Date: Mon, 11 Nov 2019 23:19:35 +0100 Subject: [PATCH 1/5] BAEL-3416 - Mockito and Fluent APIs - stage changes --- .../com/baeldung/mockito/fluentapi/Pizza.java | 82 +++++++++++++++++++ .../mockito/fluentapi/PizzaService.java | 5 ++ .../fluentapi/PizzaServiceUnitTest.java | 23 ++++++ 3 files changed, 110 insertions(+) create mode 100644 testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java create mode 100644 testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java create mode 100644 testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java new file mode 100644 index 0000000000..05a441a4f4 --- /dev/null +++ b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java @@ -0,0 +1,82 @@ +package com.baeldung.mockito.fluentapi; + +import java.util.List; + +public class Pizza { + + public enum PizzaSize { + LARGE, MEDIUM, SMALL; + } + + private String name; + private PizzaSize size; + private List toppings; + + private String email; + private boolean stuffedCrust; + + private Pizza(PizzaBuilder builder) { + this.name = builder.name; + this.size = builder.size; + this.toppings = builder.toppings; + this.stuffedCrust = builder.stuffedCrust; + } + + public static class PizzaBuilder { + private String name; + private PizzaSize size; + private String email; + private boolean stuffedCrust; + private List toppings; + + public PizzaBuilder(String name) { + this.name = name; + } + + public PizzaBuilder size(PizzaSize size) { + this.size = size; + return this; + } + + public PizzaBuilder withExtaTopping(String extraTopping) { + this.toppings.add(extraTopping); + return this; + } + + public PizzaBuilder withStuffedCrust(boolean stuffedCrust) { + this.stuffedCrust = stuffedCrust; + return this; + } + + public BankAccountBuilder willCollect(boolean collect) { + this.newsletter = newsletter; + return this; + } + + public BankAccountBuilder applyDiscount(boolean collect) { + this.newsletter = newsletter; + return this; + } + + public Pizza build() { + return new Pizza(this); + } + } + + public String getName() { + return name; + } + + public PizzaSize getSize() { + return size; + } + + public String getEmail() { + return email; + } + + public boolean isNewsletter() { + return newsletter; + } + +} diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java new file mode 100644 index 0000000000..cf3004c8a5 --- /dev/null +++ b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java @@ -0,0 +1,5 @@ +package com.baeldung.mockito.fluentapi; + +public class PizzaService { + +} diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java new file mode 100644 index 0000000000..3e47e4a1d4 --- /dev/null +++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java @@ -0,0 +1,23 @@ +package com.baeldung.mockito.fluentapi; + +import java.util.List; +import java.util.stream.Collectors; + +import org.junit.Test; + +public class PizzaServiceUnitTest { + + @Test + public void test() { + + } + + public List convertAllToUpperCase(List words) { + + return words.stream() + .map(String::toUpperCase) + .collect(Collectors.toList()); + + } + +} From ad17d70bbbab162c8f34f00b5054a7b039f4812f Mon Sep 17 00:00:00 2001 From: Jon Cook Date: Fri, 15 Nov 2019 00:28:12 +0100 Subject: [PATCH 2/5] staging changes --- .../com/baeldung/mockito/fluentapi/Pizza.java | 61 ++++++++------ .../mockito/fluentapi/PizzaService.java | 24 ++++++ .../fluentapi/PizzaServiceUnitTest.java | 81 ++++++++++++++++--- .../mockito/fluentapi/PizzaUnitTest.java | 43 ++++++++++ 4 files changed, 176 insertions(+), 33 deletions(-) create mode 100644 testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaUnitTest.java diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java index 05a441a4f4..28cbfacdc4 100644 --- a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java +++ b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java @@ -1,5 +1,6 @@ package com.baeldung.mockito.fluentapi; +import java.util.ArrayList; import java.util.List; public class Pizza { @@ -11,23 +12,51 @@ public class Pizza { private String name; private PizzaSize size; private List toppings; - - private String email; private boolean stuffedCrust; + private boolean collect; + private Integer discount; private Pizza(PizzaBuilder builder) { this.name = builder.name; this.size = builder.size; this.toppings = builder.toppings; this.stuffedCrust = builder.stuffedCrust; + this.collect = builder.collect; + this.discount = builder.discount; + } + + public String getName() { + return name; + } + + public PizzaSize getSize() { + return size; + } + + public List getToppings() { + return toppings; + } + + public boolean isStuffedCrust() { + return stuffedCrust; + } + + public boolean isCollecting() { + return collect; + } + + public Integer getDiscount() { + return discount; } public static class PizzaBuilder { private String name; private PizzaSize size; - private String email; + + private List toppings = new ArrayList<>(); private boolean stuffedCrust; - private List toppings; + private boolean collect; + private Integer discount = null; public PizzaBuilder(String name) { this.name = name; @@ -48,13 +77,13 @@ public class Pizza { return this; } - public BankAccountBuilder willCollect(boolean collect) { - this.newsletter = newsletter; + public PizzaBuilder willCollect(boolean collect) { + this.collect = collect; return this; } - public BankAccountBuilder applyDiscount(boolean collect) { - this.newsletter = newsletter; + public PizzaBuilder applyDiscount(Integer discount) { + this.discount = discount; return this; } @@ -63,20 +92,4 @@ public class Pizza { } } - public String getName() { - return name; - } - - public PizzaSize getSize() { - return size; - } - - public String getEmail() { - return email; - } - - public boolean isNewsletter() { - return newsletter; - } - } diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java index cf3004c8a5..6359ad8222 100644 --- a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java +++ b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java @@ -1,5 +1,29 @@ package com.baeldung.mockito.fluentapi; +import java.util.List; +import java.util.Optional; + +import com.baeldung.mockito.fluentapi.Pizza.PizzaSize; + public class PizzaService { + private Pizza pizza; + + public PizzaService(Pizza.PizzaBuilder builder) { + this.pizza = builder.build(); + } + + public List listToppings(Pizza.PizzaBuilder builder) { + Pizza build = builder.size(PizzaSize.LARGE) + .withExtaTopping("Mushroom") + .withStuffedCrust(false) + .willCollect(true) + .applyDiscount(20) + .build(); + } + + public boolean isLarge() { + return PizzaSize.LARGE.equals(pizza.getSize()); + } + } diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java index 3e47e4a1d4..000c3b83ed 100644 --- a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java +++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java @@ -1,23 +1,86 @@ package com.baeldung.mockito.fluentapi; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; + +import static org.mockito.Mockito.when; + +import com.baeldung.mockito.fluentapi.Pizza.PizzaSize; public class PizzaServiceUnitTest { + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private ArrayList mockList; + + @Before + public void setup() { + MockitoAnnotations.initMocks(this); + } + + @Test - public void test() { + public void givenPizzaWithToppings_whenServiceInvoked_thenReturnsList() { + + //Foo mock = mock(Foo.class, RETURNS_DEEP_STUBS); + + List bob = Arrays.asList("a1", "a2", "b1", "c2", "c1"); + + + when(mockList.stream() + .filter(s -> s.startsWith("c")) + .map(String::toUpperCase) + .sorted() + .collect(Collectors.toList())) + .thenReturn(bob); + + Assert.assertEquals(bob, mockList.stream() + .filter(s -> s.startsWith("c")) + .map(String::toUpperCase) + .sorted() + .collect(Collectors.toList())); + + +// List filtered = Arrays.asList("a1", "a2", "b1", "c2", "c1") +// .stream() +// .filter(s -> s.startsWith("c")) +// .map(String::toUpperCase) +// .sorted() +// .collect(Collectors.toList()); +// +// +// +// +// Pizza.PizzaBuilder builder = Mockito.mock(Pizza.PizzaBuilder.class, Mockito.RETURNS_DEEP_STUBS); +// +// Pizza pizza = Mockito.mock(Pizza.class); +// +// Mockito.when(builder +// .size(PizzaSize.LARGE) +// .withExtaTopping("Mushroom") +// .withStuffedCrust(false) +// .willCollect(true) +// .applyDiscount(20) +// .build()).thenReturn(pizza); +// +// PizzaService service = new PizzaService(builder); +// +// List listToppings = service.listToppings(); + } - public List convertAllToUpperCase(List words) { - - return words.stream() - .map(String::toUpperCase) - .collect(Collectors.toList()); - - } - } diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaUnitTest.java new file mode 100644 index 0000000000..fb909c34d3 --- /dev/null +++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaUnitTest.java @@ -0,0 +1,43 @@ +package com.baeldung.mockito.fluentapi; + + + +import org.junit.Test; + +import com.baeldung.mockito.fluentapi.Pizza.PizzaSize; + +public class PizzaUnitTest { + + @Test + public void givenPizza_whenBuilt_thenShouldReturnPizzaWithCorrectAttributes() { + Pizza pizza = new Pizza + .PizzaBuilder("Margherita") + .size(PizzaSize.LARGE) + .withExtaTopping("Mushroom") + .withStuffedCrust(false) + .willCollect(true) + .applyDiscount(20) + .build(); + + //assert + } + + @Test + public void givenPizza_whenBuiltWithTraditonalMock_thenShouldReturnPizza() { + + Mock + + + Pizza pizza = new Pizza + .PizzaBuilder("Margherita") + .size(PizzaSize.LARGE) + .withExtaTopping("Mushroom") + .withStuffedCrust(false) + .willCollect(true) + .applyDiscount(20) + .build(); + + //assert + } + +} From 905097c637c6c2951fba5a964c76ecb903f88e17 Mon Sep 17 00:00:00 2001 From: Jonathan Cook Date: Sun, 17 Nov 2019 11:59:47 +0100 Subject: [PATCH 3/5] BAEL-3416 - Mockito and Fluent APIs --- .../com/baeldung/mockito/fluentapi/Pizza.java | 13 +- .../mockito/fluentapi/PizzaService.java | 22 ++- .../fluentapi/PizzaServiceUnitTest.java | 126 +++++++++--------- .../mockito/fluentapi/PizzaUnitTest.java | 39 ++---- 4 files changed, 96 insertions(+), 104 deletions(-) diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java index 28cbfacdc4..0a37a2cbbd 100644 --- a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java +++ b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/Pizza.java @@ -53,13 +53,17 @@ public class Pizza { private String name; private PizzaSize size; - private List toppings = new ArrayList<>(); + private List toppings; private boolean stuffedCrust; private boolean collect; private Integer discount = null; - public PizzaBuilder(String name) { + public PizzaBuilder() { + } + + public PizzaBuilder name(String name) { this.name = name; + return this; } public PizzaBuilder size(PizzaSize size) { @@ -67,7 +71,10 @@ public class Pizza { return this; } - public PizzaBuilder withExtaTopping(String extraTopping) { + public PizzaBuilder withExtraTopping(String extraTopping) { + if (this.toppings == null) { + toppings = new ArrayList<>(); + } this.toppings.add(extraTopping); return this; } diff --git a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java index 6359ad8222..0f9d5c6b18 100644 --- a/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java +++ b/testing-modules/mockito-2/src/main/java/com/baeldung/mockito/fluentapi/PizzaService.java @@ -1,29 +1,23 @@ package com.baeldung.mockito.fluentapi; -import java.util.List; -import java.util.Optional; - import com.baeldung.mockito.fluentapi.Pizza.PizzaSize; public class PizzaService { - private Pizza pizza; + private Pizza.PizzaBuilder builder; public PizzaService(Pizza.PizzaBuilder builder) { - this.pizza = builder.build(); + this.builder = builder; } - public List listToppings(Pizza.PizzaBuilder builder) { - Pizza build = builder.size(PizzaSize.LARGE) - .withExtaTopping("Mushroom") - .withStuffedCrust(false) + public Pizza orderHouseSpecial() { + return builder.name("Special") + .size(PizzaSize.LARGE) + .withExtraTopping("Mushrooms") + .withStuffedCrust(true) + .withExtraTopping("Chilli") .willCollect(true) .applyDiscount(20) .build(); } - - public boolean isLarge() { - return PizzaSize.LARGE.equals(pizza.getSize()); - } - } diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java index 000c3b83ed..b5dd10b1d4 100644 --- a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java +++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaServiceUnitTest.java @@ -1,86 +1,88 @@ package com.baeldung.mockito.fluentapi; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.mockito.Answers; +import org.mockito.ArgumentCaptor; +import org.mockito.Captor; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import static org.mockito.Mockito.when; - +import com.baeldung.mockito.fluentapi.Pizza.PizzaBuilder; import com.baeldung.mockito.fluentapi.Pizza.PizzaSize; public class PizzaServiceUnitTest { + @Mock + private Pizza expectedPizza; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private ArrayList mockList; + private PizzaBuilder anotherbuilder; + + @Captor + private ArgumentCaptor stringCaptor; + @Captor + private ArgumentCaptor sizeCaptor; @Before public void setup() { MockitoAnnotations.initMocks(this); } - - - @Test - public void givenPizzaWithToppings_whenServiceInvoked_thenReturnsList() { - //Foo mock = mock(Foo.class, RETURNS_DEEP_STUBS); - - List bob = Arrays.asList("a1", "a2", "b1", "c2", "c1"); - - - when(mockList.stream() - .filter(s -> s.startsWith("c")) - .map(String::toUpperCase) - .sorted() - .collect(Collectors.toList())) - .thenReturn(bob); - - Assert.assertEquals(bob, mockList.stream() - .filter(s -> s.startsWith("c")) - .map(String::toUpperCase) - .sorted() - .collect(Collectors.toList())); - - -// List filtered = Arrays.asList("a1", "a2", "b1", "c2", "c1") -// .stream() -// .filter(s -> s.startsWith("c")) -// .map(String::toUpperCase) -// .sorted() -// .collect(Collectors.toList()); -// -// -// -// -// Pizza.PizzaBuilder builder = Mockito.mock(Pizza.PizzaBuilder.class, Mockito.RETURNS_DEEP_STUBS); -// -// Pizza pizza = Mockito.mock(Pizza.class); -// -// Mockito.when(builder -// .size(PizzaSize.LARGE) -// .withExtaTopping("Mushroom") -// .withStuffedCrust(false) -// .willCollect(true) -// .applyDiscount(20) -// .build()).thenReturn(pizza); -// -// PizzaService service = new PizzaService(builder); -// -// List listToppings = service.listToppings(); - - + @Test + public void givenTraditonalMocking_whenServiceInvoked_thenPizzaIsBuilt() { + PizzaBuilder nameBuilder = Mockito.mock(Pizza.PizzaBuilder.class); + PizzaBuilder sizeBuilder = Mockito.mock(Pizza.PizzaBuilder.class); + PizzaBuilder firstToppingBuilder = Mockito.mock(Pizza.PizzaBuilder.class); + PizzaBuilder secondToppingBuilder = Mockito.mock(Pizza.PizzaBuilder.class); + PizzaBuilder stuffedBuilder = Mockito.mock(Pizza.PizzaBuilder.class); + PizzaBuilder willCollectBuilder = Mockito.mock(Pizza.PizzaBuilder.class); + PizzaBuilder discountBuilder = Mockito.mock(Pizza.PizzaBuilder.class); + + PizzaBuilder builder = Mockito.mock(Pizza.PizzaBuilder.class); + when(builder.name(anyString())).thenReturn(nameBuilder); + when(nameBuilder.size(any(Pizza.PizzaSize.class))).thenReturn(sizeBuilder); + when(sizeBuilder.withExtraTopping(anyString())).thenReturn(firstToppingBuilder); + when(firstToppingBuilder.withStuffedCrust(anyBoolean())).thenReturn(stuffedBuilder); + when(stuffedBuilder.withExtraTopping(anyString())).thenReturn(secondToppingBuilder); + when(secondToppingBuilder.willCollect(anyBoolean())).thenReturn(willCollectBuilder); + when(willCollectBuilder.applyDiscount(anyInt())).thenReturn(discountBuilder); + when(discountBuilder.build()).thenReturn(expectedPizza); + + PizzaService service = new PizzaService(builder); + assertEquals("Expected Pizza", expectedPizza, service.orderHouseSpecial()); + + verify(builder).name(stringCaptor.capture()); + assertEquals("Pizza name: ", "Special", stringCaptor.getValue()); + + verify(nameBuilder).size(sizeCaptor.capture()); + assertEquals("Pizza size: ", PizzaSize.LARGE, sizeCaptor.getValue()); + + } + + @Test + public void givenDeepStubs_whenServiceInvoked_thenPizzaIsBuilt() { + Mockito.when(anotherbuilder.name(anyString()) + .size(any(Pizza.PizzaSize.class)) + .withExtraTopping(anyString()) + .withStuffedCrust(anyBoolean()) + .withExtraTopping(anyString()) + .willCollect(anyBoolean()) + .applyDiscount(anyInt()) + .build()) + .thenReturn(expectedPizza); + + PizzaService service = new PizzaService(anotherbuilder); + assertEquals("Expected Pizza", expectedPizza, service.orderHouseSpecial()); } } diff --git a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaUnitTest.java b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaUnitTest.java index fb909c34d3..1486cb7f2f 100644 --- a/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaUnitTest.java +++ b/testing-modules/mockito-2/src/test/java/com/baeldung/mockito/fluentapi/PizzaUnitTest.java @@ -1,6 +1,8 @@ package com.baeldung.mockito.fluentapi; - +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import org.junit.Test; @@ -9,35 +11,22 @@ import com.baeldung.mockito.fluentapi.Pizza.PizzaSize; public class PizzaUnitTest { @Test - public void givenPizza_whenBuilt_thenShouldReturnPizzaWithCorrectAttributes() { - Pizza pizza = new Pizza - .PizzaBuilder("Margherita") + public void givenFluentPizzaApi_whenBuilt_thenPizzaHasCorrectAttributes() { + Pizza pizza = new Pizza.PizzaBuilder() + .name("Margherita") .size(PizzaSize.LARGE) - .withExtaTopping("Mushroom") + .withExtraTopping("Mushroom") .withStuffedCrust(false) .willCollect(true) .applyDiscount(20) .build(); - //assert + assertEquals("Pizza name: ", "Margherita", pizza.getName()); + assertEquals("Pizza size: ", PizzaSize.LARGE, pizza.getSize()); + assertEquals("Extra toppings: ", "Mushroom", pizza.getToppings() + .get(0)); + assertFalse("Has stuffed crust: ", pizza.isStuffedCrust()); + assertTrue("Will collect: ", pizza.isCollecting()); + assertEquals("Discounts: ", Integer.valueOf(20), pizza.getDiscount()); } - - @Test - public void givenPizza_whenBuiltWithTraditonalMock_thenShouldReturnPizza() { - - Mock - - - Pizza pizza = new Pizza - .PizzaBuilder("Margherita") - .size(PizzaSize.LARGE) - .withExtaTopping("Mushroom") - .withStuffedCrust(false) - .willCollect(true) - .applyDiscount(20) - .build(); - - //assert - } - } From a0738d9d4be93db7ce3acfbfb586aee445063087 Mon Sep 17 00:00:00 2001 From: Jonathan Cook Date: Fri, 13 Dec 2019 20:38:44 +0000 Subject: [PATCH 4/5] BAEL-3224 - Checking if 2 Java Dates are in the same day --- .../core-java-date-operations/pom.xml | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/core-java-modules/core-java-date-operations/pom.xml b/core-java-modules/core-java-date-operations/pom.xml index 1614fa3cd7..0dd9814f33 100644 --- a/core-java-modules/core-java-date-operations/pom.xml +++ b/core-java-modules/core-java-date-operations/pom.xml @@ -1,41 +1,41 @@ - 4.0.0 - core-java-date-operations - ${project.parent.version} - core-java-date-operations - jar + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + core-java-date-operations + ${project.parent.version} + core-java-date-operations + jar - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../../parent-java - + + com.baeldung + parent-java + 0.0.1-SNAPSHOT + ../../parent-java + - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - joda-time - joda-time - ${joda-time.version} - - - com.darwinsys - hirondelle-date4j - ${hirondelle-date4j.version} - - + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + joda-time + joda-time + ${joda-time.version} + + + com.darwinsys + hirondelle-date4j + ${hirondelle-date4j.version} + + - - 2.10 - 1.5.1 - + + 2.10 + 1.5.1 + \ No newline at end of file From b2d539220a1869459505fd427b92994422148f12 Mon Sep 17 00:00:00 2001 From: Jonathan Cook Date: Fri, 13 Dec 2019 20:57:15 +0000 Subject: [PATCH 5/5] BAEL-3224 - Checking if 2 Java Dates are in the same day - update pom.xml to remove tabs. --- .../core-java-date-operations/pom.xml | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/core-java-modules/core-java-date-operations/pom.xml b/core-java-modules/core-java-date-operations/pom.xml index 0dd9814f33..4d267964ee 100644 --- a/core-java-modules/core-java-date-operations/pom.xml +++ b/core-java-modules/core-java-date-operations/pom.xml @@ -1,41 +1,41 @@ - 4.0.0 - core-java-date-operations - ${project.parent.version} - core-java-date-operations - jar + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 + core-java-date-operations + ${project.parent.version} + core-java-date-operations + jar - - com.baeldung - parent-java - 0.0.1-SNAPSHOT - ../../parent-java - + + com.baeldung + parent-java + 0.0.1-SNAPSHOT + ../../parent-java + - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - joda-time - joda-time - ${joda-time.version} - - - com.darwinsys - hirondelle-date4j - ${hirondelle-date4j.version} - - + + + org.apache.commons + commons-lang3 + ${commons-lang3.version} + + + joda-time + joda-time + ${joda-time.version} + + + com.darwinsys + hirondelle-date4j + ${hirondelle-date4j.version} + + - - 2.10 - 1.5.1 - + + 2.10 + 1.5.1 + \ No newline at end of file