iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update pom and reformat code

Browse Source
This commit is contained in:
Seun Matt 2017-12-18 20:22:31 +01:00
parent deeb2b20f3
commit 457baf6015
6 changed files with 75 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vraptor/pom.xml
View File

@ -17,7 +17,7 @@
<dependency> <dependency>
<groupId>br.com.caelum</groupId> <groupId>br.com.caelum</groupId>
<artifactId>vraptor</artifactId> <artifactId>vraptor</artifactId>
<version>4.2.0-RC3</version> <version>4.2.0.Final</version>
</dependency> </dependency>
<dependency> <dependency>

67
vraptor/src/main/java/com/baeldung/controllers/AuthController.java
View File

@ -42,30 +42,32 @@ public class AuthController {
@Post("/register") @Post("/register")
public void register(User user, HttpServletRequest request) { public void register(User user, HttpServletRequest request) {
validator.validate(user); validator.validate(user);
if(validator.hasErrors()) { if(validator.hasErrors()) {
result.include("errors", validator.getErrors()); result.include("errors", validator.getErrors());
} }
validator.onErrorRedirectTo(this).registrationForm(); validator.onErrorRedirectTo(this).registrationForm();
if(!user.getPassword().equals(request.getParameter("password_confirmation"))) { if(!user.getPassword()
result.include("error", "Passwords Do Not Match"); .equals(request.getParameter("password_confirmation"))) {
result.redirectTo(this).registrationForm(); result.include("error", "Passwords Do Not Match");
} result.redirectTo(this).registrationForm();
}
user.setPassword(BCrypt.hashpw(user.getPassword(), BCrypt.gensalt())); user.setPassword(
BCrypt.hashpw(user.getPassword(), BCrypt.gensalt()));
Object resp = userDao.add(user); Object resp = userDao.add(user);
if(resp != null) { if(resp != null) {
result.include("status", "Registration Successful! Now Login"); result.include("status", "Registration Successful! Now Login");
result.redirectTo(this).loginForm(); result.redirectTo(this).loginForm();
} else { } else {
result.include("error", "There was an error during registration"); result.include("error", "There was an error during registration");
result.redirectTo(this).registrationForm(); result.redirectTo(this).registrationForm();
} }
} }
@Get("/login") @Get("/login")
@ -76,19 +78,22 @@ public class AuthController {
@Post("/login") @Post("/login")
public void login(HttpServletRequest request) { public void login(HttpServletRequest request) {
if (request.getParameter("user.email").isEmpty() || request.getParameter("user.password").isEmpty()) { String password = request.getParameter("user.password");
result.include("error", "Email/Password is Required!"); String email = request.getParameter("user.email");
result.redirectTo(AuthController.class).loginForm();
}
User user = userDao.findByEmail(request.getParameter("user.email")); if(email.isEmpty() || password.isEmpty()) {
if (Objects.nonNull(user) && BCrypt.checkpw(request.getParameter("user.password"), user.getPassword())) { result.include("error", "Email/Password is Required!");
userInfo.setUser(user); result.redirectTo(AuthController.class).loginForm();
result.include("status", "Login Successful!"); }
result.redirectTo(IndexController.class).index();
} else { User user = userDao.findByEmail(email);
result.include("error", "Email/Password Does Not Match!"); if(user != null && BCrypt.checkpw(password, user.getPassword())) {
result.redirectTo(AuthController.class).loginForm(); userInfo.setUser(user);
} result.include("status", "Login Successful!");
result.redirectTo(IndexController.class).index();
} else {
result.include("error", "Email/Password Does Not Match!");
result.redirectTo(AuthController.class).loginForm();
}
} }
} }

6
vraptor/src/main/java/com/baeldung/controllers/IndexController.java
View File

@ -23,14 +23,14 @@ public class IndexController {
@Inject @Inject
public IndexController(Result result, PostDao postDao) { public IndexController(Result result, PostDao postDao) {
this.result = result; this.result = result;
this.postDao = postDao; this.postDao = postDao;
} }
@Path("/") @Path("/")
public void index() { public void index() {
result.include("posts", postDao.all()); result.include("posts", postDao.all());
result.use(FreemarkerView.class).withTemplate("index"); result.use(FreemarkerView.class).withTemplate("index");
} }

32
vraptor/src/main/java/com/baeldung/controllers/PostController.java
View File

@ -48,28 +48,28 @@ public class PostController {
@br.com.caelum.vraptor.Post("/post/add") @br.com.caelum.vraptor.Post("/post/add")
public void add(Post post) { public void add(Post post) {
post.setAuthor(userInfo.getUser());
validator.validate(post);
if(validator.hasErrors())
result.include("errors", validator.getErrors());
validator.onErrorRedirectTo(this).addForm();
post.setAuthor(userInfo.getUser()); Object id = postDao.add(post);
validator.validate(post);
if(validator.hasErrors())
result.include("errors", validator.getErrors());
validator.onErrorRedirectTo(this).addForm();
Object id = postDao.add(post); if(Objects.nonNull(id)) {
result.include("status", "Post Added Successfully");
if(Objects.nonNull(id)) { result.redirectTo(IndexController.class).index();
result.include("status", "Post Added Successfully"); } else {
result.redirectTo(IndexController.class).index(); result.include(
} else { "error", "There was an error creating the post. Try Again");
result.include("error", "There was an error creating the post. Try Again"); result.redirectTo(this).addForm();
result.redirectTo(this).addForm(); }
}
} }
@Get("/posts/{id}") @Get("/posts/{id}")
public void view(int id) { public void view(int id) {
result.include("post", postDao.findById(id)); result.include("post", postDao.findById(id));
result.use(FreemarkerView.class).withTemplate("view"); result.use(FreemarkerView.class).withTemplate("view");
} }

38
vraptor/src/main/java/com/baeldung/daos/PostDao.java
View File

@ -20,35 +20,35 @@ public class PostDao {
@Inject @Inject
public PostDao(SessionFactory sessionFactory) { public PostDao(SessionFactory sessionFactory) {
this.sessionFactory = sessionFactory; this.sessionFactory = sessionFactory;
} }
public Object add(Post post) { public Object add(Post post) {
Session session = sessionFactory.openSession(); Session session = sessionFactory.openSession();
session.beginTransaction(); session.beginTransaction();
Object id = session.save(post); Object id = session.save(post);
session.getTransaction().commit(); session.getTransaction().commit();
session.close(); session.close();
return id; return id;
} }
public Post findById(int id) { public Post findById(int id) {
Session session = sessionFactory.openSession(); Session session = sessionFactory.openSession();
session.beginTransaction(); session.beginTransaction();
Post post = (Post) session.get(Post.class, id); Post post = (Post) session.get(Post.class, id);
session.getTransaction().commit(); session.getTransaction().commit();
session.close(); session.close();
return post; return post;
} }
public List<Post> all() { public List<Post> all() {
Session session = sessionFactory.openSession(); Session session = sessionFactory.openSession();
session.beginTransaction(); session.beginTransaction();
List<Post> posts = (List<Post>) session.createQuery("FROM Post p").list(); List<Post> posts = (List<Post>) session.createQuery("FROM Post p").list();
session.getTransaction().commit(); session.getTransaction().commit();
session.close(); session.close();
return posts; return posts;
} }
} }

1
vraptor/src/main/java/com/baeldung/daos/UserDao.java
View File

@ -16,7 +16,6 @@ import java.util.logging.Logger;
public class UserDao { public class UserDao {
SessionFactory sessionFactory; SessionFactory sessionFactory;
Logger logger = Logger.getLogger(getClass().getName());
public UserDao() { public UserDao() {
this(null); this(null);