Skip to content
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

Mitigate possible NSE exception in PrivateAccessValidator.java #2015

Merged
merged 4 commits into from
Oct 26, 2023
+5 −3
Merged

Mitigate possible NSE exception in PrivateAccessValidator.java #2015

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffc4c50
Mitigate possible NSE exception in PrivateAccessValidator.java
jyoo980 Oct 21, 2023
0d2d056
Updating `PrivateAccessValidator#getPrivateAccessValidationEvent`
jyoo980 Oct 23, 2023
05e19ba
Removing unused import of Optional
jyoo980 Oct 23, 2023
aa785fa
Apply checkstyle fixes
jyoo980 Oct 24, 2023
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
8 changes: 5 additions & 3 deletions .../main/java/software/amazon/smithy/model/validation/validators/PrivateAccessValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import software.amazon.smithy.model.neighbor.Relationship;
import software.amazon.smithy.model.neighbor.RelationshipType;
import software.amazon.smithy.model.shapes.Shape;
import software.amazon.smithy.model.shapes.ShapeId;
import software.amazon.smithy.model.traits.PrivateTrait;
import software.amazon.smithy.model.validation.AbstractValidator;
import software.amazon.smithy.model.validation.ValidationEvent;
Expand All @@ -50,17 +51,18 @@ private void validateNeighbors(Shape shape, List<Relationship> relationships, Li
String namespace = shape.getId().getNamespace();
for (Relationship rel : relationships) {
if (!rel.getShape().getId().getNamespace().equals(namespace)) {
ValidationEvent privateAccessValidationEvent = getPrivateAccessValidationEvent(rel);
events.add(privateAccessValidationEvent);
events.add(getPrivateAccessValidationEvent(rel));
}
}
}

private ValidationEvent getPrivateAccessValidationEvent(Relationship relationship) {
ShapeId neighborId = relationship.expectNeighborShape().getId();
String message = String.format(
"This shape has an invalid %s relationship that targets a private shape, `%s`, in another namespace.",
relationship.getRelationshipType().toString().toLowerCase(Locale.US),
relationship.getNeighborShape().get().getId());
neighborId
);

// For now, emit a warning for trait relationships instead of an error. This is because private access on trait
// relationships was not being validated in the past, so emitting a warning maintains backward compatibility.
Expand Down