File tree Expand file tree Collapse file tree 8 files changed +7
-35
lines changed
cluster-api/src/main/java/io/scalecube/cluster/metadata
cluster/src/main/java/io/scalecube/cluster
transport-api/src/main/java/io/scalecube/cluster/transport/api Expand file tree Collapse file tree 8 files changed +7
-35
lines changed Original file line number Diff line number Diff line change 1- package io .scalecube .cluster .codec . jdk ;
1+ package io .scalecube .cluster .metadata ;
22
3- import io .scalecube .cluster .metadata .MetadataCodec ;
43import java .io .ByteArrayInputStream ;
54import java .io .ByteArrayOutputStream ;
65import java .io .ObjectInputStream ;
76import java .io .ObjectOutputStream ;
87import java .nio .ByteBuffer ;
98import 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 ) {
Original file line number Diff line number Diff line change 11package io .scalecube .cluster .metadata ;
22
3- import io .scalecube .cluster .codec .jdk .JdkMetadataCodec ;
43import io .scalecube .utils .ServiceLoaderUtil ;
54import java .nio .ByteBuffer ;
65
76/** Contains methods for metadata serializing/deserializing logic. */
87public 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.
Original file line number Diff line number Diff 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 () {
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 1414 <name >ScaleCube/ClusterCodec</name >
1515
1616 <modules >
17- <module >codec-jdk</module >
1817 <module >codec-jackson</module >
1918 </modules >
2019
Original file line number Diff line number Diff line change 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 >
Original file line number Diff line number Diff line change 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 ;
53import java .io .IOException ;
64import java .io .InputStream ;
75import java .io .ObjectInputStream ;
86import java .io .ObjectOutputStream ;
97import 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 {
Original file line number Diff line number Diff line change 11package io .scalecube .cluster .transport .api ;
22
3- import io .scalecube .cluster .codec .jdk .JdkMessageCodec ;
43import io .scalecube .utils .ServiceLoaderUtil ;
54import java .io .InputStream ;
65import java .io .OutputStream ;
98public 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.
You can’t perform that action at this time.
0 commit comments