Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RegApp
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janis Streib
RegApp
Commits
56655327
Commit
56655327
authored
8 months ago
by
Michael Simon
Browse files
Options
Downloads
Patches
Plain Diff
ISSUE-207 sort list alphabetically in small discovery list mode
closes #207
parent
5926c946
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
bwreg-service/src/main/java/edu/kit/scc/webreg/service/disco/DiscoveryCacheService.java
+17
-6
17 additions, 6 deletions
...u/kit/scc/webreg/service/disco/DiscoveryCacheService.java
with
17 additions
and
6 deletions
bwreg-service/src/main/java/edu/kit/scc/webreg/service/disco/DiscoveryCacheService.java
+
17
−
6
View file @
56655327
...
...
@@ -5,10 +5,11 @@ import static edu.kit.scc.webreg.dao.ops.RqlExpressions.equal;
import
java.io.IOException
;
import
java.io.Serializable
;
import
java.util.ArrayList
;
import
java.util.Comparator
;
import
java.util.Date
;
import
java.util.HashSet
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.TreeSet
;
import
javax.script.Invocable
;
import
javax.script.ScriptEngine
;
...
...
@@ -146,16 +147,26 @@ public class DiscoveryCacheService implements Serializable {
private
List
<
UserProvisionerCachedEntry
>
filterAllEntries
(
List
<
ScriptEntity
>
filterScriptList
,
List
<
UserProvisionerCachedEntry
>
entryList
)
{
if
(
filterScriptList
!=
null
&&
filterScriptList
.
size
()
>
0
)
{
Set
<
UserProvisionerCachedEntry
>
returnList
=
new
HashSet
<>();
Comparator
<
UserProvisionerCachedEntry
>
comparator
=
new
Comparator
<
UserProvisionerCachedEntry
>()
{
@Override
public
int
compare
(
UserProvisionerCachedEntry
e1
,
UserProvisionerCachedEntry
e2
)
{
if
(
e1
.
getDisplayName
()
!=
null
)
return
e1
.
getDisplayName
().
compareTo
(
e2
.
getDisplayName
());
else
return
0
;
}
};
Set
<
UserProvisionerCachedEntry
>
returnList
=
new
TreeSet
<>(
comparator
);
for
(
ScriptEntity
script
:
filterScriptList
)
{
returnList
.
addAll
(
filterEntries
(
script
,
entryList
));
}
return
new
ArrayList
<>(
returnList
);
}
else
return
entryList
;
}
else
return
entryList
;
}
private
List
<
UserProvisionerCachedEntry
>
filterEntries
(
ScriptEntity
scriptEntity
,
List
<
UserProvisionerCachedEntry
>
entryList
)
{
ScriptEngine
engine
=
(
new
ScriptEngineManager
()).
getEngineByName
(
scriptEntity
.
getScriptEngine
());
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment