Skip to content

Commit b9e283e

Browse files
create package for variance related classes
1 parent 2c2ec82 commit b9e283e

File tree

8 files changed

+17
-15
lines changed

8 files changed

+17
-15
lines changed

src/main/java/io/github/bldl/annotationProcessing/VarianceProcessor.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55

66
import java.lang.annotation.Annotation;
77

8-
import io.github.bldl.annotationProcessing.annotations.Contravariant;
9-
import io.github.bldl.annotationProcessing.annotations.Covariant;
10-
import io.github.bldl.annotationProcessing.annotations.MyVariance;
118
import io.github.bldl.astParsing.AstManipulator;
129
import io.github.bldl.astParsing.util.TypeHandler;
1310
import io.github.bldl.astParsing.visitors.ParameterTypeCollector;
1411
import io.github.bldl.astParsing.visitors.ReturnTypeCollector;
12+
import io.github.bldl.variance.annotations.Contravariant;
13+
import io.github.bldl.variance.annotations.Covariant;
14+
import io.github.bldl.variance.annotations.MyVariance;
15+
import io.github.bldl.variance.annotations.VarianceType;
1516
import io.leangen.geantyref.AnnotationFormatException;
1617
import io.leangen.geantyref.TypeFactory;
1718

src/main/java/io/github/bldl/astParsing/AstManipulator.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver;
1818
import com.github.javaparser.utils.CodeGenerationUtils;
1919
import com.github.javaparser.utils.SourceRoot;
20-
import io.github.bldl.annotationProcessing.annotations.MyVariance;
20+
2121
import io.github.bldl.astParsing.util.ClassData;
2222
import io.github.bldl.astParsing.util.MethodData;
2323
import io.github.bldl.astParsing.util.ParamData;
@@ -28,6 +28,8 @@
2828
import io.github.bldl.astParsing.visitors.VariableCollector;
2929
import io.github.bldl.graph.ClassHierarchyGraph;
3030
import io.github.bldl.util.Pair;
31+
import io.github.bldl.variance.annotations.MyVariance;
32+
3133
import com.github.javaparser.ast.body.Parameter;
3234
import java.io.File;
3335
import java.io.IOException;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.bldl.astParsing.util;
22

3-
import io.github.bldl.annotationProcessing.annotations.MyVariance;
3+
import io.github.bldl.variance.annotations.MyVariance;
44

55
public record ParamData(int index, String leftmostBound, MyVariance variance) {
66
}

src/main/java/io/github/bldl/astParsing/visitors/SubtypingCheckVisitor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
import com.github.javaparser.resolution.types.ResolvedReferenceType;
1818
import com.github.javaparser.resolution.types.ResolvedType;
1919

20-
import io.github.bldl.annotationProcessing.annotations.MyVariance;
2120
import io.github.bldl.astParsing.AstManipulator;
2221
import io.github.bldl.astParsing.util.ClassData;
2322
import io.github.bldl.graph.ClassHierarchyGraph;
23+
import io.github.bldl.variance.annotations.MyVariance;
2424

2525
public class SubtypingCheckVisitor extends VoidVisitorAdapter<Void> {
2626
private final Map<String, Map<Integer, Type>> methodParams;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.bldl.annotationProcessing.annotations;
1+
package io.github.bldl.variance.annotations;
22

33
import java.lang.annotation.ElementType;
44
import java.lang.annotation.Retention;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.bldl.annotationProcessing.annotations;
1+
package io.github.bldl.variance.annotations;
22

33
import java.lang.annotation.ElementType;
44
import java.lang.annotation.Retention;
Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
package io.github.bldl.annotationProcessing.annotations;
1+
package io.github.bldl.variance.annotations;
22

33
import java.lang.annotation.ElementType;
44
import java.lang.annotation.Retention;
55
import java.lang.annotation.RetentionPolicy;
66
import java.lang.annotation.Target;
77

8-
import io.github.bldl.annotationProcessing.VarianceType;
9-
108
/**
119
* Indicates the variance characteristics of a type parameter.
1210
* <p>
@@ -48,17 +46,18 @@
4846
* Indicates whether strict variance checking is enforced.
4947
*
5048
* <p>
51-
* If set to true, the compiler will enforce strict variance rules.
49+
* If set to true, the compiler will enforce strict variance rules.
5250
* This means that compilation will fail if the specified variance
53-
* is not adhered to. If set to false, warnings are logged, but program will still compile.
51+
* is not adhered to. If set to false, warnings are logged, but program will
52+
* still compile.
5453
* </p>
5554
*
5655
* @return true if strict checking is enforced; false otherwise
5756
*/
5857
public boolean strict() default false;
5958

6059
public Class<?>[] requiredSubtypes() default {};
61-
60+
6261
public Class<?>[] requiredSupertypes() default {};
6362

6463
}

src/main/java/io/github/bldl/annotationProcessing/VarianceType.java renamed to src/main/java/io/github/bldl/variance/annotations/VarianceType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.bldl.annotationProcessing;
1+
package io.github.bldl.variance.annotations;
22

33
public enum VarianceType {
44
INVARIANT,

0 commit comments

Comments
 (0)