Skip to content

Conversation

@wind57
Copy link
Contributor

@wind57 wind57 commented Sep 10, 2022

No description provided.

@wind57 wind57 marked this pull request as ready for review September 10, 2022 12:26
pom.xml Outdated
<plugin>
<groupId>io.spring.javaformat</groupId>
<artifactId>spring-javaformat-maven-plugin</artifactId>
<!-- Remove version when : https://github.com/spring-cloud/spring-cloud-build/pull/235 is integrated and released -->
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I will take care of this one also, when it is fixed over there

Copy link
Contributor

Choose a reason for hiding this comment

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

Let me know when the PR is ready and we can do this all at once...or you can separate this change out into a separate PR

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Right, this is ready. Let me know when you close and release that one, and Ill integrate it in after after that. I hope I understood you correctly

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ryanjbaxter build has passed over there, FYI

Copy link
Contributor

Choose a reason for hiding this comment

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

Its merged, the build should only take a few minutes before snapshots are published

List<MapPropertySource> list = source.getPropertySources().stream()
.filter(p -> p instanceof MapPropertySource).map(x -> (MapPropertySource) x).toList();
result.addAll(list);
source.getPropertySources().forEach(x -> {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this is so much easier to read, I am really sorry it did not occur to me when I was here in this code path before

<suppress files=".*ConfigurationWatcherApplication\.java" checks="HideUtilityClassConstructor"/>
<suppress files=".*DiscoveryServerApplication\.java" checks="HideUtilityClassConstructor"/>
<suppress files=".*KubernetesConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
<suppress files=".*NormalizedSource\.java" checks="WhitespaceAfter" />
Copy link
Contributor Author

Choose a reason for hiding this comment

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

if we upgrade formatter plugin, we do not require this one anymore

@wind57
Copy link
Contributor Author

wind57 commented Sep 10, 2022

@ryanjbaxter let's see if I get lucky :) one more to look at please? :)

@wind57
Copy link
Contributor Author

wind57 commented Sep 11, 2022

@ryanjbaxter ready.

@ryanjbaxter ryanjbaxter added this to the 3.0.0-M5 milestone Sep 11, 2022
@ryanjbaxter ryanjbaxter merged commit 2458af5 into spring-cloud:main Sep 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants