Update index files for deleted config files

dnestoro · gradinac · commit fe74d0e8c620 · 2023-04-21T13:20:31.000+02:00
diff --git a/metadata/ch.qos.logback/logback-classic/1.2.11/reflect-config.json b/metadata/ch.qos.logback/logback-classic/1.2.11/reflect-config.json
@@ -287,6 +287,9 @@
     "allPublicConstructors": true
   },
   {
+    "condition": {
+      "typeReachable": "ch.qos.logback.classic.LoggerContext"
+    },
     "name": "org.slf4j.impl.StaticLoggerBinder"
   }
 ]
diff --git a/metadata/com.graphql-java/graphql-java-extended-validation/19.1/proxy-config.json b/metadata/com.graphql-java/graphql-java-extended-validation/19.1/proxy-config.json
@@ -1,5 +1,8 @@
 [
   {
+    "condition": {
+      "typeReachable": "graphql.validation.interpolation.ResourceBundleMessageInterpolator$BridgeAnnotation"
+    },
     "interfaces": [
       "graphql.validation.interpolation.ResourceBundleMessageInterpolator$BridgeAnnotation"
     ]
diff --git a/metadata/com.sun.mail/jakarta.mail/2.0.1/resource-config.json b/metadata/com.sun.mail/jakarta.mail/2.0.1/resource-config.json
@@ -1,3 +1,4 @@
+
 {
   "resources": {
     "includes": [
@@ -17,6 +18,9 @@
         "pattern": "\\QMETA-INF/javamail.default.providers\\E"
       },
       {
+        "condition": {
+          "typeReachable": "jakarta.mail.Session"
+        },
         "pattern": "\\QMETA-INF/mailcap\\E"
       }
     ]
diff --git a/metadata/com.zaxxer/HikariCP/5.0.1/index.json b/metadata/com.zaxxer/HikariCP/5.0.1/index.json
@@ -1,7 +1,5 @@
 [
   "jni-config.json",
   "proxy-config.json",
-  "reflect-config.json",
-  "resource-config.json",
-  "serialization-config.json"
+  "reflect-config.json"
 ]
diff --git a/metadata/org.apache.tomcat.embed/tomcat-embed-core/10.0.20/reflect-config.json b/metadata/org.apache.tomcat.embed/tomcat-embed-core/10.0.20/reflect-config.json
@@ -48,6 +48,9 @@
     "name": "org.apache.tomcat.util.modeler.AttributeInfo"
   },
   {
+    "condition": {
+      "typeReachable": "org.apache.tomcat.util.modeler.BaseModelMBean"
+    },
     "name": "org.apache.tomcat.util.modeler.BaseModelMBean",
     "queriedMethods": [
       {
diff --git a/metadata/org.eclipse.jetty/jetty-server/11.0.12/reflect-config.json b/metadata/org.eclipse.jetty/jetty-server/11.0.12/reflect-config.json
@@ -1,5 +1,8 @@
 [
   {
+    "condition": {
+      "typeReachable": "org.eclipse.jetty.websocket.jakarta.common.decoders.StringDecoder"
+    },
     "name": "org.eclipse.jetty.websocket.jakarta.common.decoders.StringDecoder",
     "allDeclaredConstructors": true
   },
diff --git a/metadata/org.hibernate.orm/hibernate-core/6.1.1.Final/proxy-config.json b/metadata/org.hibernate.orm/hibernate-core/6.1.1.Final/proxy-config.json
@@ -1,16 +1,25 @@
 [
   {
+    "condition": {
+      "typeReachable": "org.hibernate.query.spi.QueryImplementor"
+    },
     "interfaces": [
       "org.hibernate.query.spi.QueryImplementor"
     ]
   },
   {
+    "condition": {
+      "typeReachable": "org.hibernate.query.Query"
+    },
     "interfaces": [
       "org.hibernate.query.Query",
       "org.hibernate.query.spi.QueryImplementor"
     ]
   },
   {
+    "condition": {
+      "typeReachable": "org.hibernate.query.hql.spi.SqmQueryImplementor"
+    },
     "interfaces": [
       "org.hibernate.query.hql.spi.SqmQueryImplementor",
       "org.hibernate.query.sqm.internal.SqmInterpretationsKey$InterpretationsKeySource",
diff --git a/metadata/org.hibernate.orm/hibernate-envers/6.1.1.Final/reflect-config.json b/metadata/org.hibernate.orm/hibernate-envers/6.1.1.Final/reflect-config.json
@@ -1,5 +1,8 @@
 [
   {
+    "condition": {
+      "typeReachable": "java.util.ServiceLoader"
+    },
     "name": "java.util.ServiceLoader$Provider",
     "allPublicMethods": true
   },
diff --git a/metadata/org.mariadb.jdbc/mariadb-java-client/3.0.6/index.json b/metadata/org.mariadb.jdbc/mariadb-java-client/3.0.6/index.json
@@ -1,7 +1,4 @@
 [
-  "jni-config.json",
-  "proxy-config.json",
   "reflect-config.json",
-  "resource-config.json",
-  "serialization-config.json"
+  "resource-config.json"
 ]
diff --git a/metadata/org.quartz-scheduler/quartz/2.3.2/resource-config.json b/metadata/org.quartz-scheduler/quartz/2.3.2/resource-config.json
@@ -2,7 +2,10 @@
   "resources": {
     "includes": [
       {
-        "pattern": "\\Qorg/quartz/impl/jdbcjobstore/tables_\\E.*\\Q.sql\\E"
+        "pattern": "\\Qorg/quartz/impl/jdbcjobstore/tables_\\E.*\\Q.sql\\E",
+        "condition": {
+          "typeReachable": "org.quartz.SimpleJob"
+        }
       },
       {
         "pattern": "\\Qquartz.properties\\E",
diff --git a/tests/src/com.ecwid.consul/consul-api/1.4.5/src/test/resources/META-INF/native-image/tomcat-hints/reflect-config.json b/tests/src/com.ecwid.consul/consul-api/1.4.5/src/test/resources/META-INF/native-image/tomcat-hints/reflect-config.json
@@ -48,6 +48,9 @@
     "name": "org.apache.tomcat.util.modeler.AttributeInfo"
   },
   {
+    "condition": {
+      "typeReachable": "org.apache.tomcat.util.modeler.BaseModelMBean"
+    },
     "name": "org.apache.tomcat.util.modeler.BaseModelMBean",
     "queriedMethods": [
       {
diff --git a/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-harness.gradle b/tests/tck-build-logic/src/main/groovy/org.graalvm.internal.tck-harness.gradle
@@ -10,11 +10,8 @@ plugins {
 }
 
 import groovy.json.JsonOutput
-<<<<<<< HEAD
 import org.graalvm.internal.tck.DockerTask
-=======
 import org.graalvm.internal.tck.ConfigFilesChecker
->>>>>>> cbf3f68 (Check conditions, duplicates and empty config files)
 import org.graalvm.internal.tck.ScaffoldTask
 import org.graalvm.internal.tck.GrypeTask
 import org.graalvm.internal.tck.harness.tasks.CheckstyleInvocationTask
@@ -147,6 +144,10 @@ Provider<Task> getListOfDockerImages = tasks.register("checkAllowedDockerImages"
     task.setGroup(METADATA_GROUP)
 }
 
+tasks.register("pullAllowedDockerImages", DockerTask.class) { task ->
+    task.setDescription("Pull allowed docker images from list.")
+    task.setGroup(METADATA_GROUP)
+}
 
 tasks.register("scaffold", ScaffoldTask.class) { task ->
     task.setDescription("Creates a metadata and test scaffold for the given coordindates")
@@ -155,14 +156,7 @@ tasks.register("scaffold", ScaffoldTask.class) { task ->
     task.finalizedBy("spotlessApply")
 }
 
-<<<<<<< HEAD
-tasks.register("pullAllowedDockerImages", DockerTask.class) { task ->
-    task.setDescription("Pull allowed docker images from list.")
-    task.setGroup(METADATA_GROUP)
-}
-=======
 tasks.register("checkConfigFiles", ConfigFilesChecker.class) { task ->
     task.setDescription("Checks content of config files for a new library.")
     task.setGroup(METADATA_GROUP)
 }
->>>>>>> cbf3f68 (Check conditions, duplicates and empty config files)
diff --git a/tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/ConfigFilesChecker.java b/tests/tck-build-logic/src/main/java/org/graalvm/internal/tck/ConfigFilesChecker.java
@@ -252,7 +252,7 @@ private boolean checkTypeReachable(Map<String, Object> entry, File file) {
 
         // check if typeReachable exists inside condition entry
         String typeReachable = (String) condition.get("typeReachable");
-        if (ILLEGAL_TYPE_VALUES.stream().anyMatch(type -> type.startsWith(typeReachable))) {
+        if (ILLEGAL_TYPE_VALUES.stream().anyMatch(typeReachable::startsWith)) {
             // get name of entry that misses typeReachable. If name cannot be determinate, write whole entry
             String entryName = (String) entry.get("name");
             if (entryName == null) {

Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,9 @@`
`287`	`287`	`"allPublicConstructors": true`
`288`	`288`	`},`
`289`	`289`	`{`
	`290`	`+ "condition": {`
	`291`	`+ "typeReachable": "ch.qos.logback.classic.LoggerContext"`
	`292`	`+ },`
`290`	`293`	`"name": "org.slf4j.impl.StaticLoggerBinder"`
`291`	`294`	`}`
`292`	`295`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`[`
`2`	`2`	`{`
	`3`	`+ "condition": {`
	`4`	`+ "typeReachable": "graphql.validation.interpolation.ResourceBundleMessageInterpolator$BridgeAnnotation"`
	`5`	`+ },`
`3`	`6`	`"interfaces": [`
`4`	`7`	`"graphql.validation.interpolation.ResourceBundleMessageInterpolator$BridgeAnnotation"`
`5`	`8`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+`
`1`	`2`	`{`
`2`	`3`	`"resources": {`
`3`	`4`	`"includes": [`
`@@ -17,6 +18,9 @@`
`17`	`18`	`"pattern": "\\QMETA-INF/javamail.default.providers\\E"`
`18`	`19`	`},`
`19`	`20`	`{`
	`21`	`+ "condition": {`
	`22`	`+ "typeReachable": "jakarta.mail.Session"`
	`23`	`+ },`
`20`	`24`	`"pattern": "\\QMETA-INF/mailcap\\E"`
`21`	`25`	`}`
`22`	`26`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`	`1`	`[`
`2`	`2`	`"jni-config.json",`
`3`	`3`	`"proxy-config.json",`
`4`		`- "reflect-config.json",`
`5`		`- "resource-config.json",`
`6`		`- "serialization-config.json"`
	`4`	`+ "reflect-config.json"`
`7`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,9 @@`
`48`	`48`	`"name": "org.apache.tomcat.util.modeler.AttributeInfo"`
`49`	`49`	`},`
`50`	`50`	`{`
	`51`	`+ "condition": {`
	`52`	`+ "typeReachable": "org.apache.tomcat.util.modeler.BaseModelMBean"`
	`53`	`+ },`
`51`	`54`	`"name": "org.apache.tomcat.util.modeler.BaseModelMBean",`
`52`	`55`	`"queriedMethods": [`
`53`	`56`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`[`
`2`	`2`	`{`
	`3`	`+ "condition": {`
	`4`	`+ "typeReachable": "org.eclipse.jetty.websocket.jakarta.common.decoders.StringDecoder"`
	`5`	`+ },`
`3`	`6`	`"name": "org.eclipse.jetty.websocket.jakarta.common.decoders.StringDecoder",`
`4`	`7`	`"allDeclaredConstructors": true`
`5`	`8`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,25 @@`
`1`	`1`	`[`
`2`	`2`	`{`
	`3`	`+ "condition": {`
	`4`	`+ "typeReachable": "org.hibernate.query.spi.QueryImplementor"`
	`5`	`+ },`
`3`	`6`	`"interfaces": [`
`4`	`7`	`"org.hibernate.query.spi.QueryImplementor"`
`5`	`8`	`]`
`6`	`9`	`},`
`7`	`10`	`{`
	`11`	`+ "condition": {`
	`12`	`+ "typeReachable": "org.hibernate.query.Query"`
	`13`	`+ },`
`8`	`14`	`"interfaces": [`
`9`	`15`	`"org.hibernate.query.Query",`
`10`	`16`	`"org.hibernate.query.spi.QueryImplementor"`
`11`	`17`	`]`
`12`	`18`	`},`
`13`	`19`	`{`
	`20`	`+ "condition": {`
	`21`	`+ "typeReachable": "org.hibernate.query.hql.spi.SqmQueryImplementor"`
	`22`	`+ },`
`14`	`23`	`"interfaces": [`
`15`	`24`	`"org.hibernate.query.hql.spi.SqmQueryImplementor",`
`16`	`25`	`"org.hibernate.query.sqm.internal.SqmInterpretationsKey$InterpretationsKeySource",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`	`1`	`[`
`2`	`2`	`{`
	`3`	`+ "condition": {`
	`4`	`+ "typeReachable": "java.util.ServiceLoader"`
	`5`	`+ },`
`3`	`6`	`"name": "java.util.ServiceLoader$Provider",`
`4`	`7`	`"allPublicMethods": true`
`5`	`8`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`[`
`2`		`- "jni-config.json",`
`3`		`- "proxy-config.json",`
`4`	`2`	`"reflect-config.json",`
`5`		`- "resource-config.json",`
`6`		`- "serialization-config.json"`
	`3`	`+ "resource-config.json"`
`7`	`4`	`]`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,10 @@`
`2`	`2`	`"resources": {`
`3`	`3`	`"includes": [`
`4`	`4`	`{`
`5`		`- "pattern": "\\Qorg/quartz/impl/jdbcjobstore/tables_\\E.*\\Q.sql\\E"`
	`5`	`+ "pattern": "\\Qorg/quartz/impl/jdbcjobstore/tables_\\E.*\\Q.sql\\E",`
	`6`	`+ "condition": {`
	`7`	`+ "typeReachable": "org.quartz.SimpleJob"`
	`8`	`+ }`
`6`	`9`	`},`
`7`	`10`	`{`
`8`	`11`	`"pattern": "\\Qquartz.properties\\E",`