Skip to content

Commit a11767b

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents 7dae289 + 3192bee commit a11767b

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

src/main/java/javax/money/spi/ServiceProvider.java

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* DOWNLOADING THIS SPECIFICATION, YOU ACCEPT THE TERMS AND CONDITIONS OF THE
66
* AGREEMENT. IF YOU ARE NOT WILLING TO BE BOUND BY IT, SELECT THE "DECLINE"
77
* BUTTON AT THE BOTTOM OF THIS PAGE. Specification: JSR-354 Money and Currency
8-
* API ("Specification") Copyright (c) 2012-2013, Credit Suisse All rights
8+
* API ("Specification") Copyright (c) 2012-2015, Credit Suisse All rights
99
* reserved.
1010
*/
1111
package javax.money.spi;
@@ -29,20 +29,19 @@ public interface ServiceProvider {
2929
*/
3030
public int getPriority();
3131

32-
/**
33-
* Access a list of services, given its type. The bootstrap mechanism should
34-
* order the instance for precedence, hereby the most significant should be
32+
/**
33+
* Access a list of services, given its type. The bootstrap mechanism should
34+
* order the instance for precedence, hereby the most significant should be
3535
* first in order. If no such services are found, an empty list should be
3636
* returned.
3737
*
38-
* @param serviceType
39-
* the service type.
40-
* @return The instance to be used, never {@code null}
41-
*/
38+
* @param serviceType the service type.
39+
* @return The instance to be used, never {@code null}
40+
*/
4241
<T> List<T> getServices(Class<T> serviceType);
4342

4443
/**
45-
* Access a single services, given its type. The bootstrap mechanism should
44+
* Access a single service, given its type. The bootstrap mechanism should
4645
* order the instance for precedence, hereby the most significant should be
4746
* first in order and returned. If no such services are found, null is
4847
* returned.
@@ -53,5 +52,4 @@ public interface ServiceProvider {
5352
default <T> T getService(Class<T> serviceType) {
5453
return getServices(serviceType).stream().findFirst().orElse(null);
5554
}
56-
57-
}
55+
}

0 commit comments

Comments
 (0)