From 930bfadc7003a96f42eff68cd05bebf4031b8016 Mon Sep 17 00:00:00 2001
From: Antonio Goncalves <antonio.goncalves@gmail.com>
Date: Mon, 6 Feb 2023 11:52:16 +0100
Subject: [PATCH 1/2] Lombok <1.18.22 is not compatible with JDK 17

---
 .../openjdk17/openjdk11/lombok.windup.xml     | 31 +++++++++++++++++++
 .../openjdk11/tests/data/lombok/pom.xml       | 17 ++++++++++
 .../openjdk11/tests/lombok.windup.test.xml    | 23 ++++++++++++++
 3 files changed, 71 insertions(+)
 create mode 100644 rules/rules-reviewed/openjdk17/openjdk11/lombok.windup.xml
 create mode 100644 rules/rules-reviewed/openjdk17/openjdk11/tests/data/lombok/pom.xml
 create mode 100644 rules/rules-reviewed/openjdk17/openjdk11/tests/lombok.windup.test.xml

diff --git a/rules/rules-reviewed/openjdk17/openjdk11/lombok.windup.xml b/rules/rules-reviewed/openjdk17/openjdk11/lombok.windup.xml
new file mode 100644
index 000000000..caea9cad6
--- /dev/null
+++ b/rules/rules-reviewed/openjdk17/openjdk11/lombok.windup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<ruleset xmlns="http://windup.jboss.org/schema/jboss-ruleset" id="lombok"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd">
+    <metadata>
+        <description>
+            This ruleset provides analysis with respect to Lombok incompatibility between OpenJDK 11 to 17.
+        </description>
+        <dependencies>
+            <addon id="org.jboss.windup.rules,windup-rules-xml,3.0.0.Final"/>
+        </dependencies>
+        <sourceTechnology id="openjdk" versionRange="(,11]"/>
+        <targetTechnology id="openjdk" versionRange="[17,)"/>
+    </metadata>
+    <rules>
+        <rule id="lombok-incompatibility-00001">
+            <when>
+                <project>
+                    <artifact groupId="org.projectlombok" artifactId="lombok" toVersion="1.18.22"/>
+                </project>
+            </when>
+            <perform>
+                <hint title="The Lombok version is incompatible with Open JDK 17" effort="3" category-id="mandatory">
+                    <message>
+                        Lombok supports Java 17 since version 1.18.22. The version of Lombok used in this project is too old and not compatible with Java 17. You should consider upgrading it.
+                    </message>
+                    <link title="Upgrade Lombok version to support Java 17" href="https://github.com/projectlombok/lombok/issues/2898"/>
+                </hint>
+            </perform>
+        </rule>
+    </rules>
+</ruleset>
diff --git a/rules/rules-reviewed/openjdk17/openjdk11/tests/data/lombok/pom.xml b/rules/rules-reviewed/openjdk17/openjdk11/tests/data/lombok/pom.xml
new file mode 100644
index 000000000..15e0d9737
--- /dev/null
+++ b/rules/rules-reviewed/openjdk17/openjdk11/tests/data/lombok/pom.xml
@@ -0,0 +1,17 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.jboss.windup.data</groupId>
+    <artifactId>test</artifactId>
+    <version>1.0.0</version>
+    <dependencies>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.17.0</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+    <name>Test project</name>
+</project>
\ No newline at end of file
diff --git a/rules/rules-reviewed/openjdk17/openjdk11/tests/lombok.windup.test.xml b/rules/rules-reviewed/openjdk17/openjdk11/tests/lombok.windup.test.xml
new file mode 100644
index 000000000..60a4454d4
--- /dev/null
+++ b/rules/rules-reviewed/openjdk17/openjdk11/tests/lombok.windup.test.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<ruletest id="lombok-test"
+          xmlns="http://windup.jboss.org/schema/jboss-ruleset"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://windup.jboss.org/schema/jboss-ruleset http://windup.jboss.org/schema/jboss-ruleset/windup-jboss-ruleset.xsd">
+    <testDataPath>data/lombok</testDataPath>
+    <rulePath>../lombok.windup.xml</rulePath>
+    <ruleset>
+        <rules>
+            <rule id="lombok-incompatibility-00001">
+                <when>
+                    <not>
+                        <iterable-filter size="1">
+                            <hint-exists message="Lombok supports Java 17 since version 1.18.22.*"/>
+                        </iterable-filter>
+                    </not>
+                </when>
+                <perform>
+                    <fail message="lombok-incompatibility-00001 - has failed"/>
+                </perform>
+            </rule>
+        </rules>
+    </ruleset>
+</ruletest>

