From f8e8aa0fce920b5c23d5017c2767771a459574a7 Mon Sep 17 00:00:00 2001
From: mokhan <mokhan@192.168.2.6>
Date: Sun, 25 Jun 2017 13:40:38 +0530
Subject: [PATCH 1/3] Updated code to use latest version Modifed code sample to
 easy scenario Deleted exisiting Code/files which are not required

---
 spring-drools/pom.xml                         |   4 +-
 .../baeldung/spring/drools/Application.java   |  30 ------
 .../spring/drools/DroolConfiguration.java     |  83 ---------------
 .../spring/drools/app/ApplicationRunner.java  |  24 +++++
 .../spring/drools/model/Applicant.java        |  48 ---------
 .../baeldung/spring/drools/model/Fare.java    |  39 +++++++
 .../baeldung/spring/drools/model/Product.java |  38 -------
 .../spring/drools/model/SuggestedRole.java    |  14 ---
 .../spring/drools/model/TaxiRide.java         |  24 +++++
 .../drools/service/ApplicantService.java      |  25 -----
 .../spring/drools/service/ProductService.java |  24 -----
 .../service/TaxiFareCalculatorService.java    |  22 ++++
 .../drools/service/TaxiFareConfiguration.java |  39 +++++++
 .../src/main/resources/TAXI_FARE_RULE.drl     |  57 +++++++++++
 .../spring/drools/rules/Product_rules.xls     | Bin 27648 -> 0 bytes
 .../spring/drools/rules/SuggestApplicant.drl  |  31 ------
 .../ApplicantServiceIntegrationTest.java      |  52 ----------
 .../ProductServiceIntegrationTest.java        |  34 -------
 .../TaxiFareCalculatorServiceTest.java        |  95 ++++++++++++++++++
 19 files changed, 302 insertions(+), 381 deletions(-)
 delete mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/Application.java
 delete mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/DroolConfiguration.java
 create mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/app/ApplicationRunner.java
 delete mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/model/Applicant.java
 create mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/model/Fare.java
 delete mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/model/Product.java
 delete mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/model/SuggestedRole.java
 create mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/model/TaxiRide.java
 delete mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/service/ApplicantService.java
 delete mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/service/ProductService.java
 create mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java
 create mode 100644 spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java
 create mode 100644 spring-drools/src/main/resources/TAXI_FARE_RULE.drl
 delete mode 100644 spring-drools/src/main/resources/com/baeldung/spring/drools/rules/Product_rules.xls
 delete mode 100644 spring-drools/src/main/resources/com/baeldung/spring/drools/rules/SuggestApplicant.drl
 delete mode 100644 spring-drools/src/test/java/com/baeldung/spring/drools/service/ApplicantServiceIntegrationTest.java
 delete mode 100644 spring-drools/src/test/java/com/baeldung/spring/drools/service/ProductServiceIntegrationTest.java
 create mode 100644 spring-drools/src/test/java/com/baeldung/spring/drools/service/TaxiFareCalculatorServiceTest.java

diff --git a/spring-drools/pom.xml b/spring-drools/pom.xml
index 8dba1271d7..de2ccd882b 100644
--- a/spring-drools/pom.xml
+++ b/spring-drools/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <spring-boot-version>1.1.1.RELEASE</spring-boot-version>
         <http-component-version>4.0-alpha6</http-component-version>
-        <drools-version>7.0.0.CR1</drools-version>
+        <drools-version>7.0.0.Final</drools-version>
         <apache-poi-version>3.13</apache-poi-version>
     </properties>
     <dependencyManagement>
