Skip to content

Improve CleanClientDiscoveryTraitTransformer #2559

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

Improve CleanClientDiscoveryTraitTransformer #2559

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
15 changes: 8 additions & 7 deletions ...mazon/smithy/aws/traits/clientendpointdiscovery/CleanClientDiscoveryTraitTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import software.amazon.smithy.model.shapes.ServiceShape;
import software.amazon.smithy.model.shapes.Shape;
import software.amazon.smithy.model.shapes.ShapeId;
import software.amazon.smithy.model.traits.ErrorTrait;
import software.amazon.smithy.model.transform.ModelTransformer;
import software.amazon.smithy.model.transform.ModelTransformerPlugin;
import software.amazon.smithy.utils.SmithyInternalApi;
Expand All @@ -27,16 +26,18 @@
public final class CleanClientDiscoveryTraitTransformer implements ModelTransformerPlugin {
@Override
public Model onRemove(ModelTransformer transformer, Collection<Shape> shapes, Model model) {
// Short circuit if the traits aren't applied.
if (!model.isTraitApplied(ClientEndpointDiscoveryTrait.class)
&& !model.isTraitApplied(ClientDiscoveredEndpointTrait.class)) {
return model;
}

Set<ShapeId> removedOperations = shapes.stream()
.filter(Shape::isOperationShape)
.map(Shape::getId)
.collect(Collectors.toSet());
Set<ShapeId> removedErrors = shapes.stream()
.filter(shape -> shape.hasTrait(ErrorTrait.class))
.map(Shape::getId)
.collect(Collectors.toSet());

Set<Shape> servicesToUpdate = getServicesToUpdate(model, removedOperations, removedErrors);
Set<Shape> servicesToUpdate = getServicesToUpdate(model, removedOperations);
Set<Shape> shapesToUpdate = new HashSet<>(servicesToUpdate);

Set<Shape> operationsToUpdate = getOperationsToUpdate(
Expand All @@ -51,7 +52,7 @@ public Model onRemove(ModelTransformer transformer, Collection<Shape> shapes, Mo
return transformer.replaceShapes(model, shapesToUpdate);
}

private Set<Shape> getServicesToUpdate(Model model, Set<ShapeId> removedOperations, Set<ShapeId> removedErrors) {
private Set<Shape> getServicesToUpdate(Model model, Set<ShapeId> removedOperations) {
Set<Shape> result = new HashSet<>();
for (ServiceShape service : model.getServiceShapesWithTrait(ClientEndpointDiscoveryTrait.class)) {
ClientEndpointDiscoveryTrait trait = service.expectTrait(ClientEndpointDiscoveryTrait.class);
Expand Down
Loading