Merge branch 'master' of https://github.com/half-wit4u/tutorials.git
Conflicts: spring-drools/src/main/java/com/baeldung/spring/drools/app/ApplicationRunner.java spring-drools/src/main/java/com/baeldung/spring/drools/model/Fare.java spring-drools/src/test/java/com/baeldung/spring/drools/service/TaxiFareCalculatorServiceIntegrationTest.java
This commit is contained in:
commit
75c9345efa
|
@ -13,7 +13,6 @@ public class ApplicationRunner {
|
|||
public static void main(String[] args) {
|
||||
ApplicationContext context = new AnnotationConfigApplicationContext(TaxiFareConfiguration.class);
|
||||
TaxiFareCalculatorService taxiFareCalculatorService = (TaxiFareCalculatorService) context.getBean(TaxiFareCalculatorService.class);
|
||||
|
||||
TaxiRide taxiRide = new TaxiRide();
|
||||
taxiRide.setIsNightSurcharge(true);
|
||||
taxiRide.setDistanceInMile(190L);
|
||||
|
|
|
@ -4,7 +4,7 @@ public class Fare {
|
|||
|
||||
private Long nightSurcharge;
|
||||
private Long rideFare;
|
||||
|
||||
|
||||
public Fare() {
|
||||
nightSurcharge = 0L;
|
||||
rideFare = 0L;
|
||||
|
|
Loading…
Reference in New Issue