-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Implement ConcatFilesTask from Groovy to Java issues#34459 #37497
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
af7f347
Implement ConcatFilesTask from Groovy to Java issues#34459
akki 8909525
Update code according to review
akki f763b45
Add setter function for `target`
akki 765c66f
WIP: Attempt to writing tests for ConcatFilesTask
akki 231b119
Use StandardCharsets constant rather than own variable
akki a4f9131
Complete tests and final working code
akki 60c1202
Remove unused imports from ConcatFilesTaskTests
akki 1b67905
Changes according to review and refactor
akki 66feb00
Merge remote-tracking branch 'origin/master' into 34459-concatFilesGr…
alpar-t 3bb3ee3
fix checkstyle
alpar-t File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
70 changes: 0 additions & 70 deletions
70
buildSrc/src/main/groovy/org/elasticsearch/gradle/ConcatFilesTask.groovy
This file was deleted.
Oops, something went wrong.
96 changes: 96 additions & 0 deletions
96
buildSrc/src/main/java/org/elasticsearch/gradle/ConcatFilesTask.java
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,96 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you 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 | ||
| * | ||
| * http://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.elasticsearch.gradle; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.StandardOpenOption; | ||
| import java.util.LinkedHashSet; | ||
|
|
||
| import org.gradle.api.DefaultTask; | ||
| import org.gradle.api.file.FileTree; | ||
| import org.gradle.api.tasks.Input; | ||
| import org.gradle.api.tasks.InputFiles; | ||
| import org.gradle.api.tasks.Optional; | ||
| import org.gradle.api.tasks.OutputFile; | ||
| import org.gradle.api.tasks.TaskAction; | ||
|
|
||
| /** | ||
| * Concatenates a list of files into one and removes duplicate lines. | ||
| */ | ||
| public class ConcatFilesTask extends DefaultTask { | ||
|
|
||
| public ConcatFilesTask() { | ||
| setDescription("Concat a list of files into one."); | ||
| } | ||
|
|
||
| /** List of files to concatenate */ | ||
| private FileTree files; | ||
|
|
||
| /** line to add at the top of the target file */ | ||
| private String headerLine; | ||
|
|
||
| private File target; | ||
|
|
||
| public void setFiles(FileTree files) { | ||
| this.files = files; | ||
| } | ||
|
|
||
| @InputFiles | ||
| public FileTree getFiles() { return files; } | ||
|
|
||
| public void setHeaderLine(String headerLine) { | ||
| this.headerLine = headerLine; | ||
| } | ||
|
|
||
| @Input | ||
| @Optional | ||
| public String getHeaderLine() { return headerLine; } | ||
|
|
||
| public void setTarget(File target) { | ||
| this.target = target; | ||
| } | ||
|
|
||
| @OutputFile | ||
| public File getTarget() { | ||
| return target; | ||
| } | ||
|
|
||
| @TaskAction | ||
| public void concatFiles() throws IOException { | ||
| if (getHeaderLine() != null) { | ||
| Files.write( | ||
| getTarget().toPath(), | ||
| (getHeaderLine() + '\n').getBytes(StandardCharsets.UTF_8) | ||
| ); | ||
| } | ||
|
|
||
| // To remove duplicate lines | ||
| LinkedHashSet<String> uniqueLines = new LinkedHashSet<>(); | ||
| for (File f : getFiles()) { | ||
| uniqueLines.addAll(Files.readAllLines(f.toPath(), StandardCharsets.UTF_8)); | ||
| } | ||
| Files.write( | ||
| getTarget().toPath(), uniqueLines, StandardCharsets.UTF_8, StandardOpenOption.APPEND | ||
| ); | ||
| } | ||
|
|
||
| } | ||
92 changes: 92 additions & 0 deletions
92
buildSrc/src/test/java/org/elasticsearch/gradle/ConcatFilesTaskTests.java
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,92 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you 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 | ||
| * | ||
| * http://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.elasticsearch.gradle; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.Files; | ||
| import java.util.Arrays; | ||
|
|
||
| import org.elasticsearch.gradle.test.GradleUnitTestCase; | ||
| import org.gradle.api.Project; | ||
| import org.gradle.testfixtures.ProjectBuilder; | ||
|
|
||
| public class ConcatFilesTaskTests extends GradleUnitTestCase { | ||
|
|
||
| public void testHeaderAdded() throws IOException { | ||
|
|
||
| Project project = createProject(); | ||
| ConcatFilesTask concatFilesTask = createTask(project); | ||
|
|
||
| concatFilesTask.setHeaderLine("Header"); | ||
|
|
||
| File file = new File(project.getProjectDir(), "src/main/java/Code.java"); | ||
| file.getParentFile().mkdirs(); | ||
| file.createNewFile(); | ||
| concatFilesTask.setTarget(file); | ||
| concatFilesTask.setFiles(project.fileTree("tmp/")); | ||
|
|
||
| concatFilesTask.concatFiles(); | ||
|
|
||
| assertEquals(Arrays.asList("Header"), Files.readAllLines(concatFilesTask.getTarget().toPath(), StandardCharsets.UTF_8)); | ||
|
|
||
| file.delete(); | ||
| } | ||
|
|
||
| public void testConcatenationWithUnique() throws IOException { | ||
|
|
||
| Project project = createProject(); | ||
| ConcatFilesTask concatFilesTask = createTask(project); | ||
|
|
||
| File file = new File(project.getProjectDir(), "src/main/java/Code.java"); | ||
| file.getParentFile().mkdirs(); | ||
| file.createNewFile(); | ||
| concatFilesTask.setTarget(file); | ||
|
|
||
| File file1 = new File(project.getProjectDir(), "src/main/input/java/file1.java"); | ||
| File file2 = new File(project.getProjectDir(), "src/main/input/text/file2.txt"); | ||
| file1.getParentFile().mkdirs(); | ||
| file2.getParentFile().mkdirs(); | ||
| file1.createNewFile(); | ||
| file2.createNewFile(); | ||
| Files.write(file1.toPath(), "Hello\nHello".getBytes()); | ||
| Files.write(file2.toPath(), "Hello\nनमस्ते".getBytes()); | ||
|
|
||
| concatFilesTask.setFiles(project.fileTree(file1.getParentFile().getParentFile())); | ||
|
|
||
| concatFilesTask.concatFiles(); | ||
|
|
||
| assertEquals( | ||
| Arrays.asList("Hello", "नमस्ते"), | ||
| Files.readAllLines(concatFilesTask.getTarget().toPath(), StandardCharsets.UTF_8) | ||
| ); | ||
|
|
||
| } | ||
|
|
||
| private Project createProject() { | ||
| Project project = ProjectBuilder.builder().build(); | ||
| return project; | ||
| } | ||
|
|
||
| private ConcatFilesTask createTask(Project project) { | ||
| return project.getTasks().create("concatFilesTask", ConcatFilesTask.class); | ||
| } | ||
|
|
||
| } |
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.
I am not sure if looping over a
FileTreeinstance this way is correct.