some code improvements

This commit is contained in:
steam 2020-03-06 19:16:02 +01:00
parent 8d43230522
commit 504cc01a9f

View File

@ -38,11 +38,9 @@ public class DataServiceImpl implements DataService {
@Override
public Optional<Feature> getFeature(String featureId) {
try {
List<Feature> features = dataTransformationService.transformToFeatureList(jsonFileRepository.readAllFeatures());
if (!features.isEmpty()) {
return features.stream().filter(feature -> feature.getId().equals(featureId)).findFirst();
}
return Optional.empty();
return dataTransformationService.transformToFeatureList(jsonFileRepository.readAllFeatures())
.stream()
.filter(feature -> feature.getId().equals(featureId)).findFirst();
} catch (IOException e) {
log.error("exception on getFeature() and featureIo {} occurred, please check your app configuration", featureId);
return Optional.empty();
@ -52,11 +50,8 @@ public class DataServiceImpl implements DataService {
@Override
public Optional<byte[]> getPicture(String featureId) {
try {
List<Feature> features = dataTransformationService.transformToFeatureList(jsonFileRepository.readAllFeatures());
if (!features.isEmpty()) {
return features.stream().filter(feature -> feature.getId().equals(featureId)).findFirst().filter(feature -> feature.getPicture() != null).map(Feature::getPicture);
}
return Optional.empty();
return dataTransformationService.transformToFeatureList(jsonFileRepository.readAllFeatures())
.stream().filter(feature -> feature.getId().equals(featureId)).findFirst().filter(feature -> feature.getPicture() != null).map(Feature::getPicture);
} catch (IOException e) {
log.error("exception on getPicture() and featureIo {} occurred, please check your app configuration", featureId);
return Optional.empty();