Author: bcarothers Date: 2009-05-15 12:39:22 -0400 (Fri, 15 May 2009) New Revision: 907 Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrEngine.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrWorkspace.java trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/InMemoryRepositoryStub.java trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrConfigurationTest.java trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrRepositoryTest.java trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/MixinTest.java trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/RepositoryNodeTypeManagerTest.java Log: DNA-411 JcrRepository.Options Is Plural - Coding Convention Violation Applied patch that renamed JcrRepository.Options to Option and JcrRepository.DefaultOptions to DefaultOption. The patch also propagates the name changes through the JCR source and test packages as needed. Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java 2009-05-15 16:17:10 UTC (rev 906) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrConfiguration.java 2009-05-15 16:39:22 UTC (rev 907) @@ -180,7 +180,7 @@ * @param option the option to be set * @return the interface used to set the value for the property; never null */ - OptionSetter<ReturnType> with( JcrRepository.Options option ); + OptionSetter<ReturnType> with( JcrRepository.Option option ); } /** @@ -240,7 +240,7 @@ super(path, returnObject); } - public OptionSetter<JcrRepositoryDetails<RT>> with( final JcrRepository.Options option ) { + public OptionSetter<JcrRepositoryDetails<RT>> with( final JcrRepository.Option option ) { final Path optionsPath = createOrReplaceNode(path(), DnaLexicon.OPTIONS); final JcrRepositoryDetails<RT> details = this; Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrEngine.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrEngine.java 2009-05-15 16:17:10 UTC (rev 906) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrEngine.java 2009-05-15 16:39:22 UTC (rev 907) @@ -41,7 +41,7 @@ import org.jboss.dna.graph.property.PathFactory; import org.jboss.dna.graph.property.PathNotFoundException; import org.jboss.dna.graph.property.Property; -import org.jboss.dna.jcr.JcrRepository.Options; +import org.jboss.dna.jcr.JcrRepository.Option; import org.jboss.dna.repository.DnaEngine; import org.jboss.dna.repository.RepositoryService; import org.jboss.dna.repository.observation.ObservationService; @@ -142,7 +142,7 @@ * Extract the JCR options from the configuration graph */ String configurationName = dnaEngine.getRepositoryService().getConfigurationSourceName(); - Map<Options, String> options = new HashMap<Options, String>(); + Map<Option, String> options = new HashMap<Option, String>(); PathFactory pathFactory = getExecutionContext().getValueFactories().getPathFactory(); Graph configuration = Graph.create(connectionFactory.createConnection(configurationName), getExecutionContext()); @@ -167,7 +167,7 @@ Node optionNode = configuration.getNodeAt(optionLocation); Property valueProperty = optionNode.getProperty(DnaLexicon.VALUE); - options.put(Options.valueOf(segment.getName().getLocalName()), + options.put(Option.valueOf(segment.getName().getLocalName()), valueProperty.getFirstValue().toString()); } Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java 2009-05-15 16:17:10 UTC (rev 906) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrRepository.java 2009-05-15 16:39:22 UTC (rev 907) @@ -77,7 +77,7 @@ /** * The available options for the {@code JcrRepository}. */ - public enum Options { + public enum Option { /** * Flag that defines whether or not the node types should be exposed as content under the "{@code @@ -96,7 +96,7 @@ /** * The default values for each of the {@link Options}. */ - public static class DefaultOptions { + public static class DefaultOption { /** * The default value for the {@link Options#PROJECT_NODE_TYPES} option is {@value} . */ @@ -111,14 +111,14 @@ /** * The static unmodifiable map of default options, which are initialized in the static initializer. */ - protected static final Map<Options, String> DEFAULT_OPTIONS; + protected static final Map<Option, String> DEFAULT_OPTIONS; static { // Initialize the unmodifiable map of default options ... - EnumMap<Options, String> defaults = new EnumMap<Options, String>(Options.class); - defaults.put(Options.PROJECT_NODE_TYPES, DefaultOptions.PROJECT_NODE_TYPES); - defaults.put(Options.JAAS_LOGIN_CONFIG_NAME, DefaultOptions.JAAS_LOGIN_CONFIG_NAME); - DEFAULT_OPTIONS = Collections.<Options, String>unmodifiableMap(defaults); + EnumMap<Option, String> defaults = new EnumMap<Option, String>(Option.class); + defaults.put(Option.PROJECT_NODE_TYPES, DefaultOption.PROJECT_NODE_TYPES); + defaults.put(Option.JAAS_LOGIN_CONFIG_NAME, DefaultOption.JAAS_LOGIN_CONFIG_NAME); + DEFAULT_OPTIONS = Collections.<Option, String>unmodifiableMap(defaults); } private final String sourceName; @@ -126,7 +126,7 @@ private final ExecutionContext executionContext; private final RepositoryConnectionFactory connectionFactory; private final RepositoryNodeTypeManager repositoryTypeManager; - private final Map<Options, String> options; + private final Map<Option, String> options; /** * Creates a JCR repository that uses the supplied {@link RepositoryConnectionFactory repository connection factory} to @@ -160,7 +160,7 @@ RepositoryConnectionFactory connectionFactory, String repositorySourceName, Map<String, String> descriptors, - Map<Options, String> options ) { + Map<Option, String> options ) { CheckArg.isNotNull(executionContext, "executionContext"); CheckArg.isNotNull(connectionFactory, "connectionFactory"); CheckArg.isNotNull(repositorySourceName, "repositorySourceName"); @@ -217,7 +217,7 @@ this.options = DEFAULT_OPTIONS; } else { // Initialize with defaults, then add supplied options ... - EnumMap<Options, String> localOptions = new EnumMap<Options, String>(DEFAULT_OPTIONS); + EnumMap<Option, String> localOptions = new EnumMap<Option, String>(DEFAULT_OPTIONS); localOptions.putAll(options); this.options = Collections.unmodifiableMap(localOptions); } @@ -237,7 +237,7 @@ * * @return the unmodifiable options; never null */ - public Map<Options, String> getOptions() { + public Map<Option, String> getOptions() { return options; } @@ -360,7 +360,7 @@ } catch (NoSuchMethodException error2) { if (credentials instanceof SimpleCredentials) { SimpleCredentials simple = (SimpleCredentials)credentials; - execContext = executionContext.with(options.get(Options.JAAS_LOGIN_CONFIG_NAME), + execContext = executionContext.with(options.get(Option.JAAS_LOGIN_CONFIG_NAME), simple.getUserID(), simple.getPassword()); } else { Modified: trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrWorkspace.java =================================================================== --- trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrWorkspace.java 2009-05-15 16:17:10 UTC (rev 906) +++ trunk/dna-jcr/src/main/java/org/jboss/dna/jcr/JcrWorkspace.java 2009-05-15 16:39:22 UTC (rev 907) @@ -59,7 +59,7 @@ import org.jboss.dna.graph.property.basic.GraphNamespaceRegistry; import org.jboss.dna.jcr.JcrContentHandler.EnclosingSAXException; import org.jboss.dna.jcr.JcrContentHandler.SaveMode; -import org.jboss.dna.jcr.JcrRepository.Options; +import org.jboss.dna.jcr.JcrRepository.Option; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -171,7 +171,7 @@ this.nodeTypeManager = new JcrNodeTypeManager(session.getExecutionContext(), repoTypeManager); this.queryManager = new JcrQueryManager(this.session); - if (Boolean.valueOf(repository.getOptions().get(Options.PROJECT_NODE_TYPES))) { + if (Boolean.valueOf(repository.getOptions().get(Option.PROJECT_NODE_TYPES))) { Path parentOfTypeNodes = context.getValueFactories().getPathFactory().create(systemPath, JcrLexicon.NODE_TYPES); repoTypeManager.projectOnto(this.graph, parentOfTypeNodes); } Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/InMemoryRepositoryStub.java =================================================================== --- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/InMemoryRepositoryStub.java 2009-05-15 16:17:10 UTC (rev 906) +++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/InMemoryRepositoryStub.java 2009-05-15 16:39:22 UTC (rev 907) @@ -34,7 +34,7 @@ import org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource; import org.jboss.dna.graph.io.GraphImporter; import org.jboss.dna.graph.property.Path; -import org.jboss.dna.jcr.JcrRepository.Options; +import org.jboss.dna.jcr.JcrRepository.Option; import org.jboss.security.config.IDTrustConfiguration; /** @@ -72,7 +72,7 @@ .addRepository("JCR Repository") .usingClass(InMemoryRepositorySource.class.getName()) .loadedFromClasspath() - .with(Options.PROJECT_NODE_TYPES).setTo(Boolean.FALSE.toString()) + .with(Option.PROJECT_NODE_TYPES).setTo(Boolean.FALSE.toString()) .describedAs("JCR Repository") .with("name").setTo(REPOSITORY_SOURCE_NAME) .and().build(); Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrConfigurationTest.java =================================================================== --- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrConfigurationTest.java 2009-05-15 16:17:10 UTC (rev 906) +++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrConfigurationTest.java 2009-05-15 16:39:22 UTC (rev 907) @@ -39,7 +39,7 @@ import org.jboss.dna.graph.connector.inmemory.InMemoryRepositorySource; import org.jboss.dna.graph.mimetype.ExtensionBasedMimeTypeDetector; import org.jboss.dna.graph.property.Path; -import org.jboss.dna.jcr.JcrRepository.Options; +import org.jboss.dna.jcr.JcrRepository.Option; import org.jboss.dna.repository.DnaConfiguration; import org.jboss.dna.repository.DnaEngine; import org.jboss.dna.repository.RepositoryLibrary; @@ -265,7 +265,7 @@ .addRepository("Source2") .usingClass(InMemoryRepositorySource.class.getName()) .loadedFromClasspath() - .with(Options.JAAS_LOGIN_CONFIG_NAME).setTo("test") + .with(Option.JAAS_LOGIN_CONFIG_NAME).setTo("test") .describedAs("description") .with("name").setTo("JCR Repository") .and() @@ -282,9 +282,9 @@ JcrRepository repository = engine.getRepository("JCR Repository"); - Map<Options, String> options = new HashMap<Options, String>(); - options.put(Options.JAAS_LOGIN_CONFIG_NAME, "test"); - options.put(Options.PROJECT_NODE_TYPES, "false"); + Map<Option, String> options = new HashMap<Option, String>(); + options.put(Option.JAAS_LOGIN_CONFIG_NAME, "test"); + options.put(Option.PROJECT_NODE_TYPES, "false"); assertThat(repository.getOptions(), is(options)); } Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrRepositoryTest.java =================================================================== --- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrRepositoryTest.java 2009-05-15 16:17:10 UTC (rev 906) +++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/JcrRepositoryTest.java 2009-05-15 16:39:22 UTC (rev 907) @@ -156,8 +156,8 @@ @Test public void shouldHaveDefaultOptionsWhenNotOverridden() { JcrRepository repository = new JcrRepository(context, connectionFactory, sourceName, descriptors, null); - assertThat(repository.getOptions().get(JcrRepository.Options.PROJECT_NODE_TYPES), - is(JcrRepository.DefaultOptions.PROJECT_NODE_TYPES)); + assertThat(repository.getOptions().get(JcrRepository.Option.PROJECT_NODE_TYPES), + is(JcrRepository.DefaultOption.PROJECT_NODE_TYPES)); } @Test Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/MixinTest.java =================================================================== --- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/MixinTest.java 2009-05-15 16:17:10 UTC (rev 906) +++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/MixinTest.java 2009-05-15 16:39:22 UTC (rev 907) @@ -93,7 +93,7 @@ private RepositoryConnectionFactory connectionFactory; private RepositoryNodeTypeManager repoTypeManager; private Map<String, Object> sessionAttributes; - private Map<JcrRepository.Options, String> options; + private Map<JcrRepository.Option, String> options; private NamespaceRegistry registry; @Mock private JcrRepository repository; @@ -152,8 +152,8 @@ stub(repository.getConnectionFactory()).toReturn(connectionFactory); // Stub out the repository options ... - options = new EnumMap<JcrRepository.Options, String>(JcrRepository.Options.class); - options.put(JcrRepository.Options.PROJECT_NODE_TYPES, Boolean.FALSE.toString()); + options = new EnumMap<JcrRepository.Option, String>(JcrRepository.Option.class); + options.put(JcrRepository.Option.PROJECT_NODE_TYPES, Boolean.FALSE.toString()); stub(repository.getOptions()).toReturn(options); // Set up the session attributes ... Modified: trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/RepositoryNodeTypeManagerTest.java =================================================================== --- trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/RepositoryNodeTypeManagerTest.java 2009-05-15 16:17:10 UTC (rev 906) +++ trunk/dna-jcr/src/test/java/org/jboss/dna/jcr/RepositoryNodeTypeManagerTest.java 2009-05-15 16:39:22 UTC (rev 907) @@ -73,7 +73,7 @@ private RepositoryConnectionFactory connectionFactory; private RepositoryNodeTypeManager repoTypeManager; private Map<String, Object> sessionAttributes; - private Map<JcrRepository.Options, String> options; + private Map<JcrRepository.Option, String> options; @Mock private JcrRepository repository; @@ -135,8 +135,8 @@ stub(repository.getConnectionFactory()).toReturn(connectionFactory); // Stub out the repository options ... - options = new EnumMap<JcrRepository.Options, String>(JcrRepository.Options.class); - options.put(JcrRepository.Options.PROJECT_NODE_TYPES, Boolean.TRUE.toString()); + options = new EnumMap<JcrRepository.Option, String>(JcrRepository.Option.class); + options.put(JcrRepository.Option.PROJECT_NODE_TYPES, Boolean.TRUE.toString()); stub(repository.getOptions()).toReturn(options); // Set up the session attributes ...