mariusz.pacek/SpringRest
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add sample roles, get roles for mobile door

Browse Source
This commit is contained in:
Marcin Michałek committed 2014-05-22 19:26:47 +02:00
1 parent 78aaebc8bb
commit 2eaa2a7020
4 files changed
+48 -18
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

NFCServer.iml
+15 -15
View File
@@ -1,17 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.path="D:\NFCapp_SERVER" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web Gradle : nfc_server-0.1.0.war">
<configuration>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration>
<fileset id="fileset" name="Spring Application Context" removed="false">
@@ -29,6 +18,17 @@
<deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/resources/hibernate.cfg.xml" />
</configuration>
</facet>
<facet type="web" name="Web Gradle : nfc_server-0.1.0.war">
<configuration>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/resources" />
<root url="file://$MODULE_DIR$/src/main/java" />
</sourceRoots>
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
@@ -91,10 +91,6 @@
<orderEntry type="library" exported="" name="Gradle: spring-data-commons-1.7.1.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-data-jpa-1.5.1.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-aspects-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-embed-core-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-embed-el-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-embed-logging-juli-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-tomcat-1.0.0.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-web-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-webmvc-4.0.3.RELEASE" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: jstl-1.2" level="project" />
@@ -106,6 +102,10 @@
<orderEntry type="library" scope="TEST" name="Gradle: mockito-core-1.9.5" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: hamcrest-library-1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: spring-test-4.0.3.RELEASE" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-embed-core-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-embed-el-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: tomcat-embed-logging-juli-7.0.52" level="project" />
<orderEntry type="library" exported="" name="Gradle: spring-boot-starter-tomcat-1.0.0.RELEASE" level="project" />
</component>
</module>
build.gradle
+2 -2
View File
@@ -40,6 +40,6 @@ dependencies {
providedRuntime("javax.servlet:jstl")
/*Potrzebne do mapowanie widokow jsp, u*/
/*providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper")*/
// providedRuntime("org.springframework.boot:spring-boot-starter-tomcat")
// providedRuntime("org.apache.tomcat.embed:tomcat-embed-jasper")
}
src/main/java/application/controllers/RoleController.java
+29 -1
View File
@@ -28,6 +28,16 @@ public class RoleController {
roleRepository.save(role);
}
@RequestMapping(value = "/addSampleRoles")
@ResponseBody
public String addSampleRoles() {
roleRepository.save(new Role("CLEANER", "shityJob"));
roleRepository.save(new Role("BOSS", "fuckYea"));
roleRepository.save(new Role("SECURITY", "ochroniarzPatryk"));
return "roles added";
}
@RequestMapping("/{roleId}")
@ResponseBody
public String getRole(@PathVariable("roleId") Long roleId) throws JSONException{
@@ -49,7 +59,6 @@ public class RoleController {
JSONArray roleArray = new JSONArray();
for (Role role : roleRepository.findAll()) {
JSONObject roleJSON = new JSONObject();
roleJSON.put("id", role.getRoleId());
roleJSON.put("role", role.getRoleName());
roleJSON.put("password", role.getPassword());
roleArray.put(roleJSON);
@@ -57,6 +66,25 @@ public class RoleController {
return roleArray.toString();
}
@RequestMapping("/getRoles")
public
@ResponseBody
String getRoles() throws JSONException {
JSONObject accessCodes = new JSONObject();
accessCodes.put("success",true);
JSONArray roleArray = new JSONArray();
for (Role role : roleRepository.findAll()) {
JSONObject roleJSON = new JSONObject();
roleJSON.put("role", role.getRoleName());
roleJSON.put("password", role.getPassword());
roleArray.put(roleJSON);
}
accessCodes.put("accessCodes", roleArray);
return accessCodes.toString();
}
@RequestMapping("/remove/{roleId}")
public String removeRole(@PathVariable("roleId") Long roleId) {
roleRepository.delete(roleId);
src/main/java/application/controllers/UserController.java
+2
View File
@@ -61,6 +61,7 @@ public class UserController {
//access codes
JSONArray accessCodes = new JSONArray();
//message
JSONObject message = new JSONObject();
@@ -89,6 +90,7 @@ public class UserController {
@ResponseBody
public String addMe() {
User marcin = new User("Marcin", "Michalek", "marcin.marcim@gmail.com", "pass");
userRepository.save(marcin);
return "User created" + marcin.getUserId();