-
Notifications
You must be signed in to change notification settings - Fork 285
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Updates the style of all java files under the */dlic/util/ dir. (#2823)
* rebase Signed-off-by: Stephen Crawford <[email protected]> * Update java style under **/auth Signed-off-by: Stephen Crawford <[email protected]> * Update Util dir Signed-off-by: Stephen Crawford <[email protected]> * readd formatting Signed-off-by: Stephen Crawford <[email protected]> --------- Signed-off-by: Stephen Crawford <[email protected]>
- Loading branch information
1 parent
30d960c
commit 76a5d7f
Showing
236 changed files
with
7,670 additions
and
6,451 deletions.
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
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 |
|---|---|---|
| @@ -1,36 +1,95 @@ | ||
| allprojects { | ||
| project.apply plugin: "com.diffplug.spotless" | ||
| spotless { | ||
| java { | ||
| // Normally this isn't necessary, but we have Java sources in | ||
| // non-standard places | ||
| target '*/com/amazon/dlic/auth/**/*.java' | ||
|
|
||
| removeUnusedImports() | ||
| eclipse().configFile rootProject.file('formatter/formatterConfig.xml') | ||
| trimTrailingWhitespace() | ||
| endWithNewline(); | ||
|
|
||
| // note: you can use an empty string for all the imports you didn't specify explicitly, and '\\#` prefix for static imports | ||
| importOrder('java', 'javax', '', 'com.amazon', 'org.opensearch', '\\#') | ||
|
|
||
| custom 'Refuse wildcard imports', { | ||
| // Wildcard imports can't be resolved; fail the build | ||
| if (it =~ /\s+import .*\*;/) { | ||
| throw new AssertionError("Do not use wildcard imports. 'spotlessApply' cannot resolve this issue.") | ||
| } | ||
| } | ||
|
|
||
| // See DEVELOPER_GUIDE.md for details of when to enable this. | ||
| if (System.getProperty('spotless.paddedcell') != null) { | ||
| paddedCell() | ||
| } | ||
| } | ||
| format 'misc', { | ||
| target '*.md', '*.gradle', '**/*.json', '**/*.yaml', '**/*.yml', '**/*.svg' | ||
|
|
||
| trimTrailingWhitespace() | ||
| endWithNewline() | ||
| } | ||
| } | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| * | ||
| * Modifications Copyright OpenSearch Contributors. See | ||
| * GitHub history for details. | ||
| */ | ||
|
|
||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| import org.opensearch.gradle.BuildPlugin | ||
|
|
||
| /* | ||
| * This script plugin configures formatting for Java source using Spotless | ||
| * for Gradle. Since the act of formatting existing source can interfere | ||
| * with developers' workflows, we don't automatically format all code | ||
| * (yet). Instead, we maintain a list of projects that are excluded from | ||
| * formatting, until we reach a point where we can comfortably format them | ||
| * in one go without too much disruption. | ||
| * | ||
| * Any new sub-projects must not be added to the exclusions list! | ||
| * | ||
| * To perform a reformat, run: | ||
| * | ||
| * ./gradlew spotlessApply | ||
| * | ||
| * To check the current format, run: | ||
| * | ||
| * ./gradlew spotlessJavaCheck | ||
| * | ||
| * This is also carried out by the `precommit` task. | ||
| * | ||
| * For more about Spotless, see: | ||
| * | ||
| * https://github.com/diffplug/spotless/tree/master/plugin-gradle | ||
| */ | ||
|
|
||
| org.opensearch.gradle.BuildPlugin { | ||
| plugins.withType(BuildPlugin).whenPluginAdded { | ||
| project.apply plugin: "com.diffplug.spotless" | ||
|
|
||
| spotless { | ||
| java { | ||
| // Normally this isn't necessary, but we have Java sources in | ||
| // non-standard places | ||
| target '**/*.java' | ||
|
|
||
| removeUnusedImports() | ||
| eclipse().configFile rootProject.file('buildSrc/formatterConfig.xml') | ||
| trimTrailingWhitespace() | ||
| endWithNewline() | ||
|
|
||
| custom 'Refuse wildcard imports', { | ||
| // Wildcard imports can't be resolved; fail the build | ||
| if (it =~ /\s+import .*\*;/) { | ||
| throw new AssertionError("Do not use wildcard imports. 'spotlessApply' cannot resolve this issue.") | ||
| } | ||
| } | ||
|
|
||
| // See DEVELOPER_GUIDE.md for details of when to enable this. | ||
| if (System.getProperty('spotless.paddedcell') != null) { | ||
| paddedCell() | ||
| } | ||
| } | ||
| format 'misc', { | ||
| target '*.md', '*.gradle', '**/*.yaml', '**/*.yml', '**/*.svg' | ||
|
|
||
| trimTrailingWhitespace() | ||
| endWithNewline() | ||
| } | ||
| } | ||
|
|
||
| precommit.dependsOn 'spotlessJavaCheck' | ||
| } | ||
| } |
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
Oops, something went wrong.