zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed compile error for Java 8

Browse source
This commit is contained in:
anhefti 2019-03-12 08:11:36 +01:00
parent e024bc5462
commit 718bd74e22
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/seb/SebClientConfigServiceImpl.java
View file

@ -11,8 +11,10 @@ package ch.ethz.seb.sebserver.webservice.servicelayer.seb;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Optional;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
import org.springframework.beans.factory.annotation.Value;
@ -85,14 +87,19 @@ public class SebClientConfigServiceImpl implements SebClientConfigService {
@Override
public Result<InputStream> exportSebClientConfigurationOfInstitution(final Long institutionId) {
return this.sebClientConfigDAO.all(institutionId, true)
.flatMap(l -> l.stream()
.sorted((sc1, sc2) -> sc1.date.compareTo(sc2.date))
.findFirst()
.or(() -> Optional.of(
autoCreateSebClientConfigurationForIntitution(institutionId).getOrThrow()))
.map(this::createExport)
.get());
return Result.tryCatchOf(() -> {
final List<SebClientConfig> sebConfigs = new ArrayList<>(this.sebClientConfigDAO
.all(institutionId, true)
.getOrThrow());
if (sebConfigs.isEmpty()) {
return autoCreateSebClientConfigurationForIntitution(institutionId)
.flatMap(this::createExport);
}
Collections.sort(sebConfigs, (sc1, sc2) -> sc1.date.compareTo(sc2.date));
return this.createExport(sebConfigs.get(0));
});
}
private final static String SEB_CLIENT_CONFIG_EXAMPLE_XML =