diff --git a/bom/application/pom.xml b/bom/application/pom.xml index f6a01ef63fe40..3e6cd23ecad43 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -34,7 +34,7 @@ 1.39.0 2.5.0-alpha 1.25.0-alpha - 5.3.0 + 5.3.1 1.12.5 2.1.12 0.22.0 @@ -55,7 +55,7 @@ 4.1.0 4.0.0 3.10.0 - 2.9.0 + 2.9.1 6.3.0 4.5.3 2.1.2 diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassComparisonUtil.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassComparisonUtil.java index a7f18fb788e72..8c87e8f724916 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassComparisonUtil.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/ClassComparisonUtil.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; @@ -19,6 +20,10 @@ import org.jboss.jandex.Type; public class ClassComparisonUtil { + private static final Set IGNORED_ANNOTATIONS = Set.of( + DotName.createSimple("kotlin.jvm.internal.SourceDebugExtension"), + DotName.createSimple("kotlin.Metadata")); + static boolean isSameStructure(ClassInfo clazz, ClassInfo old) { if (clazz.flags() != old.flags()) { return false; @@ -161,6 +166,9 @@ private static void methodMap(Collection b, List valuesA = a.values(); List valuesB = b.values(); if (valuesA.size() != valuesB.size()) { diff --git a/docs/src/main/asciidoc/hibernate-orm.adoc b/docs/src/main/asciidoc/hibernate-orm.adoc index a323321d9dc2e..80430dcb18cc6 100644 --- a/docs/src/main/asciidoc/hibernate-orm.adoc +++ b/docs/src/main/asciidoc/hibernate-orm.adoc @@ -263,7 +263,7 @@ Since we're targeting CockroachDB here, we're passing the CockroachDB version, n <2> Set the Hibernate ORM dialect. [[hibernate-dialect-varying-database]] -== Varying database +==== Varying database When enabling <>, Hibernate ORM will use multiple datasources at runtime for the same persistence unit, diff --git a/docs/src/main/asciidoc/security-keycloak-authorization.adoc b/docs/src/main/asciidoc/security-keycloak-authorization.adoc index a4d34e1407fd5..10b6c70674b74 100644 --- a/docs/src/main/asciidoc/security-keycloak-authorization.adoc +++ b/docs/src/main/asciidoc/security-keycloak-authorization.adoc @@ -524,7 +524,7 @@ For example: quarkus.keycloak.policy-enforcer.enable=true # Default Tenant -quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus +quarkus.oidc.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus quarkus.oidc.client-id=quarkus-app quarkus.oidc.credentials.secret=secret @@ -535,7 +535,7 @@ quarkus.keycloak.policy-enforcer.paths.1.claim-information-point.claims.static-c # Service Tenant -quarkus.oidc.service-tenant.auth-server-url=${keycloak.url}/realms/quarkus +quarkus.oidc.service-tenant.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus quarkus.oidc.service-tenant.client-id=quarkus-app quarkus.oidc.service-tenant.credentials.secret=secret @@ -547,7 +547,7 @@ quarkus.keycloak.service-tenant.policy-enforcer.paths.1.claim-information-point. # WebApp Tenant -quarkus.oidc.webapp-tenant.auth-server-url=${keycloak.url}/realms/quarkus +quarkus.oidc.webapp-tenant.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus quarkus.oidc.webapp-tenant.client-id=quarkus-app quarkus.oidc.webapp-tenant.credentials.secret=secret quarkus.oidc.webapp-tenant.application-type=web-app diff --git a/docs/src/main/asciidoc/security-oidc-bearer-token-authentication.adoc b/docs/src/main/asciidoc/security-oidc-bearer-token-authentication.adoc index 612a65ccd5c7a..33eb0dbb0207b 100644 --- a/docs/src/main/asciidoc/security-oidc-bearer-token-authentication.adoc +++ b/docs/src/main/asciidoc/security-oidc-bearer-token-authentication.adoc @@ -602,7 +602,7 @@ For example: [source, properties] ---- # keycloak.url is set by OidcWiremockTestResource -quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/ +quarkus.oidc.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus/ quarkus.oidc.client-id=quarkus-service-app quarkus.oidc.application-type=service ---- @@ -914,7 +914,7 @@ Prepare the REST test endpoint and set `application.properties` as outlined in t [source, properties] ---- # keycloak.url is set by KeycloakTestResourceLifecycleManager -quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/ +quarkus.oidc.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus/ quarkus.oidc.client-id=quarkus-service-app quarkus.oidc.credentials=secret quarkus.oidc.application-type=service diff --git a/docs/src/main/asciidoc/security-oidc-code-flow-authentication.adoc b/docs/src/main/asciidoc/security-oidc-code-flow-authentication.adoc index 97f340925e5d3..aef6a04e7da6a 100644 --- a/docs/src/main/asciidoc/security-oidc-code-flow-authentication.adoc +++ b/docs/src/main/asciidoc/security-oidc-code-flow-authentication.adoc @@ -1737,7 +1737,7 @@ For example: [source, properties] ---- # keycloak.url is set by OidcWiremockTestResource -quarkus.oidc.auth-server-url=${keycloak.url}/realms/quarkus/ +quarkus.oidc.auth-server-url=${keycloak.url:replaced-by-test-resource}/realms/quarkus/ quarkus.oidc.client-id=quarkus-web-app quarkus.oidc.credentials.secret=secret quarkus.oidc.application-type=web-app diff --git a/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc b/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc index 84592ab1cc1db..17cc43c346a70 100644 --- a/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc +++ b/docs/src/main/asciidoc/security-openid-connect-client-reference.adoc @@ -1034,7 +1034,7 @@ Set `application.properties`, for example: [source, properties] ---- # Use the 'keycloak.url' property set by the test KeycloakRealmResourceManager -quarkus.oidc-client.auth-server-url=${keycloak.url} +quarkus.oidc-client.auth-server-url=${keycloak.url:replaced-by-test-resource} quarkus.oidc-client.discovery-enabled=false quarkus.oidc-client.token-path=/tokens quarkus.oidc-client.client-id=quarkus-service-app diff --git a/docs/src/main/asciidoc/websockets-next-reference.adoc b/docs/src/main/asciidoc/websockets-next-reference.adoc index ac9012f75da3c..7d35092c93761 100644 --- a/docs/src/main/asciidoc/websockets-next-reference.adoc +++ b/docs/src/main/asciidoc/websockets-next-reference.adoc @@ -108,6 +108,8 @@ public class ChatWebSocket { Thus, client can connect to this web socket endpoint using `ws://localhost:8080/chat/your-name`. If TLS is used, the URL is `wss://localhost:8443/chat/your-name`. +NOTE: The endpoint path is relative to the xref:http-reference.adoc#context-path[root context] configured by the `quarkus.http.root-path` (which is `/` by default). For example, if you add `quarkus.http.root-path=/api` to your `application.properties` then a client can connect to this endpoint using `http://localhost:8080/api/chat/the-name`. + [[client-endpoints]] === Client endpoints diff --git a/docs/src/main/java/io/quarkus/docs/generation/CheckCrossReferences.java b/docs/src/main/java/io/quarkus/docs/generation/CheckCrossReferences.java index cfcb0f48560ac..8fce62522ef48 100644 --- a/docs/src/main/java/io/quarkus/docs/generation/CheckCrossReferences.java +++ b/docs/src/main/java/io/quarkus/docs/generation/CheckCrossReferences.java @@ -85,7 +85,7 @@ public CheckCrossReferences(Path srcDir, Path referenceIndexPath) if (!Files.exists(referenceIndexPath) || !Files.isReadable(referenceIndexPath)) { throw new IllegalStateException( - String.format("Reference index does not exist or is not readable", referenceIndexPath.toAbsolutePath())); + String.format("Reference index %s does not exist or is not readable", referenceIndexPath.toAbsolutePath())); } ObjectMapper om = new ObjectMapper(new YAMLFactory().enable(YAMLGenerator.Feature.MINIMIZE_QUOTES)); diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java index 282b529ec8f30..007ab91f2677c 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestStoreDataAtDeleteResource.java @@ -41,7 +41,7 @@ public String delete() { AuditReader auditReader = AuditReaderFactory.get(em); List revisions = auditReader.getRevisions(MyAuditedEntity.class, entity.getId()); if (revisions.size() != 2) { - throw new IllegalStateException(String.format("found {} revisions", revisions.size())); + throw new IllegalStateException(String.format("found %d revisions", revisions.size())); } for (Number revision : revisions) { diff --git a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java index 9b18d539bbbce..0556b0cdad7ff 100644 --- a/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java +++ b/extensions/hibernate-envers/deployment/src/test/java/io/quarkus/hibernate/orm/envers/EnversTestValidationResource.java @@ -41,7 +41,7 @@ public String save(String name) { AuditReader auditReader = AuditReaderFactory.get(em); List revisions = auditReader.getRevisions(MyAuditedEntity.class, entity.getId()); if (revisions.size() != 2) { - throw new IllegalStateException(String.format("found {} revisions", revisions.size())); + throw new IllegalStateException(String.format("found %d revisions", revisions.size())); } MyRevisionEntity revEntity = auditReader.findRevision(MyRevisionEntity.class, revisions.get(0)); diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java index dd91316bffb0e..97a490790d418 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java @@ -426,20 +426,6 @@ enum IdOptimizerType { * Assumes the value retrieved from the table/sequence is the lower end of the pool. * * Upon retrieving value `N`, the new pool of identifiers will go from `N` to `N + - 1`, inclusive. - * `pooled`:: - * Assumes the value retrieved from the table/sequence is the higher end of the pool. - * + - * Upon retrieving value `N`, the new pool of identifiers will go from `N - ` to `N + - * - 1`, inclusive. - * + - * The first value, `1`, is handled differently to avoid negative identifiers. - * + - * Use this to get the legacy behavior of Quarkus 2 / Hibernate ORM 5 or older. - * `none`:: - * No optimizer, resulting in a database call each and every time an identifier value is needed from the generator. - * + - * Not recommended in production environments: - * may result in degraded performance and/or frequent gaps in identifier values. * * @asciidoclet */ diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java index ecf9b2afc6aa9..d500a274f7a59 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/MicrometerRecorder.java @@ -107,15 +107,21 @@ public void configureRegistries(MicrometerConfig config, } } + List autoCloseables = new ArrayList<>(); + // Base JVM Metrics if (config.checkBinderEnabledWithDefault(() -> config.binder.jvm)) { new ClassLoaderMetrics().bindTo(Metrics.globalRegistry); - new JvmHeapPressureMetrics().bindTo(Metrics.globalRegistry); + JvmHeapPressureMetrics jvmHeapPressureMetrics = new JvmHeapPressureMetrics(); + jvmHeapPressureMetrics.bindTo(Metrics.globalRegistry); + autoCloseables.add(jvmHeapPressureMetrics); new JvmMemoryMetrics().bindTo(Metrics.globalRegistry); new JvmThreadMetrics().bindTo(Metrics.globalRegistry); new JVMInfoBinder().bindTo(Metrics.globalRegistry); if (ImageMode.current() == ImageMode.JVM) { - new JvmGcMetrics().bindTo(Metrics.globalRegistry); + JvmGcMetrics jvmGcMetrics = new JvmGcMetrics(); + jvmGcMetrics.bindTo(Metrics.globalRegistry); + autoCloseables.add(jvmGcMetrics); } } @@ -149,6 +155,14 @@ public void run() { meterRegistry.close(); Metrics.removeRegistry(meterRegistry); } + // iterate over the auto-closeables and close them + for (AutoCloseable autoCloseable : autoCloseables) { + try { + autoCloseable.close(); + } catch (Exception e) { + log.error("Error closing", e); + } + } } }); } diff --git a/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java b/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java index c661f5ea866b6..214fa3bf3ec0b 100644 --- a/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java +++ b/extensions/narayana-jta/deployment/src/main/java/io/quarkus/narayana/jta/deployment/NarayanaJtaProcessor.java @@ -204,6 +204,11 @@ public void startRecoveryService(NarayanaJtaRecorder recorder, @BuildStep(onlyIf = IsTest.class) void testTx(BuildProducer generatedBeanBuildItemBuildProducer, BuildProducer additionalBeans) { + + if (!testTransactionOnClassPath()) { + return; + } + //generate the annotated interceptor with gizmo //all the logic is in the parent, but we don't have access to the //binding annotation here @@ -219,6 +224,15 @@ void testTx(BuildProducer generatedBeanBuildItemBuildPro .addBeanClass(TEST_TRANSACTION).build()); } + private static boolean testTransactionOnClassPath() { + try { + Class.forName(TEST_TRANSACTION, false, Thread.currentThread().getContextClassLoader()); + return true; + } catch (ClassNotFoundException ignored) { + return false; + } + } + @BuildStep public ContextConfiguratorBuildItem transactionContext(ContextRegistrationPhaseBuildItem contextRegistrationPhase) { return new ContextConfiguratorBuildItem(contextRegistrationPhase.getContext() diff --git a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java index 33c6ce44bbe73..0f0881c594a9a 100644 --- a/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java +++ b/extensions/oidc-common/runtime/src/main/java/io/quarkus/oidc/common/runtime/OidcCommonUtils.java @@ -160,8 +160,8 @@ public static void setHttpClientOptions(OidcCommonConfig oidcConfig, HttpClientO } } catch (IOException ex) { throw new ConfigurationException(String.format( - "OIDC truststore file does not exist or can not be read", - oidcConfig.tls.trustStoreFile.get().toString()), ex); + "OIDC truststore file %s does not exist or can not be read", + oidcConfig.tls.trustStoreFile.get()), ex); } } if (oidcConfig.tls.keyStoreFile.isPresent()) { @@ -182,8 +182,8 @@ public static void setHttpClientOptions(OidcCommonConfig oidcConfig, HttpClientO } catch (IOException ex) { throw new ConfigurationException(String.format( - "OIDC keystore file does not exist or can not be read", - oidcConfig.tls.keyStoreFile.get().toString()), ex); + "OIDC keystore file %s does not exist or can not be read", + oidcConfig.tls.keyStoreFile.get()), ex); } } Optional proxyOpt = toProxyOptions(oidcConfig.getProxy()); diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java index 83d4aca1ad8a9..14594b13d9df1 100644 --- a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java +++ b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/AbstractJpaOperations.java @@ -482,7 +482,7 @@ public int executeUpdate(Class entityClass, String panacheQuery, Object... pa try { String updateQuery = PanacheJpaUtil.createUpdateQuery(entityClass, panacheQuery, paramCount(params)); - return bindParameters(getSession(DEFAULT_PERSISTENCE_UNIT_NAME).createMutationQuery(updateQuery), params) + return bindParameters(getSession(entityClass).createMutationQuery(updateQuery), params) .executeUpdate(); } catch (RuntimeException x) { throw NamedQueryUtil.checkForNamedQueryMistake(x, panacheQuery); diff --git a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java index 42a14c283900a..12446bb9d0ccc 100644 --- a/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java +++ b/extensions/panache/hibernate-orm-panache-common/runtime/src/main/java/io/quarkus/hibernate/orm/panache/common/runtime/CommonPanacheQueryImpl.java @@ -337,7 +337,10 @@ public T singleResult() { public Optional singleResultOptional() { SelectionQuery hibernateQuery = createQuery(); try (NonThrowingCloseable c = applyFilters()) { - return hibernateQuery.uniqueResultOptional(); + // Yes, there's a much nicer hibernateQuery.uniqueResultOptional() BUT + // it throws org.hibernate.NonUniqueResultException instead of a jakarta.persistence.NonUniqueResultException + // and at this point changing it would be a breaking change >_< + return Optional.ofNullable((T) hibernateQuery.getSingleResultOrNull()); } } diff --git a/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java b/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java index 307a82c770060..8190c8dfa5989 100644 --- a/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java +++ b/extensions/panache/hibernate-reactive-panache-common/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheJpaCommonResourceProcessor.java @@ -61,6 +61,11 @@ public final class PanacheJpaCommonResourceProcessor { @BuildStep(onlyIf = IsTest.class) void testTx(BuildProducer generatedBeanBuildItemBuildProducer, BuildProducer additionalBeans) { + + if (!testReactiveTransactionOnClassPath()) { + return; + } + //generate the annotated interceptor with gizmo //all the logic is in the parent, but we don't have access to the //binding annotation here @@ -76,6 +81,15 @@ void testTx(BuildProducer generatedBeanBuildItemBuildPro .addBeanClass(TEST_REACTIVE_TRANSACTION).build()); } + private static boolean testReactiveTransactionOnClassPath() { + try { + Class.forName(TEST_REACTIVE_TRANSACTION, false, Thread.currentThread().getContextClassLoader()); + return true; + } catch (ClassNotFoundException ignored) { + return false; + } + } + @BuildStep void registerInterceptors(BuildProducer additionalBeans) { AdditionalBeanBuildItem.Builder builder = AdditionalBeanBuildItem.builder(); diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java index 3b45e64f29e94..2a9ff85c3a60c 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java @@ -864,7 +864,7 @@ boolean isEnumConstantMessageKey(String key, IndexView index, ClassInfo bundleIn return true; } throw new MessageBundleException( - String.format("%s is not an enum constant of %: %s", constant, maybeEnum, key)); + String.format("%s is not an enum constant of %s: %s", constant, maybeEnum, key)); } } } diff --git a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java index 4c3a98c3b7af5..165963c28cabe 100644 --- a/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java +++ b/extensions/spring-data-jpa/deployment/src/test/java/io/quarkus/spring/data/deployment/ModifyingQueryWithFlushAndClearTest.java @@ -33,6 +33,7 @@ public class ModifyingQueryWithFlushAndClearTest { public void setUp() { final User user = getUser("JOHN"); user.setLoginCounter(0); + user.getLoginEvents().clear(); repo.save(user); } @@ -69,8 +70,9 @@ public void testNoAutoFlush() { final User verifyUser = getUser("JOHN"); // processLoginEvents did not see the new login event + assertThat(verifyUser.getLoginEvents()).hasSize(1); final boolean allProcessed = verifyUser.getLoginEvents().stream() - .allMatch(loginEvent -> loginEvent.isProcessed()); + .allMatch(LoginEvent::isProcessed); assertThat(allProcessed).describedAs("all LoginEvents are marked as processed").isFalse(); } @@ -83,8 +85,9 @@ public void testAutoFlush() { repo.processLoginEventsPlainAutoClearAndFlush(); final User verifyUser = getUser("JOHN"); + assertThat(verifyUser.getLoginEvents()).hasSize(1); final boolean allProcessed = verifyUser.getLoginEvents().stream() - .allMatch(loginEvent -> loginEvent.isProcessed()); + .allMatch(LoginEvent::isProcessed); assertThat(allProcessed).describedAs("all LoginEvents are marked as processed").isTrue(); } diff --git a/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java b/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java index 64daa3dceb133..f6c26e52be9c9 100644 --- a/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java +++ b/extensions/spring-data-jpa/runtime/src/main/java/io/quarkus/spring/data/runtime/RepositorySupport.java @@ -78,6 +78,6 @@ public static void clear(Class clazz) { } public static void flush(Class clazz) { - Panache.getSession(clazz).clear(); + Panache.getSession(clazz).flush(); } } diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java index d7e20c81b4a95..978c5887321f3 100644 --- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java +++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/core/runtime/VertxCoreRecorder.java @@ -334,7 +334,7 @@ private static VertxOptions convertToVertxOptions(VertxConfiguration conf, Vertx .setClassPathResolvingEnabled(conf.classpathResolving()); String fileCacheDir = System.getProperty(CACHE_DIR_BASE_PROP_NAME); - if (fileCacheDir != null) { + if (fileCacheDir == null) { fileCacheDir = conf.cacheDirectory().orElse(null); } diff --git a/extensions/vertx/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java b/extensions/vertx/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java index 0341a22de21c5..b5a6868b2b41f 100644 --- a/extensions/vertx/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java +++ b/extensions/vertx/runtime/src/test/java/io/quarkus/vertx/core/runtime/VertxCoreProducerTest.java @@ -1,5 +1,7 @@ package io.quarkus.vertx.core.runtime; +import static io.vertx.core.file.impl.FileResolverImpl.CACHE_DIR_BASE_PROP_NAME; + import java.time.Duration; import java.util.Arrays; import java.util.List; @@ -221,6 +223,24 @@ public void accept(VertxOptions vertxOptions) { Assertions.assertTrue(called.get(), "Customizer should get called during initialization"); } + @Test + public void vertxCacheDirectoryBySystemProperty() { + final String cacheDir = System.getProperty("user.dir"); + try { + System.setProperty(CACHE_DIR_BASE_PROP_NAME, cacheDir); + VertxOptionsCustomizer customizers = new VertxOptionsCustomizer(List.of( + vertxOptions -> { + Assertions.assertNotNull(vertxOptions.getFileSystemOptions()); + Assertions.assertEquals(cacheDir, vertxOptions.getFileSystemOptions().getFileCacheDir()); + })); + VertxCoreRecorder.initialize(new DefaultVertxConfiguration(), customizers, ThreadPoolConfig.empty(), + null, + LaunchMode.TEST); + } finally { + System.clearProperty(CACHE_DIR_BASE_PROP_NAME); + } + } + private static class DefaultVertxConfiguration implements VertxConfiguration { @Override public boolean caching() { diff --git a/extensions/websockets-next/deployment/src/main/java/io/quarkus/websockets/next/deployment/WebSocketProcessor.java b/extensions/websockets-next/deployment/src/main/java/io/quarkus/websockets/next/deployment/WebSocketProcessor.java index a6e5c44f375d7..cf2040a7e2c2a 100644 --- a/extensions/websockets-next/deployment/src/main/java/io/quarkus/websockets/next/deployment/WebSocketProcessor.java +++ b/extensions/websockets-next/deployment/src/main/java/io/quarkus/websockets/next/deployment/WebSocketProcessor.java @@ -86,7 +86,6 @@ import io.quarkus.security.spi.ClassSecurityCheckStorageBuildItem; import io.quarkus.security.spi.SecurityTransformerUtils; import io.quarkus.security.spi.runtime.SecurityCheck; -import io.quarkus.vertx.http.deployment.HttpRootPathBuildItem; import io.quarkus.vertx.http.deployment.RouteBuildItem; import io.quarkus.vertx.http.runtime.HandlerType; import io.quarkus.vertx.http.runtime.HttpBuildTimeConfig; @@ -445,18 +444,17 @@ public String apply(String name) { @Consume(SyntheticBeansRuntimeInitBuildItem.class) // SecurityHttpUpgradeCheck is runtime init due to runtime config @Record(RUNTIME_INIT) @BuildStep - public void registerRoutes(WebSocketServerRecorder recorder, HttpRootPathBuildItem httpRootPath, - List generatedEndpoints, HttpBuildTimeConfig httpConfig, Capabilities capabilities, + public void registerRoutes(WebSocketServerRecorder recorder, List generatedEndpoints, + HttpBuildTimeConfig httpConfig, Capabilities capabilities, BuildProducer routes) { for (GeneratedEndpointBuildItem endpoint : generatedEndpoints.stream().filter(GeneratedEndpointBuildItem::isServer) .toList()) { RouteBuildItem.Builder builder = RouteBuildItem.builder(); - String relativePath = httpRootPath.relativePath(endpoint.path); if (capabilities.isPresent(Capability.SECURITY) && !httpConfig.auth.proactive) { // Add a special handler so that it's possible to capture the SecurityIdentity before the HTTP upgrade - builder.routeFunction(relativePath, recorder.initializeSecurityHandler()); + builder.routeFunction(endpoint.path, recorder.initializeSecurityHandler()); } else { - builder.route(relativePath); + builder.route(endpoint.path); } builder .displayOnNotFoundPage("WebSocket Endpoint") diff --git a/extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/rootpath/CustomRootPathTest.java b/extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/rootpath/CustomRootPathTest.java new file mode 100644 index 0000000000000..fc76db5f64c9f --- /dev/null +++ b/extensions/websockets-next/deployment/src/test/java/io/quarkus/websockets/next/test/rootpath/CustomRootPathTest.java @@ -0,0 +1,52 @@ +package io.quarkus.websockets.next.test.rootpath; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.net.URI; + +import jakarta.inject.Inject; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.RegisterExtension; + +import io.quarkus.test.QuarkusUnitTest; +import io.quarkus.test.common.http.TestHTTPResource; +import io.quarkus.websockets.next.OnTextMessage; +import io.quarkus.websockets.next.WebSocket; +import io.quarkus.websockets.next.test.utils.WSClient; +import io.vertx.core.Vertx; + +public class CustomRootPathTest { + + @RegisterExtension + public static final QuarkusUnitTest test = new QuarkusUnitTest() + .withApplicationRoot(root -> { + root.addClasses(Echo.class, WSClient.class); + }).overrideConfigKey("quarkus.http.root-path", "/api"); + + @Inject + Vertx vertx; + + @TestHTTPResource("echo") + URI testUri; + + @Test + void testEndpoint() { + assertTrue(testUri.toString().contains("/api")); + try (WSClient client = WSClient.create(vertx).connect(testUri)) { + assertEquals("monty", client.sendAndAwaitReply("monty").toString()); + } + } + + @WebSocket(path = "/echo") + public static class Echo { + + @OnTextMessage + String process(String message) throws InterruptedException { + return message; + } + + } + +} diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/custompu/CustomPuEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/custompu/CustomPuEntity.java new file mode 100644 index 0000000000000..edb22ff1614de --- /dev/null +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/custompu/CustomPuEntity.java @@ -0,0 +1,10 @@ +package io.quarkus.it.panache.custompu; + +import jakarta.persistence.Entity; + +import io.quarkus.hibernate.orm.panache.PanacheEntity; + +@Entity +public class CustomPuEntity extends PanacheEntity { + public String string; +} diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AbstractRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/AbstractRepository.java similarity index 78% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AbstractRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/AbstractRepository.java index 9541d5e706a03..8c5fb88735c6a 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AbstractRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/AbstractRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.hibernate.orm.panache.PanacheRepositoryBase; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AccessorEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/AccessorEntity.java similarity index 96% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AccessorEntity.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/AccessorEntity.java index 5925ada96e057..db8d9fec751d2 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AccessorEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/AccessorEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; import jakarta.persistence.Transient; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Address.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Address.java similarity index 91% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Address.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Address.java index 9e4a0552d81cd..fd62bacee7825 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Address.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Address.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AddressDao.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/AddressDao.java similarity index 83% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AddressDao.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/AddressDao.java index 748552b781735..fe11ffdbb3438 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/AddressDao.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/AddressDao.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Beer.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Beer.java similarity index 89% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Beer.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Beer.java index 873ee9aadd6b3..db1c71f5ee7b0 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Beer.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Beer.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; import jakarta.transaction.Transactional; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BeerRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/BeerRepository.java similarity index 90% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BeerRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/BeerRepository.java index a816a582c8f60..2a2d3eb9f0b25 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BeerRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/BeerRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.util.List; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Book.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Book.java similarity index 92% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Book.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Book.java index a66e82f4cb062..ce323f2493a56 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Book.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Book.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookDao.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/BookDao.java similarity index 83% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookDao.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/BookDao.java index 5cd8f6131e2ab..695e8cdac972d 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/BookDao.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/BookDao.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5274EntityRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug5274EntityRepository.java similarity index 78% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5274EntityRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug5274EntityRepository.java index e45eb251156d7..9fca66ea9677d 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5274EntityRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug5274EntityRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885AbstractRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug5885AbstractRepository.java similarity index 78% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885AbstractRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug5885AbstractRepository.java index 0bd118580bf55..48863c1c5355c 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885AbstractRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug5885AbstractRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.hibernate.orm.panache.PanacheRepository; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885EntityRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug5885EntityRepository.java similarity index 79% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885EntityRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug5885EntityRepository.java index 3f16aa62a542c..6778a6fcdf160 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug5885EntityRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug5885EntityRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721Entity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug7721Entity.java similarity index 95% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721Entity.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug7721Entity.java index 6f3bd9a4afb48..cb5a623681104 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721Entity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug7721Entity.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.util.Objects; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721EntitySuperClass.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug7721EntitySuperClass.java similarity index 92% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721EntitySuperClass.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug7721EntitySuperClass.java index cdfdab400efbd..256c60c9993e9 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721EntitySuperClass.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug7721EntitySuperClass.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.util.Objects; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721OtherEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug7721OtherEntity.java similarity index 86% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721OtherEntity.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug7721OtherEntity.java index a63df847ce753..3ed58753ffad6 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Bug7721OtherEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Bug7721OtherEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Cat.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Cat.java similarity index 92% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Cat.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Cat.java index 23cad520333a7..2c12a37ca8bba 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Cat.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Cat.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; import jakarta.persistence.ManyToOne; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatDto.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/CatDto.java similarity index 90% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatDto.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/CatDto.java index 420bf9922f3d3..55e33c2b09382 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatDto.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/CatDto.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.hibernate.orm.panache.common.ProjectedFieldName; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatOwner.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/CatOwner.java similarity index 86% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatOwner.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/CatOwner.java index 1b2c50222b6b8..b3e1e33d09f3f 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatOwner.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/CatOwner.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatProjectionBean.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/CatProjectionBean.java similarity index 94% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatProjectionBean.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/CatProjectionBean.java index e02da61409fbe..e9881ddce0edd 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/CatProjectionBean.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/CatProjectionBean.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Dog.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Dog.java similarity index 93% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Dog.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Dog.java index f517180e048fd..d91e3eb54035c 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Dog.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Dog.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDao.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DogDao.java similarity index 84% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDao.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DogDao.java index 073a6e9832d4c..d82983e6c5cb9 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDao.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DogDao.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DogDto.java similarity index 90% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DogDto.java index fb6e1d6809654..1cbd44dece00c 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DogDto.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.hibernate.orm.panache.common.ProjectedFieldName; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto2.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DogDto2.java similarity index 92% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto2.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DogDto2.java index 22d772fd165d4..45f7c9c4806ee 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DogDto2.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DogDto2.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.hibernate.orm.panache.common.NestedProjectedClass; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DuplicateEntity.java similarity index 94% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateEntity.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DuplicateEntity.java index 86383e2e56464..27e54c7796492 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DuplicateEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DuplicateRepository.java similarity index 91% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DuplicateRepository.java index fa780446eadd3..4f6e64df4dbe4 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/DuplicateRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/DuplicateRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Fruit.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Fruit.java similarity index 89% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Fruit.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Fruit.java index b64435f858be2..99f75b24e2235 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Fruit.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Fruit.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/GenericEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/GenericEntity.java similarity index 88% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/GenericEntity.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/GenericEntity.java index 66d1840e05d58..e4de8366b921a 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/GenericEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/GenericEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.MappedSuperclass; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/JAXBEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/JAXBEntity.java similarity index 95% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/JAXBEntity.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/JAXBEntity.java index 88f79e4c2c1de..ea821efcf9c9e 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/JAXBEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/JAXBEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; import jakarta.xml.bind.annotation.XmlAccessType; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/MockablePersonRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/MockablePersonRepository.java similarity index 88% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/MockablePersonRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/MockablePersonRepository.java index 1b1e55e6544b6..27969a528acc1 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/MockablePersonRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/MockablePersonRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.util.List; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryEntity.java similarity index 86% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryEntity.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryEntity.java index 05121d2421d06..ea9ba305956f2 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; import jakarta.persistence.NamedQuery; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryMappedSuperClass.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryMappedSuperClass.java similarity index 89% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryMappedSuperClass.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryMappedSuperClass.java index 356118d6a38ad..e208d127c705a 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryMappedSuperClass.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryMappedSuperClass.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.NamedQuery; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryRepository.java similarity index 84% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryRepository.java index f9f8d47b20d8b..729ebf84e5008 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryWith2QueriesEntity.java similarity index 91% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryWith2QueriesEntity.java index 3d68bbd247dd2..8f66776e6d14d 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryWith2QueriesEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; import jakarta.persistence.NamedQuery; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryWith2QueriesRepository.java similarity index 85% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryWith2QueriesRepository.java index 6f81290b2c487..5fee4c03ec35b 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NamedQueryWith2QueriesRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NamedQueryWith2QueriesRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NoPagingTestEndpoint.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NoPagingTestEndpoint.java similarity index 90% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NoPagingTestEndpoint.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NoPagingTestEndpoint.java index d1f6c2af5c03e..8a2cbf5d1c147 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/NoPagingTestEndpoint.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/NoPagingTestEndpoint.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.transaction.Transactional; import jakarta.ws.rs.GET; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/ObjectWithCompositeId.java similarity index 96% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/ObjectWithCompositeId.java index 9c56fb443a5a0..57ebe0c8c4d55 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithCompositeId.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/ObjectWithCompositeId.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.io.Serializable; import java.util.Objects; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/ObjectWithEmbeddableId.java similarity index 96% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/ObjectWithEmbeddableId.java index b566107a13838..829087121eb91 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/ObjectWithEmbeddableId.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/ObjectWithEmbeddableId.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.io.Serializable; import java.util.Objects; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PageItem.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PageItem.java similarity index 78% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PageItem.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PageItem.java index d252519c32f77..8bebac2a9b45a 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PageItem.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PageItem.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Entity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Person.java similarity index 99% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Person.java index 2298a87e18dbd..155a685f2b7e8 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Person.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Person.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.util.ArrayList; import java.util.List; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDTO.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonDTO.java similarity index 97% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDTO.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonDTO.java index 58f5c874c63c7..f04894742a34b 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDTO.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonDTO.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.hibernate.orm.panache.common.NestedProjectedClass; import io.quarkus.hibernate.orm.panache.common.ProjectedFieldName; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDescription.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonDescription.java similarity index 77% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDescription.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonDescription.java index 1680db956dfba..02d8ea00af508 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDescription.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonDescription.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Embeddable; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDescriptionEmbedded.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonDescriptionEmbedded.java similarity index 76% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDescriptionEmbedded.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonDescriptionEmbedded.java index 2686088f05adf..215d7003cac07 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonDescriptionEmbedded.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonDescriptionEmbedded.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Embeddable; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonName.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonName.java similarity index 88% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonName.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonName.java index dd81cce776232..9d0c371efaf77 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonName.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonName.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonRepository.java similarity index 88% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonRepository.java index 8079899d72e23..82c11acd537d5 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/PersonRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/PersonRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.util.List; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Status.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Status.java similarity index 54% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Status.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Status.java index a7ec2e06037a2..cf909fb2e0302 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/Status.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/Status.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; public enum Status { LIVING, diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/TestEndpoint.java similarity index 98% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/TestEndpoint.java index 33b34fc47bcb8..c6eed8c982a8a 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/TestEndpoint.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/TestEndpoint.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -1266,7 +1266,7 @@ public String testProjection() { Assertions.assertEquals("2", person.name); person = Person.find(String.format( - "select uniqueName, name%sfrom io.quarkus.it.panache.Person%swhere name = ?1", + "select uniqueName, name%sfrom io.quarkus.it.panache.defaultpu.Person%swhere name = ?1", LINE_SEPARATOR, LINE_SEPARATOR), "2") .project(PersonName.class) .firstResult(); @@ -1374,8 +1374,8 @@ public String testNestedProjection() { person.persist(); PersonDTO personDTO = Person.find( "select uniqueName, name, " + - " new io.quarkus.it.panache.PersonDTO$AddressDTO(address.street)," + - " new io.quarkus.it.panache.PersonDTO$DescriptionDTO(description.size, description.weight)," + + " new io.quarkus.it.panache.defaultpu.PersonDTO$AddressDTO(address.street)," + + " new io.quarkus.it.panache.defaultpu.PersonDTO$DescriptionDTO(description.size, description.weight)," + " description.size" + " from Person2 where name = ?1", "2n") @@ -1860,4 +1860,41 @@ public String testBug31117() { Assertions.assertEquals(1, Person.delete("\r\n \n\ndelete\nfrom\n Person2\nwhere\nname = ?1", "foo")); return "OK"; } + + @GET + @Path("42416") + public String testBug42416() { + createSomeEntities42416(); + runSomeTests42416(); + return "OK"; + } + + @Transactional + public void createSomeEntities42416() { + Fruit.deleteAll(); + Fruit f = new Fruit("apple", "red"); + f.persist(); + + Fruit f2 = new Fruit("apple", "yellow"); + f2.persist(); + } + + @Transactional + public void runSomeTests42416() { + try { + Fruit.find("where name = ?1", "apple").singleResult(); + } catch (jakarta.persistence.NonUniqueResultException e) { + // all good let's continue + } + try { + Fruit.find("where name = ?1", "not-a-fruit").singleResult(); + } catch (jakarta.persistence.NoResultException e) { + // all good let's continue + } + try { + Fruit.find("where name = ?1", "apple").singleResultOptional(); + } catch (jakarta.persistence.NonUniqueResultException e) { + // all good let's continue + } + } } diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/User.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/User.java similarity index 93% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/User.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/User.java index c6013403f609d..97e7c26181005 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/User.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/User.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/UserRepository.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/UserRepository.java similarity index 90% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/UserRepository.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/UserRepository.java index efc29128dc198..c067d5e69cf1f 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/UserRepository.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/UserRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.util.Optional; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/fk/issue35812/SomeEntity.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/fk/issue35812/SomeEntity.java similarity index 76% rename from integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/fk/issue35812/SomeEntity.java rename to integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/fk/issue35812/SomeEntity.java index 5fbc4852341cc..065f1ec4124f3 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/fk/issue35812/SomeEntity.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/defaultpu/fk/issue35812/SomeEntity.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache.fk.issue35812; +package io.quarkus.it.panache.defaultpu.fk.issue35812; import jakarta.persistence.Entity; diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java index 9852323a15e5c..a0231b70310a6 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/BookResource.java @@ -8,8 +8,8 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; -import io.quarkus.it.panache.Book; -import io.quarkus.it.panache.BookDao; +import io.quarkus.it.panache.defaultpu.Book; +import io.quarkus.it.panache.defaultpu.BookDao; @Path("/book") public class BookResource { diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/CustomPuResource.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/CustomPuResource.java new file mode 100644 index 0000000000000..d4e8c61fafe68 --- /dev/null +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/CustomPuResource.java @@ -0,0 +1,33 @@ +package io.quarkus.it.panache.resources; + +import java.util.List; + +import jakarta.transaction.Transactional; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; + +import io.quarkus.it.panache.custompu.CustomPuEntity; + +@Path("/custom-pu") +public class CustomPuResource { + + @Transactional + @POST + @Path("/{string}") + public CustomPuEntity create(@PathParam("string") String string) { + CustomPuEntity entity = new CustomPuEntity(); + entity.string = string; + entity.persist(); + return entity; + } + + @Transactional + @PATCH + @Path("/{string}") + public List updateAll(@PathParam("string") String string) { + CustomPuEntity.update("set string = ?1 where 1 = 1", string); + return CustomPuEntity.findAll().list(); + } +} diff --git a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/UserResource.java b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/UserResource.java index 0f307f61004cd..7d353a90ae785 100644 --- a/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/UserResource.java +++ b/integration-tests/hibernate-orm-panache/src/main/java/io/quarkus/it/panache/resources/UserResource.java @@ -10,7 +10,7 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; -import io.quarkus.it.panache.UserRepository; +import io.quarkus.it.panache.defaultpu.UserRepository; @Path("/users") @Produces(MediaType.APPLICATION_JSON) diff --git a/integration-tests/hibernate-orm-panache/src/main/resources/application.properties b/integration-tests/hibernate-orm-panache/src/main/resources/application.properties index b3f68572c8c5c..c3d3b34f727d6 100644 --- a/integration-tests/hibernate-orm-panache/src/main/resources/application.properties +++ b/integration-tests/hibernate-orm-panache/src/main/resources/application.properties @@ -2,7 +2,17 @@ quarkus.datasource.db-kind=h2 quarkus.datasource.jdbc.url=jdbc:h2:tcp://localhost/mem:test quarkus.datasource.jdbc.max-size=8 +quarkus.hibernate-orm.packages=io.quarkus.it.panache.defaultpu quarkus.hibernate-orm.database.generation=drop-and-create quarkus.hibernate-orm.statistics=true quarkus.hibernate-orm.metrics.enabled=true + +quarkus.datasource."custom".db-kind=h2 +quarkus.datasource."custom".jdbc.url=jdbc:h2:tcp://localhost/mem:test +quarkus.datasource."custom".jdbc.max-size=8 + +quarkus.hibernate-orm."custom".datasource=custom +quarkus.hibernate-orm."custom".packages=io.quarkus.it.panache.custompu +quarkus.hibernate-orm."custom".database.generation=drop-and-create +quarkus.hibernate-orm."custom".database.generation.create-schemas=true diff --git a/integration-tests/hibernate-orm-panache/src/test/java/DefaultPackageWithFastJarPMT.java b/integration-tests/hibernate-orm-panache/src/test/java/DefaultPackageWithFastJarPMT.java index d289e5a55c559..805dcccc454e1 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/DefaultPackageWithFastJarPMT.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/DefaultPackageWithFastJarPMT.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.extension.RegisterExtension; import io.quarkus.builder.Version; -import io.quarkus.it.panache.TestResources; +import io.quarkus.it.panache.defaultpu.TestResources; import io.quarkus.test.ProdBuildResults; import io.quarkus.test.ProdModeTestResults; import io.quarkus.test.QuarkusProdModeTest; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/custompu/SmokeTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/custompu/SmokeTest.java new file mode 100644 index 0000000000000..bb050e5ab7d38 --- /dev/null +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/custompu/SmokeTest.java @@ -0,0 +1,18 @@ +package io.quarkus.it.panache.custompu; + +import static org.hamcrest.Matchers.containsString; + +import org.junit.jupiter.api.Test; + +import io.quarkus.test.junit.QuarkusTest; +import io.restassured.RestAssured; + +@QuarkusTest +class SmokeTest { + + @Test + void testPanacheFunctionality() throws Exception { + RestAssured.when().post("/custom-pu/someValue").then().body(containsString("someValue")); + RestAssured.when().patch("/custom-pu/someUpdatedValue").then().body(containsString("someUpdatedValue")); + } +} diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DDLGenerationPMT.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DDLGenerationPMT.java similarity index 97% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DDLGenerationPMT.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DDLGenerationPMT.java index 9ac4997a4cf39..86bbeef1b4dda 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DDLGenerationPMT.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DDLGenerationPMT.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.is; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DuplicateMethodTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DuplicateMethodTest.java similarity index 95% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DuplicateMethodTest.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DuplicateMethodTest.java index f6bb30397318d..bbe5ac21690dd 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/DuplicateMethodTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/DuplicateMethodTest.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/JacksonTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/JacksonTest.java similarity index 71% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/JacksonTest.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/JacksonTest.java index 81e59b415072c..ddbd313189710 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/JacksonTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/JacksonTest.java @@ -1,9 +1,10 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import static org.assertj.core.api.Assertions.assertThat; import java.util.List; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import io.quarkus.test.junit.QuarkusTest; @@ -17,6 +18,6 @@ public void testJsonIgnoreHonoured() { List books = RestAssured.when().get("/book/Berlin/Beevor").then().extract().body().jsonPath().getList(".", Book.class); - assertThat(books).hasSize(1).filteredOn(book -> book.author != null).isEmpty(); + Assertions.assertThat(books).hasSize(1).filteredOn(book -> book.author != null).isEmpty(); } } diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/MockPersonRepository.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/MockPersonRepository.java similarity index 91% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/MockPersonRepository.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/MockPersonRepository.java index 8fafb7585a474..06bb0d24f4c90 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/MockPersonRepository.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/MockPersonRepository.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.annotation.Priority; import jakarta.enterprise.context.ApplicationScoped; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/NoPagingPMT.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/NoPagingPMT.java similarity index 98% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/NoPagingPMT.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/NoPagingPMT.java index c02d570568b44..bb03b3aec56f3 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/NoPagingPMT.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/NoPagingPMT.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheFunctionalityInGraalITCase.java similarity index 84% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheFunctionalityInGraalITCase.java index cf1335df76c6b..dbf966054d082 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityInGraalITCase.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheFunctionalityInGraalITCase.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.test.junit.QuarkusIntegrationTest; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheFunctionalityTest.java similarity index 96% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheFunctionalityTest.java index 5d7883e050d60..823f0f5c1db06 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheFunctionalityTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheFunctionalityTest.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; @@ -13,7 +13,6 @@ import jakarta.xml.bind.JAXBException; import jakarta.xml.bind.Marshaller; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import com.fasterxml.jackson.core.JsonProcessingException; @@ -67,7 +66,7 @@ public void testPanacheSerialisation() { @DisabledOnIntegrationTest @Test public void testPanacheInTest() { - Assertions.assertEquals(0, Person.count()); + assertEquals(0, Person.count()); } @Test @@ -215,10 +214,10 @@ void testBug7102InOneTransaction() { public void testBug7102() { Person person = createBug7102(); Person person1 = getBug7102(person.id); - Assertions.assertEquals("pero", person1.name); + assertEquals("pero", person1.name); updateBug7102(person.id); Person person2 = getBug7102(person.id); - Assertions.assertEquals("jozo", person2.name); + assertEquals("jozo", person2.name); } @Transactional @@ -259,4 +258,9 @@ public void testBug36496() { public void testBug31117() { RestAssured.when().get("/test/31117").then().body(is("OK")); } + + @Test + public void testBug42416() { + RestAssured.when().get("/test/42416").then().body(is("OK")); + } } diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheMockingTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheMockingTest.java similarity index 99% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheMockingTest.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheMockingTest.java index 11ad14eee636a..13d34e7f3aa36 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheMockingTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheMockingTest.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import java.util.Collections; import java.util.Optional; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheRepositoryBaseTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheRepositoryBaseTest.java similarity index 87% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheRepositoryBaseTest.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheRepositoryBaseTest.java index adecfaa956055..23676109d2617 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/PanacheRepositoryBaseTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/PanacheRepositoryBaseTest.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import org.junit.jupiter.api.Test; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestResources.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TestResources.java similarity index 84% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestResources.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TestResources.java index ba184daba024c..0634b8da653a1 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestResources.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TestResources.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import io.quarkus.test.common.WithTestResource; import io.quarkus.test.h2.H2DatabaseTestResource; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionOnSingleMethodTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TestTransactionOnSingleMethodTest.java similarity index 96% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionOnSingleMethodTest.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TestTransactionOnSingleMethodTest.java index 03a6bcc9c5ad7..ea5b750a8b330 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionOnSingleMethodTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TestTransactionOnSingleMethodTest.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.transaction.Transactional; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TestTransactionTest.java similarity index 92% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionTest.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TestTransactionTest.java index d3f93c057512c..a70b5b196a535 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TestTransactionTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TestTransactionTest.java @@ -1,11 +1,11 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.MethodOrderer.MethodName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestMethodOrder; -import io.quarkus.it.panache.fk.issue35812.SomeEntity; +import io.quarkus.it.panache.defaultpu.fk.issue35812.SomeEntity; import io.quarkus.test.TestTransaction; import io.quarkus.test.junit.QuarkusTest; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalPanacheEntityTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TransactionalPanacheEntityTest.java similarity index 92% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalPanacheEntityTest.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TransactionalPanacheEntityTest.java index 8ca1ac7d0cf9b..bb7858e73edd5 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalPanacheEntityTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TransactionalPanacheEntityTest.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalRepositoryTest.java b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TransactionalRepositoryTest.java similarity index 93% rename from integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalRepositoryTest.java rename to integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TransactionalRepositoryTest.java index f72061a3a3a67..64865250a6679 100644 --- a/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/TransactionalRepositoryTest.java +++ b/integration-tests/hibernate-orm-panache/src/test/java/io/quarkus/it/panache/defaultpu/TransactionalRepositoryTest.java @@ -1,4 +1,4 @@ -package io.quarkus.it.panache; +package io.quarkus.it.panache.defaultpu; import jakarta.inject.Inject; diff --git a/tcks/microprofile-graphql/src/main/resources/overrides/importantDatesUS/output.json b/tcks/microprofile-graphql/src/main/resources/overrides/importantDatesUS/output.json deleted file mode 100644 index 43170576feaa0..0000000000000 --- a/tcks/microprofile-graphql/src/main/resources/overrides/importantDatesUS/output.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "data": { - "importantDatesUS": null - } -} \ No newline at end of file diff --git a/tcks/microprofile-graphql/src/main/resources/overrides/trackLongLat/output.json b/tcks/microprofile-graphql/src/main/resources/overrides/trackLongLat/output.json deleted file mode 100644 index 7bb698a75f141..0000000000000 --- a/tcks/microprofile-graphql/src/main/resources/overrides/trackLongLat/output.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "data": { - "trackHeroLongLat": null - } -} \ No newline at end of file