From 0aca8a95f28934ab17c21d289c65ac1dda2fe25d Mon Sep 17 00:00:00 2001
From: TiagoRG <35657250+TiagoRG@users.noreply.github.com>
Date: Thu, 4 May 2023 15:41:45 +0100
Subject: [PATCH] [POO] simplified enums fromString

---
 .../2semestre/poo/src/aula08/ex1/Enums/EngineType.java |  6 +++---
 .../poo/src/aula08/ex2/Enums/AlimentType.java          | 10 +++++-----
 1ano/2semestre/poo/src/aula08/ex2/Enums/DishType.java  |  8 ++++----
 1ano/2semestre/poo/src/aula08/ex2/Enums/FishState.java |  6 +++---
 1ano/2semestre/poo/src/aula08/ex2/Enums/MeatType.java  | 10 +++++-----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/1ano/2semestre/poo/src/aula08/ex1/Enums/EngineType.java b/1ano/2semestre/poo/src/aula08/ex1/Enums/EngineType.java
index 743da2c..7bd2da0 100644
--- a/1ano/2semestre/poo/src/aula08/ex1/Enums/EngineType.java
+++ b/1ano/2semestre/poo/src/aula08/ex1/Enums/EngineType.java
@@ -4,9 +4,9 @@ public enum EngineType {
     FUEL, ELECTRIC;
 
     public static EngineType fromString(String string) {
-        return switch (string) {
-            case "FUEL", "Fuel", "fuel" -> EngineType.FUEL;
-            case "ELECTRIC", "Electric", "electric" -> EngineType.ELECTRIC;
+        return switch (string.toUpperCase()) {
+            case "FUEL" -> FUEL;
+            case "ELECTRIC" -> ELECTRIC;
             default -> null;
         };
     }
diff --git a/1ano/2semestre/poo/src/aula08/ex2/Enums/AlimentType.java b/1ano/2semestre/poo/src/aula08/ex2/Enums/AlimentType.java
index 5bfc701..4cb8336 100644
--- a/1ano/2semestre/poo/src/aula08/ex2/Enums/AlimentType.java
+++ b/1ano/2semestre/poo/src/aula08/ex2/Enums/AlimentType.java
@@ -4,11 +4,11 @@ public enum AlimentType {
     MEAT, FISH, CEREAL, VEGETABLE;
 
     public static AlimentType fromString(String string) {
-        return switch (string) {
-            case "MEAT", "Meat", "meat" -> MEAT;
-            case "FISH", "Fish", "fish" -> FISH;
-            case "CEREAL", "Cereal", "cereal" -> CEREAL;
-            case "VEGETABLE", "Vegetable", "vegetable" -> VEGETABLE;
+        return switch (string.toUpperCase()) {
+            case "MEAT"-> MEAT;
+            case "FISH" -> FISH;
+            case "CEREAL" -> CEREAL;
+            case "VEGETABLE" -> VEGETABLE;
             default -> null;
         };
     }
diff --git a/1ano/2semestre/poo/src/aula08/ex2/Enums/DishType.java b/1ano/2semestre/poo/src/aula08/ex2/Enums/DishType.java
index 90098e5..d5d33e4 100644
--- a/1ano/2semestre/poo/src/aula08/ex2/Enums/DishType.java
+++ b/1ano/2semestre/poo/src/aula08/ex2/Enums/DishType.java
@@ -4,10 +4,10 @@ public enum DishType {
     NORMAL, VEGAN, DIET;
 
     public static DishType fromString(String string) {
-        return switch (string) {
-            case "NORMAL", "Normal", "normal" -> NORMAL;
-            case "VEGAN", "Vegan", "vegan" -> VEGAN;
-            case "DIET", "Diet", "diet" -> DIET;
+        return switch (string.toUpperCase()) {
+            case "NORMAL" -> NORMAL;
+            case "VEGAN" -> VEGAN;
+            case "DIET" -> DIET;
             default -> null;
         };
     }
diff --git a/1ano/2semestre/poo/src/aula08/ex2/Enums/FishState.java b/1ano/2semestre/poo/src/aula08/ex2/Enums/FishState.java
index ee33518..db2824b 100644
--- a/1ano/2semestre/poo/src/aula08/ex2/Enums/FishState.java
+++ b/1ano/2semestre/poo/src/aula08/ex2/Enums/FishState.java
@@ -4,9 +4,9 @@ public enum FishState {
     FRESH, FROZEN;
 
     public static FishState fromString(String string) {
-        return switch (string) {
-            case "FRESH", "Fresh", "fresh" -> FRESH;
-            case "FROZEN", "Frozen", "frozen" -> FROZEN;
+        return switch (string.toUpperCase()) {
+            case "FRESH"-> FRESH;
+            case "FROZEN" -> FROZEN;
             default -> null;
         };
     }
diff --git a/1ano/2semestre/poo/src/aula08/ex2/Enums/MeatType.java b/1ano/2semestre/poo/src/aula08/ex2/Enums/MeatType.java
index 73709d6..ff9f6dc 100644
--- a/1ano/2semestre/poo/src/aula08/ex2/Enums/MeatType.java
+++ b/1ano/2semestre/poo/src/aula08/ex2/Enums/MeatType.java
@@ -4,11 +4,11 @@ public enum MeatType {
     COW, PORK, TURKEY, CHICKEN;
 
     public static MeatType fromString(String string) {
-        return switch (string) {
-            case "COW", "Cow", "cow" -> COW;
-            case "PORK", "Pork", "pork" -> PORK;
-            case "TURKEY", "Turkey", "turkey" -> TURKEY;
-            case "CHICKEN", "Chicken", "chicken" -> CHICKEN;
+        return switch (string.toUpperCase()) {
+            case "COW" -> COW;
+            case "PORK" -> PORK;
+            case "TURKEY" -> TURKEY;
+            case "CHICKEN" -> CHICKEN;
             default -> null;
         };
     }