Added functionality to get group by name.

Implemented configurable default group and default category when registering unknown devices

1 files changed, 9 insertions, 0 deletions

diff --git a/src/org/traccar/database/DeviceManager.java b/src/org/traccar/database/DeviceManager.java
index c70e67231..700d22679 100644
--- a/src/org/traccar/database/DeviceManager.java
+++ b/src/org/traccar/database/DeviceManager.java
@@ -49,6 +49,7 @@ public class DeviceManager implements IdentityManager {
     private AtomicLong devicesLastUpdate = new AtomicLong();
 
     private Map<Long, Group> groupsById;
+    private Map<String, Group> groupsByName;
     private AtomicLong groupsLastUpdate = new AtomicLong();
 
     private final Map<Long, Position> positions = new ConcurrentHashMap<>();
@@ -245,15 +246,21 @@ public class DeviceManager implements IdentityManager {
             if (groupsById == null) {
                 groupsById = new ConcurrentHashMap<>(databaseGroups.size());
             }
+            if(groupsByName == null){
+                groupsByName = new ConcurrentHashMap<>(databaseGroups.size());
+            }
             Set<Long> databaseGroupsIds = new HashSet<>();
+            Set<String> databaseGroupsNames = new HashSet<>();
             for (Group group : databaseGroups) {
                 databaseGroupsIds.add(group.getId());
+                databaseGroupsNames.add(group.getName());
                 if (groupsById.containsKey(group.getId())) {
                     Group cachedGroup = groupsById.get(group.getId());
                     cachedGroup.setName(group.getName());
                     cachedGroup.setGroupId(group.getGroupId());
                 } else {
                     groupsById.put(group.getId(), group);
+                    groupsByName.put(group.getName(), group);
                 }
             }
             for (Long cachedGroupId : groupsById.keySet()) {
@@ -269,6 +276,8 @@ public class DeviceManager implements IdentityManager {
         return groupsById.get(id);
     }
 
+    public Group getGroupByName(String name) { return groupsByName.get(name); }
+
     public Collection<Group> getAllGroups() {
         boolean forceUpdate = groupsById.isEmpty();