From 34316c314eeee2b0e44facc0d4d62fc2ef3b350e Mon Sep 17 00:00:00 2001
From: Anthony Dahanne <anthony.dahanne@gmail.com>
Date: Thu, 16 Feb 2023 09:39:58 -0500
Subject: [PATCH] help tooling detect which versions to use

Co-authored-by: Daniel Garnier-Moiroux <git@garnier.wf>

Enhance SpringBootVersionResolver

[issue] Make this package-protected ; you don't want this class to be a part of your public API (same as MapMapper).
[suggestion] set the default value for forcedVersion to -1, it's a usual convention for "this is invalid".

Co-authored-by: Daniel Garnier-Moiroux <git@garnier.wf>
---
 spring-cloud-bindings-tests-boot-2/pom.xml             |  2 ++
 spring-cloud-bindings-tests-boot-3/pom.xml             |  2 ++
 .../cloud/bindings/boot/SpringBootVersionResolver.java | 10 +++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-bindings-tests-boot-2/pom.xml b/spring-cloud-bindings-tests-boot-2/pom.xml
index 71d9914..039f202 100644
--- a/spring-cloud-bindings-tests-boot-2/pom.xml
+++ b/spring-cloud-bindings-tests-boot-2/pom.xml
@@ -12,6 +12,8 @@
 	<description>Test project to verify Spring Cloud Bindings works properly with Spring Boot 2</description>
 	<properties>
 		<java.version>1.8</java.version>
+		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<spring-boot.version>2.5.14</spring-boot.version>
 	</properties>
 	<dependencies>
diff --git a/spring-cloud-bindings-tests-boot-3/pom.xml b/spring-cloud-bindings-tests-boot-3/pom.xml
index 48264b5..d9ad93e 100644
--- a/spring-cloud-bindings-tests-boot-3/pom.xml
+++ b/spring-cloud-bindings-tests-boot-3/pom.xml
@@ -12,6 +12,8 @@
 	<description>Test project to verify Spring Cloud Bindings works properly with Spring Boot 2</description>
 	<properties>
 		<java.version>17</java.version>
+		<maven.compiler.source>${java.version}</maven.compiler.source>
+		<maven.compiler.target>${java.version}</maven.compiler.target>
 		<spring-boot.version>3.0.2</spring-boot.version>
 	</properties>
 	<dependencies>
diff --git a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringBootVersionResolver.java b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringBootVersionResolver.java
index ba02cc9..06ccbbe 100644
--- a/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringBootVersionResolver.java
+++ b/spring-cloud-bindings/src/main/java/org/springframework/cloud/bindings/boot/SpringBootVersionResolver.java
@@ -2,19 +2,19 @@ package org.springframework.cloud.bindings.boot;
 
 import org.springframework.boot.SpringBootVersion;
 
-public class SpringBootVersionResolver {
+class SpringBootVersionResolver {
 
-    private int forcedVersion;
+    private int forcedVersion = -1;
 
-    public SpringBootVersionResolver() {
+    SpringBootVersionResolver() {
     }
 
     protected SpringBootVersionResolver(int forcedVersion) {
         this.forcedVersion = forcedVersion;
     }
 
-    public boolean isBootMajorVersionEnabled(int bootVersion) {
-        if (forcedVersion != 0) {
+   protected boolean isBootMajorVersionEnabled(int bootVersion) {
+        if (forcedVersion != -1) {
             return forcedVersion == bootVersion;
         }
         int major = Integer.parseInt(SpringBootVersion.getVersion().split("\\.")[0]);