Merge pull request #3504 from Abyss777/remove_aliases

Remove Attribute Aliases

2 files changed, 0 insertions, 97 deletions

diff --git a/src/org/traccar/api/BaseObjectResource.java b/src/org/traccar/api/BaseObjectResource.java
index a1b90bc28..b13dc2e71 100644
--- a/src/org/traccar/api/BaseObjectResource.java
+++ b/src/org/traccar/api/BaseObjectResource.java
@@ -138,10 +138,6 @@ public abstract class BaseObjectResource<T extends BaseModel> extends BaseResour
                 Context.getPermissionsManager().refreshAllExtendedPermissions();
             }
         }
-        // Next should be removed with Attribute Aliases
-        if (baseClass.equals(Device.class)) {
-            Context.getAliasesManager().removeDevice(id);
-        }
         return Response.noContent().build();
     }
 
diff --git a/src/org/traccar/api/resource/AttributeAliasResource.java b/src/org/traccar/api/resource/AttributeAliasResource.java
deleted file mode 100644
index b2636acf1..000000000
--- a/src/org/traccar/api/resource/AttributeAliasResource.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright 2016 Anton Tananaev (anton@traccar.org)
- * Copyright 2016 Andrey Kunitsyn (andrey@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-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.model.AttributeAlias;
-
-@Path("attributes/aliases")
-@Produces(MediaType.APPLICATION_JSON)
-@Consumes(MediaType.APPLICATION_JSON)
-public class AttributeAliasResource extends BaseResource {
-
-    @GET
-    public Collection<AttributeAlias> get(@QueryParam("deviceId") long deviceId) throws SQLException {
-        if (deviceId != 0) {
-            if (!Context.getPermissionsManager().isAdmin(getUserId())) {
-                Context.getPermissionsManager().checkDevice(getUserId(), deviceId);
-            }
-            return Context.getAliasesManager().getAttributeAliases(deviceId);
-        } else {
-            return Context.getAliasesManager().getAllAttributeAliases(getUserId());
-        }
-    }
-
-    @POST
-    public Response add(AttributeAlias entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
-        if (!Context.getPermissionsManager().isAdmin(getUserId())) {
-            Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        }
-        Context.getAliasesManager().addAttributeAlias(entity);
-        return Response.ok(entity).build();
-    }
-
-    @Path("{id}")
-    @PUT
-    public Response update(AttributeAlias entity) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
-        if (!Context.getPermissionsManager().isAdmin(getUserId())) {
-            AttributeAlias oldEntity = Context.getAliasesManager().getAttributeAlias(entity.getId());
-            Context.getPermissionsManager().checkDevice(getUserId(), oldEntity.getDeviceId());
-            Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        }
-        Context.getAliasesManager().updateAttributeAlias(entity);
-        return Response.ok(entity).build();
-    }
-
-    @Path("{id}")
-    @DELETE
-    public Response remove(@PathParam("id") long id) throws SQLException {
-        Context.getPermissionsManager().checkReadonly(getUserId());
-        Context.getPermissionsManager().checkDeviceReadonly(getUserId());
-        if (!Context.getPermissionsManager().isAdmin(getUserId())) {
-            AttributeAlias entity = Context.getAliasesManager().getAttributeAlias(id);
-            Context.getPermissionsManager().checkDevice(getUserId(), entity.getDeviceId());
-        }
-        Context.getAliasesManager().removeArrtibuteAlias(id);
-        return Response.noContent().build();
-    }
-
-}