Skip to content
GitLab
Explore
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
kebidge
ShoppingApp
Commits
e8c0a006
Commit
e8c0a006
authored
3 years ago
by
Kutzner
Browse files
Options
Download
Email Patches
Plain Diff
delete item
parent
2d8f3574
master
dev
1 merge request
!1
Dev
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
pom.xml
+4
-4
pom.xml
src/main/java/de/kebidge/middleware/MiddlewareApplication.java
+12
-0
...ain/java/de/kebidge/middleware/MiddlewareApplication.java
src/main/java/de/kebidge/middleware/ShoppingAPI.java
+8
-10
src/main/java/de/kebidge/middleware/ShoppingAPI.java
src/main/java/de/kebidge/middleware/ShoppingItem.java
+1
-1
src/main/java/de/kebidge/middleware/ShoppingItem.java
src/main/java/de/kebidge/middleware/ShoppingItemRepository.java
+1
-1
...in/java/de/kebidge/middleware/ShoppingItemRepository.java
src/main/resources/application.properties
+3
-3
src/main/resources/application.properties
src/test/java/de/kebidge/middleware/MiddlewareApplicationTests.java
+1
-1
...ava/de/kebidge/middleware/MiddlewareApplicationTests.java
with
30 additions
and
20 deletions
+30
-20
pom.xml
+
4
-
4
View file @
e8c0a006
...
@@ -8,11 +8,11 @@
...
@@ -8,11 +8,11 @@
<version>
2.5.6
</version>
<version>
2.5.6
</version>
<relativePath/>
<!-- lookup parent from repository -->
<relativePath/>
<!-- lookup parent from repository -->
</parent>
</parent>
<groupId>
de.
hft-stuttg
ar
t
</groupId>
<groupId>
de.
kebidge.middlew
ar
e
</groupId>
<artifactId>
middleware
</artifactId>
<artifactId>
shopping-app
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
<version>
0.0.1-SNAPSHOT
</version>
<name>
middleware
</name>
<name>
ShoppingApp
</name>
<description>
Demo project for Spring Boot
</description>
<description>
Shopping List Application
</description>
<properties>
<properties>
<java.version>
11
</java.version>
<java.version>
11
</java.version>
</properties>
</properties>
...
...
This diff is collapsed.
Click to expand it.
src/main/java/de/
hftstuttgart
/middleware/MiddlewareApplication.java
→
src/main/java/de/
kebidge
/middleware/MiddlewareApplication.java
+
12
-
0
View file @
e8c0a006
package
de.
hftstuttgart
.middleware
;
package
de.
kebidge
.middleware
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
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
@SpringBootApplication
public
class
MiddlewareApplication
{
public
class
MiddlewareApplication
{
...
@@ -12,25 +9,4 @@ public class MiddlewareApplication {
...
@@ -12,25 +9,4 @@ public class MiddlewareApplication {
public
static
void
main
(
String
[]
args
)
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
MiddlewareApplication
.
class
,
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
This diff is collapsed.
Click to expand it.
src/main/java/de/
hftstuttgart
/middleware/ShoppingAPI.java
→
src/main/java/de/
kebidge
/middleware/ShoppingAPI.java
+
8
-
10
View file @
e8c0a006
package
de.
hftstuttgart
.middleware
;
package
de.
kebidge
.middleware
;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Iterator
;
import
java.util.Iterator
;
...
@@ -24,11 +24,6 @@ public class ShoppingAPI {
...
@@ -24,11 +24,6 @@ public class ShoppingAPI {
Logger
logger
=
LoggerFactory
.
getLogger
(
ShoppingAPI
.
class
);
Logger
logger
=
LoggerFactory
.
getLogger
(
ShoppingAPI
.
class
);
/*public ShoppingAPI(ShoppingItemRepository shoppingItemRepository) {
this.shoppingItemRepository = shoppingItemRepository;
}*/
@GetMapping
(
"/shoppingItem"
)
@GetMapping
(
"/shoppingItem"
)
public
ArrayList
<
Optional
<
ShoppingItem
>>
getShoppingItems
()
{
public
ArrayList
<
Optional
<
ShoppingItem
>>
getShoppingItems
()
{
...
@@ -40,9 +35,6 @@ public class ShoppingAPI {
...
@@ -40,9 +35,6 @@ public class ShoppingAPI {
Iterator
<
ShoppingItem
>
itemTerator
=
iterableItems
.
iterator
();
Iterator
<
ShoppingItem
>
itemTerator
=
iterableItems
.
iterator
();
// TODO: That should be work
//Iterator<Optional<ShoppingItem>> optionalItemTerator = optionalItemList.iterator();
logger
.
info
(
"----- GET Item -----"
);
logger
.
info
(
"----- GET Item -----"
);
while
(
itemTerator
.
hasNext
()){
while
(
itemTerator
.
hasNext
()){
...
@@ -187,11 +179,17 @@ public class ShoppingAPI {
...
@@ -187,11 +179,17 @@ public class ShoppingAPI {
if
(
itemAmount
>
1
)
{
if
(
itemAmount
>
1
)
{
/****************************************************
* ID bring nix da automatisch generiert !!!!!!!
* is aber nich schlimm
* amount ist ja richtig
*/
ShoppingItem
newItem
=
new
ShoppingItem
(
item
);
ShoppingItem
newItem
=
new
ShoppingItem
(
item
);
newItem
.
setAmount
(
itemAmount
-
1
);
newItem
.
setAmount
(
itemAmount
-
1
);
newItem
.
setId
(
itemId
);
newItem
.
setId
(
itemId
);
shoppingItemRepository
.
delete
(
tempItem
);
//
shoppingItemRepository.delete(tempItem);
logger
.
info
(
"----- DELETE Item (Amount) -----"
);
logger
.
info
(
"----- DELETE Item (Amount) -----"
);
logger
.
info
(
"id = {}"
,
newItem
.
id
);
logger
.
info
(
"id = {}"
,
newItem
.
id
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/de/
hftstuttgart
/middleware/ShoppingItem.java
→
src/main/java/de/
kebidge
/middleware/ShoppingItem.java
+
1
-
1
View file @
e8c0a006
package
de.
hftstuttgart
.middleware
;
package
de.
kebidge
.middleware
;
import
javax.persistence.Entity
;
import
javax.persistence.Entity
;
import
javax.persistence.GeneratedValue
;
import
javax.persistence.GeneratedValue
;
...
...
This diff is collapsed.
Click to expand it.
src/main/java/de/
hftstuttgart
/middleware/ShoppingItemRepository.java
→
src/main/java/de/
kebidge
/middleware/ShoppingItemRepository.java
+
1
-
1
View file @
e8c0a006
package
de.
hftstuttgart
.middleware
;
package
de.
kebidge
.middleware
;
import
org.springframework.data.repository.CrudRepository
;
import
org.springframework.data.repository.CrudRepository
;
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/application.properties
+
3
-
3
View file @
e8c0a006
spring.datasource.url
=
jdbc:postgresql://localhost:5432/ke
vindb
spring.datasource.url
=
jdbc:postgresql://localhost:5432/ke
bidgedata
spring.datasource.username
=
ke
vin
spring.datasource.username
=
ke
bidge
spring.datasource.password
=
password
spring.datasource.password
=
password
spring.jpa.hibernate.ddl-auto
=
update
spring.jpa.hibernate.ddl-auto
=
update
server.port
=
8181
server.port
=
8181
logging.level.de.hftstuttgart
=
INFO
logging.level.de.kebidge
=
INFO
\ No newline at end of file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/test/java/de/
hftstuttgart
/middleware/MiddlewareApplicationTests.java
→
src/test/java/de/
kebidge
/middleware/MiddlewareApplicationTests.java
+
1
-
1
View file @
e8c0a006
package
de.
hftstuttgart
.middleware
;
package
de.
kebidge
.middleware
;
import
org.junit.jupiter.api.Test
;
import
org.junit.jupiter.api.Test
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Snippets