From f243c5d66d178a4cac6851a810289d63a7591745 Mon Sep 17 00:00:00 2001 From: Paul Robinson Date: Fri, 20 Aug 2021 15:57:31 +0100 Subject: [PATCH 1/4] Updated github links containing 'master' to use 'main' --- docs/src/main/asciidoc/cassandra.adoc | 2 +- docs/src/main/asciidoc/conditional-extension-dependencies.adoc | 2 +- docs/src/main/asciidoc/deploying-to-heroku.adoc | 2 +- docs/src/main/asciidoc/ide-tooling.adoc | 2 +- docs/src/main/asciidoc/lra.adoc | 2 +- .../quarkus/container/image/jib/deployment/PlatformHelper.java | 2 +- .../elytron/security/jdbc/JdbcSecurityRealmRuntimeConfig.java | 2 +- .../smallrye/metrics/runtime/SmallRyeMetricsRecorder.java | 2 +- .../java/io/quarkus/vertx/http/runtime/ForwardedParser.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/src/main/asciidoc/cassandra.adoc b/docs/src/main/asciidoc/cassandra.adoc index 74ac4425ccd03..7a564da5d5203 100644 --- a/docs/src/main/asciidoc/cassandra.adoc +++ b/docs/src/main/asciidoc/cassandra.adoc @@ -52,7 +52,7 @@ We recommend that you follow the instructions in the next sections and create th by step. However, you can go right to the completed example. The solution is located in the -link:https://github.com/datastax/cassandra-quarkus/tree/master/quickstart[quickstart directory] of +link:https://github.com/datastax/cassandra-quarkus/tree/main/quickstart[quickstart directory] of the Cassandra Quarkus extension GitHub repository. == Creating a Blank Maven Project diff --git a/docs/src/main/asciidoc/conditional-extension-dependencies.adoc b/docs/src/main/asciidoc/conditional-extension-dependencies.adoc index 754d2f3b5e145..b8e655d6a6c8f 100644 --- a/docs/src/main/asciidoc/conditional-extension-dependencies.adoc +++ b/docs/src/main/asciidoc/conditional-extension-dependencies.adoc @@ -1,7 +1,7 @@ //// This guide is maintained in the main Quarkus repository and pull requests should be submitted there: -https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc +https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc //// = Conditional Extension Dependencies diff --git a/docs/src/main/asciidoc/deploying-to-heroku.adoc b/docs/src/main/asciidoc/deploying-to-heroku.adoc index 80ea1c92aacf9..6cd6e8763f073 100644 --- a/docs/src/main/asciidoc/deploying-to-heroku.adoc +++ b/docs/src/main/asciidoc/deploying-to-heroku.adoc @@ -1,7 +1,7 @@ //// This guide is maintained in the main Quarkus repository and pull requests should be submitted there: -https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc +https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc //// = Deploying to Heroku include::./attributes.adoc[] diff --git a/docs/src/main/asciidoc/ide-tooling.adoc b/docs/src/main/asciidoc/ide-tooling.adoc index 68c20cb151034..a41e587d9c996 100644 --- a/docs/src/main/asciidoc/ide-tooling.adoc +++ b/docs/src/main/asciidoc/ide-tooling.adoc @@ -12,7 +12,7 @@ The following IDEs have support for the community developed Quarkus Tools: * https://marketplace.visualstudio.com/items?itemName=redhat.vscode-quarkus[Quarkus Tools for Visual Studio Code] * https://marketplace.eclipse.org/content/quarkus-tools[Quarkus Tools for Eclipse] * https://plugins.jetbrains.com/plugin/13234-quarkus/versions[Quarkus Tools for IntelliJ] -* https://github.com/eclipse/che-devfile-registry/blob/master/devfiles/quarkus/devfile.yaml[Quarkus Tools for Eclipse Che] +* https://github.com/eclipse/che-devfile-registry/blob/main/devfiles/quarkus/devfile.yaml[Quarkus Tools for Eclipse Che] In addition IntelliJ has additional support for Quarkus in their Ultimate non-open source version. diff --git a/docs/src/main/asciidoc/lra.adoc b/docs/src/main/asciidoc/lra.adoc index 528c60ee66853..97e3bea0aa771 100644 --- a/docs/src/main/asciidoc/lra.adoc +++ b/docs/src/main/asciidoc/lra.adoc @@ -1,7 +1,7 @@ //// This guide is maintained in the main Quarkus repository and pull requests should be submitted there: -https://github.com/quarkusio/quarkus/tree/master/docs/src/main/asciidoc +https://github.com/quarkusio/quarkus/tree/main/docs/src/main/asciidoc //// = Narayana LRA Participant Support diff --git a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java index b6544f150c2a1..221a44baca605 100755 --- a/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java +++ b/extensions/container-image/container-image-jib/deployment/src/main/java/io/quarkus/container/image/jib/deployment/PlatformHelper.java @@ -15,7 +15,7 @@ * * The accepted platform format is: |[/variant]|/[/variant] * The default OS is linux and the default Architecture is amd64 (as in Jib lib) - * Valid values for OS and Arch are define by OCI. See image-index + * Valid values for OS and Arch are define by OCI. See image-index * */ final class PlatformHelper { diff --git a/extensions/elytron-security-jdbc/runtime/src/main/java/io/quarkus/elytron/security/jdbc/JdbcSecurityRealmRuntimeConfig.java b/extensions/elytron-security-jdbc/runtime/src/main/java/io/quarkus/elytron/security/jdbc/JdbcSecurityRealmRuntimeConfig.java index 09bb0322d8633..f3cfa790e7982 100644 --- a/extensions/elytron-security-jdbc/runtime/src/main/java/io/quarkus/elytron/security/jdbc/JdbcSecurityRealmRuntimeConfig.java +++ b/extensions/elytron-security-jdbc/runtime/src/main/java/io/quarkus/elytron/security/jdbc/JdbcSecurityRealmRuntimeConfig.java @@ -16,7 +16,7 @@ public class JdbcSecurityRealmRuntimeConfig { */ @ConfigItem(name = "principal-query") public PrincipalQueriesConfig principalQueries; - // https://github.com/wildfly/wildfly-core/blob/master/elytron/src/test/resources/org/wildfly/extension/elytron/security-realms.xml#L18 + // https://github.com/wildfly/wildfly-core/blob/main/elytron/src/test/resources/org/wildfly/extension/elytron/security-realms.xml#L18 @Override public String toString() { diff --git a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java index 4a5899ced21f7..35a1daf30d05b 100644 --- a/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java +++ b/extensions/smallrye-metrics/runtime/src/main/java/io/quarkus/smallrye/metrics/runtime/SmallRyeMetricsRecorder.java @@ -731,7 +731,7 @@ public long getCount() { /** * Mimics Uptime metrics from Micrometer. Most of the logic here is basically copied from * {@link Micrometer + * "https://github.com/micrometer-metrics/micrometer/blob/main/micrometer-core/src/main/java/io/micrometer/core/instrument/binder/system/UptimeMetrics.java">Micrometer * Uptime metrics}. * * @param registry diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedParser.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedParser.java index 5392a3c89ed35..437e0e6002965 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedParser.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/ForwardedParser.java @@ -15,7 +15,7 @@ */ // This code was Heavily influenced from spring forward header parser -// https://github.com/spring-projects/spring-framework/blob/master/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java#L849 +// https://github.com/spring-projects/spring-framework/blob/main/spring-web/src/main/java/org/springframework/web/util/UriComponentsBuilder.java#L849 package io.quarkus.vertx.http.runtime; From 044faab97fd5887f99db432f293cd38a3d140822 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Fri, 20 Aug 2021 16:10:58 +0100 Subject: [PATCH 2/4] Retire the previously deprecated BlacklistedServletContainerInitializerBuildItem --- .../deployment/UndertowBuildStep.java | 7 ------- ...dServletContainerInitializerBuildItem.java | 20 ------------------- 2 files changed, 27 deletions(-) delete mode 100644 extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/BlacklistedServletContainerInitializerBuildItem.java diff --git a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java index fa8f71c8f185f..c07101bef3fe1 100644 --- a/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java +++ b/extensions/undertow/deployment/src/main/java/io/quarkus/undertow/deployment/UndertowBuildStep.java @@ -247,13 +247,6 @@ public void registerUndertowHandlersConf(BuildProducer translateDeprecated( - List old) { - return old.stream().map(BlacklistedServletContainerInitializerBuildItem::getSciClass) - .map(IgnoredServletContainerInitializerBuildItem::new).collect(Collectors.toList()); - } - /* * look for Servlet container initializers * diff --git a/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/BlacklistedServletContainerInitializerBuildItem.java b/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/BlacklistedServletContainerInitializerBuildItem.java deleted file mode 100644 index 19fc3fc54762b..0000000000000 --- a/extensions/undertow/spi/src/main/java/io/quarkus/undertow/deployment/BlacklistedServletContainerInitializerBuildItem.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.quarkus.undertow.deployment; - -import io.quarkus.builder.item.MultiBuildItem; - -/** - * Use {@link IgnoredServletContainerInitializerBuildItem} instead - */ -@Deprecated -public final class BlacklistedServletContainerInitializerBuildItem extends MultiBuildItem { - - final String sciClass; - - public BlacklistedServletContainerInitializerBuildItem(String sciClass) { - this.sciClass = sciClass; - } - - public String getSciClass() { - return sciClass; - } -} From bdb27a0ee2e7c53548b898a2959d67bec465afe4 Mon Sep 17 00:00:00 2001 From: Paul Robinson Date: Fri, 20 Aug 2021 16:49:05 +0100 Subject: [PATCH 3/4] Renamed Whitelisted to AllowListed in ReflectiveHierarchy code --- .../nativeimage/ReflectiveHierarchyBuildItem.java | 10 +++++----- .../deployment/steps/ReflectiveHierarchyStep.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java index dcca87d743c7b..00c3c64911eb5 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/builditem/nativeimage/ReflectiveHierarchyBuildItem.java @@ -211,7 +211,7 @@ public static class DefaultIgnoreTypePredicate implements Predicate { "org.reactivestreams.", "org.slf4j.", "javax.json.", "com.fasterxml.jackson.databind.", "io.vertx.core.json."); // if this gets more complicated we will need to move to some tree like structure - static final Set WHITELISTED_FROM_IGNORED_PACKAGES = new HashSet<>( + static final Set ALLOWED_FROM_IGNORED_PACKAGES = new HashSet<>( Arrays.asList("java.math.BigDecimal", "java.math.BigInteger")); static final List PRIMITIVE = Arrays.asList("boolean", "byte", @@ -225,7 +225,7 @@ public boolean test(DotName dotName) { } for (String containerPackageName : DEFAULT_IGNORED_PACKAGES) { if (name.startsWith(containerPackageName)) { - return !WHITELISTED_FROM_IGNORED_PACKAGES.contains(name); + return !ALLOWED_FROM_IGNORED_PACKAGES.contains(name); } } return false; @@ -233,13 +233,13 @@ public boolean test(DotName dotName) { } - public static class IgnoreWhiteListedPredicate implements Predicate { + public static class IgnoreAllowListedPredicate implements Predicate { - public static IgnoreWhiteListedPredicate INSTANCE = new IgnoreWhiteListedPredicate(); + public static IgnoreAllowListedPredicate INSTANCE = new IgnoreAllowListedPredicate(); @Override public boolean test(DotName dotName) { - return DefaultIgnoreTypePredicate.WHITELISTED_FROM_IGNORED_PACKAGES.contains(dotName.toString()); + return DefaultIgnoreTypePredicate.ALLOWED_FROM_IGNORED_PACKAGES.contains(dotName.toString()); } } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java index 41269ff57b034..4e324cea461e3 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ReflectiveHierarchyStep.java @@ -46,7 +46,7 @@ private interface ReflectiveHierarchyVisitor { @BuildStep public ReflectiveHierarchyIgnoreWarningBuildItem ignoreJavaClassWarnings() { - return new ReflectiveHierarchyIgnoreWarningBuildItem(ReflectiveHierarchyBuildItem.IgnoreWhiteListedPredicate.INSTANCE); + return new ReflectiveHierarchyIgnoreWarningBuildItem(ReflectiveHierarchyBuildItem.IgnoreAllowListedPredicate.INSTANCE); } @BuildStep From 5483df8bf6db1a6d36a08a8cd2e66596c6ad0f26 Mon Sep 17 00:00:00 2001 From: Paul Robinson Date: Fri, 20 Aug 2021 17:05:55 +0100 Subject: [PATCH 4/4] Renamed whitelist to allowList in mongodb-panache-kotlin TestAnalogs --- .../hibernate/orm/panache/kotlin/runtime/TestAnalogs.kt | 4 ++-- .../kotlin/io/quarkus/mongodb/panache/kotlin/TestAnalogs.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/TestAnalogs.kt b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/TestAnalogs.kt index 529a5e720b15e..d0076144f59e4 100644 --- a/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/TestAnalogs.kt +++ b/extensions/panache/hibernate-orm-panache-kotlin/runtime/src/test/kotlin/io/quarkus/hibernate/orm/panache/kotlin/runtime/TestAnalogs.kt @@ -82,7 +82,7 @@ class TestAnalogs { private fun KClass<*>.bytes() = java.classLoader.getResourceAsStream(qualifiedName.toString().replace(".", "/") + ".class") - private fun compare(javaClass: AnalogVisitor, kotlinClass: AnalogVisitor, whiteList: List = listOf()) { + private fun compare(javaClass: AnalogVisitor, kotlinClass: AnalogVisitor, allowList: List = listOf()) { val javaMethods = javaClass.methods val kotlinMethods = kotlinClass.methods val implemented = mutableListOf() @@ -97,7 +97,7 @@ class TestAnalogs { javaMethods.removeIf { it.name.endsWith("Optional") || - it.name in whiteList || + it.name in allowList || it in implemented } diff --git a/extensions/panache/mongodb-panache-kotlin/runtime/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/TestAnalogs.kt b/extensions/panache/mongodb-panache-kotlin/runtime/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/TestAnalogs.kt index e89d8b126d6be..cf16838d3056b 100644 --- a/extensions/panache/mongodb-panache-kotlin/runtime/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/TestAnalogs.kt +++ b/extensions/panache/mongodb-panache-kotlin/runtime/src/test/kotlin/io/quarkus/mongodb/panache/kotlin/TestAnalogs.kt @@ -118,7 +118,7 @@ class TestAnalogs { private fun KClass<*>.bytes() = java.classLoader.getResourceAsStream(qualifiedName.toString().replace(".", "/") + ".class") - private fun compare(javaClass: AnalogVisitor, kotlinClass: AnalogVisitor, whiteList: List = listOf()) { + private fun compare(javaClass: AnalogVisitor, kotlinClass: AnalogVisitor, allowList: List = listOf()) { val javaMethods = javaClass.methods val kotlinMethods = kotlinClass.methods val implemented = mutableListOf() @@ -132,7 +132,7 @@ class TestAnalogs { } javaMethods.removeIf { - it.name in whiteList || + it.name in allowList || it in implemented }