@@ -86,7 +86,7 @@
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-spring</artifactId>
-            <version>6.4.0.Final</version>
+            <version>7.0.0.Final</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/Application.java b/spring-drools/src/main/java/com/baeldung/spring/drools/Application.java
deleted file mode 100644
index 8f5b915f88..0000000000
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/Application.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.baeldung.spring.drools;
-
-
-import com.baeldung.spring.drools.model.Applicant;
-import com.baeldung.spring.drools.model.Product;
-import com.baeldung.spring.drools.model.SuggestedRole;
-import com.baeldung.spring.drools.service.ApplicantService;
-import com.baeldung.spring.drools.service.ProductService;
-import org.kie.api.KieServices;
-import org.kie.api.runtime.KieContainer;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-
-@SpringBootApplication
-@Import(DroolConfiguration.class)
-public class Application {
-
-    public static void main(String[] args) {
-        ApplicationContext ctx = SpringApplication.run(Application.class, args);
-        ApplicantService applicantService=(ApplicantService)ctx.getBean("applicantService");
-        applicantService.suggestARoleForApplicant(new Applicant("Baljeet",37,1200000.0,8),new SuggestedRole());
-
-        ProductService productService=(ProductService)ctx.getBean("productService");
-        Product returnedProduct=productService.applyLabelToProduct(new Product("Microwave","Book"));
-    }
-
-}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/DroolConfiguration.java b/spring-drools/src/main/java/com/baeldung/spring/drools/DroolConfiguration.java
deleted file mode 100644
index 7a5e833ed5..0000000000
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/DroolConfiguration.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.baeldung.spring.drools;
-
-import com.baeldung.spring.drools.service.ApplicantService;
-import com.baeldung.spring.drools.service.ProductService;
-import org.kie.api.KieBase;
-import org.kie.api.KieServices;
-import org.kie.api.builder.*;
-import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.KieSession;
-import org.kie.internal.io.ResourceFactory;
-import org.kie.spring.KModuleBeanFactoryPostProcessor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.io.support.ResourcePatternResolver;
-
-import java.io.IOException;
-
-@Configuration
-public class DroolConfiguration {
-
-    private static final String RULES_PATH = "com/baeldung/spring/drools/rules/";
-
-    @Bean
-    public KieFileSystem kieFileSystem() throws IOException {
-        KieFileSystem kieFileSystem = getKieServices().newKieFileSystem();
-        for (Resource file : getRuleFiles()) {
-            kieFileSystem.write(ResourceFactory.newClassPathResource(RULES_PATH + file.getFilename(), "UTF-8"));
-        }
-        return kieFileSystem;
-    }
-
-    private Resource[] getRuleFiles() throws IOException {
-        ResourcePatternResolver resourcePatternResolver = new PathMatchingResourcePatternResolver();
-        return resourcePatternResolver.getResources("classpath*:" + RULES_PATH + "**/*.*");
-    }
-
-    @Bean
-    public KieContainer kieContainer() throws IOException {
-        final KieRepository kieRepository = getKieServices().getRepository();
-
-        kieRepository.addKieModule(new KieModule() {
-            public ReleaseId getReleaseId() {
-                return kieRepository.getDefaultReleaseId();
-            }
-        });
-
-        KieBuilder kieBuilder = getKieServices().newKieBuilder(kieFileSystem());
-        kieBuilder.buildAll();
-
-        return getKieServices().newKieContainer(kieRepository.getDefaultReleaseId());
-    }
-
-    private KieServices getKieServices() {
-        return KieServices.Factory.get();
-    }
-
-    @Bean
-    public KieBase kieBase() throws IOException {
-        return kieContainer().getKieBase();
-    }
-
-    @Bean
-    public KieSession kieSession() throws IOException {
-        return kieContainer().newKieSession();
-    }
-
-    @Bean
-    public ApplicantService getApplicantService(){
-        return new ApplicantService();
-    }
-
-    @Bean
-    public ProductService getProductService(KieContainer kieContainer){
-        return new ProductService();
-    }
-
-    @Bean
-    public KModuleBeanFactoryPostProcessor kiePostProcessor() {
-        return new KModuleBeanFactoryPostProcessor();
-    }
-}
\ No newline at end of file
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/app/ApplicationRunner.java b/spring-drools/src/main/java/com/baeldung/spring/drools/app/ApplicationRunner.java
new file mode 100644
index 0000000000..e8f926cc6f
--- /dev/null
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/app/ApplicationRunner.java
@@ -0,0 +1,24 @@
+package com.baeldung.spring.drools.app;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+
+import com.baeldung.spring.drools.model.TaxiRide;
+import com.baeldung.spring.drools.model.Fare;
+import com.baeldung.spring.drools.service.TaxiFareCalculatorService;
+import com.baeldung.spring.drools.service.TaxiFareConfiguration;
+
+public class ApplicationRunner {
+
+    public static void main(String[] args) {
+        ApplicationContext context = new AnnotationConfigApplicationContext(TaxiFareConfiguration.class);
+        TaxiFareCalculatorService orderService = (TaxiFareCalculatorService) context.getBean(TaxiFareCalculatorService.class);
+
+        TaxiRide taxiRide = new TaxiRide();
+        taxiRide.setbNightSurcharge(true);
+        taxiRide.setDistanceInMile(190L);
+        Fare rideFare = new Fare();
+        orderService.calculateFare(taxiRide, rideFare);
+    }
+
+}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/model/Applicant.java b/spring-drools/src/main/java/com/baeldung/spring/drools/model/Applicant.java
deleted file mode 100644
index f28d0fcab7..0000000000
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/model/Applicant.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.baeldung.spring.drools.model;
-
-public class Applicant {
-
-    private String name;
-    private int age;
-    private double currentSalary;
-    private int experienceInYears;
-
-    public Applicant(String name, int age, Double currentSalary, int experienceInYears) {
-        this.name = name;
-        this.age = age;
-        this.currentSalary = currentSalary;
-        this.experienceInYears = experienceInYears;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public int getAge() {
-        return age;
-    }
-
-    public void setAge(int age) {
-        this.age = age;
-    }
-
-    public Double getCurrentSalary() {
-        return currentSalary;
-    }
-
-    public void setCurrentSalary(Double currentSalary) {
-        this.currentSalary = currentSalary;
-    }
-
-    public int getExperienceInYears() {
-        return experienceInYears;
-    }
-
-    public void setExperienceInYears(int experienceInYears) {
-        this.experienceInYears = experienceInYears;
-    }
-}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/model/Fare.java b/spring-drools/src/main/java/com/baeldung/spring/drools/model/Fare.java
new file mode 100644
index 0000000000..a67156f167
--- /dev/null
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/model/Fare.java
@@ -0,0 +1,39 @@
+package com.baeldung.spring.drools.model;
+
+public class Fare {
+
+    private Long nightSurcharge;
+    private Long rideFare;
+    private Long totalFare;
+
+    public Fare() {
+        nightSurcharge = 0L;
+        rideFare = 0L;
+        totalFare = 0L;
+    }
+
+    public Long getNightSurcharge() {
+        return nightSurcharge;
+    }
+
+    public void setNightSurcharge(Long nightSurcharge) {
+        this.nightSurcharge = nightSurcharge;
+    }
+
+    public Long getRideFare() {
+        return rideFare;
+    }
+
+    public void setRideFare(Long rideFare) {
+        this.rideFare = rideFare;
+    }
+
+    public Long getTotalFare() {
+        return nightSurcharge + rideFare;
+    }
+
+    public void setTotalFare(Long totalFare) {
+        this.totalFare = totalFare;
+    }
+
+}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/model/Product.java b/spring-drools/src/main/java/com/baeldung/spring/drools/model/Product.java
deleted file mode 100644
index a861df5834..0000000000
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/model/Product.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.baeldung.spring.drools.model;
-
-public class Product {
-    private String name;
-    private String type;
-
-    private String label;
-
-    public Product(String name, String type) {
-        this.name = name;
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getLabel() {
-        return label;
-    }
-
-    public void setLabel(String label) {
-        this.label = label;
-    }
-
-}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/model/SuggestedRole.java b/spring-drools/src/main/java/com/baeldung/spring/drools/model/SuggestedRole.java
deleted file mode 100644
index 1ace5aa4ae..0000000000
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/model/SuggestedRole.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.baeldung.spring.drools.model;
-
-public class SuggestedRole {
-
-    private String role;
-
-    public String getRole() {
-        return role;
-    }
-
-    public void setRole(String role) {
-        this.role = role;
-    }
-}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/model/TaxiRide.java b/spring-drools/src/main/java/com/baeldung/spring/drools/model/TaxiRide.java
new file mode 100644
index 0000000000..6dc08bbb60
--- /dev/null
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/model/TaxiRide.java
@@ -0,0 +1,24 @@
+package com.baeldung.spring.drools.model;
+
+public class TaxiRide {
+    
+    private Boolean bNightSurcharge;
+    private Long distanceInMile;
+
+    public Boolean getbNightSurcharge() {
+        return bNightSurcharge;
+    }
+
+    public void setbNightSurcharge(Boolean bNightSurcharge) {
+        this.bNightSurcharge = bNightSurcharge;
+    }
+
+    public Long getDistanceInMile() {
+        return distanceInMile;
+    }
+
+    public void setDistanceInMile(Long distanceInMile) {
+        this.distanceInMile = distanceInMile;
+    }
+
+}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/service/ApplicantService.java b/spring-drools/src/main/java/com/baeldung/spring/drools/service/ApplicantService.java
deleted file mode 100644
index f78ffe668b..0000000000
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/service/ApplicantService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.baeldung.spring.drools.service;
-
-import com.baeldung.spring.drools.model.Applicant;
-import com.baeldung.spring.drools.model.SuggestedRole;
-import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.KieSession;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ApplicantService {
-
-    @Autowired
-    private KieContainer kieContainer;
-
-    public SuggestedRole suggestARoleForApplicant(Applicant applicant,SuggestedRole suggestedRole){
-        KieSession kieSession = kieContainer.newKieSession();
-        kieSession.insert(applicant);
-        kieSession.setGlobal("suggestedRole",suggestedRole);
-        kieSession.fireAllRules();
-        System.out.println(suggestedRole.getRole());
-        return  suggestedRole;
-
-    }
-}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/service/ProductService.java b/spring-drools/src/main/java/com/baeldung/spring/drools/service/ProductService.java
deleted file mode 100644
index 21ca9c9730..0000000000
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/service/ProductService.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.baeldung.spring.drools.service;
-
-import com.baeldung.spring.drools.model.Product;
-import org.kie.api.runtime.KieContainer;
-import org.kie.api.runtime.KieSession;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ProductService {
-
-    @Autowired
-    private  KieContainer kieContainer;
-
-    public Product applyLabelToProduct(Product product){
-        KieSession kieSession = kieContainer.newKieSession();
-        kieSession.insert(product);
-        kieSession.fireAllRules();
-        System.out.println(product.getLabel());
-        return  product;
-
-    }
-
-}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java
new file mode 100644
index 0000000000..4279643339
--- /dev/null
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java
@@ -0,0 +1,22 @@
+package com.baeldung.spring.drools.service;
+
+import org.kie.api.runtime.KieSession;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.baeldung.spring.drools.model.Fare;
+import com.baeldung.spring.drools.model.TaxiRide;
+
+public class TaxiFareCalculatorService {
+
+    @Autowired
+    private KieSession kieSession;
+
+    public Long calculateFare(TaxiRide taxiRide, Fare rideFare) {
+        kieSession.setGlobal("rideFare", rideFare);
+        kieSession.insert(taxiRide);
+        kieSession.fireAllRules();
+        kieSession.dispose();
+        System.out.println("!! RIDE FARE !! " + rideFare.getTotalFare());
+        return rideFare.getTotalFare();
+    }
+}
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java
new file mode 100644
index 0000000000..69c910f84d
--- /dev/null
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java
@@ -0,0 +1,39 @@
+package com.baeldung.spring.drools.service;
+
+import org.kie.api.KieServices;
+import org.kie.api.builder.KieBuilder;
+import org.kie.api.builder.KieFileSystem;
+import org.kie.api.builder.KieModule;
+import org.kie.api.runtime.KieContainer;
+import org.kie.api.runtime.KieSession;
+import org.kie.internal.io.ResourceFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class TaxiFareConfiguration {
+
+    public static final String drlFile = "TAXI_FARE_RULE.drl";
+
+    @Bean
+    public KieSession kieSession() {
+        KieServices kieServices = KieServices.Factory.get();
+
+        KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
+        kieFileSystem.write(ResourceFactory.newClassPathResource(drlFile));
+        KieBuilder kieBuilder = kieServices.newKieBuilder(kieFileSystem);
+        kieBuilder.buildAll();
+        KieModule kieModule = kieBuilder.getKieModule();
+
+        KieContainer kContainer = kieServices.newKieContainer(kieModule.getReleaseId());
+        KieSession ksession = kContainer.newKieSession();
+
+        return ksession;
+    }
+
+    @Bean
+    public TaxiFareCalculatorService taxiFareCalculatorService() {
+        TaxiFareCalculatorService taxiFareCalculatorService = new TaxiFareCalculatorService();
+        return taxiFareCalculatorService;
+    }
+}
diff --git a/spring-drools/src/main/resources/TAXI_FARE_RULE.drl b/spring-drools/src/main/resources/TAXI_FARE_RULE.drl
new file mode 100644
index 0000000000..56335c08b3
--- /dev/null
+++ b/spring-drools/src/main/resources/TAXI_FARE_RULE.drl
@@ -0,0 +1,57 @@
+import com.baeldung.spring.drools.model.TaxiRide;
+import com.baeldung.spring.drools.model.Fare;
+import java.util.*;
+
+global com.baeldung.spring.drools.model.Fare rideFare;
+dialect  "mvel"
+
+rule "Calculate Taxi Fare - Scenario 1"
+    when
+        taxiRideInstance:TaxiRide(bNightSurcharge == false && distanceInMile < 10);
+    then
+       	rideFare.setNightSurcharge(0);
+       	rideFare.setRideFare(70);
+end
+
+rule "Calculate Taxi Fare - Scenario 2"
+    when
+        taxiRideInstance:TaxiRide(bNightSurcharge == true && distanceInMile < 10);
+    then
+       	rideFare.setNightSurcharge(30);
+       	rideFare.setRideFare(70);
+end
+
+
+rule "Calculate Taxi Fare - Scenario 3"
+    when
+        taxiRideInstance:TaxiRide(bNightSurcharge == false && distanceInMile >= 10 && distanceInMile < 100);
+    then
+       	rideFare.setNightSurcharge(0);
+       	rideFare.setRideFare(70+(2*taxiRideInstance.getDistanceInMile()));
+end
+
+
+rule "Calculate Taxi Fare - Scenario 4"
+    when
+        taxiRideInstance:TaxiRide(bNightSurcharge == true && distanceInMile >= 10 && distanceInMile < 100);
+    then
+       	rideFare.setNightSurcharge(30+taxiRideInstance.getDistanceInMile());
+       	rideFare.setRideFare(70+(2*taxiRideInstance.getDistanceInMile()));
+end
+
+
+rule "Calculate Taxi Fare - Scenario 5"
+    when
+        taxiRideInstance:TaxiRide(bNightSurcharge == false && distanceInMile >= 100);
+    then
+       	rideFare.setNightSurcharge(0);
+       	rideFare.setRideFare(70+(1.5*taxiRideInstance.getDistanceInMile()));
+end
+
+rule "Calculate Taxi Fare - Scenario 6"
+    when
+        taxiRideInstance:TaxiRide(bNightSurcharge == true && distanceInMile >= 100);
+    then
+       	rideFare.setNightSurcharge(30+taxiRideInstance.getDistanceInMile());
+       	rideFare.setRideFare(70+(1.5*taxiRideInstance.getDistanceInMile()));
+end
diff --git a/spring-drools/src/main/resources/com/baeldung/spring/drools/rules/Product_rules.xls b/spring-drools/src/main/resources/com/baeldung/spring/drools/rules/Product_rules.xls
deleted file mode 100644
index 24caaf24707c1c8df2934def23897f213b30a990..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27648
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

diff --git a/spring-drools/src/main/resources/com/baeldung/spring/drools/rules/SuggestApplicant.drl b/spring-drools/src/main/resources/com/baeldung/spring/drools/rules/SuggestApplicant.drl
deleted file mode 100644
index baaf29d0b4..0000000000
--- a/spring-drools/src/main/resources/com/baeldung/spring/drools/rules/SuggestApplicant.drl
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.baeldung.spring.drools.rules;
-
-import com.baeldung.spring.drools.model.Applicant;
-
-global com.baeldung.spring.drools.model.SuggestedRole suggestedRole;
-
-dialect  "mvel"
-
-rule "Suggest Manager Role"
-    when
-        Applicant(experienceInYears > 10)
-        Applicant(currentSalary > 1000000 && currentSalary <= 2500000)
-    then
-        suggestedRole.setRole("Manager");
-end
-
-rule "Suggest Senior developer Role"
-    when
-        Applicant(experienceInYears > 5 && experienceInYears <= 10)
-        Applicant(currentSalary > 500000 && currentSalary <= 1500000)
-    then
-        suggestedRole.setRole("Senior developer");
-end
-
-rule "Suggest Developer Role"
-    when
-        Applicant(experienceInYears > 0 && experienceInYears <= 5)
-        Applicant(currentSalary > 200000 && currentSalary <= 1000000)
-    then
-        suggestedRole.setRole("Developer");
-end
diff --git a/spring-drools/src/test/java/com/baeldung/spring/drools/service/ApplicantServiceIntegrationTest.java b/spring-drools/src/test/java/com/baeldung/spring/drools/service/ApplicantServiceIntegrationTest.java
deleted file mode 100644
index d7e7634c00..0000000000
--- a/spring-drools/src/test/java/com/baeldung/spring/drools/service/ApplicantServiceIntegrationTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.baeldung.spring.drools.service;
-
-import com.baeldung.spring.drools.Application;
-import com.baeldung.spring.drools.DroolConfiguration;
-import com.baeldung.spring.drools.model.Applicant;
-import com.baeldung.spring.drools.model.SuggestedRole;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import static junit.framework.Assert.assertNull;
-import static junit.framework.TestCase.assertEquals;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {DroolConfiguration.class})
-public class ApplicantServiceIntegrationTest {
-
-    @Autowired
-    ApplicantService applicantService;
-
-    @Test
-    public void whenCriteriaMatching_ThenSuggestManagerRole(){
-        Applicant applicant=new Applicant("Davis",37,1600000.0,11);
-        SuggestedRole suggestedRole=new SuggestedRole();
-        applicantService.suggestARoleForApplicant(applicant,suggestedRole);
-        assertEquals("Manager",suggestedRole.getRole());
-    }
-
-    @Test
-    public void whenCriteriaMatching_ThenSuggestSeniorDeveloperRole(){
-        Applicant applicant=new Applicant("John",37,1200000.0,8);
-        SuggestedRole suggestedRole=new SuggestedRole();
-        applicantService.suggestARoleForApplicant(applicant,suggestedRole);
-        assertEquals("Senior developer",suggestedRole.getRole());
-    }
-    @Test
-    public void whenCriteriaMatching_ThenSuggestDeveloperRole(){
-        Applicant applicant=new Applicant("Davis",37,800000.0,3);
-        SuggestedRole suggestedRole=new SuggestedRole();
-        applicantService.suggestARoleForApplicant(applicant,suggestedRole);
-        assertEquals("Developer",suggestedRole.getRole());
-    }
-    @Test
-    public void whenCriteriaNotMatching_ThenNoRole(){
-        Applicant applicant=new Applicant("John",37,1200000.0,5);
-        SuggestedRole suggestedRole=new SuggestedRole();
-        applicantService.suggestARoleForApplicant(applicant,suggestedRole);
-        assertNull(suggestedRole.getRole());
-    }
-}
diff --git a/spring-drools/src/test/java/com/baeldung/spring/drools/service/ProductServiceIntegrationTest.java b/spring-drools/src/test/java/com/baeldung/spring/drools/service/ProductServiceIntegrationTest.java
deleted file mode 100644
index 7a442e48fd..0000000000
--- a/spring-drools/src/test/java/com/baeldung/spring/drools/service/ProductServiceIntegrationTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.baeldung.spring.drools.service;
-
-import com.baeldung.spring.drools.Application;
-import com.baeldung.spring.drools.DroolConfiguration;
-import com.baeldung.spring.drools.model.Product;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import static junit.framework.TestCase.assertEquals;
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = {DroolConfiguration.class})
-public class ProductServiceIntegrationTest {
-
-    @Autowired
-    ProductService productService;
-
-    @Test
-    public void whenProductTypeElectronic_ThenLabelBarcode(){
-        Product product=new Product("Microwave","Electronic");
-        product=productService.applyLabelToProduct(product);
-        assertEquals("BarCode",product.getLabel());
-    }
-
-    @Test
-    public void whenProductTypeBook_ThenLabelIsbn(){
-        Product product=new Product("AutoBiography","Book");
-        product=productService.applyLabelToProduct(product);
-        assertEquals("ISBN",product.getLabel());
-    }
-}
diff --git a/spring-drools/src/test/java/com/baeldung/spring/drools/service/TaxiFareCalculatorServiceTest.java b/spring-drools/src/test/java/com/baeldung/spring/drools/service/TaxiFareCalculatorServiceTest.java
new file mode 100644
index 0000000000..b8e105a785
--- /dev/null
+++ b/spring-drools/src/test/java/com/baeldung/spring/drools/service/TaxiFareCalculatorServiceTest.java
@@ -0,0 +1,95 @@
+package com.baeldung.spring.drools.service;
+
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+import com.baeldung.spring.drools.model.TaxiRide;
+import com.baeldung.spring.drools.model.Fare;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
+public class TaxiFareCalculatorServiceTest {
+
+    ApplicationContext context = null;
+    TaxiFareCalculatorService taxiFareCalculatorService = null;
+
+    @Before
+    public void init() {
+        context = new AnnotationConfigApplicationContext(TaxiFareConfiguration.class);
+        taxiFareCalculatorService = (TaxiFareCalculatorService) context.getBean(TaxiFareCalculatorService.class);
+    }
+
+    @Test
+    public void testCalculateFareScenario1() {
+        TaxiRide taxiRide = new TaxiRide();
+        taxiRide.setbNightSurcharge(false);
+        taxiRide.setDistanceInMile(9L);
+        Fare rideFare = new Fare();
+        Long totalCharge = taxiFareCalculatorService.calculateFare(taxiRide, rideFare);
+        Assert.assertNotNull(totalCharge);
+        Assert.assertEquals(Long.valueOf(70), totalCharge);
+    }
+    
+    @Test
+    public void testCalculateFareScenario2() {
+        TaxiRide taxiRide = new TaxiRide();
+        taxiRide.setbNightSurcharge(true);
+        taxiRide.setDistanceInMile(5L);
+        Fare rideFare = new Fare();
+        Long totalCharge = taxiFareCalculatorService.calculateFare(taxiRide, rideFare);
+        Assert.assertNotNull(totalCharge);
+        Assert.assertEquals(Long.valueOf(100), totalCharge);
+    }
+
+    @Test
+    public void testCalculateFareScenario3() {
+        TaxiRide taxiRide = new TaxiRide();
+        taxiRide.setbNightSurcharge(false);
+        taxiRide.setDistanceInMile(50L);
+        Fare rideFare = new Fare();
+        Long totalCharge = taxiFareCalculatorService.calculateFare(taxiRide, rideFare);
+        Assert.assertNotNull(totalCharge);
+        Assert.assertEquals(Long.valueOf(170), totalCharge);
+    }
+    
+    @Test
+    public void testCalculateFareScenario4() {
+        TaxiRide taxiRide = new TaxiRide();
+        taxiRide.setbNightSurcharge(true);
+        taxiRide.setDistanceInMile(50L);
+        Fare rideFare = new Fare();
+        Long totalCharge = taxiFareCalculatorService.calculateFare(taxiRide, rideFare);
+        Assert.assertNotNull(totalCharge);
+        Assert.assertEquals(Long.valueOf(250), totalCharge);
+    }
+    
+    @Test
+    public void testCalculateFareScenario5() {
+        TaxiRide taxiRide = new TaxiRide();
+        taxiRide.setbNightSurcharge(false);
+        taxiRide.setDistanceInMile(100L);
+        Fare rideFare = new Fare();
+        Long totalCharge = taxiFareCalculatorService.calculateFare(taxiRide, rideFare);
+        Assert.assertNotNull(totalCharge);
+        Assert.assertEquals(Long.valueOf(220), totalCharge);
+    }
+    
+    @Test
+    public void testCalculateFareScenario6() {
+        TaxiRide taxiRide = new TaxiRide();
+        taxiRide.setbNightSurcharge(true);
+        taxiRide.setDistanceInMile(100L);
+        Fare rideFare = new Fare();
+        Long totalCharge = taxiFareCalculatorService.calculateFare(taxiRide, rideFare);
+        Assert.assertNotNull(totalCharge);
+        Assert.assertEquals(Long.valueOf(350), totalCharge);
+    }
+   
+}

