Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 2 additions & 9 deletions jdk-annotation-processor/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,6 @@
<artifactId>codemodel-framework-builder</artifactId>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
Expand All @@ -106,8 +99,8 @@
</dependency>

<dependency>
<groupId>com.google.testing.compile</groupId>
<artifactId>compile-testing</artifactId>
<groupId>build.base</groupId>
<artifactId>base-compile-testing</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package build.codemodel.annotation.processing;

import com.google.testing.compile.Compilation;
import com.google.testing.compile.Compiler;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.Compilation;
import build.base.compile.testing.Compiler;
import build.base.compile.testing.JavaFileObjects;

import java.io.File;
import java.nio.file.FileSystems;
import java.util.Arrays;
import java.util.Locale;

import static com.google.testing.compile.Compilation.Status.SUCCESS;
import static org.assertj.core.api.Assertions.assertThat;

abstract class AnnotationProcessorTests {
Expand All @@ -23,7 +22,7 @@ protected static Compilation compile(final AnnotationProcessor processor,
compilation.diagnostics()
.forEach(d -> System.out.printf("[%s] %s%n", d.getKind(), d.getMessage(Locale.ROOT)));

assertThat(compilation.status()).isEqualTo(SUCCESS);
assertThat(compilation.status()).isEqualTo(Compilation.Status.SUCCESS);
return compilation;
}

Expand All @@ -43,7 +42,7 @@ protected static Compilation run(final AnnotationProcessor processor,
private static Compiler makeCompiler(final AnnotationProcessor processor) {
final var classPath = Arrays.stream(System.getProperty("java.class.path", "").split(File.pathSeparator))
.filter(s -> !s.isBlank())
.map(p -> FileSystems.getDefault().getPath(p).toFile())
.map(p -> FileSystems.getDefault().getPath(p))
.toList();

var compiler = Compiler.javac()
Expand Down
4 changes: 2 additions & 2 deletions jdk-codemodel/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@
</dependency>

<dependency>
<groupId>com.google.testing.compile</groupId>
<artifactId>compile-testing</artifactId>
<groupId>build.base</groupId>
<artifactId>base-compile-testing</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import build.codemodel.jdk.expression.ArrayAccess;
import build.codemodel.jdk.statement.LocalVariableDeclaration;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import build.codemodel.objectoriented.descriptor.ConstructorDescriptor;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package build.codemodel.jdk;

import build.base.compile.testing.JavaFileObjects;
import build.codemodel.foundation.descriptor.ThrowableDescriptor;
import build.codemodel.foundation.usage.NamedTypeUsage;
import build.codemodel.jdk.descriptor.Varargs;
import build.codemodel.objectoriented.descriptor.AccessModifier;
import build.codemodel.objectoriented.descriptor.ConstructorDescriptor;
import build.codemodel.objectoriented.descriptor.ParameterizedTypeDescriptor;
import com.google.testing.compile.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import build.codemodel.objectoriented.descriptor.ExtendsTypeDescriptor;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import build.codemodel.jdk.statement.ExpressionStatement;
import build.codemodel.jdk.statement.LocalVariableDeclaration;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import build.codemodel.jdk.statement.ExpressionStatement;
import build.codemodel.jdk.statement.LocalVariableDeclaration;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import build.codemodel.jdk.expression.FieldAccess;
import build.codemodel.jdk.statement.LocalVariableDeclaration;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import build.codemodel.objectoriented.descriptor.AccessModifier;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import build.codemodel.objectoriented.descriptor.ParameterizedTypeDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

import build.codemodel.jdk.descriptor.ImportDeclaration;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.Comparator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
* #L%
*/

import build.base.compile.testing.JavaFileObjects;
import build.codemodel.foundation.descriptor.RequiresModuleDescriptor;
import build.codemodel.foundation.naming.NonCachingNameProvider;
import build.codemodel.foundation.usage.SpecificTypeUsage;
Expand All @@ -28,7 +29,6 @@
import build.codemodel.jdk.descriptor.SourceLocation;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import build.codemodel.objectoriented.descriptor.ConstructorDescriptor;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.io.ByteArrayOutputStream;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import build.codemodel.jdk.descriptor.SourceLocation;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import build.codemodel.jdk.descriptor.SourceLocation;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.Comparator;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import build.codemodel.objectoriented.descriptor.Classification;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import build.codemodel.jdk.expression.MethodInvocation;
import build.codemodel.jdk.statement.ExpressionStatement;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import build.codemodel.jdk.descriptor.MethodBodyDescriptor;
import build.codemodel.jdk.expression.MethodReference;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import build.codemodel.jdk.expression.ResolvedMethod;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import build.codemodel.jdk.JdkInitializer;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import build.codemodel.jdk.descriptor.OpensDescriptor;
import build.codemodel.jdk.descriptor.ProvidesDescriptor;
import build.codemodel.jdk.descriptor.UsesDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

import build.codemodel.foundation.naming.ModuleName;
import build.codemodel.jdk.descriptor.MemberTypeDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;
import org.junit.jupiter.api.Test;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

import build.codemodel.jdk.descriptor.EnclosingTypeDescriptor;
import build.codemodel.jdk.descriptor.MemberTypeDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import build.codemodel.objectoriented.descriptor.ParameterizedTypeDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import build.codemodel.objectoriented.descriptor.ConstructorDescriptor;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import build.codemodel.jdk.expression.Identifier;
import build.codemodel.jdk.expression.Symbol;
import build.codemodel.objectoriented.descriptor.MethodDescriptor;
import com.google.testing.compile.JavaFileObjects;
import build.base.compile.testing.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package build.codemodel.jdk;

import build.base.compile.testing.JavaFileObjects;
import build.codemodel.foundation.usage.AnnotationTypeUsage;
import build.codemodel.foundation.usage.GenericTypeUsage;
import build.codemodel.foundation.usage.TypeVariableUsage;
import build.codemodel.foundation.usage.UnknownTypeUsage;
import build.codemodel.foundation.usage.WildcardTypeUsage;
import build.codemodel.objectoriented.descriptor.FieldDescriptor;
import com.google.testing.compile.JavaFileObjects;
import org.junit.jupiter.api.Test;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package build.codemodel.jdk;

import build.base.compile.testing.JavaFileObjects;
import build.codemodel.foundation.naming.NonCachingNameProvider;
import build.codemodel.jdk.descriptor.AnnotationType;
import build.codemodel.jdk.descriptor.EnumType;
Expand All @@ -21,7 +22,7 @@ class TypeKindDiscoveryTests {

@Test
void shouldDetectEnumType() {
final var source = com.google.testing.compile.JavaFileObjects.forSourceString(
final var source = JavaFileObjects.forSourceString(
"com.example.Color",
"""
package com.example;
Expand All @@ -38,7 +39,7 @@ public enum Color { RED, GREEN, BLUE }

@Test
void shouldDetectRecordType() {
final var source = com.google.testing.compile.JavaFileObjects.forSourceString(
final var source = JavaFileObjects.forSourceString(
"com.example.Point",
"""
package com.example;
Expand All @@ -55,7 +56,7 @@ public record Point(int x, int y) {}

@Test
void shouldDetectAnnotationType() {
final var source = com.google.testing.compile.JavaFileObjects.forSourceString(
final var source = JavaFileObjects.forSourceString(
"com.example.Marker",
"""
package com.example;
Expand All @@ -72,7 +73,7 @@ void shouldDetectAnnotationType() {

@Test
void shouldCaptureEnumConstants() {
final var source = com.google.testing.compile.JavaFileObjects.forSourceString(
final var source = JavaFileObjects.forSourceString(
"com.example.Color",
"""
package com.example;
Expand All @@ -92,7 +93,7 @@ public enum Color { RED, GREEN, BLUE }

@Test
void shouldCaptureRecordComponents() {
final var source = com.google.testing.compile.JavaFileObjects.forSourceString(
final var source = JavaFileObjects.forSourceString(
"com.example.Point",
"""
package com.example;
Expand All @@ -113,7 +114,7 @@ public record Point(int x, int y) {}

@Test
void shouldCaptureAnnotationMemberDefault() {
final var source = com.google.testing.compile.JavaFileObjects.forSourceString(
final var source = JavaFileObjects.forSourceString(
"com.example.Marker",
"""
package com.example;
Expand Down Expand Up @@ -148,7 +149,7 @@ void shouldCaptureAnnotationMemberDefault() {

@Test
void shouldCaptureEnclosingTypeForNestedClass() {
final var source = com.google.testing.compile.JavaFileObjects.forSourceString(
final var source = JavaFileObjects.forSourceString(
"com.example.Outer",
"""
package com.example;
Expand Down Expand Up @@ -180,7 +181,7 @@ public static class Inner {}

@Test
void enumConstantsShouldBeReturnedInSourceDeclarationOrder() {
final var source = com.google.testing.compile.JavaFileObjects.forSourceString(
final var source = JavaFileObjects.forSourceString(
"com.example.Planet",
"""
package com.example;
Expand Down
Loading