From 5957a47902ec8408292f49b01c533ac4ebe64132 Mon Sep 17 00:00:00 2001
From: "roxanne.grant" <roxanne.grant@etu.hesge.ch>
Date: Sun, 3 Feb 2019 20:33:24 +0100
Subject: [PATCH] Clearer toString message with parameters of event
---
services/src/main/java/ch/hepia/event/Event.java | 2 +-
.../src/main/java/ch/hepia/event/EventAccountCreated.java | 2 +-
.../src/main/java/ch/hepia/event/EventAccountCredited.java | 2 +-
.../src/main/java/ch/hepia/event/EventAccountDoesntExist.java | 2 +-
.../src/main/java/ch/hepia/event/EventAddProductQuantity.java | 2 +-
services/src/main/java/ch/hepia/event/EventCreateAccount.java | 2 +-
services/src/main/java/ch/hepia/event/EventCreateProduct.java | 2 +-
.../src/main/java/ch/hepia/event/EventCreditAccepted.java | 2 +-
.../src/main/java/ch/hepia/event/EventCreditAnAccount.java | 2 +-
services/src/main/java/ch/hepia/event/EventCreditRefused.java | 2 +-
.../src/main/java/ch/hepia/event/EventCreditWithdrawn.java | 2 +-
.../src/main/java/ch/hepia/event/EventOrderCancelled.java | 2 +-
services/src/main/java/ch/hepia/event/EventOrderCreated.java | 2 +-
services/src/main/java/ch/hepia/event/EventOrderPlaced.java | 2 +-
services/src/main/java/ch/hepia/event/EventOrderPrepared.java | 4 +++-
services/src/main/java/ch/hepia/event/EventOrderSent.java | 2 +-
.../src/main/java/ch/hepia/event/EventProductCreated.java | 2 +-
.../src/main/java/ch/hepia/event/EventProductDoesntExist.java | 2 +-
.../src/main/java/ch/hepia/event/EventProductOutOfStock.java | 2 +-
.../main/java/ch/hepia/event/EventProductQuantityAdded.java | 2 +-
20 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/services/src/main/java/ch/hepia/event/Event.java b/services/src/main/java/ch/hepia/event/Event.java
index ed4720e..6af206e 100644
--- a/services/src/main/java/ch/hepia/event/Event.java
+++ b/services/src/main/java/ch/hepia/event/Event.java
@@ -23,6 +23,6 @@ public abstract class Event implements Serializable{
@Override
public String toString(){
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd hh:mm:ss");
- return dateFormat.format(this.date).toString();
+ return dateFormat.format(this.date).toString() + " " + this.getClass().getSimpleName() + " n°(" + this.id +")";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventAccountCreated.java b/services/src/main/java/ch/hepia/event/EventAccountCreated.java
index 75fe2df..9e64965 100644
--- a/services/src/main/java/ch/hepia/event/EventAccountCreated.java
+++ b/services/src/main/java/ch/hepia/event/EventAccountCreated.java
@@ -10,6 +10,6 @@ public class EventAccountCreated extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Account created n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventAccountCredited.java b/services/src/main/java/ch/hepia/event/EventAccountCredited.java
index 03b66ad..033b5f8 100644
--- a/services/src/main/java/ch/hepia/event/EventAccountCredited.java
+++ b/services/src/main/java/ch/hepia/event/EventAccountCredited.java
@@ -10,6 +10,6 @@ public class EventAccountCredited extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Account credited n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventAccountDoesntExist.java b/services/src/main/java/ch/hepia/event/EventAccountDoesntExist.java
index b80ebab..b7bf980 100644
--- a/services/src/main/java/ch/hepia/event/EventAccountDoesntExist.java
+++ b/services/src/main/java/ch/hepia/event/EventAccountDoesntExist.java
@@ -10,6 +10,6 @@ public class EventAccountDoesntExist extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Account n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventAddProductQuantity.java b/services/src/main/java/ch/hepia/event/EventAddProductQuantity.java
index fab441c..a224dd1 100644
--- a/services/src/main/java/ch/hepia/event/EventAddProductQuantity.java
+++ b/services/src/main/java/ch/hepia/event/EventAddProductQuantity.java
@@ -19,6 +19,6 @@ public class EventAddProductQuantity extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Credit an account n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( product id =" + this.idProduct+", quantity ordered = "+this.quantity+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreateAccount.java b/services/src/main/java/ch/hepia/event/EventCreateAccount.java
index cf61df2..18fd0c3 100644
--- a/services/src/main/java/ch/hepia/event/EventCreateAccount.java
+++ b/services/src/main/java/ch/hepia/event/EventCreateAccount.java
@@ -15,6 +15,6 @@ public class EventCreateAccount extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Create Account n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+ " ( account name = "+this.name+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreateProduct.java b/services/src/main/java/ch/hepia/event/EventCreateProduct.java
index fe435bb..b75e877 100644
--- a/services/src/main/java/ch/hepia/event/EventCreateProduct.java
+++ b/services/src/main/java/ch/hepia/event/EventCreateProduct.java
@@ -18,6 +18,6 @@ public class EventCreateProduct extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product created n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+ " ( name of product = "+this.name+", price of product = "+this.price+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreditAccepted.java b/services/src/main/java/ch/hepia/event/EventCreditAccepted.java
index 7c37679..351f316 100644
--- a/services/src/main/java/ch/hepia/event/EventCreditAccepted.java
+++ b/services/src/main/java/ch/hepia/event/EventCreditAccepted.java
@@ -21,6 +21,6 @@ public class EventCreditAccepted extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Credit accepted n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+ " ( id of account = "+this.idAccount+", price of product = "+this.price+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreditAnAccount.java b/services/src/main/java/ch/hepia/event/EventCreditAnAccount.java
index f7e3ba6..a25165e 100644
--- a/services/src/main/java/ch/hepia/event/EventCreditAnAccount.java
+++ b/services/src/main/java/ch/hepia/event/EventCreditAnAccount.java
@@ -18,6 +18,6 @@ public class EventCreditAnAccount extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Credit an account n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( id of account = "+this.idAccount+", amount credited = "+this.amount+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreditRefused.java b/services/src/main/java/ch/hepia/event/EventCreditRefused.java
index b29a703..dc383ef 100644
--- a/services/src/main/java/ch/hepia/event/EventCreditRefused.java
+++ b/services/src/main/java/ch/hepia/event/EventCreditRefused.java
@@ -10,6 +10,6 @@ public class EventCreditRefused extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Credit refused n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventCreditWithdrawn.java b/services/src/main/java/ch/hepia/event/EventCreditWithdrawn.java
index 0460300..6e29ab5 100644
--- a/services/src/main/java/ch/hepia/event/EventCreditWithdrawn.java
+++ b/services/src/main/java/ch/hepia/event/EventCreditWithdrawn.java
@@ -10,6 +10,6 @@ public class EventCreditWithdrawn extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Credit withdrawn n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderCancelled.java b/services/src/main/java/ch/hepia/event/EventOrderCancelled.java
index 849ad2c..8a5ec43 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderCancelled.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderCancelled.java
@@ -10,6 +10,6 @@ public class EventOrderCancelled extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order cancelled n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderCreated.java b/services/src/main/java/ch/hepia/event/EventOrderCreated.java
index dd66501..7486278 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderCreated.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderCreated.java
@@ -18,6 +18,6 @@ public class EventOrderCreated extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order created n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( id of account = "+this.idAccount+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderPlaced.java b/services/src/main/java/ch/hepia/event/EventOrderPlaced.java
index 501deda..1947d72 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderPlaced.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderPlaced.java
@@ -21,6 +21,6 @@ public class EventOrderPlaced extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order placed n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( id of account = "+this.idAccount+", price of order = "+this.price+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderPrepared.java b/services/src/main/java/ch/hepia/event/EventOrderPrepared.java
index 757c5f9..439498b 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderPrepared.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderPrepared.java
@@ -9,7 +9,9 @@ public class EventOrderPrepared extends Event{
public EventOrderPrepared(int id, String msg, int idAccount, double price){
super(id, msg);
+ this.idAccount = idAccount;
this.price = price;
+
}
public int idAccount(){ return this.idAccount; }
@@ -17,6 +19,6 @@ public class EventOrderPrepared extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order prepared n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+" ( id of account = "+this.idAccount+", price of order = "+this.price+" )\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventOrderSent.java b/services/src/main/java/ch/hepia/event/EventOrderSent.java
index 2d14230..db5a881 100644
--- a/services/src/main/java/ch/hepia/event/EventOrderSent.java
+++ b/services/src/main/java/ch/hepia/event/EventOrderSent.java
@@ -10,6 +10,6 @@ public class EventOrderSent extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Order sent n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventProductCreated.java b/services/src/main/java/ch/hepia/event/EventProductCreated.java
index 7a9bcaf..0c71ace 100644
--- a/services/src/main/java/ch/hepia/event/EventProductCreated.java
+++ b/services/src/main/java/ch/hepia/event/EventProductCreated.java
@@ -10,6 +10,6 @@ public class EventProductCreated extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product created n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventProductDoesntExist.java b/services/src/main/java/ch/hepia/event/EventProductDoesntExist.java
index 49889ab..960db2b 100644
--- a/services/src/main/java/ch/hepia/event/EventProductDoesntExist.java
+++ b/services/src/main/java/ch/hepia/event/EventProductDoesntExist.java
@@ -10,6 +10,6 @@ public class EventProductDoesntExist extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventProductOutOfStock.java b/services/src/main/java/ch/hepia/event/EventProductOutOfStock.java
index 2dd89c8..8dbdf79 100644
--- a/services/src/main/java/ch/hepia/event/EventProductOutOfStock.java
+++ b/services/src/main/java/ch/hepia/event/EventProductOutOfStock.java
@@ -10,6 +10,6 @@ public class EventProductOutOfStock extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product is out of stock n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
diff --git a/services/src/main/java/ch/hepia/event/EventProductQuantityAdded.java b/services/src/main/java/ch/hepia/event/EventProductQuantityAdded.java
index 9bcfa3c..da457d8 100644
--- a/services/src/main/java/ch/hepia/event/EventProductQuantityAdded.java
+++ b/services/src/main/java/ch/hepia/event/EventProductQuantityAdded.java
@@ -10,6 +10,6 @@ public class EventProductQuantityAdded extends Event{
@Override
public String toString(){
- return "\n"+super.toString()+" : Product quantity added n°(" + this.id +"): "+this.msg+"\n";
+ return "\n"+super.toString()+" : "+this.msg+"\n";
}
}
\ No newline at end of file
--
GitLab