Skip to content

Commit 145d0d4

Browse files
Fixing merge error
1 parent 108e8a1 commit 145d0d4

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/main/java/edu/ie3/datamodel/io/source/csv/CsvSystemParticipantSource.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ private Optional<HpInputEntityData> buildHpEntityData(
645645

646646
// if the requested entity is not present we return an empty element and
647647
// log a warning
648-
if (!hpInputEntityDataOpt.isPresent()) {
648+
if (hpInputEntityDataOpt.isEmpty()) {
649649
logSkippingWarning(
650650
typedEntityData.getTargetClass().getSimpleName(),
651651
saveMapGet(fieldsToAttributes, "uuid", FIELDS_TO_VALUES_MAP),
@@ -761,8 +761,8 @@ public Set<EmInput> getEmSystems() {
761761
*/
762762
@Override
763763
public Set<EmInput> getEmSystems(Set<NodeInput> nodes, Set<OperatorInput> operators) {
764-
return filterEmptyOptionals(
765-
nodeAssetEntityStream(EmInput.class, emInputFactory, nodes, operators))
764+
return nodeAssetEntityStream(EmInput.class, emInputFactory, nodes, operators)
765+
.flatMap(Optional::stream)
766766
.collect(Collectors.toSet());
767767
}
768768
}

0 commit comments

Comments
 (0)