-
Notifications
You must be signed in to change notification settings - Fork 134
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
License derived from .baseline/copyright #1217
Merged
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
212009f
separate out spotless application from java-specific config
dansanduleac dd40a7c
move PJF stuff inside configureSpotlessJava
dansanduleac 14b209f
Handle copyright via BaselineFormat and not checkstyle
dansanduleac c916b3a
test groovy files as well
dansanduleac ccf044c
unnecessary eager task get
dansanduleac 891ce66
lazy
dansanduleac 7934080
trim rhs of copyright lines
dansanduleac a4fcb7e
ensure that empty lines are tested as well
dansanduleac 8ddbbb1
Add generated changelog entries
dansanduleac 2f09ddc
goodcorp
dansanduleac 7b58418
LazyFormatterStep
dansanduleac 5e4d111
need to serde properly
dansanduleac 41ea218
need to not instantiate this thing just to get the name..
dansanduleac a11f26c
Merge remote-tracking branch 'origin/develop' into ds/copyright-spotless
dansanduleac 63b5702
fix spotless java configuration without plugin
dansanduleac fb50d4b
fix up readme
dansanduleac 57f423c
fork LicenseHeaderStep
dansanduleac 8bff97c
rewrite to support multiple header files
dansanduleac 1c33af5
proper tests, test other copyright is supported too
dansanduleac 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
This file contains 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 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,6 @@ | ||
type: improvement | ||
improvement: | ||
description: Enforcing copyright based on the first file (lexicographically) founds | ||
in `.baseline/copyright`. | ||
links: | ||
- https://github.com/palantir/gradle-baseline/pull/1217 |
This file contains 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 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
59 changes: 59 additions & 0 deletions
59
gradle-baseline-java/src/main/groovy/com/palantir/baseline/plugins/LazyFormatterStep.java
This file contains 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,59 @@ | ||
/* | ||
* (c) Copyright 2020 Palantir Technologies Inc. All rights reserved. | ||
* | ||
* 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 | ||
* | ||
* 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 com.palantir.baseline.plugins; | ||
|
||
import com.diffplug.spotless.FormatterStep; | ||
import com.google.common.base.Suppliers; | ||
import java.io.File; | ||
import java.io.IOException; | ||
import java.io.ObjectInputStream; | ||
import java.io.ObjectOutputStream; | ||
import java.util.function.Supplier; | ||
import javax.annotation.Nullable; | ||
|
||
/** A lazy {@link FormatterStep} that instantiates its delegate only when methods are called. */ | ||
class LazyFormatterStep implements FormatterStep { | ||
private final String name; | ||
private transient Supplier<FormatterStep> delegate; | ||
|
||
LazyFormatterStep(String name, Supplier<FormatterStep> delegate) { | ||
this.name = name; | ||
this.delegate = Suppliers.memoize(delegate::get); | ||
} | ||
|
||
@Override | ||
public String getName() { | ||
return name; | ||
} | ||
|
||
@Nullable | ||
@Override | ||
public String format(String rawUnix, File file) throws Exception { | ||
return delegate.get().format(rawUnix, file); | ||
} | ||
|
||
public final void writeObject(ObjectOutputStream output) throws IOException { | ||
output.defaultWriteObject(); | ||
output.writeObject(delegate.get()); | ||
} | ||
|
||
public void readObject(ObjectInputStream input) throws IOException, ClassNotFoundException { | ||
input.defaultReadObject(); | ||
FormatterStep serialized = (FormatterStep) input.readObject(); | ||
delegate = () -> serialized; | ||
} | ||
} |
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.
./gradlew format
feels a bit odd here. I think I'd almost recommendspotlessApply
hereThere 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.
Isn't it the same thing though?
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.
Recommending another command that
format
intentionally aliases feels like it might confuse people.