- result.addAll(this.genTOs.values().stream().map(GeneratedTOBuilder::toInstance).collect(Collectors.toList()));
- result.addAll(this.typedefs.values().stream().filter(b -> b != null).collect(Collectors.toList()));
- result.addAll(this.dataTypes.values().stream().map(GeneratedTypeBuilder::toInstance).collect(Collectors.toList()));
- result.addAll(this.groupings.values().stream().map(GeneratedTypeBuilder::toInstance).collect(Collectors.toList()));
- result.addAll(this.cases.values().stream().map(GeneratedTypeBuilder::toInstance).collect(Collectors.toList()));
- result.addAll(this.identities.values().stream().map(GeneratedTypeBuilder::toInstance).collect(Collectors.toList()));
- result.addAll(this.topLevelNodes.stream().map(GeneratedTypeBuilder::toInstance).collect(Collectors.toList()));
- result.addAll(this.augmentations.stream().map(GeneratedTypeBuilder::toInstance).collect(Collectors.toList()));
- result.addAll(this.keyTypes.values().stream().map(GeneratedTypeBuilder::toInstance).collect(Collectors.toList()));
+ Streams.concat(
+ this.genTOs.values().stream().map(GeneratedTOBuilder::toInstance),
+ this.typedefs.values().stream().filter(Objects::nonNull),
+ this.dataTypes.values().stream().map(GeneratedTypeBuilder::toInstance),
+ this.groupings.values().stream().map(GeneratedTypeBuilder::toInstance),
+ this.cases.values().stream().map(GeneratedTypeBuilder::toInstance),
+ this.identities.values().stream().map(GeneratedTypeBuilder::toInstance),
+ this.topLevelNodes.stream().map(GeneratedTypeBuilder::toInstance),
+ this.augmentations.stream().map(GeneratedTypeBuilder::toInstance),
+ this.keyTypes.values().stream().map(GeneratedTypeBuilder::toInstance))
+ .forEach(result::add);