Fix enforcer config, ported import check changes to orchestration

Author: CharlesDuboisSAP

orchestration/src/test/java/com/sap/ai/sdk/orchestration/spring/ImportCheckTest.java

@@ -16,10 +16,12 @@
 import lombok.val;
 import org.junit.jupiter.api.Test;
 
-public class ImportCheckTest {
+class ImportCheckTest {
+
+  private static final JavaParser PARSER = new JavaParser();
 
   @Test
-  public void testSpringAIOptional() throws IOException {
+  void testSpringAIOptional() throws IOException {
     String springAI = "org.springframework.ai";
     checkImports("com/sap/ai/sdk/orchestration", springAI, false);
     checkImports("com/sap/ai/sdk/orchestration/spring", springAI, true);
@@ -31,7 +33,7 @@ private void checkImports(String packagePath, String imports, boolean shouldCont
 
     boolean hasImport = false;
     for (File file : javaFiles) {
-      val result = new JavaParser().parse(file).getResult();
+      val result = PARSER.parse(file).getResult();
       assertThat(result).isPresent();
 
       hasImport =
@@ -55,7 +57,7 @@ private List<File> getJavaFiles(String packagePath) throws IOException {
     try (Stream<Path> files = Files.list(orchestrationPackage)) {
       return files
           .filter(Files::isRegularFile)
-          .map(java.nio.file.Path::toFile)
+          .map(Path::toFile)
           .filter(file -> file.getName().endsWith(".java"))
           .collect(Collectors.toList());
     }

pom.xml

@@ -83,6 +83,7 @@
     <enforcer.skipEnforceScopeLoggerBridges>false</enforcer.skipEnforceScopeLoggerBridges>
     <enforcer.skipEnforceScopeLombok>false</enforcer.skipEnforceScopeLombok>
     <enforcer.skipBanGeneratedModulesReference>false</enforcer.skipBanGeneratedModulesReference>
+    <enforcer.skipEnforceSpringAIOptional>false</enforcer.skipEnforceSpringAIOptional>
     <!-- Test coverage DO NOT CHANGE IN THE ROOT POM -->
     <coverage.complexity>100%</coverage.complexity>
     <coverage.line>100%</coverage.line>
@@ -435,15 +436,13 @@
               <goal>enforce</goal>
             </goals>
             <configuration>
+              <skip>${enforcer.skipEnforceSpringAIOptional}</skip>
               <rules>
                 <bannedDependencies>
                   <message>Spring AI dependencies should be optional</message>
                   <excludes>
                     <exclude>org.springframework.ai:*</exclude>
                   </excludes>
-                  <includes>
-                    <include>com.sap.ai.sdk.app:*</include>
-                  </includes>
                 </bannedDependencies>
               </rules>
             </configuration>

sample-code/spring-app/pom.xml

@@ -41,7 +41,7 @@
     <!-- Allow logging frameworks because this module is not released -->
     <enforcer.skipBanLoggingFrameworks>true</enforcer.skipBanLoggingFrameworks>
     <enforcer.skipEnforceScopeLoggerBridges>true</enforcer.skipEnforceScopeLoggerBridges>
-    <enforcer.enforce-spring-ai-optional>false</enforcer.enforce-spring-ai-optional>
+    <enforcer.skipEnforceSpringAIOptional>true</enforcer.skipEnforceSpringAIOptional>
   </properties>
 
   <dependencies>
@@ -215,16 +215,6 @@
           <skipAddThirdParty>true</skipAddThirdParty>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>enforce-spring-ai-optional</id>
-            <phase>none</phase>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>