RFCT Muda o nome do pacote de 'controle' para controller, aplica muda…

…nças sugeridas pela IDE
italo48 · May 7, 2021 · 0f4b3af · 0f4b3af
1 parent 77c249c
commit 0f4b3af
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 70 deletions.
diff --git a/architecture.dcl b/architecture.dcl
@@ -1,6 +1,6 @@
 %modules def
 module View: bvs.boundery.**
-module Control: bvs.controle.**
+module Control: bvs.controller.**
 module Entity: bvs.entity.**
 module App: bvs.BeverageStockApp.BeverageStockApp
 

diff --git a/src/main/java/bvs/BeverageStockApp/BeverageStockApp.java b/src/main/java/bvs/BeverageStockApp/BeverageStockApp.java
@@ -4,29 +4,27 @@
 import java.util.Scanner;
 
 import bvs.boundery.UI;
-import bvs.controle.BeverageControl;
-import bvs.controle.InMemoryDB;
-import bvs.controle.StockControl;
+import bvs.controller.BeverageControl;
+import bvs.controller.InMemoryDB;
+import bvs.controller.StockControl;
 import bvs.entity.Beverage;
 
 public class BeverageStockApp {
-	private ArrayList<Beverage> beverageDB;
-	private InMemoryDB db;
 	private BeverageControl bevApp;
 	private StockControl stockApp;
 	private UI userInterface;
 
 	private Scanner inputApp;
 
 	public void run() {
-		beverageDB = new ArrayList<>();
-		db = new InMemoryDB(beverageDB);
+		ArrayList<Beverage> beverageDB = new ArrayList<>();
+		InMemoryDB db = new InMemoryDB(beverageDB);
 		stockApp = new StockControl(db);
 		bevApp = new BeverageControl(db, stockApp);
 		userInterface = new UI();
 		inputApp = new Scanner(System.in);
 
-		int op = -1;
+		int op;
 		boolean controloop = true;
 
 		do {
@@ -48,9 +46,9 @@ public void run() {
 	}
 
 	public void beverageApp() {
-		int op = -1;
-		String bev = "";
-		long id = 0;
+		int op;
+		String bev;
+		long id;
 		boolean controloop = true;
 		while (controloop) {
 			userInterface.beverageMenu();
@@ -65,7 +63,6 @@ public void beverageApp() {
 
 				try{
 					Beverage beverage = bevApp.toBeverage(bev);
-					bev = "";
 					userInterface.askIsProhibited();
 					bev = inputApp.next();
 					if (bev.equals("S") || bev.equals("s")) {
@@ -179,7 +176,7 @@ public void beverageApp() {
 	}
 
 	public void stockApp() {
-		int op = -1;
+		int op;
 		boolean controloop = true;
 		while (controloop) {
 			userInterface.stockMenu();

diff --git a/...in/java/bvs/controle/BeverageControl.java → .../java/bvs/controller/BeverageControl.java b/...in/java/bvs/controle/BeverageControl.java → .../java/bvs/controller/BeverageControl.java
@@ -1,12 +1,12 @@
-package bvs.controle;
+package bvs.controller;
 
 import java.util.List;
 
 import bvs.entity.Beverage;
 
 public class BeverageControl {
-	private InMemoryDB db;
-	private StockControl stock;
+	private final InMemoryDB db;
+	private final StockControl stock;
 
 	public BeverageControl(InMemoryDB datab, StockControl stock) {
 		this.db = datab;
@@ -20,10 +20,10 @@ public boolean addBeverage(Beverage bev) {
 		if (bev.getPrice() + stock.total() > 1500) {
 			return false;
 		}
-		if (this.db.getDb().indexOf(bev) != -1) {
-			return false;
+		if (!this.db.getDb().contains(bev)) {
+			return db.getDb().add(bev);
 		}
-		return db.getDb().add(bev);
+		return false;
 	}
 
 	public List<Beverage> listBeverage() {
@@ -58,16 +58,13 @@ public Beverage upBeverage(long id, Beverage bev) {
 	}
 
 	private boolean beverageIsValid(Beverage bev) {
-		if (bev.getId() <=  0 || bev.getAmount() < 0 || bev.getAlcoholContent() < 0
-				|| bev.getLoss() > bev.getAmount() || bev.getName().equals("") 
-				|| bev.getType().equals("") || bev.getPrice() == 0.0) {
-			return false;
-		}
-		return true;
+		return bev.getId() > 0 && bev.getAmount() >= 0 && bev.getAlcoholContent() >= 0
+				&& bev.getLoss() <= bev.getAmount() && !bev.getName().equals("")
+				&& !bev.getType().equals("") && bev.getPrice() != 0.0;
 	}
 //	Ganbs
-	public Beverage toBeverage(String beverage) throws Exception {
-		String bevStringFormat[] = beverage.split(",");
+	public Beverage toBeverage(String beverage) {
+		String[] bevStringFormat = beverage.split(",");
 			long id = Integer.parseInt(bevStringFormat[0]);
 			float price = Float.parseFloat(bevStringFormat[3]);
 			int ac = Integer.parseInt(bevStringFormat[4]);

diff --git a/src/main/java/bvs/controle/InMemoryDB.java → src/main/java/bvs/controller/InMemoryDB.java b/src/main/java/bvs/controle/InMemoryDB.java → src/main/java/bvs/controller/InMemoryDB.java
@@ -1,11 +1,11 @@
-package bvs.controle;
+package bvs.controller;
 
 import java.util.ArrayList;
 
 import bvs.entity.Beverage;
 
 public class InMemoryDB {
-	private ArrayList<Beverage> db;
+	private final ArrayList<Beverage> db;
 
 	public InMemoryDB(ArrayList<Beverage> db) {
 		this.db = db;

diff --git a/src/main/java/bvs/controle/StockControl.java → ...ain/java/bvs/controller/StockControl.java b/src/main/java/bvs/controle/StockControl.java → ...ain/java/bvs/controller/StockControl.java
@@ -1,9 +1,9 @@
-package bvs.controle;
+package bvs.controller;
 
 import bvs.entity.Beverage;
 
 public class StockControl{
-	private InMemoryDB bank;
+	private final InMemoryDB bank;
 	public StockControl(InMemoryDB db) {
 		this.bank = db;
 	}
@@ -23,7 +23,7 @@ public int total() {
 		return sum;
 	}
 	public double calcPorc() {
-		return (total() * 100)/1500;
+		return (total() * 100.0) / 1500.0;
 	}
 	public byte LevelStock() {
 		double qtd = total();

diff --git a/src/main/java/bvs/entity/Beverage.java b/src/main/java/bvs/entity/Beverage.java
@@ -29,50 +29,26 @@ public long getId() {
 		return id;
 	}
 
-	public void setId(long id) {
-		this.id = id;
-	}
-
 	public String getName() {
 		return name;
 	}
 
-	public void setName(String name) {
-		this.name = name;
-	}
-
 	public String getType() {
 		return type;
 	}
 
-	public void setType(String type) {
-		this.type = type;
-	}
-
 	public float getPrice() {
 		return price;
 	}
 
-	public void setPrice(float price) {
-		this.price = price;
-	}
-
 	public short getAlcoholContent() {
 		return alcoholContent;
 	}
 
-	public void setAlcoholContent(short alcoholContent) {
-		this.alcoholContent = alcoholContent;
-	}
-
 	public int getAmount() {
 		return amount;
 	}
 
-	public void setAmount(int amount) {
-		this.amount = amount;
-	}
-
 	public boolean isProhibited() {
 		return isProhibited;
 	}

diff --git a/src/test/java/bvs/test/Stock/StockTest.java b/src/test/java/bvs/test/Stock/StockTest.java
@@ -7,18 +7,17 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import bvs.controle.InMemoryDB;
-import bvs.controle.StockControl;
+import bvs.controller.InMemoryDB;
+import bvs.controller.StockControl;
 import bvs.entity.Beverage;
 
 public class StockTest {
-	private bvs.controle.StockControl stock;
-	private ArrayList<Beverage> beverage;
+	private bvs.controller.StockControl stock;
 	private InMemoryDB db;
 
 	@Before
 	public void setUp() {
-		beverage = new ArrayList<>();
+		ArrayList<Beverage> beverage = new ArrayList<>();
 		db = new InMemoryDB(beverage);
 		stock = new StockControl(db);
 

diff --git a/src/test/java/bvs/test/bebida/BebidaControlTest.java b/src/test/java/bvs/test/bebida/BebidaControlTest.java
@@ -11,22 +11,21 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import bvs.controle.BeverageControl;
-import bvs.controle.InMemoryDB;
-import bvs.controle.StockControl;
+import bvs.controller.BeverageControl;
+import bvs.controller.InMemoryDB;
+import bvs.controller.StockControl;
 import bvs.entity.Beverage;
 
 public class BebidaControlTest {
-
-	private ArrayList<Beverage> beverage;
+
 	private InMemoryDB db;
 	private BeverageControl beverageControl;
-	private StockControl stock;
+
 	@Before
 	public void setUp() {
-		beverage = new ArrayList<>();
+		ArrayList<Beverage> beverage = new ArrayList<>();
 		db = new InMemoryDB(beverage);
-		stock = new StockControl(db);
+		StockControl stock = new StockControl(db);
 		beverageControl = new BeverageControl(db, stock);
 		Beverage b1 = new Beverage(1, "Ninnoff", "Vodka", 8.99f, (short)20, 120);
 		Beverage b2 = new Beverage(2, "Fogo Verde", "Absinto", 190.00f,(short)12, 750);