--- a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/src/main/java/storage/internal/ExampleDAOImplStatementDescriptorRegistration.java	Wed Apr 01 13:56:21 2015 -0400
+++ b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/src/main/java/storage/internal/ExampleDAOImplStatementDescriptorRegistration.java	Wed Apr 01 20:52:28 2015 +0200
@@ -6,7 +6,6 @@
 import ${package}.storage.ExampleDAO;
 
 import com.redhat.thermostat.storage.core.PreparedParameter;
-import com.redhat.thermostat.storage.core.auth.DescriptorMetadata;
 import com.redhat.thermostat.storage.core.auth.StatementDescriptorRegistration;
 
 
@@ -22,19 +21,6 @@
     }
 
     @Override
-    public DescriptorMetadata getDescriptorMetadata(String descriptor,
-            PreparedParameter[] params) {
-        if (descs.contains(descriptor)) {
-            String agentId = (String)params[0].getValue();
-            DescriptorMetadata metadata = new DescriptorMetadata(agentId);
-            return metadata;
-        } else {
-            throw new IllegalArgumentException("Unknown descriptor: ->"
-                    + descriptor + "<-");
-        }
-    }
-
-    @Override
     public Set<String> getStatementDescriptors() {
         return descs;
     }

--- a/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/src/test/java/storage/internal/ExampleDAOImplStatementDescriptorRegistrationTest.java	Wed Apr 01 13:56:21 2015 -0400
+++ b/dev/multi-module-plugin-archetype/src/main/resources/archetype-resources/storage-common/src/test/java/storage/internal/ExampleDAOImplStatementDescriptorRegistrationTest.java	Wed Apr 01 20:52:28 2015 +0200
@@ -37,7 +37,7 @@
 package ${package}.storage.internal;
 
 import com.redhat.thermostat.storage.core.Key;
-import com.redhat.thermostat.storage.core.auth.StatementDescriptorMetadataFactory;
+import com.redhat.thermostat.storage.core.auth.StatementDescriptorRegistration;
 import org.junit.Test;
 import java.util.Set;
 import static org.junit.Assert.assertEquals;
@@ -57,7 +57,7 @@
 
     @Test
     public void registersAllQueries() {
-        ExampleDAOImplStatementDescriptorRegistration reg = new ExampleDAOImplStatementDescriptorRegistration();
+        StatementDescriptorRegistration reg = new ExampleDAOImplStatementDescriptorRegistration();
         Set<String> descriptors = reg.getStatementDescriptors();
         assertEquals("More descriptors than expected", 2, descriptors.size());
         assertFalse("One of the descriptors is null", descriptors.contains(null));
@@ -65,17 +65,11 @@
 
     @Test
     public void descriptorRegistrationContainsCorrectDescriptors() {
-        ExampleDAOImplStatementDescriptorRegistration reg = new ExampleDAOImplStatementDescriptorRegistration();
+        StatementDescriptorRegistration reg = new ExampleDAOImplStatementDescriptorRegistration();
         Set<String> descriptors = reg.getStatementDescriptors();
         assertTrue("Expected Query Descriptor", descriptors.contains(QUERY_DESCRIPTOR));
         assertTrue("Expected Replace Descriptor", descriptors.contains(REPLACE_DESCRIPTOR));
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void unknownDescriptorThrowsException() {
-        StatementDescriptorMetadataFactory factory = new ExampleDAOImplStatementDescriptorRegistration();
-        factory.getDescriptorMetadata("QUERY foo-bar WHERE 'a' = 'b'", null);
-        fail("should have thrown exception");
-    }
 }