nikita/food-chain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed intterface and abstract class after consultansion

Browse Source
This commit is contained in:
Nikita Iryupin 2020-11-30 15:39:49 +01:00
parent bd653482e5
commit d3378d37d4
2 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/cz/cvut/fel/sit/omo/foodchain/node/INode.java
View File

@ -1,22 +1,26 @@
package cz.cvut.fel.sit.omo.foodchain.node;
import cz.cvut.fel.sit.omo.foodchain.channel.IChannel;
import cz.cvut.fel.sit.omo.foodchain.operation.Action;
import cz.cvut.fel.sit.omo.foodchain.operation.Transaction;
import cz.cvut.fel.sit.omo.foodchain.operation.*;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
import cz.cvut.fel.sit.omo.foodchain.product.ProductType;
import cz.cvut.fel.sit.omo.foodchain.requirement.Requirement;
import cz.cvut.fel.sit.omo.foodchain.signature.Signature;
import java.util.LinkedList;
import java.util.List;
public interface INode {
void sendTransaction(Product product, INode INode);
void sendTransaction(Product product, INode node);
void receiveTransaction(Transaction transaction);
void sendTransaction(MonetaryAmount amount, INode node);
void refuseTransaction(Transaction transaction);
void receiveTransaction(ProductTransaction transaction);
void receiveTransaction(FinancialTransaction transaction);
void refuseTransaction(ProductTransaction transaction);
void refuseTransaction(FinancialTransaction transaction);
Transaction readNextTransaction(IChannel channel);
@ -28,9 +32,9 @@ public interface INode {
void unsubscribeFromChannel(IChannel channel);
void doAction(Action action, Product product);
void doAction(ProductOperationType action, Product product);
void doAction(Action action);
void doAction(ProductOperationType action);
void storeProduct(Product product);

43
src/main/java/cz/cvut/fel/sit/omo/foodchain/node/NodeBase.java
View File

@ -1,9 +1,7 @@
package cz.cvut.fel.sit.omo.foodchain.node;
import cz.cvut.fel.sit.omo.foodchain.channel.IChannel;
import cz.cvut.fel.sit.omo.foodchain.operation.Action;
import cz.cvut.fel.sit.omo.foodchain.operation.ProductTransaction;
import cz.cvut.fel.sit.omo.foodchain.operation.Transaction;
import cz.cvut.fel.sit.omo.foodchain.operation.*;
import cz.cvut.fel.sit.omo.foodchain.product.Product;
import cz.cvut.fel.sit.omo.foodchain.product.ProductType;
import cz.cvut.fel.sit.omo.foodchain.requirement.Requirement;
@ -14,17 +12,17 @@ import java.util.List;
public class NodeBase implements INode {
List<IChannel> subscribedChannels;
private final List<IChannel> subscribedChannels;
private final List<Product> products;
public NodeBase(){
subscribedChannels = new LinkedList<>();
products = new LinkedList<>();
}
@Override
public void sendTransaction(Product product, INode node) {
Transaction transaction = new ProductTransaction();
transaction.setProduct(product);
transaction.setGoal(node);
Transaction transaction = new ProductTransaction(product, node);
subscribedChannels.stream()
.filter(ch -> ch.getProductType().equals(product.getType()))
@ -32,15 +30,31 @@ public class NodeBase implements INode {
}
@Override
public void receiveTransaction(Transaction transaction) {
//TODO
public void sendTransaction(MonetaryAmount amount, INode node) {
}
@Override
public void refuseTransaction(Transaction transaction) {
public void receiveTransaction(ProductTransaction transaction) {
}
@Override
public void receiveTransaction(FinancialTransaction transaction) {
}
@Override
public void refuseTransaction(ProductTransaction transaction) {
}
@Override
public void refuseTransaction(FinancialTransaction transaction) {
}
@Override
public Transaction readNextTransaction(IChannel channel) {
return channel.getNextTransaction();
@ -67,15 +81,16 @@ public class NodeBase implements INode {
}
@Override
public void doAction(Action action, Product product) {
action.doWithProduct(product);
public void doAction(ProductOperationType action, Product product) {
//create new action
}
@Override
public void doAction(Action action) {
action.doActionWithNodeContext(this);
public void doAction(ProductOperationType action) {
//create new action
}
@Override
public void storeProduct(Product product) {