_Bastler/we.bstly-back
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

upgrade spring, add javadoc, formatting

Browse Source
This commit is contained in:
_Bastler
2022-04-13 16:38:23 +02:00
parent 8ebed47574
commit eb829bfa26
168 changed files with 1554 additions and 2020 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/src/main/java/de/bstly/we/services/businesslogic/ServiceManager.java
+9 -13
View File
@@ -73,8 +73,7 @@ public class ServiceManager {
if (permissionManager.hasPermission(target, Permissions.ROLE_ADMIN)) {
services.addAll(serviceRepository.findAll());
for (OidcClient client : oidcClientRepository
.findAll(qOidcClient.loginUrl.isNotNull())) {
for (OidcClient client : oidcClientRepository.findAll(qOidcClient.loginUrl.isNotNull())) {
Service service = new Service(client.getClientName(), client.getLoginUrl());
service.setCategory(client.getCategory());
services.add(service);
@@ -85,17 +84,15 @@ public class ServiceManager {
for (Permission permission : permissionManager.getNotExpiresByTarget(target)) {
if (serviceRepository.existsById(permission.getName())) {
services.add(get(permission.getName()));
} else if (oidcClientRepository.exists(qOidcClient.clientName.eq(permission.getName())
.and(qOidcClient.loginUrl.isNotNull()))) {
OidcClient client = oidcClientRepository
.findOne(qOidcClient.clientName.eq(permission.getName())).get();
} else if (oidcClientRepository
.exists(qOidcClient.clientName.eq(permission.getName()).and(qOidcClient.loginUrl.isNotNull()))) {
OidcClient client = oidcClientRepository.findOne(qOidcClient.clientName.eq(permission.getName())).get();
Service service = new Service(client.getClientName(), client.getLoginUrl());
service.setCategory(client.getCategory());
services.add(service);
}
for (Service service : serviceRepository
.findAll(qService.permission.eq(permission.getName()))) {
for (Service service : serviceRepository.findAll(qService.permission.eq(permission.getName()))) {
services.add(service);
}
}
@@ -105,8 +102,7 @@ public class ServiceManager {
services.add(service);
}
for (OidcClient client : oidcClientRepository
.findAll(qOidcClient.alwaysPermitted.isTrue())) {
for (OidcClient client : oidcClientRepository.findAll(qOidcClient.alwaysPermitted.isTrue())) {
Service service = new Service(client.getClientName(), client.getLoginUrl());
service.setCategory(client.getCategory());
services.add(service);
@@ -128,9 +124,9 @@ public class ServiceManager {
/**
* Gets the.
*
* @param page the page
* @param size the size
* @param sortBy the sort by
* @param page the page
* @param size the size
* @param sortBy the sort by
* @param descending the descending
* @return the page
*/
services/src/main/java/de/bstly/we/services/model/Service.java
+1 -1
View File
@@ -41,7 +41,7 @@ public class Service {
* Instantiates a new service.
*
* @param name the name
* @param url the url
* @param url the url
*/
public Service(String name, String url) {
super();