Skip to content

Optimize transforms and validators #2561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kstich merged 1 commit into from
Mar 11, 2025
Merged

Optimize transforms and validators #2561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 45 additions & 21 deletions ...rc/main/java/software/amazon/smithy/model/transform/plugins/CleanOperationStructures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.shapes.OperationShape;
import software.amazon.smithy.model.shapes.Shape;
Expand All @@ -28,42 +27,67 @@ public Model onRemove(ModelTransformer transformer, Collection<Shape> removed, M
}

private Collection<Shape> getModifiedOperations(Model model, Collection<Shape> removed) {
return model.shapes(OperationShape.class)
.flatMap(operation -> {
OperationShape result = transformErrors(removed, operation);
result = transformInput(removed, result);
result = transformOutput(removed, result);
return result.equals(operation) ? Stream.empty() : Stream.of(result);
})
.collect(Collectors.toList());
List<Shape> modifiedShapes = new ArrayList<>();
for (OperationShape operation : model.getOperationShapes()) {
OperationShape.Builder builder = transformInput(removed, operation);
builder = transformOutput(removed, operation, builder);
builder = transformErrors(removed, operation, builder);
if (builder != null) {
modifiedShapes.add(builder.build());
}
}
return modifiedShapes;
}

private OperationShape transformInput(Collection<Shape> removed, OperationShape operation) {
private OperationShape.Builder transformInput(
Collection<Shape> removed,
OperationShape operation
) {
for (Shape remove : removed) {
if (remove.getId().equals(operation.getInputShape())) {
return operation.toBuilder().input(null).build();
OperationShape.Builder builder = operation.toBuilder();
builder.input(null);
return builder;
}
}
return operation;
return null;
}

private OperationShape transformOutput(Collection<Shape> removed, OperationShape operation) {
private OperationShape.Builder transformOutput(
Collection<Shape> removed,
OperationShape operation,
OperationShape.Builder builder
) {
for (Shape remove : removed) {
if (remove.getId().equals(operation.getOutputShape())) {
return operation.toBuilder().output(null).build();
if (builder == null) {
builder = operation.toBuilder();
}
builder.output(null);
return builder;
}
}
return operation;
return builder;
}

private OperationShape transformErrors(Collection<Shape> removed, OperationShape operation) {
private OperationShape.Builder transformErrors(
Collection<Shape> removed,
OperationShape operation,
OperationShape.Builder builder
) {
Set<ShapeId> errors = new HashSet<>(operation.getErrors());
removed.forEach(shape -> errors.remove(shape.getId()));
for (Shape remove : removed) {
errors.remove(remove.getId());
}

if (new ArrayList<>(errors).equals(operation.getErrors())) {
return operation;
if (errors.size() != operation.getErrors().size()) {
if (builder == null) {
builder = operation.toBuilder();
}
builder.errors(errors);
return builder;
}

return operation.toBuilder().errors(errors).build();
return builder;
}
}
79 changes: 50 additions & 29 deletions ...in/java/software/amazon/smithy/model/transform/plugins/CleanStructureAndUnionMembers.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,15 @@
*/
package software.amazon.smithy.model.transform.plugins;

import static java.util.stream.Collectors.groupingBy;
import static java.util.stream.Collectors.mapping;

import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
import software.amazon.smithy.model.Model;
import software.amazon.smithy.model.shapes.EnumShape;
import software.amazon.smithy.model.shapes.IntEnumShape;
Expand All @@ -26,8 +23,6 @@
import software.amazon.smithy.model.shapes.UnionShape;
import software.amazon.smithy.model.transform.ModelTransformer;
import software.amazon.smithy.model.transform.ModelTransformerPlugin;
import software.amazon.smithy.utils.OptionalUtils;
import software.amazon.smithy.utils.Pair;

/**
* Cleans up structure, union, enum, and intEnum shapes after shapes are removed.
Expand Down Expand Up @@ -59,31 +54,39 @@ private Model removeMembersFromContainers(ModelTransformer transformer, Collecti
private Collection<Shape> getEnumReplacements(Model model, Collection<Shape> removed) {
return createUpdatedShapes(model, removed, Shape::asEnumShape, entry -> {
EnumShape.Builder builder = entry.getKey().toBuilder();
entry.getValue().forEach(member -> builder.removeMember(member.getMemberName()));
for (MemberShape member : entry.getValue()) {
builder.removeMember(member.getMemberName());
}
return builder.build();
});
}

private Collection<Shape> getIntEnumReplacements(Model model, Collection<Shape> removed) {
return createUpdatedShapes(model, removed, Shape::asIntEnumShape, entry -> {
IntEnumShape.Builder builder = entry.getKey().toBuilder();
entry.getValue().forEach(member -> builder.removeMember(member.getMemberName()));
for (MemberShape member : entry.getValue()) {
builder.removeMember(member.getMemberName());
}
return builder.build();
});
}

private Collection<Shape> getStructureReplacements(Model model, Collection<Shape> removed) {
return createUpdatedShapes(model, removed, Shape::asStructureShape, entry -> {
StructureShape.Builder builder = entry.getKey().toBuilder();
entry.getValue().forEach(member -> builder.removeMember(member.getMemberName()));
for (MemberShape member : entry.getValue()) {
builder.removeMember(member.getMemberName());
}
return builder.build();
});
}

private Collection<Shape> getUnionReplacements(Model model, Collection<Shape> removed) {
return createUpdatedShapes(model, removed, Shape::asUnionShape, entry -> {
UnionShape.Builder builder = entry.getKey().toBuilder();
entry.getValue().forEach(member -> builder.removeMember(member.getMemberName()));
for (MemberShape member : entry.getValue()) {
builder.removeMember(member.getMemberName());
}
return builder.build();
});
}
Expand Down Expand Up @@ -115,16 +118,24 @@ private <S extends Shape> Collection<Shape> createUpdatedShapes(
Function<Shape, Optional<S>> containerShapeMapper,
Function<Map.Entry<S, List<MemberShape>>, S> entryMapperAndFactory
) {
return removed.stream()
.flatMap(shape -> OptionalUtils.stream(shape.asMemberShape()))
.flatMap(member -> OptionalUtils.stream(model.getShape(member.getContainer())
.flatMap(containerShapeMapper)
.map(container -> Pair.of(container, member))))
.collect(groupingBy(Pair::getLeft, mapping(Pair::getRight, Collectors.toList())))
.entrySet()
.stream()
.map(entryMapperAndFactory)
.collect(Collectors.toList());
Map<S, List<MemberShape>> containerMemberMap = new HashMap<>();
for (Shape shape : removed) {
if (!shape.isMemberShape()) {
continue;
}

MemberShape member = (MemberShape) shape;
Optional<S> container = model.getShape(member.getContainer()).flatMap(containerShapeMapper);
if (container.isPresent()) {
containerMemberMap.computeIfAbsent(container.get(), k -> new ArrayList<>()).add(member);
}
}

Collection<Shape> updatedShapes = new ArrayList<>();
for (Map.Entry<S, List<MemberShape>> entry : containerMemberMap.entrySet()) {
updatedShapes.add(entryMapperAndFactory.apply(entry));
}
return updatedShapes;
}

/**
Expand All @@ -137,16 +148,26 @@ private <S extends Shape> Collection<Shape> createUpdatedShapes(
* their target was removed.
*/
private Collection<Shape> findMembersThatNeedRemoval(Model model, Collection<Shape> removed) {
Set<ShapeId> removedIds = removed.stream().map(Shape::getId).collect(Collectors.toSet());
Set<ShapeId> removedIds = new HashSet<>();
for (Shape shape : removed) {
removedIds.add(shape.getId());
}

Collection<Shape> removeMembers = new HashSet<>();
model.shapes(StructureShape.class)
.flatMap(shape -> shape.getAllMembers().values().stream())
.filter(value -> removedIds.contains(value.getTarget()))
.forEach(removeMembers::add);
model.shapes(UnionShape.class)
.flatMap(shape -> shape.getAllMembers().values().stream())
.filter(value -> removedIds.contains(value.getTarget()))
.forEach(removeMembers::add);
for (StructureShape structure : model.getStructureShapes()) {
for (MemberShape member : structure.members()) {
if (removedIds.contains(member.getTarget())) {
removeMembers.add(member);
}
}
}
for (UnionShape structure : model.getUnionShapes()) {
for (MemberShape member : structure.members()) {
if (removedIds.contains(member.getTarget())) {
removeMembers.add(member);
}
}
}
return removeMembers;
}
}
Loading
Loading