Skip to content

Commit 2aaa45e

Browse files
authored
Merged and removed bytebuf-codec module to services/trasport-rscoket (#839)
1 parent 2e052cf commit 2aaa45e

File tree

11 files changed

+9
-35
lines changed

11 files changed

+9
-35
lines changed

pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@
8686
<module>services-api</module>
8787
<module>services-transport-parent</module>
8888
<module>services-discovery</module>
89-
<module>services-bytebuf-codec</module>
9089
<module>services-security</module>
9190
<module>services-examples</module>
9291
</modules>

services-bytebuf-codec/pom.xml

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

services-bytebuf-codec/src/main/resources/META-INF/services/io.scalecube.services.transport.api.ServiceMessageDataDecoder

Lines changed: 0 additions & 1 deletion
This file was deleted.

services-transport-parent/services-transport-rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketClientChannel.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.scalecube.services.api.ServiceMessage;
77
import io.scalecube.services.exceptions.ConnectionClosedException;
88
import io.scalecube.services.transport.api.ClientChannel;
9-
import io.scalecube.services.transport.api.ServiceMessageCodec;
109
import java.lang.reflect.Type;
1110
import org.reactivestreams.Publisher;
1211
import org.slf4j.Logger;

services-transport-parent/services-transport-rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketClientTransport.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import io.scalecube.services.transport.api.ClientTransport;
1919
import io.scalecube.services.transport.api.DataCodec;
2020
import io.scalecube.services.transport.api.HeadersCodec;
21-
import io.scalecube.services.transport.api.ReferenceCountUtil;
22-
import io.scalecube.services.transport.api.ServiceMessageCodec;
2321
import io.scalecube.utils.MaskUtil;
2422
import java.util.Collection;
2523
import java.util.Collections;

services-transport-parent/services-transport-rsocket/src/main/java/io/scalecube/services/transport/rsocket/RSocketServiceAcceptor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import io.scalecube.services.methods.ServiceMethodRegistry;
2121
import io.scalecube.services.transport.api.DataCodec;
2222
import io.scalecube.services.transport.api.HeadersCodec;
23-
import io.scalecube.services.transport.api.ReferenceCountUtil;
24-
import io.scalecube.services.transport.api.ServiceMessageCodec;
2523
import java.util.Collection;
2624
import org.reactivestreams.Publisher;
2725
import org.slf4j.Logger;

services-bytebuf-codec/src/main/java/io/scalecube/services/transport/api/ReferenceCountUtil.java renamed to services-transport-parent/services-transport-rsocket/src/main/java/io/scalecube/services/transport/rsocket/ReferenceCountUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.scalecube.services.transport.api;
1+
package io.scalecube.services.transport.rsocket;
22

33
import io.netty.util.ReferenceCounted;
44
import org.slf4j.Logger;

services-bytebuf-codec/src/main/java/io/scalecube/services/transport/api/ServiceMessageByteBufDataDecoder.java renamed to services-transport-parent/services-transport-rsocket/src/main/java/io/scalecube/services/transport/rsocket/ServiceMessageByteBufDataDecoder.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package io.scalecube.services.transport.api;
1+
package io.scalecube.services.transport.rsocket;
22

33
import io.scalecube.services.api.ServiceMessage;
4+
import io.scalecube.services.transport.api.ServiceMessageDataDecoder;
45

56
public class ServiceMessageByteBufDataDecoder implements ServiceMessageDataDecoder {
67

services-bytebuf-codec/src/main/java/io/scalecube/services/transport/api/ServiceMessageCodec.java renamed to services-transport-parent/services-transport-rsocket/src/main/java/io/scalecube/services/transport/rsocket/ServiceMessageCodec.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.scalecube.services.transport.api;
1+
package io.scalecube.services.transport.rsocket;
22

33
import static java.util.function.Function.identity;
44
import static java.util.stream.Collectors.collectingAndThen;
@@ -12,6 +12,9 @@
1212
import io.scalecube.services.api.ErrorData;
1313
import io.scalecube.services.api.ServiceMessage;
1414
import io.scalecube.services.exceptions.MessageCodecException;
15+
import io.scalecube.services.transport.api.DataCodec;
16+
import io.scalecube.services.transport.api.HeadersCodec;
17+
import io.scalecube.services.transport.api.JdkCodec;
1518
import java.lang.reflect.Type;
1619
import java.util.Collection;
1720
import java.util.Collections;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.scalecube.services.transport.rsocket.ServiceMessageByteBufDataDecoder

0 commit comments

Comments
 (0)