Spring code samples refresh + overall refresh of deps #702

TomaszGaweda · 2025-02-07T17:22:59Z

Made all projects be a child of main project, so eg. failsafe and surefire configurations are shared
Modernized code
Fixed known flakiness
Modernized dependencies

TomaszGaweda · 2025-02-10T18:00:49Z

enterprise/tls-custom-login-module/src/test/java/sample/ClientCertCheckingLoginModuleTest.java

-                .setProperty("keyStorePassword", "123456") //
-                .setProperty("trustStore", "src/ca.p12") //
-                .setProperty("trustStorePassword", "123456");
+        SSLConfig sslConf = config.getNetworkConfig().setSSLConfig(new SSLConfig()).getSSLConfig();


Reason: my local JDK got confused with types there, it's safer to extract a variable.

JDK or IDE?

JDK (built via maven)

serialization/hazelcast-airlines/grid-node/src/main/resources/application.properties

…application.properties

.run/Template JUnit.run.xml

JackPGreen · 2025-02-10T20:04:28Z

enterprise/tls-custom-login-module/src/test/java/sample/ClientCertCheckingLoginModuleTest.java

-                .setProperty("keyStorePassword", "123456") //
-                .setProperty("trustStore", "src/ca.p12") //
-                .setProperty("trustStorePassword", "123456");
+        SSLConfig sslConf = config.getNetworkConfig().setSSLConfig(new SSLConfig()).getSSLConfig();


JDK or IDE?

serialization/hazelcast-airlines/grid-node/pom.xml

pom.xml

JackPGreen · 2025-02-10T20:09:44Z

...spring-session-hazelcast/src/main/java/com/hazelcast/guide/controller/SessionController.java

    private String toHtmlTable(Map<String, Object> attributes) {
-        StringBuilder html = new StringBuilder("<html>");
-        html.append("<table border=\"1\" cellpadding=\"5\" cellspacing=\"5\">");
+        StringBuilder html = new StringBuilder("<html><body>");
+        html.append("<table style=\"border-spacing: 5px; border: 1px solid black;\">");
        attributes.forEach((k, v) -> addHtmlTableRow(html, k, v));
-        html.append("</table></html>");
+        html.append("</table></body></html>");
        return html.toString();
    }

    private void addHtmlTableRow(StringBuilder content, String key, Object value) {
        content.append("<tr>")
-                    .append("<th>").append(key).append("</th>")
-                    .append("<td>").append(value).append("</td>")
-                .append("</tr>");
+               .append("<th style=\"padding: 5px;\">").append(key).append("</th>")
+               .append("<td style=\"padding: 5px;\">").append(value).append("</td>")
+               .append("</tr>");
    }


I feel like whole thing could be implemented better (no reflection on your changes) - maybe a text-block template with a .formatted call consuming a stream-mapping of attributes?

spring/spring-data-hazelcast-chemistry-sample/server/src/main/resources/application.properties

JackPGreen · 2025-02-10T20:11:08Z

...ibernate-2ndlevel-cache/src/main/java/com/hazelcast/hibernate/springhibernate2lc/Runner.java

        LOGGER.info("Caches from hazelcast:");
        for (DistributedObject distributedObject : hazelcastInstance.getDistributedObjects()) {
-            LOGGER.info(" - " + distributedObject.getName());
+            LOGGER.info(" - {}", distributedObject.getName());


…' into 6.0/spring-boot-embedded-refresh

...spring-session-hazelcast/src/main/java/com/hazelcast/guide/controller/SessionController.java

...session-hazelcast/src/test/java/com/hazelcast/guide/HazelcastSpringSessionApplicationIT.java

spring/spring-data-hazelcast-chemistry-sample/README.md

Co-authored-by: Jack Green <[email protected]>

…' into 6.0/spring-boot-embedded-refresh

...spring-session-hazelcast/src/main/java/com/hazelcast/guide/controller/SessionController.java

…t/src/main/java/com/hazelcast/guide/controller/SessionController.java Co-authored-by: Jack Green <[email protected]>

ldziedziul

How did you test it?

TomaszGaweda · 2025-02-17T11:24:07Z

Ran mvn verify + few Spring examples

TomaszGaweda added 7 commits February 7, 2025 14:29

Refresh example, make it work with proper parent project

28293bf

Making use of project parent structure; refreshing examples

75426ea

Cleanups

d8271d8

Fix flakiness, cleanup

021c821

Fix some versions

875c1d0

Fix airplane sample

eb35267

Make the build pass

306bade

TomaszGaweda changed the title ~~Spring code samples refresh~~ Spring code samples refresh + overall refresh of deps Feb 10, 2025

TomaszGaweda requested a review from JackPGreen February 10, 2025 18:00

TomaszGaweda commented Feb 10, 2025

View reviewed changes

serialization/hazelcast-airlines/grid-node/src/main/resources/application.properties Outdated Show resolved Hide resolved

Update serialization/hazelcast-airlines/grid-node/src/main/resources/…

675f407

…application.properties

TomaszGaweda requested a review from ldziedziul February 10, 2025 18:09

JackPGreen requested changes Feb 10, 2025

View reviewed changes

TomaszGaweda added 6 commits February 11, 2025 11:26

Use BOM

748cf94

Merge remote-tracking branch 'origin/6.0/spring-boot-embedded-refresh…

d726683

…' into 6.0/spring-boot-embedded-refresh

Better code style

2e2d45e

Line ending, remove old projects

73b29fd

Fix typo

47119be

Fix typo

c49b064

TomaszGaweda requested a review from JackPGreen February 11, 2025 11:14

JackPGreen requested changes Feb 11, 2025

View reviewed changes

TomaszGaweda and others added 3 commits February 11, 2025 14:18

Update spring/spring-data-hazelcast-chemistry-sample/README.md

2c0ccc9

Co-authored-by: Jack Green <[email protected]>

Removed usage of StringBuilder

cc9a0ca

Merge remote-tracking branch 'origin/6.0/spring-boot-embedded-refresh…

031e9fb

…' into 6.0/spring-boot-embedded-refresh

TomaszGaweda requested a review from JackPGreen February 11, 2025 13:21

JackPGreen requested changes Feb 11, 2025

View reviewed changes

...spring-session-hazelcast/src/main/java/com/hazelcast/guide/controller/SessionController.java Outdated Show resolved Hide resolved

Update spring/spring-boot-session-replication-spring-session-hazelcas…

c9be7c2

…t/src/main/java/com/hazelcast/guide/controller/SessionController.java Co-authored-by: Jack Green <[email protected]>

TomaszGaweda requested a review from JackPGreen February 12, 2025 10:09

JackPGreen approved these changes Feb 12, 2025

View reviewed changes

ldziedziul reviewed Feb 17, 2025

View reviewed changes

ldziedziul approved these changes Feb 17, 2025

View reviewed changes

TomaszGaweda merged commit 314530c into hazelcast:master Feb 17, 2025
3 checks passed

Spring code samples refresh + overall refresh of deps #702

Spring code samples refresh + overall refresh of deps #702

Uh oh!

Conversation

TomaszGaweda commented Feb 7, 2025

Uh oh!

TomaszGaweda Feb 10, 2025

Choose a reason for hiding this comment

Uh oh!

JackPGreen Feb 10, 2025

Choose a reason for hiding this comment

Uh oh!

TomaszGaweda Feb 11, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JackPGreen Feb 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JackPGreen Feb 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

JackPGreen Feb 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ldziedziul left a comment

Choose a reason for hiding this comment

Uh oh!

TomaszGaweda commented Feb 17, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

JackPGreen Feb 10, 2025 •

edited

Loading