From a51abbab58fba957dc879307ea167e8724bbbea9 Mon Sep 17 00:00:00 2001 From: "DESKTOP-MG5QNKB\\harsha" Date: Wed, 12 Jun 2019 00:54:16 -0400 Subject: [PATCH] Hexagonal Architecture in Java - incorporated feedback --- .../hexagon/ConstantTaxRateRepository.java | 13 ++++++------- .../com/baeldung/hexagon/TaxCalculator.java | 19 +++++++++---------- .../java/com/baeldung/hexagon/TaxFactory.java | 14 ++++++-------- .../baeldung/hexagon/TaxRateRepository.java | 3 +-- .../java/com/baeldung/hexagon/TaxService.java | 4 +--- .../com/baeldung/hexagon/TestTaxUser.java | 8 ++++---- 6 files changed, 27 insertions(+), 34 deletions(-) diff --git a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/ConstantTaxRateRepository.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/ConstantTaxRateRepository.java index fb7b2963c0..e0b653a51f 100644 --- a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/ConstantTaxRateRepository.java +++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/ConstantTaxRateRepository.java @@ -1,11 +1,10 @@ package com.baeldung.hexagon; -public class ConstantTaxRateRepository implements TaxRateRepository{ +public class ConstantTaxRateRepository implements TaxRateRepository { + private static final double TAX_RATE = 0.13d; - private static final double TAX_RATE = 0.13d; - - @Override - public double getRate() { - return TAX_RATE; - } + @Override + public double getRate() { + return TAX_RATE; + } } diff --git a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxCalculator.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxCalculator.java index 6a2f875f5b..585548d419 100644 --- a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxCalculator.java +++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxCalculator.java @@ -2,16 +2,15 @@ package com.baeldung.hexagon; public class TaxCalculator implements TaxService { - private TaxRateRepository taxRateRepository; + private TaxRateRepository taxRateRepository; - public TaxCalculator(TaxRateRepository repository) { - super(); - taxRateRepository = repository; - } + public TaxCalculator(TaxRateRepository repository) { + super(); + taxRateRepository = repository; + } - @Override - public double calculateTax(Double amount) { - return amount * taxRateRepository.getRate(); - } - + @Override + public double calculateTax(double amount) { + return amount * taxRateRepository.getRate(); + } } diff --git a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxFactory.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxFactory.java index d35c3fca2e..80a5fa0ed6 100644 --- a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxFactory.java +++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxFactory.java @@ -1,13 +1,11 @@ package com.baeldung.hexagon; public class TaxFactory { - - public static TaxService getTaxService() { - return new TaxCalculator(getTaxRepository()); - } - - public static TaxRateRepository getTaxRepository() { - return new ConstantTaxRateRepository(); - } + public static TaxService getTaxService() { + return new TaxCalculator(getTaxRepository()); + } + public static TaxRateRepository getTaxRepository() { + return new ConstantTaxRateRepository(); + } } diff --git a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxRateRepository.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxRateRepository.java index ca1623a4ef..0054a6ef60 100644 --- a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxRateRepository.java +++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxRateRepository.java @@ -1,6 +1,5 @@ package com.baeldung.hexagon; public interface TaxRateRepository { - - public double getRate(); + public double getRate(); } diff --git a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxService.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxService.java index a6652d81ff..40de255027 100644 --- a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxService.java +++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TaxService.java @@ -1,7 +1,5 @@ package com.baeldung.hexagon; public interface TaxService { - - public double calculateTax(Double amount); - + public double calculateTax(double amount); } diff --git a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TestTaxUser.java b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TestTaxUser.java index 82ab5fafa8..92623f37bf 100644 --- a/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TestTaxUser.java +++ b/core-java-modules/core-java-lang-oop/src/main/java/com/baeldung/hexagon/TestTaxUser.java @@ -2,8 +2,8 @@ package com.baeldung.hexagon; public class TestTaxUser { - public double calculateTax(Double amount) { - return TaxFactory.getTaxService().calculateTax(amount); - } - + public double calculateTax(Double amount) { + return TaxFactory.getTaxService() + .calculateTax(amount); + } }