chore: update spring-boot to 3.3.4 (#2561)

* chore: update spring-boot to 3.2.7 * upgrade spring * Try to fix exception, needs test updates * Restore comment proximity to code * Fix a test * Update pom.xml * Update pom.xml * Fix tests: use object comparison --------- Co-authored-by: Zhe Sun <[email protected]> Co-authored-by: Luciano Vernaschi <[email protected]> Co-authored-by: Anton Platonov <[email protected]> Co-authored-by: Soroosh Taefi <[email protected]>
vaadin · Sep 20, 2024 · ec4ba7f · ec4ba7f
1 parent 224b9ae
commit ec4ba7f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 13 deletions.
diff --git a/...point/src/test/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListenerTest.java b/...point/src/test/java/com/vaadin/hilla/route/RouteUnifyingIndexHtmlRequestListenerTest.java
@@ -206,8 +206,7 @@ public void when_productionMode_anonymous_user_should_modifyIndexHtmlResponse_wi
  MatcherAssert.assertThat("Generated missing fieldName " + field,
  actual.has(field), Matchers.is(true));
  MatcherAssert.assertThat("Missing element " + field,
- actual.toString(),
- Matchers.containsString(expected.get(field).toString()));
+ actual.get(field), Matchers.equalTo(expected.get(field)));
  } while (elementsFields.hasNext());
  }
 
@@ -260,8 +259,7 @@ public void when_productionMode_authenticated_user_should_modifyIndexHtmlRespons
  MatcherAssert.assertThat("Generated missing fieldName " + field,
  actual.has(field), Matchers.is(true));
  MatcherAssert.assertThat("Missing element " + field,
- actual.toString(),
- Matchers.containsString(expected.get(field).toString()));
+ actual.get(field), Matchers.equalTo(expected.get(field)));
  } while (elementsFields.hasNext());
  }
 
@@ -316,8 +314,7 @@ public void when_productionMode_admin_user_should_modifyIndexHtmlResponse_with_a
  MatcherAssert.assertThat("Generated missing fieldName " + field,
  actual.has(field), Matchers.is(true));
  MatcherAssert.assertThat("Missing element " + field,
- actual.toString(),
- Matchers.containsString(expected.get(field).toString()));
+ actual.get(field), Matchers.equalTo(expected.get(field)));
  } while (elementsFields.hasNext());
 
  }
@@ -362,8 +359,7 @@ public void when_developmentMode_should_modifyIndexHtmlResponse()
  MatcherAssert.assertThat("Generated missing fieldName " + field,
  actual.has(field), Matchers.is(true));
  MatcherAssert.assertThat("Missing element " + field,
- actual.toString(),
- Matchers.containsString(expected.get(field).toString()));
+ actual.get(field), Matchers.equalTo(expected.get(field)));
  } while (elementsFields.hasNext());
  }
 
@@ -492,8 +488,7 @@ public void when_exposeServerRoutesToClient_false_serverSideRoutesAreNotInRespon
  MatcherAssert.assertThat("Generated missing fieldName " + field,
  actual.has(field), Matchers.is(true));
  MatcherAssert.assertThat("Missing element " + field,
- actual.toString(),
- Matchers.containsString(expected.get(field).toString()));
+ actual.get(field), Matchers.equalTo(expected.get(field)));
  } while (elementsFields.hasNext());
  }
 
@@ -616,8 +611,7 @@ public void when_exposeServerRoutesToClient_layoutExists_serverSideRoutesAreInRe
  MatcherAssert.assertThat("Generated missing fieldName " + field,
  actual.has(field), Matchers.is(true));
  MatcherAssert.assertThat("Missing element " + field,
- actual.toString(),
- Matchers.containsString(expected.get(field).toString()));
+ actual.get(field), Matchers.equalTo(expected.get(field)));
  } while (elementsFields.hasNext());
  }
 

diff --git a/...va/engine-core/src/test/resources/com/vaadin/hilla/engine/hilla-engine-configuration.json b/...va/engine-core/src/test/resources/com/vaadin/hilla/engine/hilla-engine-configuration.json
@@ -34,6 +34,19 @@
  {
  "configuration": null,
  "name": "parser-jvm-plugin-use"
+ },
+ {
+ "configuration": {
+ "class": "com.vaadin.hilla.parser.plugins.nonnull.NonnullPluginConfig",
+ "disable": [],
+ "use": [
+ {
+ "name": "com.example.application.annotations.NeverNull",
+ "score": 50
+ }
+ ]
+ },
+ "name": "parser-jvm-plugin-nonnull"
  }
  ]
  },

diff --git a/packages/java/parser-jvm-utils/src/main/java/com/vaadin/hilla/parser/utils/JsonPrinter.java b/packages/java/parser-jvm-utils/src/main/java/com/vaadin/hilla/parser/utils/JsonPrinter.java
@@ -13,6 +13,7 @@ public final class JsonPrinter {
  private final Pretty pretty;
 
  public JsonPrinter() {
+ mapper.findAndRegisterModules();
  // Putting the `pretty` initialization here allows preserving correct
  // class initialization sequence.
  pretty = new Pretty();

diff --git a/pom.xml b/pom.xml
@@ -77,7 +77,7 @@
  <mockito.version>4.5.0</mockito.version>
  <flow.version>24.5-SNAPSHOT</flow.version>
  <slf4j.version>2.0.9</slf4j.version>
- <spring.boot.version>3.2.9</spring.boot.version>
+ <spring.boot.version>3.3.4</spring.boot.version>
  <testbench.version>9.3.4</testbench.version>
  <jakarta.validation.version>3.0.2</jakarta.validation.version>
  <jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>