Skip to content

Commit 7714557

Browse files
committed
cleanup
1 parent 8a41aed commit 7714557

8 files changed

Lines changed: 30 additions & 561 deletions

File tree

lombok.config

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
config.stopBubbling = true
2+
3+
# Required for NullAway to work
4+
lombok.addLombokGeneratedAnnotation = true
5+
6+
# Copy JSpecify annotations to generated code (constructors, getters, setters)
7+
lombok.copyableAnnotations += org.jspecify.annotations.Nullable
8+
lombok.copyableAnnotations += org.jspecify.annotations.NonNull
9+
lombok.addNullAnnotations = jspecify

pom.xml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>4.0.0</version>
9+
<version>4.0.1</version>
1010
<relativePath/> <!-- lookup parent from repository -->
1111
</parent>
1212

1313
<groupId>it.aboutbits</groupId>
1414
<artifactId>spring-boot-testing</artifactId>
15-
<version>1.4.0</version>
15+
<version>2.0.0</version>
1616
<description>Testing library for Spring Boot projects.</description>
1717

1818
<properties>
@@ -26,7 +26,12 @@
2626
<dependency>
2727
<groupId>it.aboutbits</groupId>
2828
<artifactId>spring-boot-toolbox</artifactId>
29-
<version>2.0.0</version>
29+
<version>2.1.0-RC1</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>it.aboutbits</groupId>
33+
<artifactId>archunit-toolbox</artifactId>
34+
<version>1.0.0-RC1</version>
3035
</dependency>
3136
</dependencies>
3237
</dependencyManagement>
@@ -89,6 +94,12 @@
8994
<version>1.4.1</version>
9095
<scope>compile</scope>
9196
</dependency>
97+
98+
<dependency>
99+
<groupId>it.aboutbits</groupId>
100+
<artifactId>archunit-toolbox</artifactId>
101+
<scope>test</scope>
102+
</dependency>
92103
</dependencies>
93104

94105
<build>
@@ -122,7 +133,7 @@
122133
<arg>-XDcompilePolicy=simple</arg>
123134
<arg>--should-stop=ifError=FLOW</arg>
124135
<!-- @formatter:off -->
125-
<arg>-Xplugin:ErrorProne -XepDisableAllChecks -XepOpt:NullAway:AnnotatedPackages=it.aboutbits.springbootboilerplate -XepOpt:NullAway:JSpecifyMode=true -Xep:NullAway:ERROR -XepOpt:NullAway:ExcludedFieldAnnotations=org.mockito.InjectMocks,org.mockito.Mock</arg>
136+
<arg>-Xplugin:ErrorProne -XepDisableAllChecks -XepOpt:NullAway:AnnotatedPackages=it.aboutbits.springboot.testing -XepOpt:NullAway:JSpecifyMode=true -Xep:NullAway:ERROR -XepOpt:NullAway:ExcludedFieldAnnotations=org.mockito.InjectMocks,org.mockito.Mock</arg>
126137
<!-- @formatter:on -->
127138
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED</arg>
128139
<arg>-J--add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED</arg>

src/main/java/it/aboutbits/springboot/testing/archunit/ArchitectureTestBase.java

Lines changed: 0 additions & 510 deletions
This file was deleted.

src/main/java/it/aboutbits/springboot/testing/archunit/support/ArchIgnoreGroupName.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/main/java/it/aboutbits/springboot/testing/archunit/support/ArchIgnoreNoProductionCounterpart.java

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/main/java/it/aboutbits/springboot/testing/web/request/Request.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public Request<R> body(Object body) {
9090
}
9191

9292
@SuppressWarnings("unused")
93-
public Request<R> param(String name, Object value) {
93+
public Request<R> param(String name, @Nullable Object value) {
9494
this.parameters.put(name, String.valueOf(value));
9595
return this;
9696
}

src/test/java/it/aboutbits/springboot/testing/ArchitectureTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package it.aboutbits.springboot.testing;
22

33
import com.tngtech.archunit.junit.AnalyzeClasses;
4-
import it.aboutbits.springboot.testing.archunit.ArchitectureTestBase;
5-
import lombok.extern.slf4j.Slf4j;
4+
import com.tngtech.archunit.junit.CacheMode;
5+
import it.aboutbits.archunit.toolbox.ArchitectureTestBase;
66
import org.jspecify.annotations.NullMarked;
77

8-
@Slf4j
9-
@SuppressWarnings({"checkstyle:ConstantName"})
108
@AnalyzeClasses(
11-
packages = ArchitectureTest.PACKAGE
9+
packages = ArchitectureTest.PACKAGE,
10+
cacheMode = CacheMode.PER_CLASS
1211
)
1312
@NullMarked
1413
class ArchitectureTest extends ArchitectureTestBase {

src/test/java/it/aboutbits/springboot/testing/validation/ValidationAssertTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package it.aboutbits.springboot.testing.validation;
22

3-
import it.aboutbits.springboot.testing.archunit.support.ArchIgnoreNoProductionCounterpart;
3+
import it.aboutbits.archunit.toolbox.support.ArchIgnoreNoProductionCounterpart;
44
import it.aboutbits.springboot.testing.validation.core.BaseRuleBuilder;
55
import it.aboutbits.springboot.testing.validation.core.BaseValidationAssert;
66
import it.aboutbits.springboot.toolbox.type.ScaledBigDecimal;

0 commit comments

Comments
 (0)