From 287d0836ed09f587dd65d589d5e857eda5db0ba1 Mon Sep 17 00:00:00 2001
From: Antonio Goncalves <antonio.goncalves@gmail.com>
Date: Mon, 27 Feb 2023 12:03:13 +0100
Subject: [PATCH 2/2] Restrict IO classes to only Files

---
 rules/rules-reviewed/azure/azure-file-system.windup.xml   | 5 ++++-
 .../azure/tests/azure-file-system.windup.test.xml         | 2 +-
 .../azure/tests/data/azure-file-system/FileSystem.java    | 8 ++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/rules/rules-reviewed/azure/azure-file-system.windup.xml b/rules/rules-reviewed/azure/azure-file-system.windup.xml
index cf5d59abc..cea612eb9 100644
--- a/rules/rules-reviewed/azure/azure-file-system.windup.xml
+++ b/rules/rules-reviewed/azure/azure-file-system.windup.xml
@@ -22,7 +22,7 @@
         <rule id="azure-file-system-01000">
             <when>
                 <or>
-                    <javaclass references="java.io.{*}"/>
+                    <javaclass references="java.io.{ioclasses}"/>
                     <javaclass references="java.nio.{*}"/>
                     <javaclass references="org.apache.commons.io.{*}"/>
                 </or>
@@ -40,6 +40,9 @@
                     <link title="Azure Spring Boot Starter for Azure Storage" href="https://search.maven.org/artifact/com.azure.spring/azure-spring-boot-starter-storage"/>
                 </hint>
             </perform>
+            <where param="ioclasses">
+                <matches pattern="(File|FileWriter|FileReader|FileInputStream|FileOutputStream)"/>
+            </where>
         </rule>
         <rule id="azure-file-system-02000">
             <when>
diff --git a/rules/rules-reviewed/azure/tests/azure-file-system.windup.test.xml b/rules/rules-reviewed/azure/tests/azure-file-system.windup.test.xml
index cc2851bbb..c75dad69f 100644
--- a/rules/rules-reviewed/azure/tests/azure-file-system.windup.test.xml
+++ b/rules/rules-reviewed/azure/tests/azure-file-system.windup.test.xml
@@ -8,7 +8,7 @@
             <rule id="azure-file-system-test-01000">
                 <when>
                     <not>
-                        <iterable-filter size="3">
+                        <iterable-filter size="5">
                             <hint-exists message="The application uses Java APIs to read/write from the file system." />
                         </iterable-filter>
                     </not>
diff --git a/rules/rules-reviewed/azure/tests/data/azure-file-system/FileSystem.java b/rules/rules-reviewed/azure/tests/data/azure-file-system/FileSystem.java
index 72508db71..c2067d092 100644
--- a/rules/rules-reviewed/azure/tests/data/azure-file-system/FileSystem.java
+++ b/rules/rules-reviewed/azure/tests/data/azure-file-system/FileSystem.java
@@ -4,6 +4,14 @@
 import java.notnio.File;
 import org.apache.commons.io.File;
 import org.apache.commons.notio.File;
+import java.io.FileWriter;
+import java.io.FileReader;
+
+// Should not match the rule
+import java.io.IOException;
+import java.io.Closeable;
+import java.io.Serializable;
+import java.io.DefaultFileSystem;
 
 public class FileSystem {