From d6eb56a3add7dedc978c746982c465702bb9f67c Mon Sep 17 00:00:00 2001 From: Nikita Iryupin Date: Sat, 26 Dec 2020 11:28:04 +0100 Subject: [PATCH] Replace bulder of Money to Money.of --- .../cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java | 7 ++++--- .../cz/cvut/fel/sit/omo/foodchain/product/Product.java | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java index d957c84..6daf216 100644 --- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java +++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java @@ -9,6 +9,7 @@ import cz.cvut.fel.sit.omo.foodchain.requirement.Requirement; import cz.cvut.fel.sit.omo.foodchain.signature.Signature; import cz.cvut.fel.sit.omo.foodchain.signature.SignatureManager; import cz.cvut.fel.sit.omo.foodchain.util.ChannelObserver; +import org.javamoney.moneta.Money; import javax.money.Monetary; import javax.money.MonetaryAmount; @@ -21,7 +22,7 @@ import java.util.Map; public class NodeBase implements ChannelObserver { private final Map subscribedChannels; private final List products; - private MonetaryAmount money; + private final MonetaryAmount money; private final List refusedTranslations; @@ -29,14 +30,14 @@ public class NodeBase implements ChannelObserver { subscribedChannels = new HashMap<>(); products = new LinkedList<>(); refusedTranslations = new LinkedList<>(); - money = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(0).create(); + money = Money.of(0, "USD"); } public NodeBase(double m) { subscribedChannels = new HashMap<>(); products = new LinkedList<>(); refusedTranslations = new LinkedList<>(); - money = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(m).create(); + money = Money.of(m, "USD"); } diff --git a/src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java b/src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java index 6df7cee..4269371 100644 --- a/src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java +++ b/src/main/java/cz/cvut/fel/sit/omo/foodchain/product/Product.java @@ -1,6 +1,7 @@ package cz.cvut.fel.sit.omo.foodchain.product; import cz.cvut.fel.sit.omo.foodchain.operation.OperationBase; +import org.javamoney.moneta.Money; import javax.money.Monetary; import javax.money.MonetaryAmount; @@ -24,16 +25,15 @@ public class Product this.name = name; this.productType = productType; this.productState = ProductState.AVAILABLE; - this.money = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(0).create(); + this.money = Money.of(0, "USD"); } - //TODO money int constructor public Product(String name, ProductType productType, double m) { this.name = name; this.productType = productType; this.productState = ProductState.AVAILABLE; - this.money = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(m).create(); + this.money = Money.of(m, "USD"); } /** @@ -47,7 +47,7 @@ public class Product this.name = name; this.productType = productType; this.productState = productState; - this.money = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(0).create(); + this.money = Money.of(0, "USD"); } public Product(String name, ProductType productType, ProductState productState, double m) @@ -55,7 +55,7 @@ public class Product this.name = name; this.productType = productType; this.productState = productState; - this.money = Monetary.getDefaultAmountFactory().setCurrency("USD").setNumber(m).create();; + this.money = Money.of(m, "USD"); } // "State machine methods"