From 5a53852a23826b4201ec5680f97f94cf98033364 Mon Sep 17 00:00:00 2001 From: Ashley <73482956+ascopes@users.noreply.github.com> Date: Tue, 19 Mar 2024 14:43:25 +0000 Subject: [PATCH] Run checkstyle --- .../AbstractGenerateMojo.java | 79 ++++++++++--------- 1 file changed, 41 insertions(+), 38 deletions(-) diff --git a/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java b/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java index 2982ed8b..1300284c 100644 --- a/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java +++ b/src/main/java/io/github/ascopes/protobufmavenplugin/AbstractGenerateMojo.java @@ -392,33 +392,36 @@ public void execute() throws MojoExecutionException, MojoFailureException { throw new MojoExecutionException(ex.getMessage(), ex); } - var request = ImmutableGenerationRequest.builder() - .additionalImportPaths(nonNullList(additionalImportPaths).stream().map(File::toPath).collect(Collectors.toList())) - .allowedDependencyScopes(allowedScopes()) - .binaryMavenPlugins(nonNullList(binaryMavenPlugins)) - .binaryPathPlugins(nonNullList(binaryPathPlugins)) - .binaryUrlPlugins(nonNullList(binaryUrlPlugins)) - .jvmMavenPlugins(nonNullList(jvmMavenPlugins)) - .isCppEnabled(cppEnabled) - .isCsharpEnabled(csharpEnabled) - .isFailOnMissingSources(failOnMissingSources) - .isFatalWarnings(fatalWarnings) - .isJavaEnabled(javaEnabled) - .isKotlinEnabled(kotlinEnabled) - .isLiteEnabled(liteOnly) - .isObjcEnabled(objcEnabled) - .isPhpEnabled(phpEnabled) - .isPythonEnabled(pythonEnabled) - .isPythonStubsEnabled(pythonStubsEnabled) - .isRegisterAsCompilationRoot(registerAsCompilationRoot) - .isRubyEnabled(rubyEnabled) - .isRustEnabled(rustEnabled) - .mavenSession(session) - .outputDirectory(outputDirectory()) - .protocVersion(protocVersion()) - .sourceRootRegistrar(sourceRootRegistrar()) - .sourceRoots(sourceDirectories()) - .build(); + var request = ImmutableGenerationRequest.builder() + .additionalImportPaths(nonNullList(additionalImportPaths) + .stream() + .map(File::toPath) + .collect(Collectors.toList())) + .allowedDependencyScopes(allowedScopes()) + .binaryMavenPlugins(nonNullList(binaryMavenPlugins)) + .binaryPathPlugins(nonNullList(binaryPathPlugins)) + .binaryUrlPlugins(nonNullList(binaryUrlPlugins)) + .jvmMavenPlugins(nonNullList(jvmMavenPlugins)) + .isCppEnabled(cppEnabled) + .isCsharpEnabled(csharpEnabled) + .isFailOnMissingSources(failOnMissingSources) + .isFatalWarnings(fatalWarnings) + .isJavaEnabled(javaEnabled) + .isKotlinEnabled(kotlinEnabled) + .isLiteEnabled(liteOnly) + .isObjcEnabled(objcEnabled) + .isPhpEnabled(phpEnabled) + .isPythonEnabled(pythonEnabled) + .isPythonStubsEnabled(pythonStubsEnabled) + .isRegisterAsCompilationRoot(registerAsCompilationRoot) + .isRubyEnabled(rubyEnabled) + .isRustEnabled(rustEnabled) + .mavenSession(session) + .outputDirectory(outputDirectory()) + .protocVersion(protocVersion()) + .sourceRootRegistrar(sourceRootRegistrar()) + .sourceRoots(sourceDirectories()) + .build(); try { if (!sourceCodeGenerator.generate(request)) { @@ -436,12 +439,12 @@ private Path outputDirectory() { } private Collection sourceDirectories() { - if(sourceDirectories != null){ - return sourceDirectories.stream().map(File::toPath).collect(Collectors.toList()); - }else{ - return List.of(defaultSourceDirectory(session)); - } + if (sourceDirectories != null) { + return sourceDirectories.stream().map(File::toPath).collect(Collectors.toList()); + } else { + return List.of(defaultSourceDirectory(session)); } + } /** * Provides the source root registrar for this Mojo. @@ -506,12 +509,12 @@ protected void validate() { // edge case entirely. // TODO: move this logic into the source generator class. Optional.ofNullable(outputDirectory) - .map(File::toPath) - .flatMap(FileUtils::getFileExtension) - .filter(".jar"::equalsIgnoreCase) - .ifPresent(ext -> { - throw new IllegalArgumentException("The output directory cannot be a path with a JAR file extension"); - }); + .map(File::toPath) + .flatMap(FileUtils::getFileExtension) + .filter(".jar"::equalsIgnoreCase) + .ifPresent(ext -> { + throw new IllegalArgumentException("The output directory cannot be a path with a JAR file extension"); + }); } private String protocVersion() {