From e8c0a0069d71ca48ed9f22fd13da2dd98f8d1b66 Mon Sep 17 00:00:00 2001 From: Kevin Kutzner Date: Thu, 25 Nov 2021 23:41:14 +0100 Subject: [PATCH] delete item --- pom.xml | 8 ++--- .../middleware/MiddlewareApplication.java | 36 ------------------- .../middleware/MiddlewareApplication.java | 12 +++++++ .../middleware/ShoppingAPI.java | 18 +++++----- .../middleware/ShoppingItem.java | 2 +- .../middleware/ShoppingItemRepository.java | 2 +- src/main/resources/application.properties | 6 ++-- .../MiddlewareApplicationTests.java | 2 +- 8 files changed, 30 insertions(+), 56 deletions(-) delete mode 100644 src/main/java/de/hftstuttgart/middleware/MiddlewareApplication.java create mode 100644 src/main/java/de/kebidge/middleware/MiddlewareApplication.java rename src/main/java/de/{hftstuttgart => kebidge}/middleware/ShoppingAPI.java (95%) rename src/main/java/de/{hftstuttgart => kebidge}/middleware/ShoppingItem.java (96%) rename src/main/java/de/{hftstuttgart => kebidge}/middleware/ShoppingItemRepository.java (87%) rename src/test/java/de/{hftstuttgart => kebidge}/middleware/MiddlewareApplicationTests.java (83%) diff --git a/pom.xml b/pom.xml index 477aece..061bb1d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,11 +8,11 @@ 2.5.6 - de.hft-stuttgart - middleware + de.kebidge.middleware + shopping-app 0.0.1-SNAPSHOT - middleware - Demo project for Spring Boot + ShoppingApp + Shopping List Application 11 diff --git a/src/main/java/de/hftstuttgart/middleware/MiddlewareApplication.java b/src/main/java/de/hftstuttgart/middleware/MiddlewareApplication.java deleted file mode 100644 index 1c783c2..0000000 --- a/src/main/java/de/hftstuttgart/middleware/MiddlewareApplication.java +++ /dev/null @@ -1,36 +0,0 @@ -package de.hftstuttgart.middleware; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -//import org.springframework.web.bind.annotation.GetMapping; -//import org.springframework.web.bind.annotation.PathVariable; -//import org.springframework.web.bind.annotation.RestController; - -@SpringBootApplication -public class MiddlewareApplication { - - public static void main(String[] args) { - SpringApplication.run(MiddlewareApplication.class, args); - } - - /* - @RestController - class Hello { - - @GetMapping("/") - public String sayHello() { - return "Hello Kevin"; - } - - @GetMapping("/hello") - public String sayHelloAgain() { - return "Hello Kevin, from another REST Endpoint"; - } - - @GetMapping("/hello/{parameter}") - public String sayHelloWithParameter(@PathVariable String parameter) { - return "Hello Kevin, from another REST Endpoint " + parameter; - } - } - */ -} \ No newline at end of file diff --git a/src/main/java/de/kebidge/middleware/MiddlewareApplication.java b/src/main/java/de/kebidge/middleware/MiddlewareApplication.java new file mode 100644 index 0000000..ee5b5a8 --- /dev/null +++ b/src/main/java/de/kebidge/middleware/MiddlewareApplication.java @@ -0,0 +1,12 @@ +package de.kebidge.middleware; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class MiddlewareApplication { + + public static void main(String[] args) { + SpringApplication.run(MiddlewareApplication.class, args); + } +} \ No newline at end of file diff --git a/src/main/java/de/hftstuttgart/middleware/ShoppingAPI.java b/src/main/java/de/kebidge/middleware/ShoppingAPI.java similarity index 95% rename from src/main/java/de/hftstuttgart/middleware/ShoppingAPI.java rename to src/main/java/de/kebidge/middleware/ShoppingAPI.java index f07d0f8..f7da15c 100644 --- a/src/main/java/de/hftstuttgart/middleware/ShoppingAPI.java +++ b/src/main/java/de/kebidge/middleware/ShoppingAPI.java @@ -1,4 +1,4 @@ -package de.hftstuttgart.middleware; +package de.kebidge.middleware; import java.util.ArrayList; import java.util.Iterator; @@ -24,11 +24,6 @@ public class ShoppingAPI { Logger logger = LoggerFactory.getLogger(ShoppingAPI.class); - /*public ShoppingAPI(ShoppingItemRepository shoppingItemRepository) { - this.shoppingItemRepository = shoppingItemRepository; - }*/ - - @GetMapping("/shoppingItem") public ArrayList> getShoppingItems() { @@ -40,9 +35,6 @@ public class ShoppingAPI { Iterator itemTerator = iterableItems.iterator(); - // TODO: That should be work - //Iterator> optionalItemTerator = optionalItemList.iterator(); - logger.info("----- GET Item -----"); while(itemTerator.hasNext()){ @@ -187,11 +179,17 @@ public class ShoppingAPI { if(itemAmount > 1) { + /**************************************************** + * ID bring nix da automatisch generiert !!!!!!! + * is aber nich schlimm + * amount ist ja richtig + */ + ShoppingItem newItem = new ShoppingItem(item); newItem.setAmount(itemAmount - 1); newItem.setId(itemId); - shoppingItemRepository.delete(tempItem); + //shoppingItemRepository.delete(tempItem); logger.info("----- DELETE Item (Amount) -----"); logger.info("id = {}", newItem.id); diff --git a/src/main/java/de/hftstuttgart/middleware/ShoppingItem.java b/src/main/java/de/kebidge/middleware/ShoppingItem.java similarity index 96% rename from src/main/java/de/hftstuttgart/middleware/ShoppingItem.java rename to src/main/java/de/kebidge/middleware/ShoppingItem.java index 1f80115..135090c 100644 --- a/src/main/java/de/hftstuttgart/middleware/ShoppingItem.java +++ b/src/main/java/de/kebidge/middleware/ShoppingItem.java @@ -1,4 +1,4 @@ -package de.hftstuttgart.middleware; +package de.kebidge.middleware; import javax.persistence.Entity; import javax.persistence.GeneratedValue; diff --git a/src/main/java/de/hftstuttgart/middleware/ShoppingItemRepository.java b/src/main/java/de/kebidge/middleware/ShoppingItemRepository.java similarity index 87% rename from src/main/java/de/hftstuttgart/middleware/ShoppingItemRepository.java rename to src/main/java/de/kebidge/middleware/ShoppingItemRepository.java index dd4f573..ed0b6fa 100644 --- a/src/main/java/de/hftstuttgart/middleware/ShoppingItemRepository.java +++ b/src/main/java/de/kebidge/middleware/ShoppingItemRepository.java @@ -1,4 +1,4 @@ -package de.hftstuttgart.middleware; +package de.kebidge.middleware; import org.springframework.data.repository.CrudRepository; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 72e2221..da3ef5c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,9 +1,9 @@ -spring.datasource.url=jdbc:postgresql://localhost:5432/kevindb -spring.datasource.username=kevin +spring.datasource.url=jdbc:postgresql://localhost:5432/kebidgedata +spring.datasource.username=kebidge spring.datasource.password=password spring.jpa.hibernate.ddl-auto=update server.port = 8181 -logging.level.de.hftstuttgart=INFO \ No newline at end of file +logging.level.de.kebidge=INFO \ No newline at end of file diff --git a/src/test/java/de/hftstuttgart/middleware/MiddlewareApplicationTests.java b/src/test/java/de/kebidge/middleware/MiddlewareApplicationTests.java similarity index 83% rename from src/test/java/de/hftstuttgart/middleware/MiddlewareApplicationTests.java rename to src/test/java/de/kebidge/middleware/MiddlewareApplicationTests.java index 89cecbd..491bd46 100644 --- a/src/test/java/de/hftstuttgart/middleware/MiddlewareApplicationTests.java +++ b/src/test/java/de/kebidge/middleware/MiddlewareApplicationTests.java @@ -1,4 +1,4 @@ -package de.hftstuttgart.middleware; +package de.kebidge.middleware; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; -- GitLab