Fixing Tests

Author: sanagaraj-pivotal

applications/spring-boot-upgrade/src/test/java/org/springframework/sbm/ReportTestSingleModule.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2021 - 2022 the original author or authors.
+ *
+ * Licensed 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
+ *
+ *      https://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.
+ */
 package org.springframework.sbm;
 
 import org.junit.jupiter.api.Test;

components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/SpringBootUpgradeReportDeserializationTest.java

@@ -87,7 +87,7 @@ void deserializeAction() throws IOException, URISyntaxException {
                       sections:
                                 
                         - title: Upgrade Dependencies
-                          helper: org.springframework.sbm.boot.upgrade_27_30.report.helper.UpgradeDependenciesHelper
+                          helper: org.springframework.sbm.boot.upgrade_27_30.report.helper.IsSpring27Or30ProjectHelper
                           change: |-
                             Spring Boot 3.0 upgraded many used dependencies.\s
                             Also, dependencies previously in the `javax` packages use the new `jakarta` packages now.

components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/JSONBReportSectionTest.java

@@ -22,7 +22,7 @@
 import org.springframework.sbm.project.resource.TestProjectContext;
 
 
-public class JohnzonDependencyHelperSectionTest {
+public class JohnzonDependencyReportSectionTest {
 
     @Test
     public void shouldNotShowJsonBSection() {
@@ -55,16 +55,11 @@ public void rendersBannerSupportInformation() {
                                 A Jakarta EE 10-compatible version of Apache Johnzon can be used with Spring Boot 3, but you will now have to specify a version in your dependency declaration.
                                                                 
                                 ==== Why is the application affected
-                                Actually, we don't know if the scanned application is really affected by this change.
-                                But we found a dependency matching regex `org\\.springframework\\.boot\\:spring-boot-starter\\:.*`.
-                                This indicates that the scanned application might be affected.
+                                This application uses johnzon-core from org.apache.johnzon. Spring Boot 3.0 does not provide dependency support for this library,
+                                so an explicit version number must now be provided in the POM for this dependency.
                                                                 
                                 ==== Remediation
-                                [IMPORTANT]
-                                ====
-                                This section has been automatically generated from the https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Migration-Guide#json-b[Spring Boot 3.0 Migration Guide^, role="ext-link"]. +
-                                **Please consider contributing to issue https://github.com/spring-projects-experimental/spring-boot-migrator/issues/678[#678^, role="ext-link"]**
-                                ====
+                                This recipe will add an explicit version number to the org.apache.johnzon:johnzon-core dependency in the POM.
                                                                 
                                                                 
                                 """);

components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/JohnzonDependencyHelperSectionTest.java renamed to components/sbm-recipes-boot-upgrade/src/test/java/org/springframework/sbm/boot/upgrade_27_30/report/helper/JohnzonDependencyReportSectionTest.java

@@ -131,7 +131,7 @@ public void shouldHaveMethodsForSubflows() {
                         "public class FlowConfigurations {\n" +
                         "    @Bean\n" +
                         "    IntegrationFlow hbfr_bil_risk_client_rating_mb05_hub_sys_main(org.springframework.integration.dsl.IntegrationFlow set_hbfr_headers_out) {\n" +
-                        "        return IntegrationFlows.from(Http.inboundChannelAdapter(\"${http.listener.path}/*\")).handle((p, h) -> p)\n" +
+                        "        return IntegrationFlows.from(Http.inboundGateway(\"${http.listener.path}/*\")).handle((p, h) -> p)\n" +
                         "                .gateway(set_hbfr_headers_out)\n" +
                         "                //FIXME: element is not supported for conversion: <message-properties-transformer/>\n" +
                         "                .log(LoggingHandler.Level.INFO, \"${api.name}\", \"transactionId=\\\"${flowVars.transactionId}\\\", extCorrelationId=\\\"${flowVars.extCorrelationId}\\\", step=\\\"RequestParametersReceived\\\",functionalId=\\\"${flowVars.functionalId}\\\", requesterAppId=\\\"${flowVars.requesterAppId}\\\", requesterAppName=\\\"${flowVars.requesterAppName}\\\",interfaceType=\\\"${flowVars.interfaceType}\\\", requesterUserId=\\\"${flowVars.requesterUserId}\\\", httpMethod=\\\"#[message.inboundProperties.'http.method']\\\", httpScheme=\\\"#[message.inboundProperties.'http.scheme']\\\", httpHost=\\\"#[message.inboundProperties.'host']\\\", httpRequestUri=\\\"#[message.inboundProperties.'http.request.uri']\\\", httpQueryString=\\\"#[message.inboundProperties.'http.query.string']\\\" httpVersion=\\\"#[message.inboundProperties.'http.version']\\\", contentType=\\\"#[message.inboundProperties.'content-type']\\\", proxyClientId=\\\"#[message.inboundProperties.'client_id']\\\"\")\n" +

components/sbm-recipes-mule-to-boot/src/test/java/org/springframework/sbm/mule/actions/ComplexSubflowsTest.java

@@ -68,7 +68,7 @@ public void supportsBasicChoiceElement() {
                         "public class FlowConfigurations {\n" +
                         "    @Bean\n" +
                         "    IntegrationFlow choiceFlow() {\n" +
-                        "        return IntegrationFlows.from(Http.inboundChannelAdapter(\"/choice\")).handle((p, h) -> p)\n" +
+                        "        return IntegrationFlows.from(Http.inboundGateway(\"/choice\")).handle((p, h) -> p)\n" +
                         "                //FIXME: element is not supported for conversion: <expression-filter/>\n" +
                         "                //FIXME: element is not supported for conversion: <set-variable/>\n" +
                         "                /* TODO: LinkedMultiValueMap might not be apt, substitute with right input type*/\n" +
@@ -143,7 +143,7 @@ public void whenExpressionCallsSubFlow() {
                         "public class FlowConfigurations {\n" +
                         "    @Bean\n" +
                         "    IntegrationFlow choiceFlow(org.springframework.integration.dsl.IntegrationFlow spanishHello) {\n" +
-                        "        return IntegrationFlows.from(Http.inboundChannelAdapter(\"/choice\")).handle((p, h) -> p)\n" +
+                        "        return IntegrationFlows.from(Http.inboundGateway(\"/choice\")).handle((p, h) -> p)\n" +
                         "                //FIXME: element is not supported for conversion: <expression-filter/>\n" +
                         "                //FIXME: element is not supported for conversion: <set-variable/>\n" +
                         "                /* TODO: LinkedMultiValueMap might not be apt, substitute with right input type*/\n" +
@@ -223,7 +223,7 @@ public void choiceDoesNotHaveOtherwise() {
                         "public class FlowConfigurations {\n" +
                         "    @Bean\n" +
                         "    IntegrationFlow choiceFlow(org.springframework.integration.dsl.IntegrationFlow spanishHello) {\n" +
-                        "        return IntegrationFlows.from(Http.inboundChannelAdapter(\"/choice\")).handle((p, h) -> p)\n" +
+                        "        return IntegrationFlows.from(Http.inboundGateway(\"/choice\")).handle((p, h) -> p)\n" +
                         "                //FIXME: element is not supported for conversion: <expression-filter/>\n" +
                         "                //FIXME: element is not supported for conversion: <set-variable/>\n" +
                         "                /* TODO: LinkedMultiValueMap might not be apt, substitute with right input type*/\n" +