steam/my-small-satellite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some code improvements

Browse Source
This commit is contained in:
steam 2020-03-06 19:16:02 +01:00
parent 8d43230522
commit 504cc01a9f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/click/poweronoff/satellite/service/DataServiceImpl.java
View File

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