diff --git a/.idea/icon.png b/.idea/icon.png deleted file mode 100644 index 7ef06962ecc8cc..00000000000000 Binary files a/.idea/icon.png and /dev/null differ diff --git a/.idea/icon_dark.png b/.idea/icon_dark.png deleted file mode 100644 index ac7f15e5133a54..00000000000000 Binary files a/.idea/icon_dark.png and /dev/null differ diff --git a/.idea/runConfigurations/mvnDebug.xml b/.idea/runConfigurations/mvnDebug.xml deleted file mode 100644 index 522dd94a4e0822..00000000000000 --- a/.idea/runConfigurations/mvnDebug.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - \ No newline at end of file diff --git a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketRootPathTestCase.java b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketRootPathTestCase.java index a0c823eb99fc9c..502cfe3a7dce28 100644 --- a/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketRootPathTestCase.java +++ b/extensions/websockets/server/deployment/src/test/java/io/quarkus/websockets/test/WebsocketRootPathTestCase.java @@ -1,6 +1,9 @@ package io.quarkus.websockets.test; +import java.io.IOException; import java.net.URI; +import java.nio.ByteBuffer; +import java.nio.charset.StandardCharsets; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; @@ -9,6 +12,7 @@ import jakarta.websocket.Endpoint; import jakarta.websocket.EndpointConfig; import jakarta.websocket.MessageHandler; +import jakarta.websocket.PongMessage; import jakarta.websocket.Session; import org.jboss.shrinkwrap.api.asset.StringAsset; @@ -38,6 +42,7 @@ public class WebsocketRootPathTestCase { public void testHttpRootPath() throws Exception { LinkedBlockingDeque message = new LinkedBlockingDeque<>(); + LinkedBlockingDeque pongMessages = new LinkedBlockingDeque<>(); Session session = ContainerProvider.getWebSocketContainer().connectToServer(new Endpoint() { @Override public void onOpen(Session session, EndpointConfig endpointConfig) { @@ -47,12 +52,28 @@ public void onMessage(String s) { message.add(s); } }); + session.addMessageHandler(new MessageHandler.Whole() { + @Override + public void onMessage(PongMessage s) { + ByteBuffer data = s.getApplicationData(); + byte[] copy = new byte[data.remaining()]; + data.get(copy); + pongMessages.add(new String(copy, StandardCharsets.UTF_8)); + } + }); session.getAsyncRemote().sendText("hello"); + try { + session.getAsyncRemote().sendPing(ByteBuffer.wrap("PING".getBytes(StandardCharsets.UTF_8))); + } catch (IOException e) { + throw new RuntimeException(e); + } } }, ClientEndpointConfig.Builder.create().build(), echoUri); try { Assertions.assertEquals("hello", message.poll(20, TimeUnit.SECONDS)); + + Assertions.assertEquals("PING", pongMessages.poll(20, TimeUnit.SECONDS)); } finally { session.close(); } diff --git a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/AppEntity.java b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/AppEntity.java index 36853f22d76d20..84626be8bee865 100644 --- a/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/AppEntity.java +++ b/integration-tests/flyway/src/main/java/io/quarkus/it/flyway/AppEntity.java @@ -44,6 +44,17 @@ public void setCreatedBy(String createdBy) { this.createdBy = createdBy; } + public String foo; + + public String getFoo() { + return foo; + } + + public AppEntity setFoo(String foo) { + this.foo = foo; + return this; + } + @Override public boolean equals(final Object o) { if (this == o) diff --git a/integration-tests/flyway/src/main/resources/application.properties b/integration-tests/flyway/src/main/resources/application.properties index 01118fbc3f0ccd..f26c6125ec643c 100644 --- a/integration-tests/flyway/src/main/resources/application.properties +++ b/integration-tests/flyway/src/main/resources/application.properties @@ -23,7 +23,7 @@ quarkus.flyway.placeholders.title=REPLACED quarkus.flyway.placeholder-prefix=#[ quarkus.flyway.placeholder-suffix=] quarkus.flyway.init-sql=CREATE SCHEMA IF NOT EXISTS TEST_SCHEMA;CREATE OR REPLACE FUNCTION f_my_constant() RETURNS integer LANGUAGE plpgsql as $func$ BEGIN return 100; END $func$; -quarkus.hibernate-orm.database.generation=validate + # second Agroal config quarkus.datasource.second-datasource.db-kind=postgresql