Skip to content

Commit e066744

Browse files
committed
Get rid of ServiceLoaderUtil
1 parent eb6557d commit e066744

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

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

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

3-
import io.scalecube.utils.ServiceLoaderUtil;
43
import java.io.IOException;
54
import java.io.InputStream;
65
import java.io.OutputStream;
76
import java.lang.reflect.Type;
87
import java.util.Collection;
98
import java.util.Map;
109
import java.util.Objects;
10+
import java.util.ServiceLoader;
1111
import java.util.Set;
1212
import java.util.function.Function;
1313
import java.util.stream.Collectors;
14+
import java.util.stream.StreamSupport;
1415

1516
public interface DataCodec {
1617

1718
Map<String, DataCodec> INSTANCES =
18-
ServiceLoaderUtil.findAll(DataCodec.class)
19+
StreamSupport.stream(ServiceLoader.load(DataCodec.class).spliterator(), false)
1920
.collect(Collectors.toMap(DataCodec::contentType, Function.identity()));
2021

2122
static Collection<DataCodec> getAllInstances() {

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

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

3-
import io.scalecube.utils.ServiceLoaderUtil;
43
import java.io.IOException;
54
import java.io.InputStream;
65
import java.io.OutputStream;
76
import java.util.Map;
7+
import java.util.ServiceLoader;
88
import java.util.concurrent.ConcurrentHashMap;
9+
import java.util.stream.StreamSupport;
910

1011
public interface HeadersCodec {
1112

@@ -25,8 +26,9 @@ static HeadersCodec getInstance(String contentType) {
2526
* is thrown if not exist)
2627
*/
2728
static HeadersCodec loadInstance(String contentType) {
28-
return ServiceLoaderUtil.findFirst(
29-
HeadersCodec.class, codec -> codec.contentType().equalsIgnoreCase(contentType))
29+
return StreamSupport.stream(ServiceLoader.load(HeadersCodec.class).spliterator(), false)
30+
.filter(codec -> codec.contentType().equalsIgnoreCase(contentType))
31+
.findFirst()
3032
.orElseThrow(
3133
() ->
3234
new IllegalArgumentException(
Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
package io.scalecube.services.transport.api;
22

33
import io.scalecube.services.api.ServiceMessage;
4-
import io.scalecube.utils.ServiceLoaderUtil;
4+
import java.util.ServiceLoader;
55
import java.util.function.BiFunction;
6+
import java.util.stream.StreamSupport;
67

78
@FunctionalInterface
89
public interface ServiceMessageDataDecoder
910
extends BiFunction<ServiceMessage, Class<?>, ServiceMessage> {
1011

1112
ServiceMessageDataDecoder INSTANCE =
12-
ServiceLoaderUtil.findFirst(ServiceMessageDataDecoder.class).orElse(null);
13+
StreamSupport.stream(ServiceLoader.load(ServiceMessageDataDecoder.class).spliterator(), false)
14+
.findFirst()
15+
.orElse(null);
1316
}

0 commit comments

Comments
 (0)