Changeset 30381

Timestamp:

02/20/08 21:12:09 (9 months ago)

Author:

gracinet

Message:

NXP-2098: made a new constructor using schema name only but
needing to look up Schema Manager

Files:

• org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/memory/MemoryDirectory.java (modified) (2 diffs)
• org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-core/src/test/java/org/nuxeo/ecm/directory/memory/TestMemoryDirectory.java (modified) (2 diffs)

org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-core/src/main/java/org/nuxeo/ecm/directory/memory/MemoryDirectory.java

@@ -20 +20 @@
-package org.nuxeo.ecm.directory.memory;
-
+import java.util.Collection;
+import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
+import org.nuxeo.ecm.core.schema.SchemaManager;
+import org.nuxeo.ecm.core.schema.TypeService;
+import org.nuxeo.ecm.core.schema.types.Field;
+import org.nuxeo.ecm.core.schema.types.Schema;
-import org.nuxeo.ecm.directory.AbstractDirectory;
+import org.nuxeo.ecm.directory.DirectoryException;
-import org.nuxeo.ecm.directory.IdGenerator;
-import org.nuxeo.ecm.directory.Session;
+import org.nuxeo.runtime.api.Framework;
-
-/**
@@ -46 +54 @@
-
-    public MemoryDirectorySession session;
+
+    public MemoryDirectory(String name, String schema, String idField, String passwordField) throws DirectoryException {
+        this(name, schema, new HashSet<String>(), idField, passwordField);
+
+        SchemaManager sm = getSchemaManager();
+        Schema sch = sm.getSchema(schema);
+        if (sch == null) {
+            throw new DirectoryException("Unknown schema :" + schema);
+        }
+        Collection<Field> fields = sch.getFields();
+        for (Field f: fields) {
+            schemaSet.add(f.getName().getLocalName());
+        }
+
+    }
+
+    public SchemaManager getSchemaManager() throws DirectoryException {
+        SchemaManager sm = null;
+        try {
+            sm = Framework.getService(SchemaManager.class);
+        } catch (Exception e) {
+            throw new DirectoryException("Unable to look up Core Type Service");
+        }
+        if (sm == null) {
+            throw new DirectoryException("Unable to look up type service");
+        }
+        return sm;
+    }
-
-    public MemoryDirectory(String name, String schemaName, Set<String> schemaSet,

org.nuxeo.ecm.platform/branches/5.1/nuxeo-platform-directory-core/src/test/java/org/nuxeo/ecm/directory/memory/TestMemoryDirectory.java

@@ -65 +65 @@
-        deployBundle("org.nuxeo.ecm.core.schema");
-
-
-
-
-
-
-
-
-
+
-
-        Set<String> schemaSet = new HashSet<String>(Arrays.asList("i", "pw",
@@ -88 +81 @@
-    }
-
+    public void createSchema() throws Exception {
+        // XXX GR fair enough, but why not using an xsd file?
+        SchemaImpl sch = new SchemaImpl(SCHEMA_NAME);
+        sch.addField(QName.valueOf("i"), new TypeRef<Type>(SchemaNames.BUILTIN, StringType.ID));
+        sch.addField(QName.valueOf("pw"), new TypeRef<Type>(SchemaNames.BUILTIN, StringType.ID));
+        sch.addField(QName.valueOf("a"), new TypeRef<Type>(SchemaNames.BUILTIN, StringType.ID));
+        sch.addField(QName.valueOf("b"), new TypeRef<Type>(SchemaNames.BUILTIN, StringType.ID));
+        sch.addField(QName.valueOf("x"), new TypeRef<Type>(SchemaNames.BUILTIN, StringType.ID));
+        Framework.getService(SchemaManager.class).registerSchema(sch);
+    }
+
+    public void testSchemaIntrospection() throws Exception {
+        MemoryDirectory md = new MemoryDirectory("adir", SCHEMA_NAME, "i", "pw");
+        assertEquals(new HashSet<String>(Arrays.asList("i", "pw", "a", "b", "x")),
+                md.schemaSet);
+    }
+
-    public void testCreate() throws Exception {
-        // created in setUp