Skip to content

Commit c61b35e

Browse files
committed
refactor: apply spring java format formatting
1 parent 2c79a55 commit c61b35e

4 files changed

Lines changed: 618 additions & 592 deletions

File tree

‎src/main/java/se/lfv/reqstool/gradle/RequirementsToolExtension.java‎

Lines changed: 82 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -9,87 +9,89 @@
99
import java.io.File;
1010

1111
/**
12-
* Extension for configuring the Reqstool Gradle Plugin.
13-
* Provides zero-configuration defaults matching the Maven plugin behavior.
12+
* Extension for configuring the Reqstool Gradle Plugin. Provides zero-configuration
13+
* defaults matching the Maven plugin behavior.
1414
*/
1515
public class RequirementsToolExtension {
1616

17-
private final RegularFileProperty requirementsAnnotationsFile;
18-
private final RegularFileProperty svcsAnnotationsFile;
19-
private final RegularFileProperty outputDirectory;
20-
private final RegularFileProperty datasetPath;
21-
private final ListProperty<String> testResults;
22-
private final Property<Boolean> skip;
23-
private final Property<Boolean> skipAssembleZipArtifact;
24-
private final Property<Boolean> skipAttachZipArtifact;
25-
26-
public RequirementsToolExtension(Project project) {
27-
this.requirementsAnnotationsFile = project.getObjects().fileProperty();
28-
this.svcsAnnotationsFile = project.getObjects().fileProperty();
29-
this.outputDirectory = project.getObjects().fileProperty();
30-
this.datasetPath = project.getObjects().fileProperty();
31-
this.testResults = project.getObjects().listProperty(String.class);
32-
this.skip = project.getObjects().property(Boolean.class);
33-
this.skipAssembleZipArtifact = project.getObjects().property(Boolean.class);
34-
this.skipAttachZipArtifact = project.getObjects().property(Boolean.class);
35-
36-
// Set defaults matching
37-
this.requirementsAnnotationsFile.convention(
38-
project.getLayout().getBuildDirectory()
39-
.file("generated/sources/annotationProcessor/java/main/resources/annotations.yml")
40-
);
41-
this.svcsAnnotationsFile.convention(
42-
project.getLayout().getBuildDirectory()
43-
.file("generated/sources/annotationProcessor/java/test/resources/annotations.yml")
44-
);
45-
this.outputDirectory.convention(
46-
project.getObjects().fileProperty().fileProvider(
47-
project.getLayout().getBuildDirectory().map(d -> d.dir("reqstool").getAsFile())
48-
)
49-
);
50-
this.datasetPath.convention(
51-
project.getLayout().getProjectDirectory().file("reqstool")
52-
);
53-
54-
// Gradle default test results pattern
55-
this.testResults.convention(project.provider(() -> {
56-
return java.util.Arrays.asList("build/test-results/**/*.xml");
57-
}));
58-
59-
this.skip.convention(false);
60-
this.skipAssembleZipArtifact.convention(false);
61-
this.skipAttachZipArtifact.convention(false);
62-
}
63-
64-
public RegularFileProperty getRequirementsAnnotationsFile() {
65-
return requirementsAnnotationsFile;
66-
}
67-
68-
public RegularFileProperty getSvcsAnnotationsFile() {
69-
return svcsAnnotationsFile;
70-
}
71-
72-
public RegularFileProperty getOutputDirectory() {
73-
return outputDirectory;
74-
}
75-
76-
public RegularFileProperty getDatasetPath() {
77-
return datasetPath;
78-
}
79-
80-
public ListProperty<String> getTestResults() {
81-
return testResults;
82-
}
83-
84-
public Property<Boolean> getSkip() {
85-
return skip;
86-
}
87-
88-
public Property<Boolean> getSkipAssembleZipArtifact() {
89-
return skipAssembleZipArtifact;
90-
}
91-
92-
public Property<Boolean> getSkipAttachZipArtifact() {
93-
return skipAttachZipArtifact;
94-
}
17+
private final RegularFileProperty requirementsAnnotationsFile;
18+
19+
private final RegularFileProperty svcsAnnotationsFile;
20+
21+
private final RegularFileProperty outputDirectory;
22+
23+
private final RegularFileProperty datasetPath;
24+
25+
private final ListProperty<String> testResults;
26+
27+
private final Property<Boolean> skip;
28+
29+
private final Property<Boolean> skipAssembleZipArtifact;
30+
31+
private final Property<Boolean> skipAttachZipArtifact;
32+
33+
public RequirementsToolExtension(Project project) {
34+
this.requirementsAnnotationsFile = project.getObjects().fileProperty();
35+
this.svcsAnnotationsFile = project.getObjects().fileProperty();
36+
this.outputDirectory = project.getObjects().fileProperty();
37+
this.datasetPath = project.getObjects().fileProperty();
38+
this.testResults = project.getObjects().listProperty(String.class);
39+
this.skip = project.getObjects().property(Boolean.class);
40+
this.skipAssembleZipArtifact = project.getObjects().property(Boolean.class);
41+
this.skipAttachZipArtifact = project.getObjects().property(Boolean.class);
42+
43+
// Set defaults matching
44+
this.requirementsAnnotationsFile.convention(project.getLayout()
45+
.getBuildDirectory()
46+
.file("generated/sources/annotationProcessor/java/main/resources/annotations.yml"));
47+
this.svcsAnnotationsFile.convention(project.getLayout()
48+
.getBuildDirectory()
49+
.file("generated/sources/annotationProcessor/java/test/resources/annotations.yml"));
50+
this.outputDirectory.convention(project.getObjects()
51+
.fileProperty()
52+
.fileProvider(project.getLayout().getBuildDirectory().map(d -> d.dir("reqstool").getAsFile())));
53+
this.datasetPath.convention(project.getLayout().getProjectDirectory().file("reqstool"));
54+
55+
// Gradle default test results pattern
56+
this.testResults.convention(project.provider(() -> {
57+
return java.util.Arrays.asList("build/test-results/**/*.xml");
58+
}));
59+
60+
this.skip.convention(false);
61+
this.skipAssembleZipArtifact.convention(false);
62+
this.skipAttachZipArtifact.convention(false);
63+
}
64+
65+
public RegularFileProperty getRequirementsAnnotationsFile() {
66+
return requirementsAnnotationsFile;
67+
}
68+
69+
public RegularFileProperty getSvcsAnnotationsFile() {
70+
return svcsAnnotationsFile;
71+
}
72+
73+
public RegularFileProperty getOutputDirectory() {
74+
return outputDirectory;
75+
}
76+
77+
public RegularFileProperty getDatasetPath() {
78+
return datasetPath;
79+
}
80+
81+
public ListProperty<String> getTestResults() {
82+
return testResults;
83+
}
84+
85+
public Property<Boolean> getSkip() {
86+
return skip;
87+
}
88+
89+
public Property<Boolean> getSkipAssembleZipArtifact() {
90+
return skipAssembleZipArtifact;
91+
}
92+
93+
public Property<Boolean> getSkipAttachZipArtifact() {
94+
return skipAttachZipArtifact;
95+
}
96+
9597
}

