Made project and folder optional for artifact factory config

Author: michael-schnell

commons/src/main/java/org/fuin/srcgen4j/commons/ArtifactFactoryConfig.java

@@ -44,11 +44,11 @@ public final class ArtifactFactoryConfig extends AbstractElement {
     @XmlAttribute(name = "class")
     private String factoryClassName;
 
-    @NotNull
+    @Nullable
     @XmlAttribute(name = "project")
     private String project;
 
-    @NotNull
+    @Nullable
     @XmlAttribute(name = "folder")
     private String folder;
 
@@ -78,12 +78,12 @@ public final class ArtifactFactoryConfig extends AbstractElement {
      * @param factoryClassName
      *            Full qualified factory class name.
      * @param project
-     *            Name of the target project.
+     *            Name of the target project (optional).
      * @param folder
-     *            Name of the target folder inside the project.
+     *            Name of the target folder inside the project (optional).
      */
-    public ArtifactFactoryConfig(final String artifact, final String factoryClassName, final String project,
-            final String folder) {
+    public ArtifactFactoryConfig(final String artifact, final String factoryClassName, @Nullable final String project,
+            @Nullable final String folder) {
         this(artifact, factoryClassName, project, folder, null);
     }
 
@@ -95,14 +95,14 @@ public ArtifactFactoryConfig(final String artifact, final String factoryClassNam
      * @param factoryClassName
      *            Full qualified factory class name.
      * @param project
-     *            Name of the target project.
+     *            Name of the target project (optional).
      * @param folder
-     *            Name of the target folder inside the project.
+     *            Name of the target folder inside the project (optional).
      * @param incremental
      *            If the factory executes on an incremental build TRUE (default), else FALSE.
      */
-    public ArtifactFactoryConfig(final String artifact, final String factoryClassName, final String project, // NOSONAR
-            final String folder, @Nullable final Boolean incremental) {
+    public ArtifactFactoryConfig(final String artifact, final String factoryClassName, @Nullable final String project, // NOSONAR
+            @Nullable final String folder, @Nullable final Boolean incremental) {
         super();
         this.artifact = artifact;
         this.factoryClassName = factoryClassName;
@@ -132,17 +132,19 @@ public final String getFactoryClassName() {
     /**
      * Returns the name of the target project.
      *
-     * @return Project name.
+     * @return Project name or <code>null</code> if not set.
      */
+    @Nullable
     public final String getProject() {
         return project;
     }
 
     /**
      * Returns the name of the target folder inside the project.
      *
-     * @return Folder name.
+     * @return Folder name or <code>null</code> if not set.
      */
+    @Nullable
     public final String getFolder() {
         return folder;
     }

commons/src/main/resources/srcgen4j-commons-0_5_0.xsd

@@ -115,8 +115,8 @@
       </xs:sequence>
     <xs:attribute type="xs:string" name="artifact" use="required" />
     <xs:attribute type="xs:string" name="class" use="required" />
-    <xs:attribute type="xs:string" name="project" use="required" />
-    <xs:attribute type="xs:string" name="folder" use="required" />
+    <xs:attribute type="xs:string" name="project" use="optional" />
+    <xs:attribute type="xs:string" name="folder" use="optional" />
     <xs:attribute type="xs:boolean" name="incremental" use="optional" />
   </xs:complexType>
 

commons/src/test/java/org/fuin/srcgen4j/commons/ArtifactFactoryConfigTest.java

@@ -70,6 +70,25 @@ public final void testUnmarshal() throws Exception {
 
     }
 
+    @Test
+    public final void testUnmarshalWithoutProjectAndFolder() throws Exception {
+
+        // PREPARE
+        final JAXBContext jaxbContext = JAXBContext.newInstance(ArtifactFactoryConfig.class);
+
+        // TEST
+        final ArtifactFactoryConfig testee = JaxbUtils.unmarshal(new UnmarshallerBuilder().withContext(jaxbContext).build(),
+                "<artifact-factory artifact=\"abc\" class=\"a.b.c.X\"" + " xmlns=\"" + NS_SG4JC + "\"/>");
+
+        // VERIFY project and folder are optional
+        assertThat(testee).isNotNull();
+        assertThat(testee.getArtifact()).isEqualTo("abc");
+        assertThat(testee.getFactoryClassName()).isEqualTo("a.b.c.X");
+        assertThat(testee.getProject()).isNull();
+        assertThat(testee.getFolder()).isNull();
+
+    }
+
     @Test
     public final void testGetFactory() {