Skip to content

Commit c4c05c0

Browse files
committed
Fixed cycley dependency
1 parent d1e1fd9 commit c4c05c0

File tree

8 files changed

+7
-35
lines changed

8 files changed

+7
-35
lines changed
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
package io.scalecube.cluster.codec.jdk;
1+
package io.scalecube.cluster.metadata;
22

3-
import io.scalecube.cluster.metadata.MetadataCodec;
43
import java.io.ByteArrayInputStream;
54
import java.io.ByteArrayOutputStream;
65
import java.io.ObjectInputStream;
76
import java.io.ObjectOutputStream;
87
import java.nio.ByteBuffer;
98
import reactor.core.Exceptions;
109

11-
public class JdkMetadataCodec implements MetadataCodec {
10+
public class DefaultMetadataCodec implements MetadataCodec {
1211

1312
@Override
1413
public Object deserialize(ByteBuffer buffer) {

cluster-api/src/main/java/io/scalecube/cluster/metadata/MetadataCodec.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package io.scalecube.cluster.metadata;
22

3-
import io.scalecube.cluster.codec.jdk.JdkMetadataCodec;
43
import io.scalecube.utils.ServiceLoaderUtil;
54
import java.nio.ByteBuffer;
65

76
/** Contains methods for metadata serializing/deserializing logic. */
87
public interface MetadataCodec {
98

109
MetadataCodec INSTANCE =
11-
ServiceLoaderUtil.findFirst(MetadataCodec.class).orElseGet(JdkMetadataCodec::new);
10+
ServiceLoaderUtil.findFirst(MetadataCodec.class).orElseGet(DefaultMetadataCodec::new);
1211

1312
/**
1413
* Deserializes metadata from buffer.

cluster/src/main/java/io/scalecube/cluster/ClusterImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public Cluster startAwait() {
227227
}
228228

229229
private Mono<Cluster> doStart() {
230-
return Mono.fromRunnable(this::validateConfiguration).then(Mono.fromRunnable(this::doStart0));
230+
return Mono.fromRunnable(this::validateConfiguration).then(Mono.defer(this::doStart0));
231231
}
232232

233233
private Mono<Cluster> doStart0() {

codec-parent/codec-jdk/pom.xml

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

codec-parent/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<name>ScaleCube/ClusterCodec</name>
1515

1616
<modules>
17-
<module>codec-jdk</module>
1817
<module>codec-jackson</module>
1918
</modules>
2019

transport-parent/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818
</modules>
1919

2020
<dependencies>
21-
<dependency>
22-
<groupId>io.scalecube</groupId>
23-
<artifactId>scalecube-codec-jdk</artifactId>
24-
<version>${project.version}</version>
25-
</dependency>
26-
2721
<dependency>
2822
<groupId>io.projectreactor</groupId>
2923
<artifactId>reactor-core</artifactId>

codec-parent/codec-jdk/src/main/java/io/scalecube/cluster/codec/jdk/JdkMessageCodec.java renamed to transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/DefaultMessageCodec.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
package io.scalecube.cluster.codec.jdk;
1+
package io.scalecube.cluster.transport.api;
22

3-
import io.scalecube.cluster.transport.api.Message;
4-
import io.scalecube.cluster.transport.api.MessageCodec;
53
import java.io.IOException;
64
import java.io.InputStream;
75
import java.io.ObjectInputStream;
86
import java.io.ObjectOutputStream;
97
import java.io.OutputStream;
108

11-
public class JdkMessageCodec implements MessageCodec {
9+
public class DefaultMessageCodec implements MessageCodec {
1210

1311
@Override
1412
public Message deserialize(InputStream is) throws IOException, ClassNotFoundException {

transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/MessageCodec.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.scalecube.cluster.transport.api;
22

3-
import io.scalecube.cluster.codec.jdk.JdkMessageCodec;
43
import io.scalecube.utils.ServiceLoaderUtil;
54
import java.io.InputStream;
65
import java.io.OutputStream;
@@ -9,7 +8,7 @@
98
public interface MessageCodec {
109

1110
MessageCodec INSTANCE =
12-
ServiceLoaderUtil.findFirst(MessageCodec.class).orElseGet(JdkMessageCodec::new);
11+
ServiceLoaderUtil.findFirst(MessageCodec.class).orElseGet(DefaultMessageCodec::new);
1312

1413
/**
1514
* Deserializes message from given input stream.

0 commit comments

Comments
 (0)