feature: lesen und schreiben mittels REST/Jackson

Thomas Ziemer
1 parent ab335a1a
Showing 7 changed files with 130 additions and 13 deletions
pom.xml
src/main/java/net/ziemers/swxercise/db/BaseEntity.java
src/main/java/net/ziemers/swxercise/lg/user/Profile.java
src/main/java/net/ziemers/swxercise/lg/user/User.java
src/main/java/net/ziemers/swxercise/lg/user/dto/UserDto.java
src/main/java/net/ziemers/swxercise/ui/RestController.java → src/main/java/net/ziemers/swxercise/ui/RestViewController.java
src/test/java/net/ziemers/swxercise/ui/RestControllerTest.java → src/test/java/net/ziemers/swxercise/ui/RestViewControllerTest.java
@@ -18,6 +18,7 @@
 		<mockito-version>2.7.22</mockito-version>
 		<dbunit-version>2.5.1</dbunit-version>
 		<slf4j-version>1.8.0-alpha0</slf4j-version>
+		<jackson-version>2.8.8.1</jackson-version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -62,6 +63,11 @@
 			<artifactId>mysql-connector-java</artifactId>
 			<version>${mysql-version}</version>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson-version}</version>
+		</dependency>
     </dependencies>
 	<build>
 		<finalName>swXercise</finalName>
@@ -6,13 +6,17 @@ import javax.persistence.MappedSuperclass;
 @MappedSuperclass
 public class BaseEntity {
-    
+
+    protected Long id;
+
     @Id
     @GeneratedValue
-    protected Long id;
-    
     public Long getId() {
         return id;
     }
+    public void setId(Long id) {
+        this.id = id;
+    }
+
 }
 \ No newline at end of file
 package net.ziemers.swxercise.lg.user;
 import javax.persistence.Entity;
+import javax.validation.constraints.NotNull;
 import net.ziemers.swxercise.db.BaseEntity;
 @Entity
 public class Profile extends BaseEntity {
+    @NotNull
+    private String username;
+
+    @NotNull
     private String passwordHash;
     private String mailaddress;
+    public Profile() {
+        super();
+    }
+
+    public Profile(final String username, final String password) {
+        this.username = username;
+        // TODO Kennwort verhashen
+        this.passwordHash = password;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
     public String getPasswordHash() {
         return passwordHash;
     }
 package net.ziemers.swxercise.lg.user;
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.OneToOne;
+import javax.validation.constraints.NotNull;
 import net.ziemers.swxercise.db.BaseEntity;
@@ -11,6 +14,18 @@ public class User extends BaseEntity {
     private String lastname;
+    @NotNull
+    private Profile profile;
+
+    public User() {
+        super();
+    }
+
+    public User(final String firstname, final String lastname) {
+        this.firstname = firstname;
+        this.lastname = lastname;
+    }
+
     public String getFirstname() {
         return firstname;
     }
@@ -27,4 +42,13 @@ public class User extends BaseEntity {
         this.lastname = lastname;
     }
+    @OneToOne(cascade = {CascadeType.ALL})
+    public Profile getProfile() {
+        return profile;
+    }
+
+    public void setProfile(Profile profile) {
+        this.profile = profile;
+    }
+
 }
+package net.ziemers.swxercise.lg.user.dto;
+
+import javax.validation.constraints.NotNull;
+
+public class UserDto {
+
+    @NotNull
+    private String username;
+
+    @NotNull
+    private String password;
+
+    private String firstname;
+
+    private String lastname;
+
+    private String mailaddress;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getFirstname() {
+        return firstname;
+    }
+
+    public String getLastname() {
+        return lastname;
+    }
+
+    public String getMailaddress() {
+        return mailaddress;
+    }
+
+}
@@ -4,20 +4,19 @@ import java.util.Collection;
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
+import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
+import net.ziemers.swxercise.lg.user.Profile;
 import net.ziemers.swxercise.lg.user.User;
+import net.ziemers.swxercise.lg.user.dto.UserDto;
 import net.ziemers.swxercise.lg.user.service.UserService;
 @ApplicationScoped
-@Path(RestController.webContextPath)
-public class RestController {
+@Path(RestViewController.webContextPath)
+public class RestViewController {
-    static final String webContextPath = "/user";
+    static final String webContextPath = "/users";
     @Inject
     private UserService userService;
@@ -36,10 +35,32 @@ public class RestController {
     }
     @GET
-    @Path("/get")
+    @Path("/all")
     @Produces(MediaType.APPLICATION_JSON)
     public Collection<User> getAllUsers() {
         return userService.findAllUsers();
     }
+    @GET
+    @Path("{id}")
+    @Produces(MediaType.APPLICATION_JSON)
+    public User getById(@PathParam("id") Long id) {
+        return userService.findUser(id);
+    }
+
+    @PUT
+    @Path("/user")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces({MediaType.TEXT_PLAIN})
+    public String postUser(UserDto userDto) throws Exception {
+        final User user = new User(userDto.getFirstname(), userDto.getLastname());
+        final Profile profile = new Profile(userDto.getUsername(), userDto.getPassword());
+
+        // TODO hierfür benötigen wir einen Mapper
+        user.setProfile(profile);
+        userService.saveUser(user);
+
+        return "Ok";
+    }
+
 }
@@ -7,10 +7,10 @@ import org.mockito.InjectMocks;
 import org.mockito.junit.MockitoJUnitRunner;
 @RunWith(MockitoJUnitRunner.class)
-public class RestControllerTest {
+public class RestViewControllerTest {
     @InjectMocks
-    private RestController underTest;
+    private RestViewController underTest;
     @Test
     public void test() {