Rename root name generation plugin

CJSCommonPlatform · Sep 21, 2017 · 9b993d4 · 9b993d4
1 parent 1e1ca60
commit 9b993d4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/...on-test/src/test/java/uk/gov/justice/generation/pojo/integration/utils/GeneratorUtil.java b/...on-test/src/test/java/uk/gov/justice/generation/pojo/integration/utils/GeneratorUtil.java
@@ -23,7 +23,7 @@
 import uk.gov.justice.generation.pojo.plugin.classmodifying.PluginContext;
 import uk.gov.justice.generation.pojo.plugin.classmodifying.builder.BuilderGeneratorFactory;
 import uk.gov.justice.generation.pojo.plugin.classmodifying.properties.AdditionalPropertiesDeterminer;
-import uk.gov.justice.generation.pojo.plugin.namegeneratable.RootFieldNameGeneratorPlugin;
+import uk.gov.justice.generation.pojo.plugin.namegeneratable.RootNameGeneratorPlugin;
 import uk.gov.justice.generation.pojo.plugin.typemodifying.CustomReturnTypePlugin;
 import uk.gov.justice.generation.pojo.plugin.typemodifying.SupportJavaOptionalsPlugin;
 import uk.gov.justice.generation.pojo.plugin.typemodifying.TypeModifyingPlugin;
@@ -95,7 +95,7 @@ public List<Class<?>> generateAndCompileJavaSource(final File jsonSchemaFile,
         final PluginProvider pluginProvider = new ModifyingPluginProvider(
                 classModifyingPlugins,
                 typeModifyingPlugins,
-                new RootFieldNameGeneratorPlugin());
+                new RootNameGeneratorPlugin());
 
         final String fieldName = pluginProvider
                 .nameGeneratablePlugin()

diff --git a/...rator-core/src/main/java/uk/gov/justice/generation/pojo/plugin/PluginProviderFactory.java b/...rator-core/src/main/java/uk/gov/justice/generation/pojo/plugin/PluginProviderFactory.java
@@ -11,7 +11,7 @@
 import uk.gov.justice.generation.pojo.plugin.classmodifying.GenerateBuilderForClassPlugin;
 import uk.gov.justice.generation.pojo.plugin.classmodifying.builder.BuilderGeneratorFactory;
 import uk.gov.justice.generation.pojo.plugin.namegeneratable.NameGeneratablePlugin;
-import uk.gov.justice.generation.pojo.plugin.namegeneratable.RootFieldNameGeneratorPlugin;
+import uk.gov.justice.generation.pojo.plugin.namegeneratable.RootNameGeneratorPlugin;
 import uk.gov.justice.generation.pojo.plugin.typemodifying.TypeModifyingPlugin;
 import uk.gov.justice.maven.generator.io.files.parser.core.GeneratorConfig;
 
@@ -111,7 +111,7 @@ private NameGeneratablePlugin defaultOrUserDefinedNameGeneratablePlugin(final Ma
             return (NameGeneratablePlugin) nameGeneratablePlugins.get(FIRST_INDEX);
         }
 
-        return new RootFieldNameGeneratorPlugin();
+        return new RootNameGeneratorPlugin();
     }
 
     private Map<Class<?>, List<Object>> partitionPluginsAccordingToType(final Map<String, String> generatorProperties) {

diff --git a/...ratable/RootFieldNameGeneratorPlugin.java → ...egeneratable/RootNameGeneratorPlugin.java b/...ratable/RootFieldNameGeneratorPlugin.java → ...egeneratable/RootNameGeneratorPlugin.java
@@ -23,7 +23,7 @@
  *
  * somethingHasHappened
  */
-public class RootFieldNameGeneratorPlugin implements NameGeneratablePlugin {
+public class RootNameGeneratorPlugin implements NameGeneratablePlugin {
 
     @Override
     public String rootFieldNameFrom(final Schema schema, final String schemaFilename) {

diff --git a/...r-core/src/test/java/uk/gov/justice/generation/pojo/plugin/PluginProviderFactoryTest.java b/...r-core/src/test/java/uk/gov/justice/generation/pojo/plugin/PluginProviderFactoryTest.java
@@ -11,7 +11,7 @@
 import uk.gov.justice.generation.pojo.plugin.classmodifying.AddFieldsAndMethodsToClassPlugin;
 import uk.gov.justice.generation.pojo.plugin.classmodifying.GenerateBuilderForClassPlugin;
 import uk.gov.justice.generation.pojo.plugin.classmodifying.MakeClassSerializablePlugin;
-import uk.gov.justice.generation.pojo.plugin.namegeneratable.RootFieldNameGeneratorPlugin;
+import uk.gov.justice.generation.pojo.plugin.namegeneratable.RootNameGeneratorPlugin;
 import uk.gov.justice.generation.pojo.plugin.testplugins.UserDefinedNameGeneratorPlugin;
 import uk.gov.justice.generation.pojo.plugin.typemodifying.CustomReturnTypePlugin;
 import uk.gov.justice.generation.pojo.plugin.typemodifying.SupportJavaOptionalsPlugin;
@@ -172,7 +172,7 @@ public void shouldReturnProviderWithDefaultNameGeneratablePlugin() throws Except
 
         final PluginProvider pluginProvider = new PluginProviderFactory().createFor(generatorConfig);
 
-        assertThat(pluginProvider.nameGeneratablePlugin(), is(instanceOf(RootFieldNameGeneratorPlugin.class)));
+        assertThat(pluginProvider.nameGeneratablePlugin(), is(instanceOf(RootNameGeneratorPlugin.class)));
     }
 
     @Test

diff --git a/...ble/RootFieldNameGeneratorPluginTest.java → ...eratable/RootNameGeneratorPluginTest.java b/...ble/RootFieldNameGeneratorPluginTest.java → ...eratable/RootNameGeneratorPluginTest.java
@@ -12,13 +12,13 @@
 import org.mockito.runners.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-public class RootFieldNameGeneratorPluginTest {
+public class RootNameGeneratorPluginTest {
 
     @Mock
     private Schema schema;
 
     @InjectMocks
-    private RootFieldNameGeneratorPlugin nameGenerator;
+    private RootNameGeneratorPlugin nameGenerator;
 
     @Test
     public void shouldParseTheFileNameIntoAValidJavaClassName() throws Exception {