add factory for the generator plugin

CJSCommonPlatform · Nov 21, 2017 · 0c080d3 · 0c080d3
1 parent cfb3b61
commit 0c080d3
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 22 deletions.
diff --git a/catalog-generation-plugin-it/pom.xml b/catalog-generation-plugin-it/pom.xml
@@ -22,7 +22,7 @@
                         <id>internal-jsons</id>
                         <configuration>
                             <generatorName>
-                                uk.gov.justice.schema.catalog.generation.MavenCatalogGenerator
+                                uk.gov.justice.schema.catalog.generation.maven.MavenCatalogGeneratorFactory
                             </generatorName>
                             <parserName>
                                 uk.gov.justice.schema.catalog.generation.io.parser.ListOfUriParser

diff --git a/...log/generation/MavenCatalogGenerator.java → ...neration/maven/MavenCatalogGenerator.java b/...log/generation/MavenCatalogGenerator.java → ...neration/maven/MavenCatalogGenerator.java
@@ -1,24 +1,18 @@
-package uk.gov.justice.schema.catalog.generation;
+package uk.gov.justice.schema.catalog.generation.maven;
 
 import uk.gov.justice.maven.generator.io.files.parser.core.Generator;
 import uk.gov.justice.maven.generator.io.files.parser.core.GeneratorConfig;
-import uk.gov.justice.schema.catalog.generation.maven.CatalogGeneratorProperties;
+import uk.gov.justice.schema.catalog.generation.CatalogGenerationRunner;
+import uk.gov.justice.schema.catalog.generation.ObjectFactory;
 
 import java.net.URI;
 import java.nio.file.Path;
 import java.util.List;
 
-import com.google.common.annotations.VisibleForTesting;
-
 public class MavenCatalogGenerator implements Generator<List<URI>> {
 
     private final ObjectFactory objectFactory;
 
-    public MavenCatalogGenerator() {
-        this(new ObjectFactory());
-    }
-
-    @VisibleForTesting
     public MavenCatalogGenerator(final ObjectFactory objectFactory) {
         this.objectFactory = objectFactory;
     }

diff --git a/...ain/java/uk/gov/justice/schema/catalog/generation/maven/MavenCatalogGeneratorFactory.java b/...ain/java/uk/gov/justice/schema/catalog/generation/maven/MavenCatalogGeneratorFactory.java
@@ -0,0 +1,16 @@
+package uk.gov.justice.schema.catalog.generation.maven;
+
+import uk.gov.justice.maven.generator.io.files.parser.core.Generator;
+import uk.gov.justice.maven.generator.io.files.parser.core.GeneratorFactory;
+import uk.gov.justice.schema.catalog.generation.ObjectFactory;
+
+import java.net.URI;
+import java.util.List;
+
+public class MavenCatalogGeneratorFactory implements GeneratorFactory<List<URI>> {
+
+    @Override
+    public Generator<List<URI>> create() {
+        return new MavenCatalogGenerator(new ObjectFactory());
+    }
+}
diff --git a/...java/uk/gov/justice/schema/catalog/generation/maven/MavenCatalogGeneratorFactoryTest.java b/...java/uk/gov/justice/schema/catalog/generation/maven/MavenCatalogGeneratorFactoryTest.java
@@ -0,0 +1,33 @@
+package uk.gov.justice.schema.catalog.generation.maven;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+import uk.gov.justice.maven.generator.io.files.parser.core.Generator;
+
+import java.net.URI;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.runners.MockitoJUnitRunner;
+
+
+@RunWith(MockitoJUnitRunner.class)
+public class MavenCatalogGeneratorFactoryTest {
+
+    @InjectMocks
+    private MavenCatalogGeneratorFactory mavenCatalogGeneratorFactory;
+
+    @Test
+    public void shouldCreateAMavenCatalogGenerator() throws Exception {
+
+        final Generator<List<URI>> generator = mavenCatalogGeneratorFactory.create();
+
+        assertThat(generator, is(notNullValue()));
+        assertThat(generator, is(instanceOf(MavenCatalogGenerator.class)));
+    }
+}
diff --git a/...generation/MavenCatalogGeneratorTest.java → ...tion/maven/MavenCatalogGeneratorTest.java b/...generation/MavenCatalogGeneratorTest.java → ...tion/maven/MavenCatalogGeneratorTest.java
@@ -1,15 +1,13 @@
-package uk.gov.justice.schema.catalog.generation;
+package uk.gov.justice.schema.catalog.generation.maven;
 
 import static java.util.Collections.singletonList;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import uk.gov.justice.maven.generator.io.files.parser.core.GeneratorConfig;
-import uk.gov.justice.schema.catalog.generation.maven.CatalogGeneratorProperties;
+import uk.gov.justice.schema.catalog.generation.CatalogGenerationRunner;
+import uk.gov.justice.schema.catalog.generation.ObjectFactory;
 
 import java.net.URI;
 import java.nio.file.Path;
@@ -53,9 +51,4 @@ public void shouldInstantiateAndRunTheCatalogGeneration() throws Exception {
 
         verify(catalogGenerationRunner).generateCatalog(catalogName, schemaFiles, catalogGenerationPath, jsonSchemaPath);
     }
-
-    @Test
-    public void shouldAddThisTestToStopCoverallsFromWhingeing() throws Exception {
-        assertThat(new MavenCatalogGenerator(), is(instanceOf(MavenCatalogGenerator.class)));
-    }
 }
diff --git a/schema-example-context/schema-example-command-api/pom.xml b/schema-example-context/schema-example-command-api/pom.xml
@@ -23,7 +23,7 @@
                         <id>internal-jsons</id>
                         <configuration>
                             <generatorName>
-                                uk.gov.justice.schema.catalog.generation.MavenCatalogGenerator
+                                uk.gov.justice.schema.catalog.generation.maven.MavenCatalogGeneratorFactory
                             </generatorName>
                             <parserName>
                                 uk.gov.justice.schema.catalog.generation.io.parser.ListOfUriParser

diff --git a/schema-example-context/schema-example-standards/pom.xml b/schema-example-context/schema-example-standards/pom.xml
@@ -22,7 +22,7 @@
                         <id>internal-jsons</id>
                         <configuration>
                             <generatorName>
-                                uk.gov.justice.schema.catalog.generation.MavenCatalogGenerator
+                                uk.gov.justice.schema.catalog.generation.maven.MavenCatalogGeneratorFactory
                             </generatorName>
                             <parserName>
                                 uk.gov.justice.schema.catalog.generation.io.parser.ListOfUriParser