From cf372020e7625a2a548864d88f46e9a17e138730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Micha=C5=82ek?= Date: Sun, 8 Jun 2014 15:26:09 +0200 Subject: [PATCH] add roles to to addMe --- .../application/controllers/UserController.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/application/controllers/UserController.java b/src/main/java/application/controllers/UserController.java index d5794e7..cb6dd2c 100644 --- a/src/main/java/application/controllers/UserController.java +++ b/src/main/java/application/controllers/UserController.java @@ -14,9 +14,7 @@ import org.springframework.web.bind.annotation.*; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; +import java.util.*; /** * Created by lukasgol on 21.04.14. @@ -60,6 +58,12 @@ public class UserController { //access codes JSONArray accessCodes = new JSONArray(); + for(Role role : user.getRoles()){ + JSONObject returnedRole = new JSONObject(); + returnedRole.put("role", role.getRoleName()); + returnedRole.put("password", role.getPassword()); + accessCodes.put(returnedRole); + } //message @@ -90,6 +94,10 @@ public class UserController { @ResponseBody public String addMe() { User marcin = new User("Marcin", "Michalek", "marcin.marcim@gmail.com", "pass"); + Set roles = new HashSet(); + roles.add(new Role("CLEANER", "shityJob")); + roles.add(new Role("BOSS", "fuckYea")); + marcin.setRoles(roles); userRepository.save(marcin);