Skip to content

Commit cd96c1e

Browse files
committed
Update spring-javaformat to 0.0.48
Close gh-1820
1 parent 8dae990 commit cd96c1e

7 files changed

Lines changed: 15 additions & 11 deletions

File tree

initializr-generator/src/main/java/io/spring/initializr/generator/buildsystem/maven/MavenPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ public MavenPlugin build() {
281281
*/
282282
public static class ExecutionBuilder {
283283

284-
private @Nullable final String id;
284+
private final @Nullable String id;
285285

286286
private @Nullable String phase;
287287

initializr-generator/src/main/java/io/spring/initializr/generator/language/Annotation.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,11 @@ protected boolean isCompatible(AttributeType attributeType) {
290290
}
291291
};
292292

293-
protected boolean isCompatible(AttributeType attributeType) {
293+
boolean isCompatible(AttributeType attributeType) {
294294
return this.equals(attributeType) || attributeType == AttributeType.CODE;
295295
}
296296

297-
protected Collection<String> getImports(Object value) {
297+
Collection<String> getImports(Object value) {
298298
if (value instanceof CodeBlock codeBlock) {
299299
return codeBlock.getImports();
300300
}

initializr-metadata/src/main/java/io/spring/initializr/metadata/BillOfMaterials.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import com.fasterxml.jackson.annotation.JsonIgnore;
2424
import com.fasterxml.jackson.annotation.JsonInclude;
25+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2526
import io.spring.initializr.generator.version.InvalidVersionException;
2627
import io.spring.initializr.generator.version.Version;
2728
import io.spring.initializr.generator.version.VersionParser;
@@ -37,7 +38,7 @@
3738
*
3839
* @author Stephane Nicoll
3940
*/
40-
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
41+
@JsonInclude(Include.NON_DEFAULT)
4142
public class BillOfMaterials {
4243

4344
private @Nullable String groupId;
@@ -233,7 +234,7 @@ public static BillOfMaterials create(String groupId, String artifactId, String v
233234
/**
234235
* Mapping information.
235236
*/
236-
@JsonInclude(JsonInclude.Include.NON_EMPTY)
237+
@JsonInclude(Include.NON_EMPTY)
237238
public static class Mapping {
238239

239240
private @Nullable String compatibilityRange;

initializr-metadata/src/main/java/io/spring/initializr/metadata/Dependency.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import com.fasterxml.jackson.annotation.JsonIgnore;
2424
import com.fasterxml.jackson.annotation.JsonInclude;
25+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2526
import io.spring.initializr.generator.version.InvalidVersionException;
2627
import io.spring.initializr.generator.version.Version;
2728
import io.spring.initializr.generator.version.VersionParser;
@@ -37,7 +38,7 @@
3738
*
3839
* @author Stephane Nicoll
3940
*/
40-
@JsonInclude(JsonInclude.Include.NON_EMPTY)
41+
@JsonInclude(Include.NON_EMPTY)
4142
public class Dependency extends MetadataElement implements Describable {
4243

4344
/**
@@ -108,7 +109,7 @@ public class Dependency extends MetadataElement implements Describable {
108109

109110
private @Nullable String repository;
110111

111-
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
112+
@JsonInclude(Include.NON_DEFAULT)
112113
private int weight;
113114

114115
/**

initializr-metadata/src/main/java/io/spring/initializr/metadata/Link.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import com.fasterxml.jackson.annotation.JsonIgnore;
3030
import com.fasterxml.jackson.annotation.JsonInclude;
31+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
3132
import org.jspecify.annotations.Nullable;
3233

3334
import org.springframework.util.Assert;
@@ -60,7 +61,7 @@ public class Link {
6061
/**
6162
* Specify if the URI is templated.
6263
*/
63-
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
64+
@JsonInclude(Include.NON_DEFAULT)
6465
private boolean templated;
6566

6667
@JsonIgnore
@@ -69,7 +70,7 @@ public class Link {
6970
/**
7071
* A description of the link.
7172
*/
72-
@JsonInclude(JsonInclude.Include.NON_NULL)
73+
@JsonInclude(Include.NON_NULL)
7374
private @Nullable String description;
7475

7576
public Link() {

initializr-metadata/src/main/java/io/spring/initializr/metadata/ServiceCapability.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2020
import com.fasterxml.jackson.annotation.JsonInclude;
21+
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2122
import org.jspecify.annotations.Nullable;
2223

2324
import org.springframework.util.Assert;
@@ -31,7 +32,7 @@
3132
* @author Stephane Nicoll
3233
*/
3334
@JsonIgnoreProperties({ "default", "all" })
34-
@JsonInclude(JsonInclude.Include.NON_NULL)
35+
@JsonInclude(Include.NON_NULL)
3536
public abstract class ServiceCapability<T> implements Cloneable {
3637

3738
private final String id;

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
</property>
9090
</activation>
9191
<properties>
92-
<spring-javaformat.version>0.0.47</spring-javaformat.version>
92+
<spring-javaformat.version>0.0.48</spring-javaformat.version>
9393
<nohttp-checkstyle.version>0.0.11</nohttp-checkstyle.version>
9494
</properties>
9595
<build>

0 commit comments

Comments
 (0)