Merge branch 'master' into develop

1 files changed, 0 insertions, 83 deletions

diff --git a/src/main/java/org/traccar/database/GroupsManager.java b/src/main/java/org/traccar/database/GroupsManager.java
deleted file mode 100644
index c35f35f93..000000000
--- a/src/main/java/org/traccar/database/GroupsManager.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright 2017 - 2020 Anton Tananaev (anton@traccar.org)
- * Copyright 2017 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.database;
-
-import java.sql.SQLException;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.traccar.Context;
-import org.traccar.model.Group;
-
-public class GroupsManager extends BaseObjectManager<Group> implements ManagableObjects {
-
-    public GroupsManager(DataManager dataManager) {
-        super(dataManager, Group.class);
-    }
-
-    private void checkGroupCycles(Group group) {
-        Set<Long> groups = new HashSet<>();
-        while (group != null) {
-            if (groups.contains(group.getId())) {
-                throw new IllegalArgumentException("Cycle in group hierarchy");
-            }
-            groups.add(group.getId());
-            group = getById(group.getGroupId());
-        }
-    }
-
-    @Override
-    public Set<Long> getAllItems() {
-        Set<Long> result = super.getAllItems();
-        if (result.isEmpty()) {
-            refreshItems();
-            result = super.getAllItems();
-        }
-        return result;
-    }
-
-    @Override
-    protected void addNewItem(Group group) {
-        checkGroupCycles(group);
-        super.addNewItem(group);
-    }
-
-    @Override
-    public void updateItem(Group group) throws SQLException {
-        checkGroupCycles(group);
-        super.updateItem(group);
-    }
-
-    @Override
-    public Set<Long> getUserItems(long userId) {
-        if (Context.getPermissionsManager() != null) {
-            return Context.getPermissionsManager().getGroupPermissions(userId);
-        } else {
-            return new HashSet<>();
-        }
-    }
-
-    @Override
-    public Set<Long> getManagedItems(long userId) {
-        Set<Long> result = getUserItems(userId);
-        for (long managedUserId : Context.getUsersManager().getUserItems(userId)) {
-            result.addAll(getUserItems(managedUserId));
-        }
-        return result;
-    }
-
-}