From b7f84e07156013dcdc62050be1592084b75e5d19 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Tue, 14 Apr 2020 09:57:09 +0200 Subject: [PATCH 1/9] Remove HelloWorld and Create User Service --- .../geotime/controller/HelloWorldController.java | 15 --------------- .../src/main/java/de/hft/geotime/user/User.java | 4 ++++ .../java/de/hft/geotime/user/UserController.java | 4 ++++ .../java/de/hft/geotime/user/UserRepository.java | 4 ++++ .../java/de/hft/geotime/user/UserService.java | 4 ++++ 5 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 backend/src/main/java/de/hft/geotime/controller/HelloWorldController.java create mode 100644 backend/src/main/java/de/hft/geotime/user/User.java create mode 100644 backend/src/main/java/de/hft/geotime/user/UserController.java create mode 100644 backend/src/main/java/de/hft/geotime/user/UserRepository.java create mode 100644 backend/src/main/java/de/hft/geotime/user/UserService.java diff --git a/backend/src/main/java/de/hft/geotime/controller/HelloWorldController.java b/backend/src/main/java/de/hft/geotime/controller/HelloWorldController.java deleted file mode 100644 index ba3eb4e..0000000 --- a/backend/src/main/java/de/hft/geotime/controller/HelloWorldController.java +++ /dev/null @@ -1,15 +0,0 @@ -package de.hft.geotime.controller; - -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class HelloWorldController { - - @RequestMapping("/hello/{name}") - public String helloWorld(@PathVariable String name) { - return "Hello " + name; - } - -} diff --git a/backend/src/main/java/de/hft/geotime/user/User.java b/backend/src/main/java/de/hft/geotime/user/User.java new file mode 100644 index 0000000..85c6fd7 --- /dev/null +++ b/backend/src/main/java/de/hft/geotime/user/User.java @@ -0,0 +1,4 @@ +package de.hft.geotime.user; + +public class User { +} diff --git a/backend/src/main/java/de/hft/geotime/user/UserController.java b/backend/src/main/java/de/hft/geotime/user/UserController.java new file mode 100644 index 0000000..5bc6f92 --- /dev/null +++ b/backend/src/main/java/de/hft/geotime/user/UserController.java @@ -0,0 +1,4 @@ +package de.hft.geotime.user; + +public class UserController { +} diff --git a/backend/src/main/java/de/hft/geotime/user/UserRepository.java b/backend/src/main/java/de/hft/geotime/user/UserRepository.java new file mode 100644 index 0000000..6d85b5a --- /dev/null +++ b/backend/src/main/java/de/hft/geotime/user/UserRepository.java @@ -0,0 +1,4 @@ +package de.hft.geotime.user; + +public class UserRepository { +} diff --git a/backend/src/main/java/de/hft/geotime/user/UserService.java b/backend/src/main/java/de/hft/geotime/user/UserService.java new file mode 100644 index 0000000..b5bfb51 --- /dev/null +++ b/backend/src/main/java/de/hft/geotime/user/UserService.java @@ -0,0 +1,4 @@ +package de.hft.geotime.user; + +public class UserService { +} From 7bf61102902145828f2ae7d73be466355ed14088 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Tue, 14 Apr 2020 09:59:23 +0200 Subject: [PATCH 2/9] Add some config files and Run config --- backend/.idea/compiler.xml | 6 ++++++ backend/.idea/misc.xml | 5 ++++- backend/.idea/runConfigurations/GeotimeApplication.xml | 10 ++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 backend/.idea/compiler.xml create mode 100644 backend/.idea/runConfigurations/GeotimeApplication.xml diff --git a/backend/.idea/compiler.xml b/backend/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/backend/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/backend/.idea/misc.xml b/backend/.idea/misc.xml index 25d34a4..5821b2f 100644 --- a/backend/.idea/misc.xml +++ b/backend/.idea/misc.xml @@ -1,5 +1,8 @@ - + + + + \ No newline at end of file diff --git a/backend/.idea/runConfigurations/GeotimeApplication.xml b/backend/.idea/runConfigurations/GeotimeApplication.xml new file mode 100644 index 0000000..81f70ed --- /dev/null +++ b/backend/.idea/runConfigurations/GeotimeApplication.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file From 73aef924faaf337df0c09ff459f2b27485fb20c3 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Tue, 14 Apr 2020 10:20:15 +0200 Subject: [PATCH 3/9] Add data-jpa dependencies --- backend/build.gradle | 2 ++ backend/gradle/wrapper/gradle-wrapper.properties | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index 5739e9c..85ffed8 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -15,6 +15,8 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-rest' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + runtimeOnly 'com.h2database:h2' testImplementation('org.springframework.boot:spring-boot-starter-test') { exclude group: 'org.junit.vintage', module: 'junit-vintage-engine' } diff --git a/backend/gradle/wrapper/gradle-wrapper.properties b/backend/gradle/wrapper/gradle-wrapper.properties index a4b4429..d7c4d4e 100644 --- a/backend/gradle/wrapper/gradle-wrapper.properties +++ b/backend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Tue Apr 14 10:03:02 CEST 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME From 41338738b085858ef2ae6b9258b12804be0f8325 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Tue, 14 Apr 2020 13:56:15 +0200 Subject: [PATCH 4/9] Add lombok dependencies --- backend/.gitignore | 2 ++ backend/.idea/compiler.xml | 10 ++++++++++ backend/build.gradle | 1 + 3 files changed, 13 insertions(+) diff --git a/backend/.gitignore b/backend/.gitignore index 0781ed5..afab06e 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -116,3 +116,5 @@ fabric.properties ### VS Code ### .vscode/ + +lombok.config diff --git a/backend/.idea/compiler.xml b/backend/.idea/compiler.xml index fb7f4a8..eb684d8 100644 --- a/backend/.idea/compiler.xml +++ b/backend/.idea/compiler.xml @@ -1,6 +1,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/backend/build.gradle b/backend/build.gradle index 85ffed8..ebf56f5 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -1,6 +1,7 @@ plugins { id 'org.springframework.boot' version '2.2.6.RELEASE' id 'io.spring.dependency-management' version '1.0.9.RELEASE' + id "io.freefair.lombok" version "5.0.0-rc6" id 'java' } From 9ef00cc0924b5bbcd1090d14aae3cf8f67b11009 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Fri, 17 Apr 2020 18:02:57 +0200 Subject: [PATCH 5/9] Create User entity --- .../main/java/de/hft/geotime/user/User.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/backend/src/main/java/de/hft/geotime/user/User.java b/backend/src/main/java/de/hft/geotime/user/User.java index 85c6fd7..f697365 100644 --- a/backend/src/main/java/de/hft/geotime/user/User.java +++ b/backend/src/main/java/de/hft/geotime/user/User.java @@ -1,4 +1,30 @@ package de.hft.geotime.user; +import lombok.Data; + +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; + +@Data +@Entity public class User { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private long id; + private String username; + private String firstname; + private String lastname; + //TODO: roleid(FK) + //TODO: timetrackaccounts[List] + + protected User() { + } + + public User(String firstname, String lastname) { + this.firstname = firstname; + this.lastname = lastname; + } } From ce81ff07ba5a90f16814de02216ac503777d4b08 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Fri, 17 Apr 2020 18:03:36 +0200 Subject: [PATCH 6/9] Remove UserController, Add UserRepository --- backend/src/main/java/de/hft/geotime/user/UserController.java | 4 ---- backend/src/main/java/de/hft/geotime/user/UserRepository.java | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 backend/src/main/java/de/hft/geotime/user/UserController.java diff --git a/backend/src/main/java/de/hft/geotime/user/UserController.java b/backend/src/main/java/de/hft/geotime/user/UserController.java deleted file mode 100644 index 5bc6f92..0000000 --- a/backend/src/main/java/de/hft/geotime/user/UserController.java +++ /dev/null @@ -1,4 +0,0 @@ -package de.hft.geotime.user; - -public class UserController { -} diff --git a/backend/src/main/java/de/hft/geotime/user/UserRepository.java b/backend/src/main/java/de/hft/geotime/user/UserRepository.java index 6d85b5a..1da5103 100644 --- a/backend/src/main/java/de/hft/geotime/user/UserRepository.java +++ b/backend/src/main/java/de/hft/geotime/user/UserRepository.java @@ -1,4 +1,6 @@ package de.hft.geotime.user; -public class UserRepository { +import org.springframework.data.repository.CrudRepository; + +public interface UserRepository extends CrudRepository { } From b40d87375a94444db0227fbefa90fde581c7149f Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Fri, 17 Apr 2020 18:44:06 +0200 Subject: [PATCH 7/9] Make UserRepository from type PagingAndSorting --- .../java/de/hft/geotime/user/UserRepository.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/de/hft/geotime/user/UserRepository.java b/backend/src/main/java/de/hft/geotime/user/UserRepository.java index 1da5103..9b303ba 100644 --- a/backend/src/main/java/de/hft/geotime/user/UserRepository.java +++ b/backend/src/main/java/de/hft/geotime/user/UserRepository.java @@ -1,6 +1,14 @@ package de.hft.geotime.user; -import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.PagingAndSortingRepository; +import org.springframework.data.rest.core.annotation.RepositoryRestResource; + +import javax.websocket.server.PathParam; +import java.util.List; + +@RepositoryRestResource +public interface UserRepository extends PagingAndSortingRepository { + + List findByUsername(@PathParam("username") String username); -public interface UserRepository extends CrudRepository { } From dd94b40110b1efeb851373a24b282325d72d3c16 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Fri, 17 Apr 2020 18:44:31 +0200 Subject: [PATCH 8/9] Update base endpoint to "/api" --- backend/src/main/resources/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index d34b83e..c3c4d51 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -1 +1,2 @@ -server.port=80 \ No newline at end of file +server.port=80 +spring.data.rest.basePath=/api \ No newline at end of file From 916524eed5e9018763367f72f1b05666e9681af0 Mon Sep 17 00:00:00 2001 From: Marcel Schwarz Date: Fri, 17 Apr 2020 18:45:22 +0200 Subject: [PATCH 9/9] Remove UserService because it's not needed for a data entity --- backend/src/main/java/de/hft/geotime/user/UserService.java | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 backend/src/main/java/de/hft/geotime/user/UserService.java diff --git a/backend/src/main/java/de/hft/geotime/user/UserService.java b/backend/src/main/java/de/hft/geotime/user/UserService.java deleted file mode 100644 index b5bfb51..0000000 --- a/backend/src/main/java/de/hft/geotime/user/UserService.java +++ /dev/null @@ -1,4 +0,0 @@ -package de.hft.geotime.user; - -public class UserService { -}