-
Notifications
You must be signed in to change notification settings - Fork 19
style: add Spotless formatter configuration #189
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
4 commits
Select commit
Hold shift + click to select a range
f29118b
build: add Spotless configuration
ppkarwasz 2d42235
Merge remote-tracking branch 'package-url/master' into feature/spotless
ppkarwasz 1e444e4
style: formatting using Spotless
5165f79
Merge remote-tracking branch 'package-url/master' into feature/spotless
ppkarwasz 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
Large diffs are not rendered by default.
Oops, something went wrong.
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,21 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ |
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,22 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| ~ MIT License | ||
| ~ | ||
| ~ Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| ~ of this software and associated documentation files (the "Software"), to deal | ||
| ~ in the Software without restriction, including without limitation the rights | ||
| ~ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| ~ copies of the Software, and to permit persons to whom the Software is | ||
| ~ furnished to do so, subject to the following conditions: | ||
| ~ | ||
| ~ The above copyright notice and this permission notice shall be included in all | ||
| ~ copies or substantial portions of the Software. | ||
| ~ | ||
| ~ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| ~ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| ~ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| ~ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| ~ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| ~ SOFTWARE. | ||
| --> |
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
Large diffs are not rendered by default.
Oops, something went wrong.
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
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 |
|---|---|---|
|
|
@@ -64,16 +64,22 @@ static void resetLocale() { | |
| void validPercentEncoding() throws MalformedPackageURLException { | ||
| PackageURL purl = new PackageURL("maven", "com.google.summit", "summit-ast", "2.2.0\n", null, null); | ||
| assertEquals("pkg:maven/com.google.summit/[email protected]%0A", purl.toString()); | ||
| PackageURL purl2 = new PackageURL("pkg:nuget/%D0%9Cicros%D0%BEft.%D0%95ntit%D1%83Fram%D0%B5work%D0%A1%D0%BEr%D0%B5"); | ||
| PackageURL purl2 = | ||
| new PackageURL("pkg:nuget/%D0%9Cicros%D0%BEft.%D0%95ntit%D1%83Fram%D0%B5work%D0%A1%D0%BEr%D0%B5"); | ||
| assertEquals("Мicrosоft.ЕntitуFramеworkСоrе", purl2.getName()); | ||
| assertEquals("pkg:nuget/%D0%9Cicros%D0%BEft.%D0%95ntit%D1%83Fram%D0%B5work%D0%A1%D0%BEr%D0%B5", purl2.toString()); | ||
| assertEquals( | ||
| "pkg:nuget/%D0%9Cicros%D0%BEft.%D0%95ntit%D1%83Fram%D0%B5work%D0%A1%D0%BEr%D0%B5", purl2.toString()); | ||
| } | ||
|
|
||
| @SuppressWarnings("deprecation") | ||
| @Test | ||
| void invalidPercentEncoding() throws MalformedPackageURLException { | ||
| assertThrowsExactly(MalformedPackageURLException.class, () -> new PackageURL("pkg:maven/com.google.summit/[email protected]%")); | ||
| assertThrowsExactly(MalformedPackageURLException.class, () -> new PackageURL("pkg:maven/com.google.summit/[email protected]%0")); | ||
| assertThrowsExactly( | ||
| MalformedPackageURLException.class, | ||
| () -> new PackageURL("pkg:maven/com.google.summit/[email protected]%")); | ||
| assertThrowsExactly( | ||
| MalformedPackageURLException.class, | ||
| () -> new PackageURL("pkg:maven/com.google.summit/[email protected]%0")); | ||
| PackageURL purl = new PackageURL("pkg:maven/com.google.summit/[email protected]"); | ||
| Throwable t1 = assertThrowsExactly(ValidationException.class, () -> purl.uriDecode("%")); | ||
| assertEquals("Incomplete percent encoding at offset 0 with value '%'", t1.getMessage()); | ||
|
|
@@ -86,19 +92,20 @@ void invalidPercentEncoding() throws MalformedPackageURLException { | |
| } | ||
|
|
||
| static Stream<Arguments> constructorParsing() throws IOException { | ||
| return PurlParameters.getTestDataFromFiles("test-suite-data.json", | ||
| "custom-suite.json", | ||
| "string-constructor-only.json"); | ||
| return PurlParameters.getTestDataFromFiles( | ||
| "test-suite-data.json", "custom-suite.json", "string-constructor-only.json"); | ||
| } | ||
|
|
||
| @DisplayName("Test constructor parsing") | ||
| @ParameterizedTest(name = "{0}: ''{1}''") | ||
| @MethodSource | ||
| void constructorParsing(String description, | ||
| @Nullable String purlString, | ||
| PurlParameters parameters, | ||
| @Nullable String canonicalPurl, | ||
| boolean invalid) throws Exception { | ||
| void constructorParsing( | ||
| String description, | ||
| @Nullable String purlString, | ||
| PurlParameters parameters, | ||
| @Nullable String canonicalPurl, | ||
| boolean invalid) | ||
| throws Exception { | ||
| if (invalid) { | ||
| assertThrows(getExpectedException(purlString), () -> new PackageURL(purlString)); | ||
| } else { | ||
|
|
@@ -109,32 +116,38 @@ void constructorParsing(String description, | |
| } | ||
|
|
||
| static Stream<Arguments> constructorParameters() throws IOException { | ||
| return PurlParameters.getTestDataFromFiles("test-suite-data.json", "custom-suite.json", "components-constructor-only.json"); | ||
| return PurlParameters.getTestDataFromFiles( | ||
| "test-suite-data.json", "custom-suite.json", "components-constructor-only.json"); | ||
| } | ||
|
|
||
| @DisplayName("Test constructor parameters") | ||
| @ParameterizedTest(name = "{0}: {2}") | ||
| @MethodSource | ||
| void constructorParameters(String description, | ||
| @Nullable String purlString, | ||
| PurlParameters parameters, | ||
| @Nullable String canonicalPurl, | ||
| boolean invalid) throws Exception { | ||
| void constructorParameters( | ||
| String description, | ||
| @Nullable String purlString, | ||
| PurlParameters parameters, | ||
| @Nullable String canonicalPurl, | ||
| boolean invalid) | ||
| throws Exception { | ||
| if (invalid) { | ||
| assertThrows(getExpectedException(parameters), | ||
| () -> new PackageURL(parameters.getType(), | ||
| assertThrows( | ||
| getExpectedException(parameters), | ||
| () -> new PackageURL( | ||
| parameters.getType(), | ||
| parameters.getNamespace(), | ||
| parameters.getName(), | ||
| parameters.getVersion(), | ||
| parameters.getQualifiers(), | ||
| parameters.getSubpath())); | ||
| } else { | ||
| PackageURL purl = new PackageURL( | ||
| parameters.getType(), | ||
| parameters.getNamespace(), | ||
| parameters.getName(), | ||
| parameters.getVersion(), | ||
| parameters.getQualifiers(), | ||
| parameters.getSubpath())); | ||
| } else { | ||
| PackageURL purl = new PackageURL(parameters.getType(), | ||
| parameters.getNamespace(), | ||
| parameters.getName(), | ||
| parameters.getVersion(), | ||
| parameters.getQualifiers(), | ||
| parameters.getSubpath()); | ||
| parameters.getSubpath()); | ||
| assertPurlEquals(parameters, purl); | ||
| assertEquals(canonicalPurl, purl.canonicalize(), "canonical PURL"); | ||
| } | ||
|
|
@@ -146,14 +159,16 @@ static Stream<Arguments> constructorTypeNameSpace() throws IOException { | |
|
|
||
| @ParameterizedTest | ||
| @MethodSource | ||
| void constructorTypeNameSpace(String description, | ||
| @Nullable String purlString, | ||
| PurlParameters parameters, | ||
| @Nullable String canonicalPurl, | ||
| boolean invalid) throws Exception { | ||
| void constructorTypeNameSpace( | ||
| String description, | ||
| @Nullable String purlString, | ||
| PurlParameters parameters, | ||
| @Nullable String canonicalPurl, | ||
| boolean invalid) | ||
| throws Exception { | ||
| if (invalid) { | ||
| assertThrows(getExpectedException(parameters), | ||
| () -> new PackageURL(parameters.getType(), parameters.getName())); | ||
| assertThrows( | ||
| getExpectedException(parameters), () -> new PackageURL(parameters.getType(), parameters.getName())); | ||
| } else { | ||
| PackageURL purl = new PackageURL(parameters.getType(), parameters.getName()); | ||
| assertPurlEquals(parameters, purl); | ||
|
|
@@ -173,7 +188,9 @@ private static void assertPurlEquals(PurlParameters expected, PackageURL actual) | |
| } | ||
|
|
||
| private static Class<? extends Exception> getExpectedException(PurlParameters json) { | ||
| return json.getType() == null || json.getName() == null ? NullPointerException.class : MalformedPackageURLException.class; | ||
| return json.getType() == null || json.getName() == null | ||
| ? NullPointerException.class | ||
| : MalformedPackageURLException.class; | ||
| } | ||
|
|
||
| private static Class<? extends Exception> getExpectedException(@Nullable String purl) { | ||
|
|
||
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.
I am against this change since braces are not supposed to be on a single line, empty or not.
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.
This is a choice in the palantir-java-format, not modifiable.