From 5d5b44c0a96c47a240c8801f789cce1f30cc63c1 Mon Sep 17 00:00:00 2001
From: Ekaterina Galkina <i_am_me@bk.ru>
Date: Mon, 16 Apr 2018 12:36:19 +0500
Subject: [PATCH 1/3] BAEL-1645 fix

---
 .../src/main/java/com/baeldung/assertions/Car.java  |  5 +++++
 .../java/com/baeldung/assertions/CarBattery.java    | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 spring-5/src/main/java/com/baeldung/assertions/CarBattery.java

diff --git a/spring-5/src/main/java/com/baeldung/assertions/Car.java b/spring-5/src/main/java/com/baeldung/assertions/Car.java
index 4e210dfaab..599246c752 100644
--- a/spring-5/src/main/java/com/baeldung/assertions/Car.java
+++ b/spring-5/src/main/java/com/baeldung/assertions/Car.java
@@ -43,6 +43,11 @@ public class Car {
         Assert.isNull(oil, "oil must be null");
         // ...
     }
+    
+    public void replaceBattery(CarBattery carBattery){
+        Assert.isNull(carBattery.getCharge(), "to replace battery the charge must be null");
+        // ...
+    }
 
     public void сhangeEngine(Engine engine) {
         Assert.isInstanceOf(ToyotaEngine.class, engine);
diff --git a/spring-5/src/main/java/com/baeldung/assertions/CarBattery.java b/spring-5/src/main/java/com/baeldung/assertions/CarBattery.java
new file mode 100644
index 0000000000..a75457a7ec
--- /dev/null
+++ b/spring-5/src/main/java/com/baeldung/assertions/CarBattery.java
@@ -0,0 +1,13 @@
+package com.baeldung.assertions;
+
+public class CarBattery {
+    private String charge;
+
+    public String getCharge() {
+        return charge;
+    }
+
+    public void setCharge(String charge) {
+        this.charge = charge;
+    }
+}

From 56b2899171491ee28536d93820cb9731f55aaef0 Mon Sep 17 00:00:00 2001
From: Ekaterina Galkina <i_am_me@bk.ru>
Date: Mon, 16 Apr 2018 12:49:41 +0500
Subject: [PATCH 2/3] BAEL-1645 fix 2

---
 spring-5/src/main/java/com/baeldung/assertions/Car.java | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/spring-5/src/main/java/com/baeldung/assertions/Car.java b/spring-5/src/main/java/com/baeldung/assertions/Car.java
index 599246c752..210fca5cf3 100644
--- a/spring-5/src/main/java/com/baeldung/assertions/Car.java
+++ b/spring-5/src/main/java/com/baeldung/assertions/Car.java
@@ -39,12 +39,7 @@ public class Car {
         // ...
     }
 
-    public void сhangeOilWithIsNull(String oil) {
-        Assert.isNull(oil, "oil must be null");
-        // ...
-    }
-    
-    public void replaceBattery(CarBattery carBattery){
+    public void replaceBattery(CarBattery carBattery) {
         Assert.isNull(carBattery.getCharge(), "to replace battery the charge must be null");
         // ...
     }

From 59e46080d8681c8f4a854cb383d4148b3d49208b Mon Sep 17 00:00:00 2001
From: Ekaterina Galkina <i_am_me@bk.ru>
Date: Mon, 16 Apr 2018 12:57:51 +0500
Subject: [PATCH 3/3] BAEL-1645 fix 3

---
 spring-5/src/main/java/com/baeldung/assertions/Car.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spring-5/src/main/java/com/baeldung/assertions/Car.java b/spring-5/src/main/java/com/baeldung/assertions/Car.java
index 210fca5cf3..abff27f0b0 100644
--- a/spring-5/src/main/java/com/baeldung/assertions/Car.java
+++ b/spring-5/src/main/java/com/baeldung/assertions/Car.java
@@ -99,7 +99,9 @@ public class Car {
         car.fuel();
 
         car.сhangeOil("oil");
-        car.сhangeOilWithIsNull(null);
+        
+        CarBattery carBattery = new CarBattery();
+        car.replaceBattery(carBattery);
 
         car.сhangeEngine(new ToyotaEngine());