Add support for casts #822
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * Copyright 2014-2022 TNG Technology Consulting GmbH | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.tngtech.archunit.core.domain; | ||
|
|
||
| import com.tngtech.archunit.PublicAPI; | ||
| import com.tngtech.archunit.core.domain.properties.HasOwner; | ||
| import com.tngtech.archunit.core.domain.properties.HasSourceCodeLocation; | ||
| import com.tngtech.archunit.core.domain.properties.HasType; | ||
|
|
||
| import static com.google.common.base.MoreObjects.toStringHelper; | ||
| import static com.google.common.base.Preconditions.checkNotNull; | ||
| import static com.tngtech.archunit.PublicAPI.Usage.ACCESS; | ||
|
|
||
| @PublicAPI(usage = ACCESS) | ||
| public final class TypeCast implements HasType, HasOwner<JavaCodeUnit>, HasSourceCodeLocation { | ||
|
|
||
| private final JavaCodeUnit owner; | ||
| private final JavaClass value; | ||
| private final int lineNumber; | ||
| private final SourceCodeLocation sourceCodeLocation; | ||
|
|
||
| private TypeCast(JavaCodeUnit owner, JavaClass value, int lineNumber) { | ||
| this.owner = checkNotNull(owner); | ||
| this.value = checkNotNull(value); | ||
| this.lineNumber = lineNumber; | ||
|
There was a problem hiding this comment. We don't have to store the |
||
| sourceCodeLocation = SourceCodeLocation.of(owner.getOwner(), lineNumber); | ||
| } | ||
|
|
||
| @Override | ||
| @PublicAPI(usage = ACCESS) | ||
| public JavaClass getRawType() { | ||
| return value; | ||
| } | ||
|
|
||
| @Override | ||
| @PublicAPI(usage = ACCESS) | ||
| public JavaType getType() { | ||
| return value; | ||
| } | ||
|
|
||
| @Override | ||
| @PublicAPI(usage = ACCESS) | ||
| public JavaCodeUnit getOwner() { | ||
| return owner; | ||
| } | ||
|
|
||
| @PublicAPI(usage = ACCESS) | ||
| public int getLineNumber() { | ||
| return lineNumber; | ||
| } | ||
|
|
||
| @Override | ||
| public SourceCodeLocation getSourceCodeLocation() { | ||
| return sourceCodeLocation; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return toStringHelper(this) | ||
| .add("owner", owner) | ||
| .add("target", value) | ||
| .add("lineNumber", lineNumber) | ||
| .toString(); | ||
| } | ||
|
|
||
| static TypeCast from(JavaCodeUnit owner, JavaClass target, int lineNumber) { | ||
| return new TypeCast(owner, target, lineNumber); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,54 +34,20 @@ | |
| import com.tngtech.archunit.base.Function; | ||
| import com.tngtech.archunit.base.HasDescription; | ||
| import com.tngtech.archunit.base.Optional; | ||
| import com.tngtech.archunit.core.domain.*; | ||
|
There was a problem hiding this comment. We don't use There was a problem hiding this comment. sorry for it, did not set intellij auto format, |
||
| import com.tngtech.archunit.core.domain.AccessTarget.CodeUnitAccessTarget; | ||
| import com.tngtech.archunit.core.domain.AccessTarget.ConstructorCallTarget; | ||
| import com.tngtech.archunit.core.domain.AccessTarget.ConstructorReferenceTarget; | ||
| import com.tngtech.archunit.core.domain.AccessTarget.FieldAccessTarget; | ||
| import com.tngtech.archunit.core.domain.AccessTarget.MethodCallTarget; | ||
| import com.tngtech.archunit.core.domain.AccessTarget.MethodReferenceTarget; | ||
| import com.tngtech.archunit.core.domain.JavaFieldAccess.AccessType; | ||
| import com.tngtech.archunit.core.domain.properties.HasTypeParameters; | ||
|
|
||
| import static com.google.common.base.Preconditions.checkArgument; | ||
| import static com.google.common.base.Preconditions.checkNotNull; | ||
| import static com.google.common.collect.Sets.union; | ||
| import static com.tngtech.archunit.core.domain.DomainObjectCreationContext.*; | ||
| import static com.tngtech.archunit.core.domain.Formatters.ensureCanonicalArrayTypeName; | ||
| import static com.tngtech.archunit.core.domain.JavaConstructor.CONSTRUCTOR_NAME; | ||
| import static com.tngtech.archunit.core.domain.properties.HasName.Utils.namesOf; | ||
|
|
@@ -248,6 +214,7 @@ public abstract static class JavaCodeUnitBuilder<OUTPUT, SELF extends JavaCodeUn | |
| private List<JavaClassDescriptor> throwsDeclarations; | ||
| private final Set<RawReferencedClassObject> rawReferencedClassObjects = new HashSet<>(); | ||
| private final List<RawInstanceofCheck> instanceOfChecks = new ArrayList<>(); | ||
| private final List<RawTypeCast> rawTypeCasts = new ArrayList<>(); | ||
|
|
||
| private JavaCodeUnitBuilder() { | ||
| } | ||
|
|
@@ -289,6 +256,11 @@ SELF addInstanceOfCheck(RawInstanceofCheck rawInstanceOfChecks) { | |
| return self(); | ||
| } | ||
|
|
||
| SELF addRawTypeCast(RawTypeCast rawTypeCast) { | ||
| this.rawTypeCasts.add(rawTypeCast); | ||
| return self(); | ||
| } | ||
|
|
||
| List<String> getParameterTypeNames() { | ||
| ImmutableList.Builder<String> result = ImmutableList.builder(); | ||
| for (JavaClassDescriptor parameter : rawParameterTypes) { | ||
|
|
@@ -359,6 +331,14 @@ public Set<InstanceofCheck> getInstanceofChecks(JavaCodeUnit codeUnit) { | |
| return result.build(); | ||
| } | ||
|
|
||
| public Set<TypeCast> getRawTypeCasts(JavaCodeUnit codeUnit) { | ||
| ImmutableSet.Builder<TypeCast> result = ImmutableSet.builder(); | ||
| for (RawTypeCast rawTypeCast : this.rawTypeCasts) { | ||
| result.add(createTypeCast(codeUnit, get(rawTypeCast.getTarget().getFullyQualifiedClassName()), rawTypeCast.getLineNumber())); | ||
| } | ||
| return result.build(); | ||
| } | ||
|
|
||
| private List<JavaClass> asJavaClasses(List<JavaClassDescriptor> descriptors) { | ||
| ImmutableList.Builder<JavaClass> result = ImmutableList.builder(); | ||
| for (JavaClassDescriptor javaClassDescriptor : descriptors) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| /* | ||
| * Copyright 2014-2022 TNG Technology Consulting GmbH | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.tngtech.archunit.core.importer; | ||
|
|
||
| import com.tngtech.archunit.core.domain.JavaClassDescriptor; | ||
|
|
||
| import static com.google.common.base.MoreObjects.toStringHelper; | ||
|
|
||
| class RawTypeCast { | ||
|
|
||
| private final JavaClassDescriptor target; | ||
| private final int lineNumber; | ||
|
|
||
| private RawTypeCast(JavaClassDescriptor target, int lineNumber) { | ||
| this.target = target; | ||
| this.lineNumber = lineNumber; | ||
| } | ||
|
|
||
| static RawTypeCast from(JavaClassDescriptor target, int lineNumber) { | ||
| return new RawTypeCast(target, lineNumber); | ||
| } | ||
|
|
||
| JavaClassDescriptor getTarget() { | ||
| return target; | ||
| } | ||
|
|
||
| int getLineNumber() { | ||
| return lineNumber; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return toStringHelper(this) | ||
| .add("target", target) | ||
| .add("lineNumber", lineNumber) | ||
| .toString(); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe
getTypeCasts? (And same inJavaMembers.)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok, so the idea is to move typeCast inside JavaMembers class? or just call getTypeCasts inside it like for example getReferencedClassObjects method?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This method is currently called
getypeCast. As it returns aSetofTypeCastobjects, I thought that a pluralized namegetTypeCastsmight be more appropriate.The delegation to
JavaMembersis probably fine, but I'd also rename the method there.