Skip to content

Commit

Permalink
Code Cleanup: Java 16 instanceof pattern matching
Browse files Browse the repository at this point in the history
  • Loading branch information
@alshamams @akurtakov
alshamams authored and akurtakov committed Aug 12, 2023
1 parent d7228a1 commit 8435fdd
Show file tree
Hide file tree
Showing 37 changed files with 53 additions and 106 deletions.
3 changes: 1 addition & 2 deletions ...ools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiAnnotations.java
View file
Expand Up @@ -57,8 +57,7 @@ public String toString() {

@Override
public boolean equals(Object obj) {
if (obj instanceof ApiAnnotations) {
ApiAnnotations desc = (ApiAnnotations) obj;
if (obj instanceof ApiAnnotations desc) {
return this.bits == desc.bits;
}
return false;
Expand Down
6 changes: 2 additions & 4 deletions ...g.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/ApiDescriptionManager.java
View file
Expand Up @@ -356,8 +356,7 @@ private void restoreNode(ProjectApiDescription apiDesc, Element element, Manifes
break;
}
case IApiXmlConstants.ELEMENT_FIELD:
if (parentNode.element instanceof IReferenceTypeDescriptor) {
IReferenceTypeDescriptor type = (IReferenceTypeDescriptor) parentNode.element;
if (parentNode.element instanceof IReferenceTypeDescriptor type) {
int vis = getInt(element, IApiXmlConstants.ATTR_VISIBILITY);
int res = getInt(element, IApiXmlConstants.ATTR_RESTRICTIONS);
String name = element.getAttribute(IApiXmlConstants.ATTR_NAME);
Expand All @@ -366,8 +365,7 @@ private void restoreNode(ProjectApiDescription apiDesc, Element element, Manifes
}
break;
case IApiXmlConstants.ELEMENT_METHOD:
if (parentNode.element instanceof IReferenceTypeDescriptor) {
IReferenceTypeDescriptor type = (IReferenceTypeDescriptor) parentNode.element;
if (parentNode.element instanceof IReferenceTypeDescriptor type) {
int vis = getInt(element, IApiXmlConstants.ATTR_VISIBILITY);
int res = getInt(element, IApiXmlConstants.ATTR_RESTRICTIONS);
String name = element.getAttribute(IApiXmlConstants.ATTR_NAME);
Expand Down
3 changes: 1 addition & 2 deletions .../org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/BundleVersionRange.java
View file
Expand Up @@ -68,8 +68,7 @@ public boolean isIncludeMinimum() {

@Override
public boolean equals(Object obj) {
if (obj instanceof BundleVersionRange) {
BundleVersionRange range = (BundleVersionRange) obj;
if (obj instanceof BundleVersionRange range) {
return fRange.equals(range.fRange);
}
return false;
Expand Down
3 changes: 1 addition & 2 deletions ...s/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/JavadocTagManager.java
View file
Expand Up @@ -50,8 +50,7 @@ public Key(int t, int m) {

@Override
public boolean equals(Object obj) {
if (obj instanceof Key) {
Key other = (Key) obj;
if (obj instanceof Key other) {
return type == other.type && member == other.member;
}
return super.equals(obj);
Expand Down
3 changes: 1 addition & 2 deletions ...se.pde.api.tools/src/org/eclipse/pde/api/tools/internal/RequiredComponentDescription.java
View file
Expand Up @@ -59,8 +59,7 @@ public RequiredComponentDescription(String id, IVersionRange range, boolean isOp

@Override
public boolean equals(Object obj) {
if (obj instanceof RequiredComponentDescription) {
RequiredComponentDescription desc = (RequiredComponentDescription) obj;
if (obj instanceof RequiredComponentDescription desc) {
return fId.equals(desc.fId) && fRange.equals(desc.fRange);
}
return super.equals(obj);
Expand Down
3 changes: 1 addition & 2 deletions ....tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractIllegalMethodReference.java
View file
Expand Up @@ -74,8 +74,7 @@ public boolean considerReference(IReference reference, IProgressMonitor monitor)
} catch (CoreException ce) {
// do nothing, skip it
}
if (member instanceof IApiMethod) {
IApiMethod method = (IApiMethod) member;
if (member instanceof IApiMethod method) {
if (method.isDefaultMethod()) {
return considerReference(reference, monitor);
}
Expand Down
3 changes: 1 addition & 2 deletions ...pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/AbstractProblemDetector.java
View file
Expand Up @@ -517,8 +517,7 @@ public List<IApiProblem> createProblems(IProgressMonitor monitor) {
IApiComponent component = reference.getMember().getApiComponent();
try {
IApiProblem problem = null;
if (component instanceof ProjectComponent) {
ProjectComponent ppac = (ProjectComponent) component;
if (component instanceof ProjectComponent ppac) {
IJavaProject project = ppac.getJavaProject();
problem = createProblem(reference, project);
} else {
Expand Down
3 changes: 1 addition & 2 deletions ...ipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ApiAnalysisBuilder.java
View file
Expand Up @@ -629,10 +629,9 @@ public boolean contains(ISchedulingRule rule) {

@Override
public boolean isConflicting(ISchedulingRule rule) {
if (!(rule instanceof ApiAnalysisJobRule)) {
if (!(rule instanceof ApiAnalysisJobRule other)) {
return false;
}
ApiAnalysisJobRule other = (ApiAnalysisJobRule) rule;
return project.equals(other.project);
}

Expand Down
3 changes: 1 addition & 2 deletions ...eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/BaseApiAnalyzer.java
View file
Expand Up @@ -2666,8 +2666,7 @@ public void checkBaselineMismatch(IApiBaseline baseline, IApiBaseline workspaceB
* @return Java project or <code>null</code>
*/
private IJavaProject getJavaProject(IApiComponent component) {
if (component instanceof ProjectComponent) {
ProjectComponent pp = (ProjectComponent) component;
if (component instanceof ProjectComponent pp) {
return pp.getJavaProject();
}
return null;
Expand Down
3 changes: 1 addition & 2 deletions ...e.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/IncrementalApiBuilder.java
View file
Expand Up @@ -166,8 +166,7 @@ public boolean visit(IResourceDelta delta) throws CoreException {
if (component != null) {
try {
IApiAnnotations annotations = component.getApiDescription().resolveAnnotations(Factory.typeDescriptor(type.replace('/', '.')));
if (annotations instanceof TypeAnnotations) {
TypeAnnotations ta = (TypeAnnotations) annotations;
if (annotations instanceof TypeAnnotations ta) {
if (ta.getBuildStamp() == BuildStamps.getBuildStamp(resource.getProject())) {
// note description change in
// addition to structure
Expand Down
3 changes: 1 addition & 2 deletions ....pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ProblemDetectorBuilder.java
View file
Expand Up @@ -197,8 +197,7 @@ public void setOwningComponent(IApiComponent component) {
* not a {@link PluginProjectApiComponent}
*/
private IProject getProject(IApiComponent component) {
if (component instanceof ProjectComponent) {
ProjectComponent comp = (ProjectComponent) component;
if (component instanceof ProjectComponent comp) {
return comp.getJavaProject().getProject();
}
return null;
Expand Down
21 changes: 7 additions & 14 deletions ...ipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
View file
Expand Up @@ -417,8 +417,7 @@ && getDefaultDefined(type, name, desc, false) != null) {
@Override
public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) {
for (Object arg : bsmArgs) {
if (arg instanceof Handle) {
Handle handle = (Handle) arg;
if (arg instanceof Handle handle) {
Type declaringType = Type.getObjectType(handle.getOwner());
Reference reference = ReferenceExtractor.this.addMethodReference(declaringType, handle.getName(), handle.getDesc(), IReference.REF_VIRTUALMETHOD, 0);
if (reference != null) {
Expand Down Expand Up @@ -564,14 +563,12 @@ public void visitLocalVariable(String name, String desc, String signature, Label

@Override
public void visitLdcInsn(Object cst) {
if (cst instanceof Type) {
Type type = (Type) cst;
if (cst instanceof Type type) {
Reference reference = ReferenceExtractor.this.addTypeReference(type, IReference.REF_CONSTANTPOOL);
if (reference != null) {
this.linePositionTracker.addLocation(reference);
}
} else if (cst instanceof String) {
String str = (String) cst;
} else if (cst instanceof String str) {
this.stringLiteral = (Util.EMPTY_STRING.equals(str) ? null : str);
}
}
Expand Down Expand Up @@ -762,15 +759,13 @@ public void computeLineNumbers() {
remainingCatchLabelInfos = remaingEntriesTemp;
}
}
} else if (current instanceof Reference) {
Reference ref = (Reference) current;
} else if (current instanceof Reference ref) {
if (ref.getLineNumber() == -1) {
ref.setLineNumber(currentLineNumber);
} else {
currentLineNumber = ref.getLineNumber();
}
} else if (current instanceof LineInfo) {
LineInfo lineInfo = (LineInfo) current;
} else if (current instanceof LineInfo lineInfo) {
currentLineNumber = lineInfo.line;
}
}
Expand Down Expand Up @@ -810,8 +805,7 @@ public int compareTo(Object o) {

@Override
public boolean equals(Object obj) {
if (obj instanceof LineInfo) {
LineInfo lineInfo2 = (LineInfo) obj;
if (obj instanceof LineInfo lineInfo2) {
return this.line == lineInfo2.line && this.label.equals(lineInfo2.label);
}
return super.equals(obj);
Expand Down Expand Up @@ -841,8 +835,7 @@ public LocalLineNumberMarker(int line, int varIndex) {

@Override
public boolean equals(Object obj) {
if (obj instanceof LocalLineNumberMarker) {
LocalLineNumberMarker marker = (LocalLineNumberMarker) obj;
if (obj instanceof LocalLineNumberMarker marker) {
return this.lineNumber == marker.lineNumber && this.varIndex == marker.varIndex;
}
return false;
Expand Down
3 changes: 1 addition & 2 deletions ...lipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/SystemApiDetector.java
View file
Expand Up @@ -393,8 +393,7 @@ public List<IApiProblem> createProblems(IProgressMonitor monitor) {
try {
IApiProblem problem = null;
IApiComponent component = reference.getMember().getApiComponent();
if (component instanceof ProjectComponent) {
ProjectComponent ppac = (ProjectComponent) component;
if (component instanceof ProjectComponent ppac) {
IJavaProject project = ppac.getJavaProject();
problem = createProblem(reference, project);
} else {
Expand Down
3 changes: 1 addition & 2 deletions ...s/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/Validator.java
View file
Expand Up @@ -210,8 +210,7 @@ protected int getParentModifiers(ASTNode node) {
if (node == null) {
return 0;
}
if (node instanceof AbstractTypeDeclaration) {
AbstractTypeDeclaration type = (AbstractTypeDeclaration) node;
if (node instanceof AbstractTypeDeclaration type) {
return type.getModifiers();
}
return getParentModifiers(node.getParent());
Expand Down
3 changes: 1 addition & 2 deletions ...ls/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/Delta.java
View file
Expand Up @@ -187,10 +187,9 @@ public boolean equals(Object obj) {
if (obj == null) {
return false;
}
if (!(obj instanceof Delta)) {
if (!(obj instanceof Delta other)) {
return false;
}
Delta other = (Delta) obj;
if (this.elementType != other.elementType) {
return false;
}
Expand Down
3 changes: 1 addition & 2 deletions ...pde.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/FieldDescriptorImpl.java
View file
Expand Up @@ -46,8 +46,7 @@ public String toString() {

@Override
public boolean equals(Object obj) {
if (obj instanceof IFieldDescriptor) {
IFieldDescriptor field = (IFieldDescriptor) obj;
if (obj instanceof IFieldDescriptor field) {
return getName().equals(field.getName()) && getEnclosingType().equals(field.getEnclosingType());
}
return false;
Expand Down
3 changes: 1 addition & 2 deletions ...de.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/MethodDescriptorImpl.java
View file
Expand Up @@ -53,8 +53,7 @@ public String toString() {

@Override
public boolean equals(Object obj) {
if (obj instanceof IMethodDescriptor) {
IMethodDescriptor method = (IMethodDescriptor) obj;
if (obj instanceof IMethodDescriptor method) {
return getName().equals(method.getName()) && getEnclosingType().equals(method.getEnclosingType()) && getSignature().equals(method.getSignature());
}
return false;
Expand Down
3 changes: 1 addition & 2 deletions ...e.api.tools/src/org/eclipse/pde/api/tools/internal/descriptors/PackageDescriptorImpl.java
View file
Expand Up @@ -41,8 +41,7 @@ public String toString() {

@Override
public boolean equals(Object obj) {
if (obj instanceof IPackageDescriptor) {
IPackageDescriptor pkg = (IPackageDescriptor) obj;
if (obj instanceof IPackageDescriptor pkg) {
return getName().equals(pkg.getName());
}
return false;
Expand Down
3 changes: 1 addition & 2 deletions ...tools/src/org/eclipse/pde/api/tools/internal/descriptors/ReferenceTypeDescriptorImpl.java
View file
Expand Up @@ -118,8 +118,7 @@ public synchronized String getQualifiedName() {

@Override
public boolean equals(Object obj) {
if (obj instanceof IReferenceTypeDescriptor) {
IReferenceTypeDescriptor refType = (IReferenceTypeDescriptor) obj;
if (obj instanceof IReferenceTypeDescriptor refType) {
return getQualifiedName().equals(refType.getQualifiedName());
}
return false;
Expand Down
6 changes: 2 additions & 4 deletions ...s/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiBaseline.java
View file
Expand Up @@ -396,8 +396,7 @@ protected void addComponent(IApiComponent component) {
}

fComponentsById.put(component.getSymbolicName(), component);
if (component instanceof ProjectComponent) {
ProjectComponent projectApiComponent = (ProjectComponent) component;
if (component instanceof ProjectComponent projectApiComponent) {
if (this.fComponentsByProjectNames == null) {
this.fComponentsByProjectNames = new HashMap<>();
}
Expand Down Expand Up @@ -805,8 +804,7 @@ public void setName(String name) {

@Override
public boolean equals(Object obj) {
if (obj instanceof IApiBaseline) {
IApiBaseline baseline = (IApiBaseline) obj;
if (obj instanceof IApiBaseline baseline) {
return this.getName().equals(baseline.getName());
}
return super.equals(obj);
Expand Down
3 changes: 1 addition & 2 deletions ...ols/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiMember.java
View file
Expand Up @@ -99,8 +99,7 @@ public String getPackageName() {

@Override
public boolean equals(Object obj) {
if (obj instanceof IApiElement) {
IApiElement element = (IApiElement) obj;
if (obj instanceof IApiElement element) {
if (element.getType() == this.getType()) {
return enclosingTypesEqual(this, element) && getName().equals(element.getName());
}
Expand Down
6 changes: 2 additions & 4 deletions apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ApiType.java
View file
Expand Up @@ -321,8 +321,7 @@ private void reOrganizeComponents(IApiComponent[] components) throws CoreExcepti
if (javaEE != null) {
for (int i = 0; i < components.length; i++) {
IApiComponent iComponent = components[i];
if (iComponent instanceof SystemLibraryApiComponent) {
SystemLibraryApiComponent sysCom = (SystemLibraryApiComponent) iComponent;
if (iComponent instanceof SystemLibraryApiComponent sysCom) {
if (sysCom.getSymbolicName().equals(javaEE)) {
// swap i and 0;
IApiComponent temp = components[i];
Expand Down Expand Up @@ -495,8 +494,7 @@ public IMemberDescriptor getHandle() {

@Override
public boolean equals(Object obj) {
if (obj instanceof IApiType) {
IApiType type = (IApiType) obj;
if (obj instanceof IApiType type) {
if (getApiComponent() == null) {
return type.getApiComponent() == null && getName().equals(type.getName());
}
Expand Down
3 changes: 1 addition & 2 deletions ...e.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ArchiveApiTypeContainer.java
View file
Expand Up @@ -81,8 +81,7 @@ public int compareTo(Object o) {

@Override
public boolean equals(Object obj) {
if (obj instanceof ArchiveApiTypeRoot) {
ArchiveApiTypeRoot classFile = (ArchiveApiTypeRoot) obj;
if (obj instanceof ArchiveApiTypeRoot classFile) {
return this.getName().equals(classFile.getName());
}
return false;
Expand Down
3 changes: 1 addition & 2 deletions ...g.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java
View file
Expand Up @@ -260,8 +260,7 @@ public boolean isValidBundle() throws CoreException {

@Override
public boolean equals(Object obj) {
if (obj instanceof BundleComponent) {
BundleComponent comp = (BundleComponent) obj;
if (obj instanceof BundleComponent comp) {
return getName().equals(comp.getName()) && getSymbolicName().equals(comp.getSymbolicName()) && getVersion().equals(comp.getVersion());
}
return false;
Expand Down
3 changes: 1 addition & 2 deletions ...ols/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/MethodKey.java
View file
Expand Up @@ -44,8 +44,7 @@ public MethodKey(String typename, String name, String sig, boolean considertypen

@Override
public boolean equals(Object obj) {
if (obj instanceof MethodKey) {
MethodKey key = (MethodKey) obj;
if (obj instanceof MethodKey key) {
return fSelector.equals(key.fSelector) && signaturesEqual(fSig, key.fSig) && (fConsiderTypename ? fTypename.equals(key.fTypename) : true);
}
return false;
Expand Down
3 changes: 1 addition & 2 deletions ...lipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/ResourceApiTypeRoot.java
View file
Expand Up @@ -96,8 +96,7 @@ public int hashCode() {

@Override
public boolean equals(Object obj) {
if (obj instanceof IApiTypeRoot) {
IApiTypeRoot file = (IApiTypeRoot) obj;
if (obj instanceof IApiTypeRoot file) {
return getName().equals(file.getTypeName());
}
return super.equals(obj);
Expand Down
3 changes: 1 addition & 2 deletions ...e.api.tools/src/org/eclipse/pde/api/tools/internal/model/StubArchiveApiTypeContainer.java
View file
Expand Up @@ -79,8 +79,7 @@ public int compareTo(Object o) {

@Override
public boolean equals(Object obj) {
if (obj instanceof ArchiveApiTypeRoot) {
ArchiveApiTypeRoot classFile = (ArchiveApiTypeRoot) obj;
if (obj instanceof ArchiveApiTypeRoot classFile) {
return this.getName().equals(classFile.getName());
}
return false;
Expand Down
3 changes: 1 addition & 2 deletions ...ipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
View file
Expand Up @@ -282,8 +282,7 @@ public static IApiType buildTypeStructure(byte[] bytes, IApiComponent component,
*/
public static void setEnclosingMethod(IApiType enclosingType, ApiType currentAnonymousLocalType) {
IApiTypeRoot typeRoot = enclosingType.getTypeRoot();
if (typeRoot instanceof AbstractApiTypeRoot) {
AbstractApiTypeRoot abstractApiTypeRoot = (AbstractApiTypeRoot) typeRoot;
if (typeRoot instanceof AbstractApiTypeRoot abstractApiTypeRoot) {
EnclosingMethodSetter visitor = new EnclosingMethodSetter(new ClassNode(), currentAnonymousLocalType.getName());
try {
ClassReader classReader = new ClassReader(abstractApiTypeRoot.getContents());
Expand Down
3 changes: 1 addition & 2 deletions ...org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblem.java
View file
Expand Up @@ -209,8 +209,7 @@ public String[] getMessageArguments() {

@Override
public boolean equals(Object obj) {
if (obj instanceof IApiProblem) {
IApiProblem problem = (IApiProblem) obj;
if (obj instanceof IApiProblem problem) {
if (problem.getId() == fId && argumentsEqual(problem.getMessageArguments())) {
String resourcePath = problem.getResourcePath();
if (resourcePath == null) {
Expand Down
3 changes: 1 addition & 2 deletions ...lipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/problems/ApiProblemFilter.java
View file
Expand Up @@ -68,8 +68,7 @@ public String getComponentId() {

@Override
public boolean equals(Object obj) {
if (obj instanceof IApiProblemFilter) {
IApiProblemFilter filter = (IApiProblemFilter) obj;
if (obj instanceof IApiProblemFilter filter) {
return elementsEqual(filter.getComponentId(), fComponentId) && filter.getUnderlyingProblem().equals(fProblem);
} else if (obj instanceof IApiProblem) {
return fProblem.equals(obj);
Expand Down

0 comments on commit 8435fdd

Please sign in to comment.