Skip to content

Commit 0c6fbbd

Browse files
committed
Adpted to latest RC version.
1 parent 51ab54f commit 0c6fbbd

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

integration/javamoney-cdi/src/main/java/org/javamoney/cdi/bootstrap/CDISEServiceProvider.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,23 @@
2020

2121
import java.util.*;
2222

23-
import javax.enterprise.inject.Instance;
23+
import javax.annotation.Priority;
2424
import javax.money.spi.ServiceProvider;
2525

2626
import org.javamoney.moneta.internal.PriorityAwareServiceProvider;
27-
import org.javamoney.moneta.spi.ServicePriority;
2827

2928
/**
3029
* Overriding ServiceProvider that actually tries to satisfy component requests from CDI,
3130
* where possible. Additionally ServiceLoader based service are loaded and are returned
3231
* ONLY, when not the same service is loaded as well in CDI.
3332
*/
33+
@Priority(100)
3434
public class CDISEServiceProvider implements ServiceProvider {
3535
/**
3636
* Default provider, using ServiceLoader.
3737
*/
3838
private ServiceProvider defaultServiceProvider = new PriorityAwareServiceProvider();
3939

40-
/**
41-
* Get the components priority, which returns 100.
42-
*
43-
* @return 100.
44-
*/
45-
@Override
46-
public int getPriority() {
47-
return 100;
48-
}
49-
5040
@Override
5141
public <T> List<T> getServices(Class<T> serviceType) {
5242
List<T> instances = new ArrayList<T>();
@@ -65,6 +55,15 @@ public <T> List<T> getServices(Class<T> serviceType) {
6555
return instances;
6656
}
6757

58+
@Override
59+
public <T> List<T> getServices(Class<T> serviceType, List<T> defaultList) {
60+
List<T> services = getServices(serviceType);
61+
if (services.isEmpty()) {
62+
return defaultList;
63+
}
64+
return services;
65+
}
66+
6867
@Override
6968
public String toString() {
7069
return "CDISEServiceProvider{" +

0 commit comments

Comments
 (0)