Skip to content

Commit ab62832

Browse files
committed
UNITSOFMEASUREMENT-186: Change ServiceProvider.available() to Collection
Task-Url: https://java.net/jira/browse/UNITSOFMEASUREMENT-186
1 parent e73bf48 commit ab62832

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
* <p>
4545
* All the methods in this class are safe for use by multiple concurrent threads.
4646
*
47-
* @version 0.9.1, June 14, 2016
47+
* @version 0.9.2, June 15, 2016
4848
* @author Werner Keil
4949
* @author Martin Desruisseaux
5050
*/
@@ -127,12 +127,12 @@ public int compare(ServiceProvider p1, ServiceProvider p2) {
127127
}
128128

129129
/**
130-
* Returns all available service providers.
130+
* Returns the list of available service providers.
131131
*
132132
* @return all available service providers.
133133
*/
134-
public static ServiceProvider[] available() {
135-
return getProviders().clone();
134+
public static List<ServiceProvider> available() {
135+
return Arrays.asList(getProviders()); // .clone();
136136
}
137137

138138
/**

src/test/java/javax/measure/spi/ServiceProviderTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void testSetDefault_Null() {
5151
*/
5252
@Test
5353
public void testGetAndSetDefault() {
54-
assertEquals(0, ServiceProvider.available().length);
54+
assertEquals(0, ServiceProvider.available().size());
5555
try {
5656
ServiceProvider.current();
5757
fail("Expected no ServiceProvider before we set one.");
@@ -62,7 +62,7 @@ public void testGetAndSetDefault() {
6262
assertNull("Expected no ServiceProvider before we set one.", ServiceProvider.setCurrent(testProv));
6363
assertSame("Setting the same ServiceProvider twice should be a no-op.", testProv, ServiceProvider.setCurrent(testProv));
6464
assertSame(testProv, ServiceProvider.current());
65-
assertArrayEquals(new ServiceProvider[] { testProv }, ServiceProvider.available());
65+
assertArrayEquals(new ServiceProvider[] { testProv }, ServiceProvider.available().toArray());
6666
}
6767

6868
private static final class TestServiceProvider extends ServiceProvider {

0 commit comments

Comments
 (0)