Skip to content

Updates all java files under security/* and test/security/a* -> test/security/m* #2826

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.

Sign up for GitHub

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
stephen-crawford merged 5 commits into from
Jun 5, 2023
Merged

Updates all java files under security/* and test/security/a* -> test/security/m* #2826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12c381f
Update Sec/action to Sec/Filter
stephen-crawford Jun 1, 2023
57516f4
Update Security/*
stephen-crawford Jun 1, 2023
1193c42
Update Security/* and test/opensearch/security/*
stephen-crawford Jun 1, 2023
825d365
Half sec test changes
stephen-crawford Jun 1, 2023
f41fb94
Half sec test changes
stephen-crawford Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,21 @@ apply plugin: 'opensearch.opensearchplugin'
apply plugin: 'opensearch.pluginzip'
apply plugin: 'opensearch.rest-test'
apply plugin: 'opensearch.testclusters'
//apply from: 'gradle/formatting.gradle'
// apply from: 'gradle/formatting.gradle'

spotless {
java {
// Normally this isn't necessary, but we have Java sources in
// non-standard places
target '**/com/amazon/dlic/**/*.java'
Copy link
Collaborator

@reta reta May 31, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm .. same as #2823

Copy link
Contributor Author

@stephen-crawford stephen-crawford Jun 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @reta, sorry I am not sure I know what you are referencing here :/. I assume you are looking at the list of targets which I know is not the prettiest way of doing things. Unfortunately, I did not see a ton of options for creating a clearer description of which directories have the new formatting in place.

Do you have a suggestion you would like me to follow?

Copy link
Collaborator

@reta reta Jun 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My sincere apologies, pasted wrong link here (not sure how), I meant this #2823 - seems like doing the same changes ....

Copy link
Contributor Author

@stephen-crawford stephen-crawford Jun 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh gotcha. Yeah, for whatever reason, there does not seem to be many changes within the target set here. I will rebase and expand the range to include more. It is hard to tell before rebasing what is actually new. Good catch.

Copy link
Contributor Author

@stephen-crawford stephen-crawford Jun 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now should have changes under security/* and test/security/a* up to test/security/m*

target '**/com/amazon/security/**/*.java'
target '**/test/java/org/opensearch/security/a*/**/*.java'
target '**/test/java/org/opensearch/security/b*/**/*.java'
target '**/test/java/org/opensearch/security/c*/**/*.java'
target '**/test/java/org/opensearch/security/d*/**/*.java'
target '**/test/java/org/opensearch/security/f*/**/*.java'
target '**/test/java/org/opensearch/security/h*/**/*.java'
target '**/test/java/org/opensearch/security/m*/**/*.java'

removeUnusedImports()
eclipse().configFile rootProject.file('formatter/formatterConfig.xml')
Expand Down Expand Up @@ -109,7 +117,15 @@ spotless {
importOrder('java', 'javax', '', 'com.amazon', 'org.opensearch', '\\#')
target '**/*.java'
targetExclude '**/com/amazon/dlic/**/*.java'
targetExclude('src/integrationTest/**')
targetExclude '**/com/amazon/security/**/*.java'
targetExclude '**/test/java/org/opensearch/security/a*/**/*.java'
targetExclude '**/test/java/org/opensearch/security/b*/**/*.java'
targetExclude '**/test/java/org/opensearch/security/c*/**/*.java'
targetExclude '**/test/java/org/opensearch/security/d*/**/*.java'
targetExclude '**/test/java/org/opensearch/security/f*/**/*.java'
targetExclude '**/test/java/org/opensearch/security/h*/**/*.java'
targetExclude '**/test/java/org/opensearch/security/m*/**/*.java'
targetExclude 'src/integrationTest/**'

trimTrailingWhitespace()
endWithNewline();
Expand Down
Loading