‎src/main/java/se/lfv/reqstool/gradle/RequirementsToolPlugin.java‎

Lines changed: 61 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -10,72 +10,71 @@
1010
import org.gradle.api.tasks.TaskProvider;
1111

1212
/**
13-
* Gradle plugin for assembling and attaching reqstool ZIP artifacts.
14-
* Mimics the behavior of the reqstool-maven-plugin.
13+
* Gradle plugin for assembling and attaching reqstool ZIP artifacts. Mimics the behavior
14+
* of the reqstool-maven-plugin.
1515
*/
1616
public class RequirementsToolPlugin implements Plugin<Project> {
1717

18-
@Override
19-
public void apply(Project project) {
20-
// Create extension for configuration
21-
RequirementsToolExtension extension = project.getExtensions()
22-
.create("requirementsTool", RequirementsToolExtension.class, project);
18+
@Override
19+
public void apply(Project project) {
20+
// Create extension for configuration
21+
RequirementsToolExtension extension = project.getExtensions()
22+
.create("requirementsTool", RequirementsToolExtension.class, project);
2323

24-
// Register the assembleRequirements task
25-
TaskProvider<RequirementsToolTask> assembleTask = project.getTasks()
26-
.register("assembleRequirements", RequirementsToolTask.class, task -> {
27-
task.setGroup("build");
28-
task.setDescription("Assembles reqstool ZIP artifact with requirements annotations and test results");
29-
30-
// Configure task inputs from extension
31-
task.getRequirementsAnnotationsFile().set(extension.getRequirementsAnnotationsFile());
32-
task.getSvcsAnnotationsFile().set(extension.getSvcsAnnotationsFile());
33-
task.getOutputDirectory().set(extension.getOutputDirectory());
34-
task.getDatasetPath().set(extension.getDatasetPath());
35-
task.getTestResults().set(extension.getTestResults());
36-
task.getSkip().set(extension.getSkip());
37-
task.getSkipAssembleZipArtifact().set(extension.getSkipAssembleZipArtifact());
38-
task.getSkipAttachZipArtifact().set(extension.getSkipAttachZipArtifact());
39-
task.getProjectName().set(project.getName());
40-
task.getProjectVersion().set(project.provider(() -> String.valueOf(project.getVersion())));
41-
task.getProjectBasedir().set(project.getProjectDir());
42-
43-
// Configure ZIP output file
44-
String archiveBaseName = project.hasProperty("archivesBaseName")
45-
? String.valueOf(project.property("archivesBaseName"))
46-
: project.getName();
47-
String zipFileName = archiveBaseName + "-reqstool.zip";
48-
task.getZipFile().set(
49-
extension.getOutputDirectory().map(dir ->
50-
project.getLayout().getProjectDirectory().file(dir.getAsFile().getPath() + "/" + zipFileName)
51-
)
52-
);
53-
});
24+
// Register the assembleRequirements task
25+
TaskProvider<RequirementsToolTask> assembleTask = project.getTasks()
26+
.register("assembleRequirements", RequirementsToolTask.class, task -> {
27+
task.setGroup("build");
28+
task.setDescription("Assembles reqstool ZIP artifact with requirements annotations and test results");
5429

55-
// Auto-configure Maven publishing if maven-publish plugin is applied
56-
project.getPlugins().withId("maven-publish", plugin -> {
57-
configureMavenPublishing(project, assembleTask);
58-
});
59-
}
30+
// Configure task inputs from extension
31+
task.getRequirementsAnnotationsFile().set(extension.getRequirementsAnnotationsFile());
32+
task.getSvcsAnnotationsFile().set(extension.getSvcsAnnotationsFile());
33+
task.getOutputDirectory().set(extension.getOutputDirectory());
34+
task.getDatasetPath().set(extension.getDatasetPath());
35+
task.getTestResults().set(extension.getTestResults());
36+
task.getSkip().set(extension.getSkip());
37+
task.getSkipAssembleZipArtifact().set(extension.getSkipAssembleZipArtifact());
38+
task.getSkipAttachZipArtifact().set(extension.getSkipAttachZipArtifact());
39+
task.getProjectName().set(project.getName());
40+
task.getProjectVersion().set(project.provider(() -> String.valueOf(project.getVersion())));
41+
task.getProjectBasedir().set(project.getProjectDir());
42+
43+
// Configure ZIP output file
44+
String archiveBaseName = project.hasProperty("archivesBaseName")
45+
? String.valueOf(project.property("archivesBaseName")) : project.getName();
46+
String zipFileName = archiveBaseName + "-reqstool.zip";
47+
task.getZipFile()
48+
.set(extension.getOutputDirectory()
49+
.map(dir -> project.getLayout()
50+
.getProjectDirectory()
51+
.file(dir.getAsFile().getPath() + "/" + zipFileName)));
52+
});
53+
54+
// Auto-configure Maven publishing if maven-publish plugin is applied
55+
project.getPlugins().withId("maven-publish", plugin -> {
56+
configureMavenPublishing(project, assembleTask);
57+
});
58+
}
59+
60+
private void configureMavenPublishing(Project project, TaskProvider<RequirementsToolTask> assembleTask) {
61+
PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
62+
63+
publishing.getPublications().create("reqstool", MavenPublication.class, publication -> {
64+
String archiveBaseName = project.hasProperty("archivesBaseName")
65+
? String.valueOf(project.property("archivesBaseName")) : project.getName();
66+
67+
String zipFileName = archiveBaseName + "-reqstool.zip";
68+
69+
publication.setGroupId(String.valueOf(project.getGroup()));
70+
publication.setArtifactId(project.getName());
71+
publication.setVersion(String.valueOf(project.getVersion()));
72+
73+
publication.artifact(assembleTask.flatMap(task -> task.getZipFile()), artifact -> {
74+
artifact.setClassifier("reqstool");
75+
artifact.setExtension("zip");
76+
});
77+
});
78+
}
6079

61-
private void configureMavenPublishing(Project project, TaskProvider<RequirementsToolTask> assembleTask) {
62-
PublishingExtension publishing = project.getExtensions().getByType(PublishingExtension.class);
63-
64-
publishing.getPublications().create("reqstool", MavenPublication.class, publication -> {
65-
String archiveBaseName = project.hasProperty("archivesBaseName")
66-
? String.valueOf(project.property("archivesBaseName"))
67-
: project.getName();
68-
69-
String zipFileName = archiveBaseName + "-reqstool.zip";
70-
71-
publication.setGroupId(String.valueOf(project.getGroup()));
72-
publication.setArtifactId(project.getName());
73-
publication.setVersion(String.valueOf(project.getVersion()));
74-
75-
publication.artifact(assembleTask.flatMap(task -> task.getZipFile()), artifact -> {
76-
artifact.setClassifier("reqstool");
77-
artifact.setExtension("zip");
78-
});
79-
});
80-
}
8180
}

0 commit comments

Comments
 (0)