Changeset 4253

Timestamp:

01/10/14 17:27:49 (10 years ago)

Author:

olhsha

Message:

adding, updating, deleting a user (only for a user with admin rights)

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/UserResource.java (modified) (5 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/rest/UserResource.java

@@ -141 +141 @@
     @Consumes(MediaType.APPLICATION_XML)
     @Produces(MediaType.APPLICATION_XML)
-    @Path("{remoteId: " + BackendConstants.regExpRemoteId+ "}")
+    @Path("{remoteId: " + BackendConstants.regExpRemoteId + "}")
     public JAXBElement<User> addUser(@PathParam("remoteId") String remoteId, User user) throws SQLException, IOException {
         final Number remoteUserID = dbIntegrityService.getUserInternalIDFromRemoteID(httpServletRequest.getRemoteUser());
@@ -149 +149 @@
                 final Number userID = dbIntegrityService.addUser(user, remoteId);
                 if (userID != null) {
-                final User addedUser = dbIntegrityService.getUser(userID);
-                return new ObjectFactory().createUser(addedUser);
-                }
-                else {
+                    final User addedUser = dbIntegrityService.getUser(userID);
+                    return new ObjectFactory().createUser(addedUser);
+                } else {
                     httpServletResponse.sendError(HttpServletResponse.SC_CONFLICT, "The user with the given e-mail already exists in the database");
                     return null;
@@ -193 +192 @@
     }
 
-    
-    
     @DELETE
     @Path("{userId: " + BackendConstants.regExpRemoteId + "}")
@@ -205 +202 @@
                 if (userID != null) {
                     final Integer result = dbIntegrityService.deleteUser(userID);
-                    return "There is "+ result.toString()+" row deleted";
+                    return "There is " + result.toString() + " row deleted";
                 } else {
                     httpServletResponse.sendError(HttpServletResponse.SC_NOT_FOUND, "The user with the given id is not found in the database");
@@ -219 +216 @@
         }
     }
-    }
-    
-    
-    
-    
+
     private boolean ifLoggedIn(Number userID) {
         return httpServletRequest.getRemoteUser().equals(dbIntegrityService.getUserRemoteID(userID));