https://java.net/jira/browse/UNITSOFMEASUREMENT-191

Could QuantityFactoryService be merged into ServiceProvider, too?

Author: keilw

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

@@ -36,7 +36,8 @@
  *
  * @author <a href="mailto:units@catmedia.us">Werner Keil</a>
  * @author <a href="mailto:otaviojava@java.net">Otavio Santana</a>
- * @version 0.2
+ * @version 0.3
+ * @deprecated Factory provided by {@link ServiceProvider} directly
  */
 public interface QuantityFactoryService {
 

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

@@ -44,7 +44,7 @@
  * <p>
  * All the methods in this class are safe for use by multiple concurrent threads.
  *
- * @version 0.8.2, April 1, 2016
+ * @version 0.9, May 11, 2016
  * @author Werner Keil
  * @author Martin Desruisseaux
  */
@@ -94,9 +94,19 @@ public int getPriority() {
    * Returns the service to obtain a {@link Quantity}, or {@code null} if none.
    *
    * @return the service to obtain a {@link Quantity}, or {@code null}.
+   * @deprecated use {@link #getQuantityFactory(Class)} instead
    */
   public abstract QuantityFactoryService getQuantityFactoryService();
 
+  /**
+   * Return a factory for this {@link Quantity}.
+   *
+   * @param quantity
+   *          the quantity
+   * @return the {@link QuantityFactory}
+   */
+  public abstract <Q extends Quantity<Q>> QuantityFactory<Q> getQuantityFactory(Class<Q> quantity);
+
   /**
    * Gets all {@link ServiceProvider}. This method loads the provider when first needed.
    */

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

@@ -33,6 +33,8 @@
 
 import static org.junit.Assert.*;
 
+import javax.measure.Quantity;
+
 /**
  * Tests for {@link ServiceProvider}.
  */
@@ -79,5 +81,10 @@ public UnitFormatService getUnitFormatService() {
     public QuantityFactoryService getQuantityFactoryService() {
       return null;
     }
+
+    @Override
+    public <Q extends Quantity<Q>> QuantityFactory<Q> getQuantityFactory(Class<Q> quantity) {
+      return null;
+    }
   }
 }