Merge remote-tracking branch 'origin/master'

Waffaru · Apr 25, 2018 · e108f71 · e108f71
2 parents 69e652b + 501ebbb
commit e108f71
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/fi/pizzalovers/blogbackend/MyRestController.java b/src/main/java/fi/pizzalovers/blogbackend/MyRestController.java
@@ -57,8 +57,8 @@ public Iterable<BlogPost> getBlog(){
 
     //curl -v http://localhost:8080/blogPost/2
     @RequestMapping(value = "/blogpost/{blogId}", method = RequestMethod.GET)
-    public Optional<BlogPost> getBlog(@PathVariable long blogId){
-        return blogPostRepo.findById(blogId);
+    public Optional<BlogPost> getBlog(@PathVariable String blogId){
+        return blogPostRepo.findById(Long.parseLong(blogId));
     }
 
     //curl -X DELETE http://localhost:8080/blogpost/2

diff --git a/src/main/java/fi/pizzalovers/blogbackend/User.java b/src/main/java/fi/pizzalovers/blogbackend/User.java
@@ -10,7 +10,7 @@
 import java.security.SecureRandom;
 
 @Entity
-@Table(name = "users")
+@Table(name = "userna")
 public class User {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)