Skip to content

Commit 815353a

Browse files
committed
Moved CredentialsSupplier to ServiceTransport
1 parent d07c523 commit 815353a

File tree

7 files changed

+15
-19
lines changed

7 files changed

+15
-19
lines changed

services-api/src/main/java/io/scalecube/services/auth/CredentialsSupplier.java

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

services-api/src/main/java/io/scalecube/services/transport/api/ServiceTransport.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package io.scalecube.services.transport.api;
22

3+
import io.scalecube.services.ServiceReference;
34
import io.scalecube.services.registry.api.ServiceRegistry;
5+
import java.util.Map;
6+
import java.util.function.Function;
7+
import reactor.core.publisher.Mono;
48

59
public interface ServiceTransport {
610

@@ -28,4 +32,11 @@ public interface ServiceTransport {
2832

2933
/** Shutdowns transport and release occupied resources. */
3034
void stop();
35+
36+
/**
37+
* Returns credentials for the given {@link ServiceReference}. Credentials are being returned in
38+
* most generic form which is {@code Map<String, String>}.
39+
*/
40+
@FunctionalInterface
41+
interface CredentialsSupplier extends Function<ServiceReference, Mono<Map<String, String>>> {}
3142
}

services-examples/src/main/java/io/scalecube/services/examples/auth/CompositeProfileAuthExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import io.scalecube.services.ServiceInfo;
88
import io.scalecube.services.api.ServiceMessage;
99
import io.scalecube.services.auth.Authenticator;
10-
import io.scalecube.services.auth.CredentialsSupplier;
1110
import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
1211
import io.scalecube.services.exceptions.UnauthorizedException;
12+
import io.scalecube.services.transport.api.ServiceTransport.CredentialsSupplier;
1313
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
1414
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
1515
import java.time.Duration;

services-examples/src/main/java/io/scalecube/services/examples/auth/PrincipalMapperAuthExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import io.scalecube.services.ServiceEndpoint;
55
import io.scalecube.services.ServiceInfo;
66
import io.scalecube.services.auth.Authenticator;
7-
import io.scalecube.services.auth.CredentialsSupplier;
87
import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
98
import io.scalecube.services.exceptions.UnauthorizedException;
9+
import io.scalecube.services.transport.api.ServiceTransport.CredentialsSupplier;
1010
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
1111
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
1212
import java.time.Duration;

services-examples/src/main/java/io/scalecube/services/examples/auth/ServiceTransportAuthExample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import io.scalecube.services.Microservices;
44
import io.scalecube.services.ServiceEndpoint;
55
import io.scalecube.services.auth.Authenticator;
6-
import io.scalecube.services.auth.CredentialsSupplier;
76
import io.scalecube.services.discovery.ScalecubeServiceDiscovery;
87
import io.scalecube.services.exceptions.UnauthorizedException;
8+
import io.scalecube.services.transport.api.ServiceTransport.CredentialsSupplier;
99
import io.scalecube.services.transport.rsocket.RSocketServiceTransport;
1010
import io.scalecube.transport.netty.websocket.WebsocketTransportFactory;
1111
import java.time.Duration;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
import io.rsocket.util.ByteBufPayload;
1111
import io.scalecube.services.Address;
1212
import io.scalecube.services.ServiceReference;
13-
import io.scalecube.services.auth.CredentialsSupplier;
1413
import io.scalecube.services.exceptions.MessageCodecException;
1514
import io.scalecube.services.exceptions.ServiceException;
1615
import io.scalecube.services.exceptions.UnauthorizedException;
1716
import io.scalecube.services.transport.api.ClientChannel;
1817
import io.scalecube.services.transport.api.ClientTransport;
1918
import io.scalecube.services.transport.api.DataCodec;
2019
import io.scalecube.services.transport.api.HeadersCodec;
20+
import io.scalecube.services.transport.api.ServiceTransport.CredentialsSupplier;
2121
import java.util.Collection;
2222
import java.util.Collections;
2323
import java.util.Map;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import io.netty.util.concurrent.DefaultThreadFactory;
88
import io.netty.util.concurrent.Future;
99
import io.scalecube.services.auth.Authenticator;
10-
import io.scalecube.services.auth.CredentialsSupplier;
1110
import io.scalecube.services.exceptions.ConnectionClosedException;
1211
import io.scalecube.services.registry.api.ServiceRegistry;
1312
import io.scalecube.services.transport.api.ClientTransport;

0 commit comments

Comments
 (0)