Skip to content

7903852: apidiff: IllegalArgumentException for RECORD_COMPONENT #20

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

Closed
wants to merge 1 commit into from
Closed

7903852: apidiff: IllegalArgumentException for RECORD_COMPONENT #20

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
10 changes: 10 additions & 0 deletions src/share/classes/jdk/codetools/apidiff/model/API.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import javax.lang.model.element.ModuleElement;
import javax.lang.model.element.Name;
import javax.lang.model.element.PackageElement;
import javax.lang.model.element.RecordComponentElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.TypeParameterElement;
import javax.lang.model.element.VariableElement;
Expand Down Expand Up @@ -965,8 +966,17 @@ public String visitExecutable(ExecutableElement ee, APIDocs d) {
return d.getDescription(signatureVisitor.getSignature(ee));
}

@Override
public String visitRecordComponent(RecordComponentElement tpe, APIDocs d) {
// record components do not have distinct API descriptions of their own:
// they are documented by @param tags in the enclosing element
throw new IllegalArgumentException(tpe.getKind() + " " + tpe.getSimpleName());
}

@Override
public String visitTypeParameter(TypeParameterElement tpe, APIDocs d) {
// type parameters do not have distinct API descriptions of their own:
// they are documented by @param tags in the enclosing element
throw new IllegalArgumentException(tpe.getKind() + " " + tpe.getSimpleName());
}

Expand Down
4 changes: 2 additions & 2 deletions src/share/classes/jdk/codetools/apidiff/model/RecordComponentComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ public boolean compare(Position rcPos, APIMap<Element> rcMap) {
allEqual = checkMissing(rcPos, rcMap);
if (rcMap.size() > 1) {
allEqual &= compareSignatures(rcPos, rcMap);
allEqual &= compareDocComments(rcPos, rcMap);
allEqual &= compareApiDescriptions(rcPos, rcMap);
// note that record components do not have distinct API descriptions or doc comments
// of their own; they are documented by @param tags in the enclosing element
}
} finally {
reporter.completed(rcPos, allEqual);
Expand Down
3 changes: 3 additions & 0 deletions src/share/classes/jdk/codetools/apidiff/model/TypeParameterComparator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ public boolean compare(Position pos, APIMap<TypeParameterElement> map) {
allEquals &= compareNames(pos, map)
& compareBounds(pos, map)
& new AnnotationComparator(map.keySet(), accessKind, reporter).compareAll(pos, map);
// note that type parameters do not have distinct API descriptions or doc comments
// of their own; they are documented by @param tags in the enclosing element


return allEquals;
}
Expand Down