Skip to content

Commit dc51059

Browse files
authored
Merge pull request #102 from reactiverse/feature/61
Feature/61
2 parents b258b61 + 827da2e commit dc51059

File tree

61 files changed

+402
-1708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+402
-1708
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
77

88
## [Unreleased] -
9+
- Ugrade to Vert.x 3.7.1
10+
- Avoid calling graaljs APIs from the EventBus codec
11+
- Global log formatter used across graal and vert.x
12+
- Fixed EventBus codec for Graal objects
13+
- Removed Nashorn
14+
- Update to Graal 19.0.0
915
- Verticle events are now triggered from the `process.on` event emitter.
1016
- Updated to Graal rc16
1117
- Removed `es4x-cli` as it has been replaced with `es4x-pm`

codegen/src/main/java/io/reactiverse/es4x/codegen/generator/IndexDTS.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,9 @@ public String render(ClassModel model, int index, int size, Map<String, Object>
111111
final Set<String> superTypes = new HashSet<>();
112112
model.getAbstractSuperTypes().forEach(ti -> superTypes.add(genType(ti)));
113113

114-
if (model.getHandlerType() != null) {
114+
if (model.isHandler()) {
115115
if (model.isConcrete()) {
116-
superTypes.add("Handler<" + genType(model.getHandlerType()) + ">");
116+
superTypes.add("Handler<" + genType(model.getHandlerArg()) + ">");
117117
}
118118
}
119119

@@ -127,8 +127,8 @@ public String render(ClassModel model, int index, int size, Map<String, Object>
127127
writer.printf(" implements %s", String.join(", ", superTypes));
128128
}
129129
} else {
130-
if (model.getHandlerType() != null) {
131-
writer.printf(" extends Handler<%s>", genType(model.getHandlerType()));
130+
if (model.isHandler()) {
131+
writer.printf(" extends Handler<%s>", genType(model.getHandlerArg()));
132132
if (!superTypes.isEmpty()) {
133133
writer.printf(", %s", String.join(", ", superTypes));
134134
}

es4x/pom.xml

Lines changed: 3 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -28,65 +28,12 @@
2828
</licenses>
2929

3030
<profiles>
31-
<profile>
32-
<id>java9</id>
33-
<activation>
34-
<jdk>[1.9,)</jdk>
35-
</activation>
36-
<build>
37-
<plugins>
38-
<plugin>
39-
<groupId>org.codehaus.mojo</groupId>
40-
<artifactId>build-helper-maven-plugin</artifactId>
41-
<version>3.0.0</version>
42-
<executions>
43-
<execution>
44-
<id>add-sources</id>
45-
<phase>generate-sources</phase>
46-
<goals>
47-
<goal>add-source</goal>
48-
</goals>
49-
<configuration>
50-
<sources>
51-
<source>src/main/java-9</source>
52-
</sources>
53-
</configuration>
54-
</execution>
55-
<execution>
56-
<id>add-test-sources</id>
57-
<phase>generate-test-sources</phase>
58-
<goals>
59-
<goal>add-test-source</goal>
60-
</goals>
61-
<configuration>
62-
<sources>
63-
<source>src/test/java-9</source>
64-
</sources>
65-
</configuration>
66-
</execution>
67-
<execution>
68-
<id>add-resources</id>
69-
<phase>generate-resources</phase>
70-
<goals>
71-
<goal>add-resource</goal>
72-
</goals>
73-
<configuration>
74-
<resources>
75-
<resource>
76-
<directory>src/main/resources-9</directory>
77-
</resource>
78-
</resources>
79-
</configuration>
80-
</execution>
81-
</executions>
82-
</plugin>
83-
</plugins>
84-
</build>
85-
</profile>
8631
<profile>
8732
<id>graaljs</id>
8833
<activation>
89-
<jdk>[1.11,)</jdk>
34+
<file>
35+
<missing>${java.home}/../GRAALVM-README.md</missing>
36+
</file>
9037
</activation>
9138
<dependencies>
9239
<!-- GraalVM runtime -->
@@ -129,7 +76,6 @@
12976
<artifactId>graal-sdk</artifactId>
13077
<version>${graalvm.version}</version>
13178
<scope>provided</scope>
132-
<optional>true</optional>
13379
</dependency>
13480
<!-- testing -->
13581
<dependency>

es4x/src/main/java-9/io/reactiverse/es4x/dynalink/DataObjectLinker.java

Lines changed: 0 additions & 72 deletions
This file was deleted.

es4x/src/main/java-9/io/reactiverse/es4x/dynalink/ES4XJSONLinker.java

Lines changed: 0 additions & 181 deletions
This file was deleted.

es4x/src/main/java-9/io/reactiverse/es4x/dynalink/ES4XJSONLinkerExporter.java

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)