Refactor ConventionsPlugin class #20805
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| /* | ||
| * Copyright 2012-2020 the original author or authors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * https://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.springframework.boot.build; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.InputStreamReader; | ||
| import java.net.URISyntaxException; | ||
| import java.net.URL; | ||
| import java.nio.charset.StandardCharsets; | ||
|
|
||
| import org.gradle.api.GradleException; | ||
| import org.gradle.api.Project; | ||
| import org.gradle.api.file.CopySpec; | ||
| import org.gradle.api.resources.TextResourceFactory; | ||
| import org.gradle.jvm.tasks.Jar; | ||
|
|
||
| import org.springframework.util.FileCopyUtils; | ||
|
|
||
| /** | ||
| * Class to support the generation of NOTICE.txt and LICENSE.txt files as a result of the | ||
| * {@link Jar} task being configured in {@link JavaConventions} class. | ||
| * | ||
| * @author Andy Wilkinson | ||
| * @author Christoph Dreis | ||
| * @author Mike Smithson | ||
| */ | ||
| class DocumentConventions { | ||
|
There was a problem hiding this comment. I'd prefer to keep these in the same class as the other Java-related conventions. There was a problem hiding this comment. OK, I inlined all of the methods in DocumentConventions into JavaConventions. |
||
|
|
||
| void copyLegalFiles(Project project, CopySpec metaInf) { | ||
| copyNoticeFile(project, metaInf); | ||
| copyLicenseFile(project, metaInf); | ||
| } | ||
|
|
||
| void copyNoticeFile(Project project, CopySpec metaInf) { | ||
| try { | ||
| InputStream notice = getClass().getClassLoader().getResourceAsStream("NOTICE.txt"); | ||
| String noticeContent = FileCopyUtils.copyToString(new InputStreamReader(notice, StandardCharsets.UTF_8)) | ||
| .replace("${version}", project.getVersion().toString()); | ||
| TextResourceFactory resourceFactory = project.getResources().getText(); | ||
| File file = createLegalFile(resourceFactory.fromString(noticeContent).asFile(), "NOTICE.txt"); | ||
| metaInf.from(file); | ||
| } | ||
| catch (IOException ex) { | ||
| throw new GradleException("Failed to copy NOTICE.txt", ex); | ||
| } | ||
| } | ||
|
|
||
| void copyLicenseFile(Project project, CopySpec metaInf) { | ||
| URL license = getClass().getClassLoader().getResource("LICENSE.txt"); | ||
| try { | ||
| TextResourceFactory resourceFactory = project.getResources().getText(); | ||
| File file = createLegalFile(resourceFactory.fromUri(license.toURI()).asFile(), "LICENSE.txt"); | ||
| metaInf.from(file); | ||
| } | ||
| catch (URISyntaxException ex) { | ||
| throw new GradleException("Failed to copy LICENSE.txt", ex); | ||
| } | ||
| } | ||
|
|
||
| File createLegalFile(File source, String filename) { | ||
| File legalFile = new File(source.getParentFile(), filename); | ||
| source.renameTo(legalFile); | ||
| return legalFile; | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The javadoc above should be updated to replace the list of actions when the
MavenPublishPluginis applied and to link to the new Maven conventions class instead.