You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2015/03/30 13:39:19 UTC

svn commit: r1670060 - in /sis/branches/JDK8: core/sis-feature/src/main/java/org/apache/sis/feature/ core/sis-feature/src/test/java/org/apache/sis/feature/ core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ core/sis-metadata/src/test/java/org...

Author: desruisseaux
Date: Mon Mar 30 11:39:19 2015
New Revision: 1670060

URL: http://svn.apache.org/r1670060
Log:
Use META-INF/services registration instead than hard-coded reference for DefaultNameFactory.
The intend is to prepare the ground for dependency injection in a future version.

Added:
    sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.opengis.util.NameFactory   (with props)
Modified:
    sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java
    sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
    sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
    sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Names.java
    sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
    sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java
    sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
    sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java

Modified: sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/main/java/org/apache/sis/feature/AbstractIdentifiedType.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -174,7 +174,7 @@ public class AbstractIdentifiedType impl
             throw new IllegalArgumentException(Errors.getResources(identification)
                     .getString(Errors.Keys.MissingValueForProperty_1, NAME_KEY));
         } else if (value instanceof String) {
-            name = createName(DefaultFactories.NAMES, (String) value);
+            name = createName(DefaultFactories.forBuildin(NameFactory.class), (String) value);
         } else if (value instanceof GenericName) {
             name = (GenericName) value;
         } else {

Modified: sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-feature/src/test/java/org/apache/sis/feature/DefaultAssociationRoleTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -17,8 +17,9 @@
 package org.apache.sis.feature;
 
 import java.util.Map;
-import org.opengis.feature.FeatureAssociationRole;
 import org.opengis.util.GenericName;
+import org.opengis.util.NameFactory;
+import org.opengis.feature.FeatureAssociationRole;
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.DependsOn;
@@ -55,7 +56,8 @@ public final strictfp class DefaultAssoc
     static DefaultAssociationRole twinTown(final boolean cyclic) {
         final Map<String,?> properties = singletonMap(NAME_KEY, "twin town");
         if (cyclic) {
-            final GenericName valueType = DefaultFactories.SIS_NAMES.createTypeName(null, "Twin town");
+            final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+            final GenericName valueType = factory.createTypeName(null, "Twin town");
             return new DefaultAssociationRole(properties, valueType, 0, 1);
         } else {
             final DefaultFeatureType valueType = DefaultFeatureTypeTest.city();
@@ -146,10 +148,11 @@ public final strictfp class DefaultAssoc
     @Test
     @DependsOnMethod("testBidirectionalAssociation")
     public void testCyclicAssociation() {
-        final GenericName nameOfA = DefaultFactories.SIS_NAMES.createTypeName(null, "A");
-        final GenericName nameOfB = DefaultFactories.SIS_NAMES.createTypeName(null, "B");
-        final GenericName nameOfC = DefaultFactories.SIS_NAMES.createTypeName(null, "C");
-        final GenericName nameOfD = DefaultFactories.SIS_NAMES.createTypeName(null, "D");
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+        final GenericName nameOfA = factory.createTypeName(null, "A");
+        final GenericName nameOfB = factory.createTypeName(null, "B");
+        final GenericName nameOfC = factory.createTypeName(null, "C");
+        final GenericName nameOfD = factory.createTypeName(null, "D");
         /*
          * Associations defined only by the FeatureType name.
          */

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/CustomMetadataTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -25,6 +25,7 @@ import java.lang.reflect.Method;
 import java.lang.reflect.InvocationHandler;
 import java.nio.charset.Charset;
 import javax.xml.bind.JAXBException;
+import org.opengis.util.NameFactory;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.identification.*;
 import org.opengis.metadata.citation.Citation;
@@ -100,17 +101,18 @@ public final strictfp class CustomMetada
      */
     @Test
     public void testSubtypeAttributes() throws JAXBException {
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
         final DataIdentification identification = new DataIdentification() {
             @Override public InternationalString getAbstract() {
                 Map<Locale, String> names = new HashMap<>();
                 names.put(Locale.ENGLISH, "Description");
-                return DefaultFactories.SIS_NAMES.createInternationalString(names);
+                return factory.createInternationalString(names);
             }
 
             @Override public InternationalString getEnvironmentDescription() {
                 Map<Locale, String> names = new HashMap<>();
                 names.put(Locale.ENGLISH, "Environment");
-                return DefaultFactories.SIS_NAMES.createInternationalString(names);
+                return factory.createInternationalString(names);
             }
 
             @Override public InternationalString                   getSupplementalInformation()    {return null;}

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultCoupledResourceTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -17,18 +17,19 @@
 package org.apache.sis.metadata.iso.identification;
 
 import org.opengis.util.ScopedName;
+import org.opengis.util.NameFactory;
 import org.opengis.parameter.ParameterDescriptor;
 import org.opengis.metadata.citation.OnlineResource;
 import org.opengis.metadata.identification.OperationMetadata;
 import org.opengis.metadata.identification.DistributedComputingPlatform;
 import org.apache.sis.internal.jaxb.metadata.replace.ServiceParameterTest;
+import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.xml.NilReason;
 import org.apache.sis.test.DependsOn;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
 import static java.util.Collections.singleton;
-import static org.apache.sis.internal.system.DefaultFactories.SIS_NAMES;
 import static org.junit.Assert.*;
 
 
@@ -52,7 +53,8 @@ public final strictfp class DefaultCoupl
         operation.setConnectPoints(singleton(NilReason.MISSING.createNilObject(OnlineResource.class)));
 
         final DefaultCoupledResource resource = new DefaultCoupledResource();
-        resource.setScopedName((ScopedName) SIS_NAMES.createGenericName(null, "mySpace", "ABC-123"));
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+        resource.setScopedName((ScopedName) factory.createGenericName(null, "mySpace", "ABC-123"));
         resource.setOperation(operation);
         return resource;
     }

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/identification/DefaultServiceIdentificationTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -17,8 +17,10 @@
 package org.apache.sis.metadata.iso.identification;
 
 import javax.xml.bind.JAXBException;
+import org.opengis.util.NameFactory;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.identification.CouplingType;
+import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.util.ComparisonMode;
 import org.apache.sis.xml.NilReason;
 import org.apache.sis.test.DependsOn;
@@ -27,7 +29,6 @@ import org.junit.Test;
 
 import static org.apache.sis.test.Assert.*;
 import static java.util.Collections.singleton;
-import static org.apache.sis.internal.system.DefaultFactories.SIS_NAMES;
 
 
 /**
@@ -52,9 +53,10 @@ public final strictfp class DefaultServi
      * Creates the service identification to use for testing purpose.
      */
     private static DefaultServiceIdentification create() {
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
         final DefaultCoupledResource resource = DefaultCoupledResourceTest.create();
         final DefaultServiceIdentification id = new DefaultServiceIdentification(
-                SIS_NAMES.createGenericName(null, "Web Map Server"),    // serviceType
+                factory.createGenericName(null, "Web Map Server"),      // serviceType
                 NilReason.MISSING.createNilObject(Citation.class),      // citation
                 "A dummy service for testing purpose.");                // abstract
         id.setServiceTypeVersions(singleton("1.0"));

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/AbstractIdentifiedObject.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -32,6 +32,7 @@ import javax.xml.bind.annotation.XmlAttr
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import org.opengis.util.GenericName;
+import org.opengis.util.NameFactory;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
@@ -65,6 +66,7 @@ import static org.apache.sis.internal.re
 
 // Branch-dependent imports
 import java.util.Objects;
+import org.apache.sis.util.iso.DefaultNameFactory;
 
 
 /**
@@ -321,11 +323,12 @@ public class AbstractIdentifiedObject ex
         final GenericName[] names;
         try {
             /*
-             * Note: DefaultFactories.SIS_NAMES is guarantee to be a DefaultNameFactory class, not a sub-class.
-             * However for the purpose of this method, any sub-class would be okay. We should revisit this code
-             * with this flexibility in mind when we will use dependency injection.
+             * Note: DefaultFactories.forBuildin(Class) filters the implementations in order to guarantee an
+             * Apache SIS implementation. We need to revisit this mechanism for a real "dependency injection"
+             * mechanism in the future.
              */
-            names = DefaultFactories.SIS_NAMES.toGenericNames(value);
+            final DefaultNameFactory factory = DefaultFactories.forBuildin(NameFactory.class, DefaultNameFactory.class);
+            names = factory.toGenericNames(value);
         } catch (ClassCastException e) {
             throw (IllegalArgumentException) illegalPropertyType(properties, ALIAS_KEY, value).initCause(e);
         }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/Builder.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -24,15 +24,16 @@ import java.lang.reflect.Type;
 import java.lang.reflect.ParameterizedType;
 import org.opengis.util.NameSpace;
 import org.opengis.util.GenericName;
+import org.opengis.util.NameFactory;
 import org.opengis.metadata.Identifier;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.metadata.iso.ImmutableIdentifier;
+import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.internal.util.Citations;
 import org.apache.sis.util.resources.Errors;
 
 import static org.apache.sis.util.ArgumentChecks.ensureNonNull;
-import static org.apache.sis.internal.system.DefaultFactories.NAMES;
 
 
 /**
@@ -213,6 +214,13 @@ public abstract class Builder<B extends
     private NameSpace namespace;
 
     /**
+     * The name factory, fetched when first needed.
+     *
+     * @see #factory()
+     */
+    private transient NameFactory nameFactory;
+
+    /**
      * Creates a new builder.
      */
     protected Builder() {
@@ -277,13 +285,24 @@ public abstract class Builder<B extends
     }
 
     /**
+     * Returns the name factory to use for creating namespaces and local names.
+     */
+    private NameFactory factory() {
+        if (nameFactory == null) {
+            nameFactory = DefaultFactories.forBuildin(NameFactory.class);
+        }
+        return nameFactory;
+    }
+
+    /**
      * Returns the namespace, creating it when first needed.
      */
     private NameSpace namespace() {
         if (namespace == null) {
             final String codespace = getCodeSpace();
             if (codespace != null) {
-                namespace = NAMES.createNameSpace(NAMES.createLocalName(null, codespace), null);
+                final NameFactory factory = factory();
+                namespace = factory.createNameSpace(factory.createLocalName(null, codespace), null);
             }
         }
         return namespace;
@@ -404,7 +423,7 @@ public abstract class Builder<B extends
         ensureNonNull("name", name);
         if (properties.putIfAbsent(IdentifiedObject.NAME_KEY, name.toString()) != null) {
             // A primary name is already present. Add the given name as an alias instead.
-            aliases.add(name instanceof GenericName ? (GenericName) name : NAMES.createLocalName(namespace(), name));
+            aliases.add(name instanceof GenericName ? (GenericName) name : factory().createLocalName(namespace(), name));
         }
         return self();
     }

Modified: sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/main/java/org/apache/sis/referencing/NamedIdentifier.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -255,7 +255,7 @@ public class NamedIdentifier extends Imm
      * @category Generic name
      */
     private GenericName createName(final Citation authority, final CharSequence code) {
-        final NameFactory factory = DefaultFactories.NAMES;
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
         final String identifier = getUnicodeIdentifier(authority);      // Whitespaces trimed by Citations.
         NameSpace scope = null;
         if (identifier != null) {

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/BuilderTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -19,8 +19,10 @@ package org.apache.sis.referencing;
 import org.opengis.util.NameSpace;
 import org.opengis.util.LocalName;
 import org.opengis.util.GenericName;
+import org.opengis.util.NameFactory;
 import org.opengis.metadata.citation.Citation;
 import org.opengis.metadata.Identifier;
+import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.metadata.iso.ImmutableIdentifier;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
@@ -29,7 +31,6 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 import static org.opengis.referencing.IdentifiedObject.*;
 import static org.apache.sis.metadata.iso.citation.HardCodedCitations.*;
-import static org.apache.sis.internal.system.DefaultFactories.SIS_NAMES;
 
 
 /**
@@ -99,11 +100,13 @@ public final strictfp class BuilderTest
      */
     @Test
     public void testUnscopedName() {
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+
         // Expected values to be used later in the test.
         final String    name   = "Mercator (variant A)";
-        final LocalName alias1 = SIS_NAMES.createLocalName(null, "Mercator (1SP)");
-        final LocalName alias2 = SIS_NAMES.createLocalName(null, "Mercator_1SP");
-        final LocalName alias3 = SIS_NAMES.createLocalName(null, "CT_Mercator");
+        final LocalName alias1 = factory.createLocalName(null, "Mercator (1SP)");
+        final LocalName alias2 = factory.createLocalName(null, "Mercator_1SP");
+        final LocalName alias3 = factory.createLocalName(null, "CT_Mercator");
         assertEquals("Mercator (1SP)", alias1.toString());
         assertEquals("Mercator_1SP",   alias2.toString());
         assertEquals("CT_Mercator",    alias3.toString());
@@ -126,12 +129,13 @@ public final strictfp class BuilderTest
     @Test
     @DependsOnMethod({"testUnscopedName", "testSetCodeSpace"})
     public void testScopedName() {
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+
         // Expected values to be used later in the test.
         final String      name   = "Mercator (variant A)";
-        final GenericName alias1 = SIS_NAMES.createLocalName(scope("EPSG"), "Mercator (1SP)");
+        final GenericName alias1 = factory.createLocalName(scope(factory, "EPSG"), "Mercator (1SP)");
         final GenericName alias2 = new NamedIdentifier(OGC,     "Mercator_1SP");
         final GenericName alias3 = new NamedIdentifier(GEOTIFF, "CT_Mercator");
-        assertEquals("Mercator (variant A)", name  .toString());
         assertEquals("Mercator (1SP)",       alias1.toString());
         assertEquals("OGC:Mercator_1SP",     alias2.toString());
         assertEquals("GeoTIFF:CT_Mercator",  alias3.toString());
@@ -153,8 +157,8 @@ public final strictfp class BuilderTest
     /**
      * Convenience method creating a namespace for {@link #testScopedName()} purpose.
      */
-    private static NameSpace scope(final String codespace) {
-        return SIS_NAMES.createNameSpace(SIS_NAMES.createLocalName(null, codespace), null);
+    private static NameSpace scope(final NameFactory factory, final String codespace) {
+        return factory.createNameSpace(factory.createLocalName(null, codespace), null);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/IdentifiedObjectsTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -17,6 +17,7 @@
 package org.apache.sis.referencing;
 
 import org.opengis.util.GenericName;
+import org.opengis.util.NameFactory;
 import org.opengis.referencing.IdentifiedObject;
 import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.test.mock.IdentifiedObjectMock;
@@ -41,7 +42,8 @@ public final strictfp class IdentifiedOb
      */
     @Test
     public void testIsHeuristicMatchForName() {
-        final GenericName name = DefaultFactories.SIS_NAMES.createGenericName(null, "myScope", "myName");
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+        final GenericName name = factory.createGenericName(null, "myScope", "myName");
         IdentifiedObjectMock object = new IdentifiedObjectMock("myCode ", name); // Intentional trailing space.
 
         // Test the code.

Modified: sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-referencing/src/test/java/org/apache/sis/referencing/NamedIdentifierTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -20,15 +20,16 @@ import java.util.Locale;
 import org.opengis.util.InternationalString;
 import org.opengis.util.NameSpace;
 import org.opengis.util.GenericName;
+import org.opengis.util.NameFactory;
 import org.opengis.metadata.Identifier;
 import org.opengis.test.Validators;
+import org.apache.sis.internal.system.DefaultFactories;
 import org.apache.sis.util.iso.DefaultInternationalString;
 import org.apache.sis.test.DependsOnMethod;
 import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
 import static org.apache.sis.test.Assert.*;
-import static org.apache.sis.internal.system.DefaultFactories.SIS_NAMES;
 import static org.apache.sis.metadata.iso.citation.HardCodedCitations.OGP;
 import static org.apache.sis.metadata.iso.citation.HardCodedCitations.EPSG;
 
@@ -77,8 +78,9 @@ public final strictfp class NamedIdentif
      */
     @Test
     public void testCreateFromName() {
-        final NameSpace scope = SIS_NAMES.createNameSpace(SIS_NAMES.createLocalName(null, "OGP"), null);
-        final NamedIdentifier identifier = new NamedIdentifier(SIS_NAMES.createGenericName(scope, "EPSG", "4326"));
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+        final NameSpace scope = factory.createNameSpace(factory.createLocalName(null, "OGP"), null);
+        final NamedIdentifier identifier = new NamedIdentifier(factory.createGenericName(scope, "EPSG", "4326"));
         Validators.validate((Identifier)  identifier);
         Validators.validate((GenericName) identifier);
 

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/internal/system/DefaultFactories.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -19,8 +19,6 @@ package org.apache.sis.internal.system;
 import java.util.Map;
 import java.util.IdentityHashMap;
 import java.util.ServiceLoader;
-import org.opengis.util.NameFactory;
-import org.apache.sis.util.iso.DefaultNameFactory;
 
 
 /**
@@ -29,33 +27,15 @@ import org.apache.sis.util.iso.DefaultNa
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
- * @version 0.5
+ * @version 0.6
  * @module
  */
 public final class DefaultFactories extends SystemListener {
     /**
-     * A name factory which is guaranteed to be an instance of SIS {@link DefaultNameFactory}.
-     * We use this factory when we need to ensure that the created names are instances of the
-     * SIS {@link org.apache.sis.util.iso.AbstractName} implementation.
-     *
-     * <p>Note that this need to be the exact SIS class, not a user-provided subclass,
-     * otherwise we could not guarantee the above-cited requirement.</p>
-     */
-    public static final DefaultNameFactory SIS_NAMES = new DefaultNameFactory();
-
-    /**
-     * The factory to use for creating names, not necessarily SIS instances.
-     * This is fixed to {@link #SIS_NAMES} for now, but will probably be fetched in a more
-     * dynamic way later.
-     */
-    public static final NameFactory NAMES = SIS_NAMES;
-
-    /**
      * Cache of factories which are found by {@code META-INF/services}.
      */
     private static final Map<Class<?>, Object> FACTORIES = new IdentityHashMap<>(4);
     static {
-        FACTORIES.put(NameFactory.class, NAMES);
         SystemListener.add(new DefaultFactories());
     }
 
@@ -73,13 +53,13 @@ public final class DefaultFactories exte
     protected void classpathChanged() {
         synchronized (DefaultFactories.class) {
             FACTORIES.clear();
-            FACTORIES.put(NameFactory.class, NAMES);
         }
     }
 
     /**
      * Return the default factory implementing the given interface.
-     * This method will give preference to Apache SIS factories if any.
+     * This method returns only Apache SIS implementation of factories, and ignore all other.
+     * This is a temporary mechanism while we are waiting for a real dependency injection mechanism.
      *
      * @param  <T>  The interface type.
      * @param  type The interface type.
@@ -91,20 +71,55 @@ public final class DefaultFactories exte
             for (final T candidate : ServiceLoader.load(type)) {
                 final Class<?> ct = candidate.getClass();
                 if (ct.getName().startsWith("org.apache.sis.")) {
+                    if (factory != null) {
+                        throw new IllegalStateException("Found two implementations of " + type);
+                    }
                     factory = candidate;
                     break;
                 }
-                /*
-                 * Select the first provider found in the iteration. If more than one provider is found,
-                 * select the most specialized type. This is okay only for relatively simple configurations,
-                 * while we are waiting for a real dependency injection mechanism.
-                 */
-                if (factory == null || factory.getClass().isAssignableFrom(ct)) {
-                    factory = candidate;
-                }
             }
             FACTORIES.put(type, factory);
         }
         return factory;
     }
+
+    /**
+     * Returns a factory which is guaranteed to be present. If the factory is not found,
+     * this will be considered a configuration error (corrupted JAR files of incorrect classpath).
+     *
+     * @param  <T>  The interface type.
+     * @param  type The interface type.
+     * @return A factory implementing the given interface.
+     *
+     * @since 0.6
+     */
+    public static <T> T forBuildin(final Class<T> type) {
+        final T factory = forClass(type);
+        if (factory == null) {
+            throw new AssertionError("Missing “META-INF/services/" + type.getName() + "” file. "
+                    + "The JAR file may be corrupted or the classpath incorrect.");
+        }
+        return factory;
+    }
+
+    /**
+     * Returns a factory of the given type, making sure that it is an implementation of the given class.
+     * Use this method only when we know that Apache SIS registers only one implementation of a given service.
+     *
+     * @param  <T>  The interface type.
+     * @param  <I>  The requested implementation class.
+     * @param  type The interface type.
+     * @param  impl The requested implementation class.
+     * @return A factory implementing the given interface.
+     *
+     * @since 0.6
+     */
+    public static <T, I extends T> I forBuildin(final Class<T> type, final Class<I> impl) {
+        final T factory = forBuildin(type);
+        if (!impl.isInstance(factory)) {
+            throw new AssertionError("The “META-INF/services/" + type.getName() + "” file should contains only “"
+                + impl.getName() + "” in the Apache SIS namespace, but we found “" + factory.getClass().getName() + "”.");
+        }
+        return impl.cast(factory);
+    }
 }

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/AbstractName.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -22,6 +22,7 @@ import java.util.Iterator;
 import java.util.ConcurrentModificationException;
 import java.io.Serializable;
 import javax.xml.bind.annotation.XmlTransient;
+import org.opengis.util.NameFactory;
 import org.opengis.util.NameSpace;
 import org.opengis.util.LocalName;
 import org.opengis.util.ScopedName;
@@ -140,10 +141,11 @@ public abstract class AbstractName imple
             throw new ConcurrentModificationException(Errors.format(Errors.Keys.UnexpectedChange_1, "parsedNames"));
         }
         /*
-         * Following cast should be safe because the SIS_NAMES factory is fixed to a
-         * DefaultNameFactory instance, which is known to create AbstractName instances.
+         * Following cast should be safe because DefaultFactories.forBuildin(Class) filters the factories in
+         * order to return the Apache SIS implementation, which is known to create AbstractName instances.
          */
-        return (AbstractName) DefaultFactories.SIS_NAMES.createGenericName(object.scope(), names);
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+        return (AbstractName) factory.createGenericName(object.scope(), names);
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/DefaultRecordSchema.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -127,7 +127,7 @@ public class DefaultRecordSchema impleme
     public DefaultRecordSchema(NameFactory nameFactory, final NameSpace parent, final CharSequence schemaName) {
         ArgumentChecks.ensureNonNull("schemaName", schemaName);
         if (nameFactory == null) {
-            nameFactory = DefaultFactories.NAMES;
+            nameFactory = DefaultFactories.forBuildin(NameFactory.class);
         }
         this.nameFactory    = nameFactory;
         this.typeFactory    = (nameFactory instanceof DefaultNameFactory) ? null : new TypeNames(nameFactory);

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Names.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Names.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Names.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Names.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -22,6 +22,7 @@ import org.opengis.util.LocalName;
 import org.opengis.util.MemberName;
 import org.opengis.util.GenericName;
 import org.opengis.util.NameSpace;
+import org.opengis.util.NameFactory;
 import org.opengis.util.InternationalString;
 import org.apache.sis.util.Static;
 import org.apache.sis.internal.system.DefaultFactories;
@@ -91,16 +92,16 @@ public final class Names extends Static
     /**
      * Creates a namespace for the given name.
      *
+     * @param  factory   The factory to use for creating the namespace.
      * @param  namespace The namespace string, taken as a whole (not parsed).
      * @param  separator The separator between the namespace and the local part, or {@code null} for the default.
      * @return The namespace object.
      */
-    private static NameSpace createNameSpace(final CharSequence namespace, final String separator) {
+    private static NameSpace createNameSpace(final NameFactory factory, final CharSequence namespace, final String separator) {
         if (namespace == null || namespace.length() == 0) {
             return null;
         }
-        return DefaultFactories.NAMES.createNameSpace(
-                DefaultFactories.NAMES.createLocalName(null, namespace),
+        return factory.createNameSpace(factory.createLocalName(null, namespace),
                 (separator == null) ? null : Collections.singletonMap("separator.head", separator));
     }
 
@@ -118,7 +119,8 @@ public final class Names extends Static
     public static GenericName parseGenericName(final CharSequence namespace, final String separator, final CharSequence scopedName) {
         ensureNonNull("localPart", scopedName);
         ensureNonNull("separator", separator);
-        return DefaultFactories.NAMES.parseGenericName(createNameSpace(namespace, separator), scopedName);
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+        return factory.parseGenericName(createNameSpace(factory, namespace, separator), scopedName);
     }
 
     /**
@@ -164,7 +166,8 @@ public final class Names extends Static
     public static LocalName createLocalName(final CharSequence namespace, final String separator, final CharSequence localPart) {
         ensureNonNull("localPart", localPart);
         ensureNonNull("separator", separator);
-        return DefaultFactories.NAMES.createLocalName(createNameSpace(namespace, separator), localPart);
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+        return factory.createLocalName(createNameSpace(factory, namespace, separator), localPart);
     }
 
     /**
@@ -187,7 +190,8 @@ public final class Names extends Static
     public static TypeName createTypeName(final CharSequence namespace, final String separator, final CharSequence localPart) {
         ensureNonNull("localPart", localPart);
         ensureNonNull("separator", separator);
-        return DefaultFactories.NAMES.createTypeName(createNameSpace(namespace, separator), localPart);
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
+        return factory.createTypeName(createNameSpace(factory, namespace, separator), localPart);
     }
 
     /**
@@ -210,9 +214,9 @@ public final class Names extends Static
         ensureNonNull("localPart",  localPart);
         ensureNonNull("separator",  separator);
         ensureNonNull("valueClass", valueClass);
-        return DefaultFactories.NAMES.createMemberName(
-                createNameSpace(namespace, separator), localPart,
-                DefaultFactories.SIS_NAMES.toTypeName(valueClass));
+        final DefaultNameFactory factory = DefaultFactories.forBuildin(NameFactory.class, DefaultNameFactory.class);
+        return factory.createMemberName(createNameSpace(factory, namespace, separator), localPart,
+                factory.toTypeName(valueClass));    // SIS-specific method.
     }
 
     /**

Modified: sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/java/org/apache/sis/util/iso/Types.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -784,7 +784,7 @@ public final class Types extends Static
             return null;
         }
         if (!(factory instanceof DefaultNameFactory)) {
-            factory = DefaultFactories.SIS_NAMES;
+            factory = DefaultFactories.forBuildin(NameFactory.class);
         }
        return ((DefaultNameFactory) factory).toGenericNames(value);
     }

Modified: sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.apache.sis.util.ObjectConverter [UTF-8] Mon Mar 30 11:39:19 2015
@@ -1,3 +1,4 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
 # Loaded by org.apache.sis.internal.converter.ConverterRegistry.
 org.apache.sis.internal.converter.StringConverter$Number
 org.apache.sis.internal.converter.StringConverter$Byte

Added: sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.opengis.util.NameFactory
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.opengis.util.NameFactory?rev=1670060&view=auto
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.opengis.util.NameFactory (added)
+++ sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.opengis.util.NameFactory [UTF-8] Mon Mar 30 11:39:19 2015
@@ -0,0 +1,2 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements.
+org.apache.sis.util.iso.DefaultNameFactory

Propchange: sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.opengis.util.NameFactory
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK8/core/sis-utility/src/main/resources/META-INF/services/org.opengis.util.NameFactory
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8

Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -86,7 +86,7 @@ public final strictfp class NameMarshall
      */
     @Test
     public void testLocalName() throws JAXBException {
-        final NameFactory factory = DefaultFactories.SIS_NAMES;
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
         final LocalName name = factory.createLocalName(null, "An ordinary local name");
         assertEquals("An ordinary local name", name.toString());
         final String expected =
@@ -109,7 +109,7 @@ public final strictfp class NameMarshall
     @Test
     @DependsOnMethod("testLocalName")
     public void testLocalNameWithAmp() throws JAXBException {
-        final NameFactory factory = DefaultFactories.SIS_NAMES;
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
         final LocalName name = factory.createLocalName(null, "A name with & and > and <.");
         assertEquals("A name with & and > and <.", name.toString());
         final String expected =
@@ -132,7 +132,7 @@ public final strictfp class NameMarshall
     @Test
     @DependsOnMethod("testLocalName")
     public void testLocalNameWithScope() throws JAXBException {
-        final NameFactory factory = DefaultFactories.SIS_NAMES;
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
         final NameSpace scope = factory.createNameSpace(factory.createLocalName(null, "A code space"), null);
         final LocalName name = factory.createLocalName(scope, "A name in a scope");
         assertEquals("A name in a scope", name.toString());
@@ -155,7 +155,7 @@ public final strictfp class NameMarshall
      */
     @Test
     public void testTypeName() throws JAXBException {
-        final NameFactory factory = DefaultFactories.SIS_NAMES;
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
         final TypeName name = factory.createTypeName(null, "An other local name");
         assertEquals("An other local name", name.toString());
         final String expected =
@@ -181,7 +181,7 @@ public final strictfp class NameMarshall
      */
     @Test
     public void testScopedName() throws JAXBException {
-        final NameFactory factory = DefaultFactories.SIS_NAMES;
+        final NameFactory factory = DefaultFactories.forBuildin(NameFactory.class);
         final GenericName name = factory.createGenericName(null, "myScope","myName");
         assertEquals("myScope:myName", name.toString());
         final String expected =

Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -22,6 +22,7 @@ import org.opengis.util.GenericName;
 import org.opengis.util.TypeName;
 import org.opengis.util.LocalName;
 import org.opengis.util.InternationalString;
+import org.opengis.util.NameFactory;
 import org.opengis.util.NameSpace;
 import org.opengis.util.ScopedName;
 import org.apache.sis.util.UnknownNameException;
@@ -61,7 +62,8 @@ public final strictfp class NamesTest ex
      */
     @Test
     public void testClassFromClassname() {
-        final TypeName type = DefaultFactories.SIS_NAMES.toTypeName(Random.class);
+        final DefaultNameFactory factory = DefaultFactories.forBuildin(NameFactory.class, DefaultNameFactory.class);
+        final TypeName type = factory.toTypeName(Random.class);
         assertEquals("class:java.util.Random", type.toFullyQualifiedName().toString());
         assertValueClassEquals(Random.class, type);
         assertValueClassEquals(DefaultNameFactoryTest.class,
@@ -76,7 +78,8 @@ public final strictfp class NamesTest ex
      */
     @Test
     public void testClassFromOGC() {
-        final TypeName type = DefaultFactories.SIS_NAMES.toTypeName(String.class);
+        final DefaultNameFactory factory = DefaultFactories.forBuildin(NameFactory.class, DefaultNameFactory.class);
+        final TypeName type = factory.toTypeName(String.class);
         assertEquals("OGC:CharacterString", type.toFullyQualifiedName().toString());
         assertValueClassEquals(String.class,               type);
         assertValueClassEquals(Double.class,               new DefaultTypeName(type.scope(), "Real"));

Modified: sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java [UTF-8] (original)
+++ sis/branches/JDK8/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -20,6 +20,7 @@ import java.net.URI;
 import java.util.Date;
 import java.util.Locale;
 import org.opengis.util.TypeName;
+import org.opengis.util.NameFactory;
 import org.opengis.util.InternationalString;
 import org.opengis.metadata.Metadata;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
@@ -53,7 +54,8 @@ public final strictfp class TypeNamesTes
     private static void verifyLookup(final String namespace, final String name, final Class<?> valueClass)
             throws ClassNotFoundException
     {
-        final TypeName type = DefaultFactories.SIS_NAMES.toTypeName(valueClass);
+        final DefaultNameFactory factory = DefaultFactories.forBuildin(NameFactory.class, DefaultNameFactory.class);
+        final TypeName type = factory.toTypeName(valueClass);
         assertNotNull(name, type);
         assertSame   (name, valueClass, ((DefaultTypeName) type).toClass());
         assertEquals (name, namespace,  type.scope().name().toString());
@@ -64,8 +66,8 @@ public final strictfp class TypeNamesTes
     /**
      * Returns the string representation of the fully qualified path of the type name for the given value.
      */
-    private static String toTypeName(final Class<?> valueClass) {
-        return DefaultFactories.SIS_NAMES.toTypeName(valueClass).toFullyQualifiedName().toString();
+    private static String toTypeName(final DefaultNameFactory factory, final Class<?> valueClass) {
+        return factory.toTypeName(valueClass).toFullyQualifiedName().toString();
     }
 
     /**
@@ -90,10 +92,11 @@ public final strictfp class TypeNamesTes
      */
     @Test
     public void testNumbers() {
-        assertEquals("Short",  OGC+":Integer", toTypeName(Short .class));
-        assertEquals("Long",   OGC+":Integer", toTypeName(Long  .class));
-        assertEquals("Float",  OGC+":Real",    toTypeName(Float .class));
-        assertEquals("Double", OGC+":Real",    toTypeName(Double.class));
+        final DefaultNameFactory factory = DefaultFactories.forBuildin(NameFactory.class, DefaultNameFactory.class);
+        assertEquals("Short",  OGC+":Integer", toTypeName(factory, Short .class));
+        assertEquals("Long",   OGC+":Integer", toTypeName(factory, Long  .class));
+        assertEquals("Float",  OGC+":Real",    toTypeName(factory, Float .class));
+        assertEquals("Double", OGC+":Real",    toTypeName(factory, Double.class));
     }
 
     /**

Modified: sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java?rev=1670060&r1=1670059&r2=1670060&view=diff
==============================================================================
--- sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] (original)
+++ sis/branches/JDK8/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/MetadataReader.java [UTF-8] Mon Mar 30 11:39:19 2015
@@ -855,7 +855,7 @@ final class MetadataReader {
         String name = variable.getName();
         if (name != null && !(name = name.trim()).isEmpty()) {
             if (nameFactory == null) {
-                nameFactory = DefaultFactories.NAMES; // Real dependency injection to be used in a future version.
+                nameFactory = DefaultFactories.forBuildin(NameFactory.class); // Real dependency injection to be used in a future version.
             }
             band.setSequenceIdentifier(nameFactory.createMemberName(null, name,
                     nameFactory.createTypeName(null, variable.getDataTypeName())));