Merge branch 'master' into master

1 files changed, 4 insertions, 57 deletions

diff --git a/src/org/traccar/api/resource/CalendarResource.java b/src/org/traccar/api/resource/CalendarResource.java
index 641d3b4b5..9399c34a5 100644
--- a/src/org/traccar/api/resource/CalendarResource.java
+++ b/src/org/traccar/api/resource/CalendarResource.java
@@ -16,74 +16,21 @@
  */
 package org.traccar.api.resource;
 
-import java.sql.SQLException;
-import java.util.Collection;
-
 import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
-import org.traccar.Context;
-import org.traccar.api.BaseResource;
+import org.traccar.api.SimpleObjectResource;
 import org.traccar.model.Calendar;
 
 @Path("calendars")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-public class CalendarResource extends BaseResource {
-
-    @GET
-    public Collection<Calendar> get(
-            @QueryParam("all") boolean all, @QueryParam("userId") long userId) throws SQLException {
-
-        if (all) {
-            if (Context.getPermissionsManager().isAdmin(getUserId())) {
-                return Context.getCalendarManager().getAllCalendars();
-            } else {
-                Context.getPermissionsManager().checkManager(getUserId());
-                return Context.getCalendarManager().getManagedCalendars(getUserId());
-            }
-        } else {
-            if (userId == 0) {
-                userId = getUserId();
-            }
-            Context.getPermissionsManager().checkUser(getUserId(), userId);
-            return Context.getCalendarManager().getUserCalendars(userId);
-        }
-    }
+public class CalendarResource extends SimpleObjectResource<Calendar> {
 
-    @POST
-    public Response add(Calendar entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getCalendarManager().addCalendar(entity);
-        Context.getDataManager().linkCalendar(getUserId(), entity.getId());
-        Context.getCalendarManager().refreshUserCalendars();
-        return Response.ok(entity).build();
+    public CalendarResource() {
+        super(Calendar.class);
     }
 
-    @Path("{id}")
-    @PUT
-    public Response update(Calendar entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkCalendar(getUserId(), entity.getId());
-        Context.getCalendarManager().updateCalendar(entity);
-        return Response.ok(entity).build();
-    }
-
-    @Path("{id}")
-    @DELETE
-    public Response remove(@PathParam("id") long id) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkCalendar(getUserId(), id);
-        Context.getCalendarManager().removeCalendar(id);
-        return Response.noContent().build();
-    }
 }