From 12166e9016f013a009b0f23e780d06fbd0db8f36 Mon Sep 17 00:00:00 2001
From: slavisa-baeldung <slavisa.baeldung@gmail.com>
Date: Tue, 27 Jun 2017 16:02:53 +0100
Subject: [PATCH 2/3] BAEL-804 - Spring Drools refactor

---
 spring-drools/pom.xml                         | 87 ++-----------------
 .../service/TaxiFareCalculatorService.java    |  4 +-
 .../drools/service/TaxiFareConfiguration.java |  5 +-
 .../TaxiFareCalculatorServiceTest.java        | 13 +--
 4 files changed, 18 insertions(+), 91 deletions(-)

diff --git a/spring-drools/pom.xml b/spring-drools/pom.xml
index de2ccd882b..239c0c065c 100644
--- a/spring-drools/pom.xml
+++ b/spring-drools/pom.xml
@@ -14,42 +14,10 @@
     </parent>
 
     <properties>
-        <spring-boot-version>1.1.1.RELEASE</spring-boot-version>
-        <http-component-version>4.0-alpha6</http-component-version>
         <drools-version>7.0.0.Final</drools-version>
-        <apache-poi-version>3.13</apache-poi-version>
+        <spring-framework.version>4.3.3.RELEASE</spring-framework.version>
     </properties>
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.spring.platform</groupId>
-                <artifactId>platform-bom</artifactId>
-                <version>${spring-boot-version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpcore</artifactId>
-            <version>${http-component-version}</version>
-        </dependency>
         <!-- ... -->
         <dependency>
             <groupId>org.kie</groupId>
@@ -61,7 +29,6 @@
             <artifactId>drools-decisiontables</artifactId>
             <version>${drools-version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.drools</groupId>
             <artifactId>drools-core</artifactId>
@@ -72,54 +39,18 @@
             <artifactId>drools-compiler</artifactId>
             <version>${drools-version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi</artifactId>
-            <version>${apache-poi-version}</version>
-        </dependency>
 
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>${apache-poi-version}</version>
-        </dependency>
+        <!--spring integration-->
         <dependency>
             <groupId>org.kie</groupId>
             <artifactId>kie-spring</artifactId>
-            <version>7.0.0.Final</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-tx</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-            </exclusions>
+            <version>${drools-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${spring-framework.version}</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>
\ No newline at end of file
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java
index 4279643339..0407eff5d9 100644
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareCalculatorService.java
@@ -1,5 +1,6 @@
 package com.baeldung.spring.drools.service;
 
+import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -9,9 +10,10 @@ import com.baeldung.spring.drools.model.TaxiRide;
 public class TaxiFareCalculatorService {
 
     @Autowired
-    private KieSession kieSession;
+    private KieContainer kieContainer;
 
     public Long calculateFare(TaxiRide taxiRide, Fare rideFare) {
+        KieSession kieSession = kieContainer.newKieSession();
         kieSession.setGlobal("rideFare", rideFare);
         kieSession.insert(taxiRide);
         kieSession.fireAllRules();
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java
index 69c910f84d..5c8965991f 100644
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java
@@ -16,7 +16,7 @@ public class TaxiFareConfiguration {
     public static final String drlFile = "TAXI_FARE_RULE.drl";
 
     @Bean
-    public KieSession kieSession() {
+    public KieContainer kieSession() {
         KieServices kieServices = KieServices.Factory.get();
 
         KieFileSystem kieFileSystem = kieServices.newKieFileSystem();
@@ -26,9 +26,8 @@ public class TaxiFareConfiguration {
         KieModule kieModule = kieBuilder.getKieModule();
 
         KieContainer kContainer = kieServices.newKieContainer(kieModule.getReleaseId());
-        KieSession ksession = kContainer.newKieSession();
 
-        return ksession;
+        return kContainer;
     }
 
     @Bean
diff --git a/spring-drools/src/test/java/com/baeldung/spring/drools/service/TaxiFareCalculatorServiceTest.java b/spring-drools/src/test/java/com/baeldung/spring/drools/service/TaxiFareCalculatorServiceTest.java
index b8e105a785..5569772c48 100644
--- a/spring-drools/src/test/java/com/baeldung/spring/drools/service/TaxiFareCalculatorServiceTest.java
+++ b/spring-drools/src/test/java/com/baeldung/spring/drools/service/TaxiFareCalculatorServiceTest.java
@@ -4,6 +4,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.test.context.ContextConfiguration;
@@ -14,17 +15,11 @@ import com.baeldung.spring.drools.model.TaxiRide;
 import com.baeldung.spring.drools.model.Fare;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(loader = AnnotationConfigContextLoader.class)
+@ContextConfiguration(classes = TaxiFareConfiguration.class)
 public class TaxiFareCalculatorServiceTest {
 
-    ApplicationContext context = null;
-    TaxiFareCalculatorService taxiFareCalculatorService = null;
-
-    @Before
-    public void init() {
-        context = new AnnotationConfigApplicationContext(TaxiFareConfiguration.class);
-        taxiFareCalculatorService = (TaxiFareCalculatorService) context.getBean(TaxiFareCalculatorService.class);
-    }
+    @Autowired
+    TaxiFareCalculatorService taxiFareCalculatorService;
 
     @Test
     public void testCalculateFareScenario1() {

From 21865398d730fcee89ccaa1779bda3ed3c3c9c94 Mon Sep 17 00:00:00 2001
From: slavisa-baeldung <slavisa.baeldung@gmail.com>
Date: Wed, 28 Jun 2017 21:48:29 +0100
Subject: [PATCH 3/3] BAEL-804 - Spring Drools refactor

---
 .../java/com/baeldung/spring/drools/app/ApplicationRunner.java  | 2 +-
 .../baeldung/spring/drools/service/TaxiFareConfiguration.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/app/ApplicationRunner.java b/spring-drools/src/main/java/com/baeldung/spring/drools/app/ApplicationRunner.java
index e8f926cc6f..ce4b49451a 100644
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/app/ApplicationRunner.java
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/app/ApplicationRunner.java
@@ -12,7 +12,7 @@ public class ApplicationRunner {
 
     public static void main(String[] args) {
         ApplicationContext context = new AnnotationConfigApplicationContext(TaxiFareConfiguration.class);
-        TaxiFareCalculatorService orderService = (TaxiFareCalculatorService) context.getBean(TaxiFareCalculatorService.class);
+        TaxiFareCalculatorService orderService = context.getBean(TaxiFareCalculatorService.class);
 
         TaxiRide taxiRide = new TaxiRide();
         taxiRide.setbNightSurcharge(true);
diff --git a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java
index 5c8965991f..8fed574639 100644
--- a/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java
+++ b/spring-drools/src/main/java/com/baeldung/spring/drools/service/TaxiFareConfiguration.java
@@ -16,7 +16,7 @@ public class TaxiFareConfiguration {
     public static final String drlFile = "TAXI_FARE_RULE.drl";
 
     @Bean
-    public KieContainer kieSession() {
+    public KieContainer kieContainer() {
         KieServices kieServices = KieServices.Factory.get();
 
         KieFileSystem kieFileSystem = kieServices.newKieFileSystem();