2020-03-23 15:35:58 +01:00
|
|
|
/*
|
|
|
|
|
* MIT License
|
2010-12-31 16:28:55 +01:00
|
|
|
*
|
2020-03-23 15:35:58 +01:00
|
|
|
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
2010-12-31 16:28:55 +01:00
|
|
|
*
|
2020-03-23 15:35:58 +01:00
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
|
* furnished to do so, subject to the following conditions:
|
2010-12-31 16:28:55 +01:00
|
|
|
*
|
2020-03-23 15:35:58 +01:00
|
|
|
* The above copyright notice and this permission notice shall be included in all
|
|
|
|
|
* copies or substantial portions of the Software.
|
2010-12-31 16:28:55 +01:00
|
|
|
*
|
2020-03-23 15:35:58 +01:00
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
|
|
* SOFTWARE.
|
2010-12-31 16:28:55 +01:00
|
|
|
*/
|
|
|
|
|
|
Sorted autocomplete (#1918)
Users, groups, repositories and repository roles have been sorted in the rest layer by default if no other sort option was given. In the layers "below" (aka the manager classes or the dao), the collections have been unsorted. This led to the effect, that the autocomplete resource, which did not sort all values beforehand, returned unsorted results. As a sideeffect, direct matches for an input could occur at a random position or not at all (as reported in #1695), when there were enough other matches.
With this pull request the databases for users, groups, repositories and repository roles will use instances of TreeMap instead of LinkedHashMap internally, so that these values are sorted implicitly (by id respectively name for users, groups and repository roles and namespace/name for repositories).
Due to this change the default sort applied in the rest layer could be removed.
2022-01-18 09:46:10 +01:00
|
|
|
package sonia.scm.group.xml;
|
2010-12-31 16:28:55 +01:00
|
|
|
|
2023-11-29 18:14:03 +01:00
|
|
|
import jakarta.xml.bind.annotation.XmlAccessType;
|
|
|
|
|
import jakarta.xml.bind.annotation.XmlAccessorType;
|
|
|
|
|
import jakarta.xml.bind.annotation.XmlElement;
|
|
|
|
|
import jakarta.xml.bind.annotation.XmlRootElement;
|
|
|
|
|
import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
2023-03-21 12:03:51 +01:00
|
|
|
import sonia.scm.auditlog.AuditEntry;
|
2010-12-31 16:28:55 +01:00
|
|
|
import sonia.scm.group.Group;
|
2012-03-15 21:38:47 +01:00
|
|
|
import sonia.scm.xml.XmlDatabase;
|
2010-12-31 16:28:55 +01:00
|
|
|
|
Sorted autocomplete (#1918)
Users, groups, repositories and repository roles have been sorted in the rest layer by default if no other sort option was given. In the layers "below" (aka the manager classes or the dao), the collections have been unsorted. This led to the effect, that the autocomplete resource, which did not sort all values beforehand, returned unsorted results. As a sideeffect, direct matches for an input could occur at a random position or not at all (as reported in #1695), when there were enough other matches.
With this pull request the databases for users, groups, repositories and repository roles will use instances of TreeMap instead of LinkedHashMap internally, so that these values are sorted implicitly (by id respectively name for users, groups and repository roles and namespace/name for repositories).
Due to this change the default sort applied in the rest layer could be removed.
2022-01-18 09:46:10 +01:00
|
|
|
import java.util.Collection;
|
|
|
|
|
import java.util.Map;
|
|
|
|
|
import java.util.TreeMap;
|
2010-12-31 16:28:55 +01:00
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
*
|
|
|
|
|
* @author Sebastian Sdorra
|
|
|
|
|
*/
|
2023-03-21 12:03:51 +01:00
|
|
|
@AuditEntry(ignore = true)
|
2010-12-31 16:49:47 +01:00
|
|
|
@XmlRootElement(name = "group-db")
|
|
|
|
|
@XmlAccessorType(XmlAccessType.FIELD)
|
2012-03-15 21:38:47 +01:00
|
|
|
public class XmlGroupDatabase implements XmlDatabase<Group>
|
2010-12-31 16:28:55 +01:00
|
|
|
{
|
|
|
|
|
|
2011-02-15 19:19:05 +01:00
|
|
|
/**
|
|
|
|
|
* Constructs ...
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
public XmlGroupDatabase()
|
|
|
|
|
{
|
|
|
|
|
long c = System.currentTimeMillis();
|
|
|
|
|
|
|
|
|
|
creationTime = c;
|
|
|
|
|
lastModified = c;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//~--- methods --------------------------------------------------------------
|
|
|
|
|
|
2010-12-31 16:28:55 +01:00
|
|
|
/**
|
|
|
|
|
* Method description
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* @param group
|
|
|
|
|
*/
|
2012-03-15 21:38:47 +01:00
|
|
|
@Override
|
2010-12-31 16:28:55 +01:00
|
|
|
public void add(Group group)
|
|
|
|
|
{
|
|
|
|
|
groupMap.put(group.getName(), group);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Method description
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* @param groupname
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
2012-03-15 21:38:47 +01:00
|
|
|
@Override
|
2010-12-31 16:28:55 +01:00
|
|
|
public boolean contains(String groupname)
|
|
|
|
|
{
|
|
|
|
|
return groupMap.containsKey(groupname);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Method description
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* @param groupname
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
2012-03-15 21:38:47 +01:00
|
|
|
@Override
|
2010-12-31 16:28:55 +01:00
|
|
|
public Group remove(String groupname)
|
|
|
|
|
{
|
|
|
|
|
return groupMap.remove(groupname);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Method description
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
2012-03-15 21:38:47 +01:00
|
|
|
@Override
|
2010-12-31 16:28:55 +01:00
|
|
|
public Collection<Group> values()
|
|
|
|
|
{
|
|
|
|
|
return groupMap.values();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//~--- get methods ----------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Method description
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* @param groupname
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
2012-03-15 21:38:47 +01:00
|
|
|
@Override
|
2010-12-31 16:28:55 +01:00
|
|
|
public Group get(String groupname)
|
|
|
|
|
{
|
|
|
|
|
return groupMap.get(groupname);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Method description
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
2012-03-15 21:38:47 +01:00
|
|
|
@Override
|
2010-12-31 16:28:55 +01:00
|
|
|
public long getCreationTime()
|
|
|
|
|
{
|
|
|
|
|
return creationTime;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Method description
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
2012-03-15 21:38:47 +01:00
|
|
|
@Override
|
2010-12-31 16:28:55 +01:00
|
|
|
public long getLastModified()
|
|
|
|
|
{
|
|
|
|
|
return lastModified;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//~--- set methods ----------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Method description
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* @param creationTime
|
|
|
|
|
*/
|
2012-03-15 21:38:47 +01:00
|
|
|
@Override
|
2010-12-31 16:28:55 +01:00
|
|
|
public void setCreationTime(long creationTime)
|
|
|
|
|
{
|
|
|
|
|
this.creationTime = creationTime;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* Method description
|
|
|
|
|
*
|
|
|
|
|
*
|
|
|
|
|
* @param lastModified
|
|
|
|
|
*/
|
2012-03-15 21:38:47 +01:00
|
|
|
@Override
|
2010-12-31 16:28:55 +01:00
|
|
|
public void setLastModified(long lastModified)
|
|
|
|
|
{
|
|
|
|
|
this.lastModified = lastModified;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
//~--- fields ---------------------------------------------------------------
|
|
|
|
|
|
|
|
|
|
/** Field description */
|
|
|
|
|
private Long creationTime;
|
|
|
|
|
|
|
|
|
|
/** Field description */
|
|
|
|
|
@XmlJavaTypeAdapter(XmlGroupMapAdapter.class)
|
|
|
|
|
@XmlElement(name = "groups")
|
Sorted autocomplete (#1918)
Users, groups, repositories and repository roles have been sorted in the rest layer by default if no other sort option was given. In the layers "below" (aka the manager classes or the dao), the collections have been unsorted. This led to the effect, that the autocomplete resource, which did not sort all values beforehand, returned unsorted results. As a sideeffect, direct matches for an input could occur at a random position or not at all (as reported in #1695), when there were enough other matches.
With this pull request the databases for users, groups, repositories and repository roles will use instances of TreeMap instead of LinkedHashMap internally, so that these values are sorted implicitly (by id respectively name for users, groups and repository roles and namespace/name for repositories).
Due to this change the default sort applied in the rest layer could be removed.
2022-01-18 09:46:10 +01:00
|
|
|
private Map<String, Group> groupMap = new TreeMap<>();
|
2010-12-31 16:28:55 +01:00
|
|
|
|
|
|
|
|
/** Field description */
|
|
|
|
|
private Long lastModified;
|
|
|
|
|
}
|