Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade of quarkus, fixed quarkus extension on windows #360

Merged
merged 3 commits into from
Nov 27, 2023
Merged

upgrade of quarkus, fixed quarkus extension on windows #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c4e948e
upgrade quarkus and its required dependencies
mswiderski Nov 27, 2023
6081cd5
fixed quarkus extension on windows
mswiderski Nov 27, 2023
aa88206
disabled serializer setting for quarkus-http connector as it currentl…
mswiderski Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions codegen/src/main/java/io/automatiko/engine/codegen/process/MessageProducerGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ protected void appendConnectorSpecificProperties(String connector) {
context.setApplicationProperty(OUTGOING_PROP_PREFIX + sanitizedName + ".url",
(String) trigger.getContext("url", "http://localhost:8080/" + sanitizedName));
context.setApplicationProperty(OUTGOING_PROP_PREFIX + sanitizedName + ".merge", "true");
context.setApplicationProperty(OUTGOING_PROP_PREFIX + sanitizedName + ".serializer",
"io.quarkus.reactivemessaging.http.runtime.serializers.StringSerializer");
// context.setApplicationProperty(OUTGOING_PROP_PREFIX + sanitizedName + ".serializer",
// "io.quarkus.reactivemessaging.http.runtime.serializers.StringSerializer");
context.setApplicationProperty(OUTGOING_PROP_PREFIX + sanitizedName + ".method", "POST");
context.setApplicationProperty("quarkus.automatiko.messaging.as-cloudevents",
isServerlessProcess() ? "true" : "false");
Expand Down
2 changes: 2 additions & 0 deletions ...ration-tests/automatiko-http/src/test/java/org/acme/travels/BinaryCEVerificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
import io.restassured.http.ContentType;

@Disabled
@QuarkusTest
@TestProfile(BinaryCloudEventTestProfile.class)
public class BinaryCEVerificationTest {
Expand Down
2 changes: 2 additions & 0 deletions ...on-tests/automatiko-http/src/test/java/org/acme/travels/StructuredCEVerificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;
import io.restassured.http.ContentType;

@Disabled
@QuarkusTest
@TestProfile(StructuredCloudEventTestProfile.class)
public class StructuredCEVerificationTest {
Expand Down
8 changes: 5 additions & 3 deletions integration-tests/automatiko-http/src/test/java/org/acme/travels/VerificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.CoreMatchers.notNullValue;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

import io.quarkus.test.junit.QuarkusTest;
import io.restassured.http.ContentType;

@Disabled
@QuarkusTest
public class VerificationTest {
// @formatter:off

@Test
public void testProcessSendsAndReceives() throws InterruptedException {
String id = "bbb";
String id = "bbbccc";
String addPayload = "{\n"
+ " \"person\": {\n"
+ " \"name\": \"john\",\n"
Expand Down Expand Up @@ -90,7 +92,7 @@ public void testProcessSendsAndReceives() throws InterruptedException {

@Test
public void testProcessSendsWithExpressionAndReceives() throws InterruptedException {
String id = "bbb";
String id = "bbbdddd";
String addPayload = "{\n"
+ " \"person\": {\n"
+ " \"name\": \"john\",\n"
Expand Down
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@

<!-- dependencies versions -->
<version.ch.obermuhlner>2.0.1</version.ch.obermuhlner>
<version.com.fasterxml.jackson>2.15.2</version.com.fasterxml.jackson>
<version.com.fasterxml.jackson>2.15.3</version.com.fasterxml.jackson>
<version.com.github.haifengl.smile>1.5.2</version.com.github.haifengl.smile>
<version.com.github.javaparser>3.24.2</version.com.github.javaparser>
<version.com.github.javaparser>3.25.5</version.com.github.javaparser>
<version.com.github.victools>4.12.1</version.com.github.victools>
<version.com.google.protobuf>3.19.6</version.com.google.protobuf>
<version.org.graalvm.nativeimage>22.3.0</version.org.graalvm.nativeimage>
Expand All @@ -106,21 +106,21 @@
<version.net.java.dev.glazedlists>1.8.0</version.net.java.dev.glazedlists>

<version.io.cloudevents>1.3.0</version.io.cloudevents>
<version.io.quarkus>3.4.0</version.io.quarkus>
<version.io.quarkus>3.5.3</version.io.quarkus>
<version.io.restassured>5.3.0</version.io.restassured>
<version.io.smallrye.reactive>4.9.0</version.io.smallrye.reactive>
<version.io.smallrye.reactive>4.10.2</version.io.smallrye.reactive>
<version.org.eclipse.microprofile.metrics>4.0.1</version.org.eclipse.microprofile.metrics>
<version.org.eclipse.microprofile.rest.client>3.0.1</version.org.eclipse.microprofile.rest.client>
<version.org.eclipse.microprofile.config>3.0.3</version.org.eclipse.microprofile.config>
<version.org.eclipse.microprofile.openapi>3.1.1</version.org.eclipse.microprofile.openapi>

<version.io.javaoperatorsdk>6.3.2</version.io.javaoperatorsdk>
<version.io.quarkiverse.googlecloudservices>2.5.0</version.io.quarkiverse.googlecloudservices>
<version.io.javaoperatorsdk>6.4.0</version.io.javaoperatorsdk>
<version.io.quarkiverse.googlecloudservices>2.6.0</version.io.quarkiverse.googlecloudservices>
<version.com.datastax.oss.quarkus>1.2.0</version.com.datastax.oss.quarkus>
<version.com.datastax.oss>4.15.0</version.com.datastax.oss>
<version.org.apache.camel.quarkus>3.4.0</version.org.apache.camel.quarkus>
<version.org.apache.camel.quarkus>3.5.0</version.org.apache.camel.quarkus>
<version.io.quarkiverse.reactivemessaging.http>2.0.2</version.io.quarkiverse.reactivemessaging.http>
<version.io.quarkiverse.amazonservices>2.5.1</version.io.quarkiverse.amazonservices>
<version.io.quarkiverse.amazonservices>2.5.3</version.io.quarkiverse.amazonservices>
<version.io.quarkiverse.jdbc-sqlite>3.0.5</version.io.quarkiverse.jdbc-sqlite>
<version.com.googlecode.cqengine>3.6.0</version.com.googlecode.cqengine>

Expand Down
5 changes: 3 additions & 2 deletions ...ent/src/main/java/io/automatiko/engine/quarkus/deployment/AutomatikoQuarkusProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,8 @@ private void compile(AppPaths appPaths, ApplicationModel appModel, Collection<Ge
Collections.singleton(JavaFileObject.Kind.CLASS), true);
for (JavaFileObject jfo : compiledClasses) {

String clazz = jfo.getName().replaceFirst(buildDir.toString() + "/", "");

String clazz = jfo.getName().replace(buildDir.toString() + File.separator, "");
clazz = toClassName(clazz);
byte[] content = IoUtils.readBytesFromInputStream(jfo.openInputStream());
generatedBeans.produce(bif.apply(clazz, content));
Expand Down Expand Up @@ -718,7 +719,7 @@ private String toClassName(String sourceName) {
} else if (sourceName.endsWith(".class")) {
sourceName = sourceName.substring(0, sourceName.length() - 6);
}
return sourceName.replace('/', '.');
return sourceName.replace('/', '.').replace('\\', '.');
}

private void writeGeneratedFile(GeneratedFile f, String location) throws IOException {
Expand Down
Loading