From 1700cd0afb9e66fde8928ec275c6b0f586040129 Mon Sep 17 00:00:00 2001 From: amckenzie Date: Wed, 30 Aug 2017 14:17:22 +0100 Subject: [PATCH] use better names/naming for java classes --- .../pojo/integration/test/ArrayIT.java | 12 +- .../integration/test/CombinedSchemaIT.java | 12 +- .../integration/test/ComplexSchemaIT.java | 12 +- .../integration/test/DefinitionBuilderIT.java | 12 +- .../integration/test/SchemaValidationIT.java | 14 +-- ...enerator.java => SchemaPojoGenerator.java} | 20 +++- .../pojo/core/JsonSchemaParseException.java | 8 -- .../generation/pojo/core/NameGenerator.java | 4 +- .../pojo/core/SchemaLoadingException.java | 8 ++ .../validation/SchemaValidatorVisitor.java | 4 +- .../visitable/JsonSchemaWrapperFactory.java | 12 -- ...chemaWrapper.java => VisitableSchema.java} | 12 +- .../visitable/VisitableSchemaFactory.java | 12 ++ ...sonSchemaAcceptor.java => Acceptable.java} | 2 +- ...eptorFactory.java => AcceptorFactory.java} | 4 +- ...SchemaAcceptor.java => ArrayAcceptor.java} | 10 +- ...hemaAcceptor.java => BooleanAcceptor.java} | 2 +- ...emaAcceptor.java => CombinedAcceptor.java} | 10 +- .../acceptor/DefaultAcceptorFactory.java | 46 ++++++++ .../DefaultJsonSchemaAcceptorFactory.java | 46 -------- ...mSchemaAcceptor.java => EnumAcceptor.java} | 2 +- ...chemaAcceptor.java => NumberAcceptor.java} | 2 +- ...chemaAcceptor.java => ObjectAcceptor.java} | 10 +- ...maAcceptor.java => ReferenceAcceptor.java} | 10 +- ...chemaAcceptor.java => StringAcceptor.java} | 2 +- .../write/NonDuplicatingSourceWriter.java | 4 +- ...Test.java => SchemaPojoGeneratorTest.java} | 12 +- .../pojo/core/NameGeneratorTest.java | 6 +- ...t.java => VisitableSchemaFactoryTest.java} | 10 +- ...pperTest.java => VisitableSchemaTest.java} | 106 +++++++++--------- ...ceptorTest.java => ArrayAcceptorTest.java} | 26 ++--- ...ptorTest.java => BooleanAcceptorTest.java} | 4 +- ...torTest.java => CombinedAcceptorTest.java} | 14 +-- ...t.java => DefaultAcceptorFactoryTest.java} | 36 +++--- ...cceptorTest.java => EnumAcceptorTest.java} | 6 +- ...eptorTest.java => NumberAcceptorTest.java} | 6 +- ...eptorTest.java => ObjectAcceptorTest.java} | 14 +-- ...orTest.java => ReferenceAcceptorTest.java} | 10 +- ...eptorTest.java => StringAcceptorTest.java} | 6 +- .../write/NonDuplicatingSourceWriterTest.java | 6 +- pojo-plugin-it/pom.xml | 4 +- 41 files changed, 284 insertions(+), 274 deletions(-) rename pojo-generator-core/src/main/java/uk/gov/justice/generation/{SchemaToJavaGenerator.java => SchemaPojoGenerator.java} (80%) delete mode 100644 pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/JsonSchemaParseException.java create mode 100644 pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/SchemaLoadingException.java delete mode 100644 pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperFactory.java rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/{JsonSchemaWrapper.java => VisitableSchema.java} (63%) create mode 100644 pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaFactory.java rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{JsonSchemaAcceptor.java => Acceptable.java} (86%) rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{JsonSchemaAcceptorFactory.java => AcceptorFactory.java} (69%) rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{ArraySchemaAcceptor.java => ArrayAcceptor.java} (72%) rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{BooleanSchemaAcceptor.java => BooleanAcceptor.java} (84%) rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{CombinedSchemaAcceptor.java => CombinedAcceptor.java} (58%) create mode 100644 pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultAcceptorFactory.java delete mode 100644 pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultJsonSchemaAcceptorFactory.java rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{EnumSchemaAcceptor.java => EnumAcceptor.java} (85%) rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{NumberSchemaAcceptor.java => NumberAcceptor.java} (84%) rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{ObjectSchemaAcceptor.java => ObjectAcceptor.java} (57%) rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{ReferenceSchemaAcceptor.java => ReferenceAcceptor.java} (55%) rename pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/{StringSchemaAcceptor.java => StringAcceptor.java} (84%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/{SchemaToJavaGeneratorTest.java => SchemaPojoGeneratorTest.java} (89%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/{JsonSchemaWrapperFactoryTest.java => VisitableSchemaFactoryTest.java} (58%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/{JsonSchemaWrapperTest.java => VisitableSchemaTest.java} (51%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/{ArraySchemaAcceptorTest.java => ArrayAcceptorTest.java} (64%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/{BooleanSchemaAcceptorTest.java => BooleanAcceptorTest.java} (83%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/{CombinedSchemaAcceptorTest.java => CombinedAcceptorTest.java} (72%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/{DefaultJsonSchemaAcceptorFactoryTest.java => DefaultAcceptorFactoryTest.java} (64%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/{EnumSchemaAcceptorTest.java => EnumAcceptorTest.java} (75%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/{NumberSchemaAcceptorTest.java => NumberAcceptorTest.java} (74%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/{ObjectSchemaAcceptorTest.java => ObjectAcceptorTest.java} (73%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/{ReferenceSchemaAcceptorTest.java => ReferenceAcceptorTest.java} (73%) rename pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/{StringSchemaAcceptorTest.java => StringAcceptorTest.java} (74%) diff --git a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/ArrayIT.java b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/ArrayIT.java index 4feb31d..7711b82 100644 --- a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/ArrayIT.java +++ b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/ArrayIT.java @@ -11,9 +11,9 @@ import uk.gov.justice.generation.pojo.core.NameGenerator; import uk.gov.justice.generation.pojo.generators.JavaGeneratorFactory; import uk.gov.justice.generation.pojo.integration.utils.ClassCompiler; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapper; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapperFactory; -import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultJsonSchemaAcceptorFactory; +import uk.gov.justice.generation.pojo.visitable.VisitableSchema; +import uk.gov.justice.generation.pojo.visitable.VisitableSchemaFactory; +import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultAcceptorFactory; import uk.gov.justice.generation.pojo.visitor.DefaultDefinitionFactory; import uk.gov.justice.generation.pojo.visitor.DefinitionBuilderVisitor; import uk.gov.justice.generation.pojo.write.SourceWriter; @@ -66,10 +66,10 @@ public void shouldAnArraySchemaDocumentWithAnArrayOfItemSchemas() throws Excepti final String fieldName = rootFieldNameGenerator.rootFieldNameFrom(jsonSchemaFile); final DefinitionBuilderVisitor definitionBuilderVisitor = new DefinitionBuilderVisitor("uk.gov.justice.pojo.arrays", definitionFactory); - final JsonSchemaWrapperFactory jsonSchemaWrapperFactory = new JsonSchemaWrapperFactory(); - final JsonSchemaWrapper jsonSchemaWrapper = jsonSchemaWrapperFactory.createWith(schema, new DefaultJsonSchemaAcceptorFactory(jsonSchemaWrapperFactory)); + final VisitableSchemaFactory visitableSchemaFactory = new VisitableSchemaFactory(); + final VisitableSchema visitableSchema = visitableSchemaFactory.createWith(schema, new DefaultAcceptorFactory(visitableSchemaFactory)); - jsonSchemaWrapper.accept(fieldName, definitionBuilderVisitor); + visitableSchema.accept(fieldName, definitionBuilderVisitor); final List> newClasses = new ArrayList<>(); diff --git a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/CombinedSchemaIT.java b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/CombinedSchemaIT.java index de99a8a..687c9f4 100644 --- a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/CombinedSchemaIT.java +++ b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/CombinedSchemaIT.java @@ -11,9 +11,9 @@ import uk.gov.justice.generation.pojo.core.NameGenerator; import uk.gov.justice.generation.pojo.generators.JavaGeneratorFactory; import uk.gov.justice.generation.pojo.integration.utils.ClassCompiler; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapper; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapperFactory; -import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultJsonSchemaAcceptorFactory; +import uk.gov.justice.generation.pojo.visitable.VisitableSchema; +import uk.gov.justice.generation.pojo.visitable.VisitableSchemaFactory; +import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultAcceptorFactory; import uk.gov.justice.generation.pojo.visitor.DefaultDefinitionFactory; import uk.gov.justice.generation.pojo.visitor.DefinitionBuilderVisitor; import uk.gov.justice.generation.pojo.write.SourceWriter; @@ -66,10 +66,10 @@ public void shouldParseAVeryComplexSchemaDocument() throws Exception { final String fieldName = rootFieldNameGenerator.rootFieldNameFrom(jsonSchemaFile); final DefinitionBuilderVisitor definitionBuilderVisitor = new DefinitionBuilderVisitor("uk.gov.justice.pojo.combined.schema", definitionFactory); - final JsonSchemaWrapperFactory jsonSchemaWrapperFactory = new JsonSchemaWrapperFactory(); - final JsonSchemaWrapper jsonSchemaWrapper = jsonSchemaWrapperFactory.createWith(schema, new DefaultJsonSchemaAcceptorFactory(jsonSchemaWrapperFactory)); + final VisitableSchemaFactory visitableSchemaFactory = new VisitableSchemaFactory(); + final VisitableSchema visitableSchema = visitableSchemaFactory.createWith(schema, new DefaultAcceptorFactory(visitableSchemaFactory)); - jsonSchemaWrapper.accept(fieldName, definitionBuilderVisitor); + visitableSchema.accept(fieldName, definitionBuilderVisitor); final List> newClasses = new ArrayList<>(); diff --git a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/ComplexSchemaIT.java b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/ComplexSchemaIT.java index 5f639a1..27dcd40 100644 --- a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/ComplexSchemaIT.java +++ b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/ComplexSchemaIT.java @@ -7,9 +7,9 @@ import uk.gov.justice.generation.pojo.core.NameGenerator; import uk.gov.justice.generation.pojo.generators.JavaGeneratorFactory; import uk.gov.justice.generation.pojo.integration.utils.ClassCompiler; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapper; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapperFactory; -import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultJsonSchemaAcceptorFactory; +import uk.gov.justice.generation.pojo.visitable.VisitableSchema; +import uk.gov.justice.generation.pojo.visitable.VisitableSchemaFactory; +import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultAcceptorFactory; import uk.gov.justice.generation.pojo.visitor.DefaultDefinitionFactory; import uk.gov.justice.generation.pojo.visitor.DefinitionBuilderVisitor; import uk.gov.justice.generation.pojo.write.SourceWriter; @@ -55,10 +55,10 @@ public void shouldParseAVeryComplexSchemaDocument() throws Exception { final String fieldName = nameGenerator.rootFieldNameFrom(jsonSchemaFile); final DefinitionBuilderVisitor definitionBuilderVisitor = new DefinitionBuilderVisitor("uk.gov.justice.pojo.complex.schema", definitionFactory); - final JsonSchemaWrapperFactory jsonSchemaWrapperFactory = new JsonSchemaWrapperFactory(); - final JsonSchemaWrapper jsonSchemaWrapper = jsonSchemaWrapperFactory.createWith(schema, new DefaultJsonSchemaAcceptorFactory(jsonSchemaWrapperFactory)); + final VisitableSchemaFactory visitableSchemaFactory = new VisitableSchemaFactory(); + final VisitableSchema visitableSchema = visitableSchemaFactory.createWith(schema, new DefaultAcceptorFactory(visitableSchemaFactory)); - jsonSchemaWrapper.accept(fieldName, definitionBuilderVisitor); + visitableSchema.accept(fieldName, definitionBuilderVisitor); javaGeneratorFactory .createClassGeneratorsFor(definitionBuilderVisitor.getDefinitions()) diff --git a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/DefinitionBuilderIT.java b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/DefinitionBuilderIT.java index 0e54772..81f7f46 100644 --- a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/DefinitionBuilderIT.java +++ b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/DefinitionBuilderIT.java @@ -13,9 +13,9 @@ import uk.gov.justice.generation.pojo.generators.ClassGeneratable; import uk.gov.justice.generation.pojo.generators.JavaGeneratorFactory; import uk.gov.justice.generation.pojo.integration.utils.ClassCompiler; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapper; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapperFactory; -import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultJsonSchemaAcceptorFactory; +import uk.gov.justice.generation.pojo.visitable.VisitableSchema; +import uk.gov.justice.generation.pojo.visitable.VisitableSchemaFactory; +import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultAcceptorFactory; import uk.gov.justice.generation.pojo.visitor.DefaultDefinitionFactory; import uk.gov.justice.generation.pojo.visitor.DefinitionBuilderVisitor; import uk.gov.justice.generation.pojo.write.SourceWriter; @@ -65,10 +65,10 @@ public void shouldBuildTypeSpecFromSchema() throws Exception { final DefinitionBuilderVisitor definitionBuilderVisitor = new DefinitionBuilderVisitor("uk.gov.justice.pojo.definition.builder", definitionFactory); - final JsonSchemaWrapperFactory jsonSchemaWrapperFactory = new JsonSchemaWrapperFactory(); - final JsonSchemaWrapper jsonSchemaWrapper = jsonSchemaWrapperFactory.createWith(schema, new DefaultJsonSchemaAcceptorFactory(jsonSchemaWrapperFactory)); + final VisitableSchemaFactory visitableSchemaFactory = new VisitableSchemaFactory(); + final VisitableSchema visitableSchema = visitableSchemaFactory.createWith(schema, new DefaultAcceptorFactory(visitableSchemaFactory)); - jsonSchemaWrapper.accept(fieldName, definitionBuilderVisitor); + visitableSchema.accept(fieldName, definitionBuilderVisitor); final ClassDefinition personClassDefinition = (ClassDefinition) definitionBuilderVisitor.getDefinitions().get(0); diff --git a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/SchemaValidationIT.java b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/SchemaValidationIT.java index 30418ee..8ba64da 100644 --- a/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/SchemaValidationIT.java +++ b/integration-test/src/test/java/uk/gov/justice/generation/pojo/integration/test/SchemaValidationIT.java @@ -8,9 +8,9 @@ import uk.gov.justice.generation.pojo.core.UnsupportedSchemaException; import uk.gov.justice.generation.pojo.validation.SchemaValidatorVisitor; import uk.gov.justice.generation.pojo.validation.Validator; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapper; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapperFactory; -import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultJsonSchemaAcceptorFactory; +import uk.gov.justice.generation.pojo.visitable.VisitableSchema; +import uk.gov.justice.generation.pojo.visitable.VisitableSchemaFactory; +import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultAcceptorFactory; import java.io.File; @@ -27,10 +27,10 @@ public void shouldFailValidationIfAnEnumContainsDiversTypesOfValues() throws Exc final File jsonSchemaFile = new File("src/test/resources/invalid-schemas/invalid-enum.json"); final Schema schema = schemaLoader.loadFrom(jsonSchemaFile); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapperFactory().createWith(schema, new DefaultJsonSchemaAcceptorFactory(new JsonSchemaWrapperFactory())); + final VisitableSchema visitableSchema = new VisitableSchemaFactory().createWith(schema, new DefaultAcceptorFactory(new VisitableSchemaFactory())); try { - jsonSchemaWrapper.accept("", schemaValidatorVisitor); + visitableSchema.accept("", schemaValidatorVisitor); fail(); } catch (final UnsupportedSchemaException expected) { assertThat(expected.getMessage(), is("Enums must have members of the same type. Found java.lang.String, java.lang.Boolean out of possible values [Mr, false, Ms, 23, Mrs]")); @@ -42,10 +42,10 @@ public void shouldFailValidationIfAnArrayContainsDiversTypesOfValues() throws Ex final File jsonSchemaFile = new File("src/test/resources/invalid-schemas/invalid-array.json"); final Schema schema = schemaLoader.loadFrom(jsonSchemaFile); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapperFactory().createWith(schema, new DefaultJsonSchemaAcceptorFactory(new JsonSchemaWrapperFactory())); + final VisitableSchema visitableSchema = new VisitableSchemaFactory().createWith(schema, new DefaultAcceptorFactory(new VisitableSchemaFactory())); try { - jsonSchemaWrapper.accept("", schemaValidatorVisitor); + visitableSchema.accept("", schemaValidatorVisitor); fail(); } catch (final UnsupportedSchemaException expected) { assertThat(expected.getMessage(), is("Arrays must have members of the same type. Found org.everit.json.schema.NumberSchema, org.everit.json.schema.StringSchema")); diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/SchemaToJavaGenerator.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/SchemaPojoGenerator.java similarity index 80% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/SchemaToJavaGenerator.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/SchemaPojoGenerator.java index 2a421e0..83e1412 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/SchemaToJavaGenerator.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/SchemaPojoGenerator.java @@ -1,13 +1,15 @@ package uk.gov.justice.generation; +import static java.lang.String.format; + import uk.gov.justice.generation.io.files.loader.SchemaLoader; import uk.gov.justice.generation.pojo.core.ClassNameProvider; import uk.gov.justice.generation.pojo.core.GenerationContext; import uk.gov.justice.generation.pojo.core.NameGenerator; import uk.gov.justice.generation.pojo.generators.JavaGeneratorFactory; import uk.gov.justice.generation.pojo.validation.FileNameValidator; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapperFactory; -import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultJsonSchemaAcceptorFactory; +import uk.gov.justice.generation.pojo.visitable.VisitableSchemaFactory; +import uk.gov.justice.generation.pojo.visitable.acceptor.DefaultAcceptorFactory; import uk.gov.justice.generation.pojo.visitor.DefaultDefinitionFactory; import uk.gov.justice.generation.pojo.visitor.DefinitionBuilderVisitor; import uk.gov.justice.generation.pojo.write.JavaSourceFileProvider; @@ -19,28 +21,34 @@ import java.io.File; import org.everit.json.schema.Schema; +import org.slf4j.Logger; -public class SchemaToJavaGenerator implements Generator { +public class SchemaPojoGenerator implements Generator { private final SourceWriter sourceWriter = new SourceWriter(); private final JavaGeneratorFactory javaGeneratorFactory = new JavaGeneratorFactory(); private final NameGenerator nameGenerator = new NameGenerator(); private final FileNameValidator fileNameValidator = new FileNameValidator(); private final SchemaLoader schemaLoader = new SchemaLoader(); - private JsonSchemaWrapperFactory jsonSchemaWrapperFactory = new JsonSchemaWrapperFactory(); + private final VisitableSchemaFactory visitableSchemaFactory = new VisitableSchemaFactory(); @Override public void run(final File source, final GeneratorConfig generatorConfig) { + final NonDuplicatingSourceWriter writer = new NonDuplicatingSourceWriter(new JavaSourceFileProvider(), sourceWriter); final GenerationContext generationContext = new GenerationContext(generatorConfig.getOutputDirectory()); + final Logger logger = generationContext.getLoggerFor(getClass()); + + logger.info("Generating java pojos from schema file '{}'", source.getName()); + final Schema schema = schemaLoader.loadFrom(source); final String fieldName = nameGenerator.rootFieldNameFrom(source); final DefinitionBuilderVisitor definitionBuilderVisitor = constructDefinitionBuilderVisitor(source, generatorConfig.getBasePackageName()); - final DefaultJsonSchemaAcceptorFactory jsonSchemaAcceptorFactory = new DefaultJsonSchemaAcceptorFactory(jsonSchemaWrapperFactory); + final DefaultAcceptorFactory jsonSchemaAcceptorFactory = new DefaultAcceptorFactory(visitableSchemaFactory); - jsonSchemaWrapperFactory.createWith(schema, jsonSchemaAcceptorFactory) + visitableSchemaFactory.createWith(schema, jsonSchemaAcceptorFactory) .accept(fieldName, definitionBuilderVisitor); javaGeneratorFactory diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/JsonSchemaParseException.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/JsonSchemaParseException.java deleted file mode 100644 index 8d421bf..0000000 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/JsonSchemaParseException.java +++ /dev/null @@ -1,8 +0,0 @@ -package uk.gov.justice.generation.pojo.core; - -public class JsonSchemaParseException extends RuntimeException { - - public JsonSchemaParseException(final String message) { - super(message); - } -} diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/NameGenerator.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/NameGenerator.java index 83bc057..b8cddf5 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/NameGenerator.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/NameGenerator.java @@ -18,7 +18,7 @@ public String rootFieldNameFrom(final File jsonSchemaFile) { final String name = getNameFrom(fileName); if (name.contains(".") || name.isEmpty()) { - throw new JsonSchemaParseException(format("Failed to load json schema file '%s'. File name is invalid", jsonSchemaFile.getAbsolutePath())); + throw new SchemaLoadingException(format("Failed to load json schema file '%s'. File name is invalid", jsonSchemaFile.getAbsolutePath())); } final String className = Stream.of(name.split("-")).map(StringUtils::capitalize).collect(joining()); @@ -34,7 +34,7 @@ private String getValidFileNameWithNoExtension(final File jsonSchemaFile) { final String fileName = jsonSchemaFile.getName(); if (!fileName.endsWith(".json")) { - throw new JsonSchemaParseException(format("Failed to load json schema file '%s'. File does not have a '.json' extension", jsonSchemaFile.getAbsolutePath())); + throw new SchemaLoadingException(format("Failed to load json schema file '%s'. File does not have a '.json' extension", jsonSchemaFile.getAbsolutePath())); } return removeFileExtensionFrom(fileName); diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/SchemaLoadingException.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/SchemaLoadingException.java new file mode 100644 index 0000000..01637ae --- /dev/null +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/core/SchemaLoadingException.java @@ -0,0 +1,8 @@ +package uk.gov.justice.generation.pojo.core; + +public class SchemaLoadingException extends RuntimeException { + + public SchemaLoadingException(final String message) { + super(message); + } +} diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/validation/SchemaValidatorVisitor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/validation/SchemaValidatorVisitor.java index 0822382..cb25b51 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/validation/SchemaValidatorVisitor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/validation/SchemaValidatorVisitor.java @@ -1,5 +1,7 @@ package uk.gov.justice.generation.pojo.validation; +import uk.gov.justice.generation.pojo.visitor.Visitor; + import org.everit.json.schema.ArraySchema; import org.everit.json.schema.BooleanSchema; import org.everit.json.schema.CombinedSchema; @@ -8,7 +10,7 @@ import org.everit.json.schema.ObjectSchema; import org.everit.json.schema.StringSchema; -public class SchemaValidatorVisitor implements uk.gov.justice.generation.pojo.visitor.Visitor { +public class SchemaValidatorVisitor implements Visitor { private final Validator validator; diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperFactory.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperFactory.java deleted file mode 100644 index 8fb949b..0000000 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperFactory.java +++ /dev/null @@ -1,12 +0,0 @@ -package uk.gov.justice.generation.pojo.visitable; - -import uk.gov.justice.generation.pojo.visitable.acceptor.JsonSchemaAcceptorFactory; - -import org.everit.json.schema.Schema; - -public class JsonSchemaWrapperFactory { - - public JsonSchemaWrapper createWith(final Schema schema, final JsonSchemaAcceptorFactory schemaAcceptorFactory) { - return new JsonSchemaWrapper(schema, schemaAcceptorFactory); - } -} diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapper.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/VisitableSchema.java similarity index 63% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapper.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/VisitableSchema.java index 1a2b2ae..cb4dc88 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapper.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/VisitableSchema.java @@ -3,27 +3,27 @@ import static java.lang.String.format; import uk.gov.justice.generation.pojo.core.UnsupportedSchemaException; -import uk.gov.justice.generation.pojo.visitable.acceptor.JsonSchemaAcceptor; -import uk.gov.justice.generation.pojo.visitable.acceptor.JsonSchemaAcceptorFactory; +import uk.gov.justice.generation.pojo.visitable.acceptor.Acceptable; +import uk.gov.justice.generation.pojo.visitable.acceptor.AcceptorFactory; import uk.gov.justice.generation.pojo.visitor.Visitor; import java.util.Map; import org.everit.json.schema.Schema; -public class JsonSchemaWrapper implements Visitable { +public class VisitableSchema implements Visitable { private final Schema schema; - private final JsonSchemaAcceptorFactory jsonAcceptorFactory; + private final AcceptorFactory jsonAcceptorFactory; - public JsonSchemaWrapper(final Schema schema, final JsonSchemaAcceptorFactory jsonAcceptorFactory) { + public VisitableSchema(final Schema schema, final AcceptorFactory jsonAcceptorFactory) { this.schema = schema; this.jsonAcceptorFactory = jsonAcceptorFactory; } @Override public void accept(final String fieldName, final Visitor visitor) { - final Map, JsonSchemaAcceptor> acceptorMap = jsonAcceptorFactory.acceptorMap(); + final Map, Acceptable> acceptorMap = jsonAcceptorFactory.acceptorMap(); if (acceptorMap.containsKey(schema.getClass())) { acceptorMap.get(schema.getClass()).accept(fieldName, visitor, schema); diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaFactory.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaFactory.java new file mode 100644 index 0000000..70f647a --- /dev/null +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaFactory.java @@ -0,0 +1,12 @@ +package uk.gov.justice.generation.pojo.visitable; + +import uk.gov.justice.generation.pojo.visitable.acceptor.AcceptorFactory; + +import org.everit.json.schema.Schema; + +public class VisitableSchemaFactory { + + public VisitableSchema createWith(final Schema schema, final AcceptorFactory acceptorFactory) { + return new VisitableSchema(schema, acceptorFactory); + } +} diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/JsonSchemaAcceptor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/Acceptable.java similarity index 86% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/JsonSchemaAcceptor.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/Acceptable.java index 6c36a82..196b40c 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/JsonSchemaAcceptor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/Acceptable.java @@ -4,7 +4,7 @@ import org.everit.json.schema.Schema; -public interface JsonSchemaAcceptor { +public interface Acceptable { void accept(final String fieldName, final Visitor visitor, final Schema schema); } diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/JsonSchemaAcceptorFactory.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/AcceptorFactory.java similarity index 69% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/JsonSchemaAcceptorFactory.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/AcceptorFactory.java index 6b65dfc..e9598c2 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/JsonSchemaAcceptorFactory.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/AcceptorFactory.java @@ -6,9 +6,9 @@ import org.everit.json.schema.Schema; -public interface JsonSchemaAcceptorFactory { +public interface AcceptorFactory { - Map, JsonSchemaAcceptor> acceptorMap(); + Map, Acceptable> acceptorMap(); void visitSchema(String fieldName, Visitor visitor, Schema childSchema); } diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArraySchemaAcceptor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArrayAcceptor.java similarity index 72% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArraySchemaAcceptor.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArrayAcceptor.java index 7862144..df71ee0 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArraySchemaAcceptor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArrayAcceptor.java @@ -5,12 +5,12 @@ import org.everit.json.schema.ArraySchema; import org.everit.json.schema.Schema; -public class ArraySchemaAcceptor implements JsonSchemaAcceptor { +public class ArrayAcceptor implements Acceptable { - private final JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private final AcceptorFactory acceptorFactory; - public ArraySchemaAcceptor(final JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory) { - this.jsonSchemaAcceptorFactory = jsonSchemaAcceptorFactory; + public ArrayAcceptor(final AcceptorFactory acceptorFactory) { + this.acceptorFactory = acceptorFactory; } @Override @@ -30,7 +30,7 @@ public void accept(final String fieldName, final Visitor visitor, final Schema s private void acceptArraySchema(final String fieldName, final ArraySchema arraySchema, final Schema schema, final Visitor visitor) { visitor.enter(fieldName, arraySchema); - jsonSchemaAcceptorFactory.visitSchema(fieldName, visitor, schema); + acceptorFactory.visitSchema(fieldName, visitor, schema); visitor.leave(arraySchema); } } diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanSchemaAcceptor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanAcceptor.java similarity index 84% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanSchemaAcceptor.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanAcceptor.java index 5489a8f..9983676 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanSchemaAcceptor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanAcceptor.java @@ -5,7 +5,7 @@ import org.everit.json.schema.BooleanSchema; import org.everit.json.schema.Schema; -public class BooleanSchemaAcceptor implements JsonSchemaAcceptor { +public class BooleanAcceptor implements Acceptable { @Override public void accept(final String fieldName, final Visitor visitor, final Schema schema) { diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedSchemaAcceptor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedAcceptor.java similarity index 58% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedSchemaAcceptor.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedAcceptor.java index 9793ca8..b5a74c6 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedSchemaAcceptor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedAcceptor.java @@ -7,12 +7,12 @@ import org.everit.json.schema.CombinedSchema; import org.everit.json.schema.Schema; -public class CombinedSchemaAcceptor implements JsonSchemaAcceptor { +public class CombinedAcceptor implements Acceptable { - private final JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private final AcceptorFactory acceptorFactory; - public CombinedSchemaAcceptor(final JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory) { - this.jsonSchemaAcceptorFactory = jsonSchemaAcceptorFactory; + public CombinedAcceptor(final AcceptorFactory acceptorFactory) { + this.acceptorFactory = acceptorFactory; } @Override @@ -22,7 +22,7 @@ public void accept(final String fieldName, final Visitor visitor, final Schema s final Collection subschemas = combinedSchema.getSubschemas(); visitor.enter(fieldName, combinedSchema); - subschemas.forEach(childSchema -> jsonSchemaAcceptorFactory.visitSchema(fieldName, visitor, childSchema)); + subschemas.forEach(childSchema -> acceptorFactory.visitSchema(fieldName, visitor, childSchema)); visitor.leave(combinedSchema); } } diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultAcceptorFactory.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultAcceptorFactory.java new file mode 100644 index 0000000..c7bd287 --- /dev/null +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultAcceptorFactory.java @@ -0,0 +1,46 @@ +package uk.gov.justice.generation.pojo.visitable.acceptor; + +import uk.gov.justice.generation.pojo.visitable.VisitableSchemaFactory; +import uk.gov.justice.generation.pojo.visitor.Visitor; + +import java.util.HashMap; +import java.util.Map; + +import org.everit.json.schema.ArraySchema; +import org.everit.json.schema.BooleanSchema; +import org.everit.json.schema.CombinedSchema; +import org.everit.json.schema.EnumSchema; +import org.everit.json.schema.NumberSchema; +import org.everit.json.schema.ObjectSchema; +import org.everit.json.schema.ReferenceSchema; +import org.everit.json.schema.Schema; +import org.everit.json.schema.StringSchema; + +public class DefaultAcceptorFactory implements AcceptorFactory { + + private final Map, Acceptable> acceptorMap = new HashMap<>(); + private final VisitableSchemaFactory visitableSchemaFactory; + + public DefaultAcceptorFactory(final VisitableSchemaFactory visitableSchemaFactory) { + this.visitableSchemaFactory = visitableSchemaFactory; + + acceptorMap.put(ArraySchema.class, new ArrayAcceptor(this)); + acceptorMap.put(CombinedSchema.class, new CombinedAcceptor(this)); + acceptorMap.put(ObjectSchema.class, new ObjectAcceptor(this)); + acceptorMap.put(ReferenceSchema.class, new ReferenceAcceptor(this)); + acceptorMap.put(StringSchema.class, new StringAcceptor()); + acceptorMap.put(BooleanSchema.class, new BooleanAcceptor()); + acceptorMap.put(NumberSchema.class, new NumberAcceptor()); + acceptorMap.put(EnumSchema.class, new EnumAcceptor()); + } + + @Override + public Map, Acceptable> acceptorMap() { + return acceptorMap; + } + + @Override + public void visitSchema(final String fieldName, final Visitor visitor, final Schema schema) { + visitableSchemaFactory.createWith(schema, this).accept(fieldName, visitor); + } +} diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultJsonSchemaAcceptorFactory.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultJsonSchemaAcceptorFactory.java deleted file mode 100644 index 390e7e2..0000000 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultJsonSchemaAcceptorFactory.java +++ /dev/null @@ -1,46 +0,0 @@ -package uk.gov.justice.generation.pojo.visitable.acceptor; - -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapperFactory; -import uk.gov.justice.generation.pojo.visitor.Visitor; - -import java.util.HashMap; -import java.util.Map; - -import org.everit.json.schema.ArraySchema; -import org.everit.json.schema.BooleanSchema; -import org.everit.json.schema.CombinedSchema; -import org.everit.json.schema.EnumSchema; -import org.everit.json.schema.NumberSchema; -import org.everit.json.schema.ObjectSchema; -import org.everit.json.schema.ReferenceSchema; -import org.everit.json.schema.Schema; -import org.everit.json.schema.StringSchema; - -public class DefaultJsonSchemaAcceptorFactory implements JsonSchemaAcceptorFactory { - - private final Map, JsonSchemaAcceptor> acceptorMap = new HashMap<>(); - private final JsonSchemaWrapperFactory jsonSchemaWrapperFactory; - - public DefaultJsonSchemaAcceptorFactory(final JsonSchemaWrapperFactory jsonSchemaWrapperFactory) { - this.jsonSchemaWrapperFactory = jsonSchemaWrapperFactory; - - acceptorMap.put(ArraySchema.class, new ArraySchemaAcceptor(this)); - acceptorMap.put(CombinedSchema.class, new CombinedSchemaAcceptor(this)); - acceptorMap.put(ObjectSchema.class, new ObjectSchemaAcceptor(this)); - acceptorMap.put(ReferenceSchema.class, new ReferenceSchemaAcceptor(this)); - acceptorMap.put(StringSchema.class, new StringSchemaAcceptor()); - acceptorMap.put(BooleanSchema.class, new BooleanSchemaAcceptor()); - acceptorMap.put(NumberSchema.class, new NumberSchemaAcceptor()); - acceptorMap.put(EnumSchema.class, new EnumSchemaAcceptor()); - } - - @Override - public Map, JsonSchemaAcceptor> acceptorMap() { - return acceptorMap; - } - - @Override - public void visitSchema(final String fieldName, final Visitor visitor, final Schema schema) { - jsonSchemaWrapperFactory.createWith(schema, this).accept(fieldName, visitor); - } -} diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumSchemaAcceptor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumAcceptor.java similarity index 85% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumSchemaAcceptor.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumAcceptor.java index 26b9889..ec40b8d 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumSchemaAcceptor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumAcceptor.java @@ -5,7 +5,7 @@ import org.everit.json.schema.EnumSchema; import org.everit.json.schema.Schema; -public class EnumSchemaAcceptor implements JsonSchemaAcceptor { +public class EnumAcceptor implements Acceptable { @Override public void accept(final String fieldName, final Visitor visitor, final Schema schema) { diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberSchemaAcceptor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberAcceptor.java similarity index 84% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberSchemaAcceptor.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberAcceptor.java index a1bd271..1b58179 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberSchemaAcceptor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberAcceptor.java @@ -5,7 +5,7 @@ import org.everit.json.schema.NumberSchema; import org.everit.json.schema.Schema; -public class NumberSchemaAcceptor implements JsonSchemaAcceptor { +public class NumberAcceptor implements Acceptable { @Override public void accept(final String fieldName, final Visitor visitor, final Schema schema) { diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectSchemaAcceptor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectAcceptor.java similarity index 57% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectSchemaAcceptor.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectAcceptor.java index 9026d6d..b11f38c 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectSchemaAcceptor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectAcceptor.java @@ -7,12 +7,12 @@ import org.everit.json.schema.ObjectSchema; import org.everit.json.schema.Schema; -public class ObjectSchemaAcceptor implements JsonSchemaAcceptor { +public class ObjectAcceptor implements Acceptable { - private final JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private final AcceptorFactory acceptorFactory; - public ObjectSchemaAcceptor(final JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory) { - this.jsonSchemaAcceptorFactory = jsonSchemaAcceptorFactory; + public ObjectAcceptor(final AcceptorFactory acceptorFactory) { + this.acceptorFactory = acceptorFactory; } @Override @@ -22,7 +22,7 @@ public void accept(final String fieldName, final Visitor visitor, final Schema s final Map propertySchemas = objectSchema.getPropertySchemas(); visitor.enter(fieldName, objectSchema); - propertySchemas.forEach((childName, childSchema) -> jsonSchemaAcceptorFactory.visitSchema(childName, visitor, childSchema)); + propertySchemas.forEach((childName, childSchema) -> acceptorFactory.visitSchema(childName, visitor, childSchema)); visitor.leave(objectSchema); } } diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceSchemaAcceptor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceAcceptor.java similarity index 55% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceSchemaAcceptor.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceAcceptor.java index 13cf68c..7ad5c8d 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceSchemaAcceptor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceAcceptor.java @@ -5,18 +5,18 @@ import org.everit.json.schema.ReferenceSchema; import org.everit.json.schema.Schema; -public class ReferenceSchemaAcceptor implements JsonSchemaAcceptor { +public class ReferenceAcceptor implements Acceptable { - private final JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private final AcceptorFactory acceptorFactory; - public ReferenceSchemaAcceptor(final JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory) { - this.jsonSchemaAcceptorFactory = jsonSchemaAcceptorFactory; + public ReferenceAcceptor(final AcceptorFactory acceptorFactory) { + this.acceptorFactory = acceptorFactory; } @Override public void accept(final String fieldName, final Visitor visitor, final Schema schema) { final ReferenceSchema referenceSchema = (ReferenceSchema) schema; final Schema referredSchema = referenceSchema.getReferredSchema(); - jsonSchemaAcceptorFactory.visitSchema(fieldName, visitor, referredSchema); + acceptorFactory.visitSchema(fieldName, visitor, referredSchema); } } diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringSchemaAcceptor.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringAcceptor.java similarity index 84% rename from pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringSchemaAcceptor.java rename to pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringAcceptor.java index b3285c6..c86971e 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringSchemaAcceptor.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringAcceptor.java @@ -5,7 +5,7 @@ import org.everit.json.schema.Schema; import org.everit.json.schema.StringSchema; -public class StringSchemaAcceptor implements JsonSchemaAcceptor { +public class StringAcceptor implements Acceptable { @Override public void accept(final String fieldName, final Visitor visitor, final Schema schema) { diff --git a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/write/NonDuplicatingSourceWriter.java b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/write/NonDuplicatingSourceWriter.java index baadc34..4cb1138 100644 --- a/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/write/NonDuplicatingSourceWriter.java +++ b/pojo-generator-core/src/main/java/uk/gov/justice/generation/pojo/write/NonDuplicatingSourceWriter.java @@ -30,12 +30,12 @@ public File write(final ClassGeneratable classGeneratable, final GenerationConte sourceWriter.write(classGeneratable, generationContext.getOutputDirectoryPath()); if (sourceFile.exists()) { - logger.info("Wrote new Java file '%s'", sourceFile.getName()); + logger.info("Wrote new Java file '{}'", sourceFile.getName()); } else { throw new SourceCodeWriteException(format("Failed to write java file '%s'", sourceFile.getAbsolutePath())); } } else { - logger.info("Skipping generation, Java file already exists '%s'", sourceFile.getAbsolutePath()); + logger.info("Skipping generation, Java file already exists: '{}'", sourceFile.getAbsolutePath()); } return sourceFile; diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/SchemaToJavaGeneratorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/SchemaPojoGeneratorTest.java similarity index 89% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/SchemaToJavaGeneratorTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/SchemaPojoGeneratorTest.java index eab6d07..1630c30 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/SchemaToJavaGeneratorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/SchemaPojoGeneratorTest.java @@ -21,7 +21,7 @@ import org.junit.Test; -public class SchemaToJavaGeneratorTest { +public class SchemaPojoGeneratorTest { @Test public void shouldConvertSchemaFileToJavaPojo() throws Exception { @@ -31,9 +31,9 @@ public void shouldConvertSchemaFileToJavaPojo() throws Exception { when(generatorConfig.getOutputDirectory()).thenReturn(Paths.get("target/test-generation")); when(generatorConfig.getBasePackageName()).thenReturn("uk.gov.justice.generation.pojo"); - final SchemaToJavaGenerator schemaToJavaGenerator = new SchemaToJavaGenerator(); + final SchemaPojoGenerator schemaPojoGenerator = new SchemaPojoGenerator(); - schemaToJavaGenerator.run(schemaFile, generatorConfig); + schemaPojoGenerator.run(schemaFile, generatorConfig); final File directory = Paths.get("target/test-generation/uk/gov/justice/generation/pojo").toFile(); assertThat(directory.exists(), is(true)); @@ -56,9 +56,9 @@ public void shouldConvertSchemaFileToJavaPojoWithEventAnnotation() throws Except when(generatorConfig.getOutputDirectory()).thenReturn(Paths.get("target/test-generation")); when(generatorConfig.getBasePackageName()).thenReturn("uk.gov.justice.generation.event"); - final SchemaToJavaGenerator schemaToJavaGenerator = new SchemaToJavaGenerator(); + final SchemaPojoGenerator schemaPojoGenerator = new SchemaPojoGenerator(); - schemaToJavaGenerator.run(schemaFile, generatorConfig); + schemaPojoGenerator.run(schemaFile, generatorConfig); final File directory = Paths.get("target/test-generation/uk/gov/justice/generation/event").toFile(); assertThat(directory.exists(), is(true)); @@ -78,4 +78,4 @@ private String loadFileAsString(final Path path) throws IOException { return IOUtils.toString(reader); } } -} \ No newline at end of file +} diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/core/NameGeneratorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/core/NameGeneratorTest.java index 0f28fbc..8c70a3e 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/core/NameGeneratorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/core/NameGeneratorTest.java @@ -46,7 +46,7 @@ public void shouldFailIfTheFileNameDoesNotHaveTheExtensionJson() throws Exceptio try { nameGenerator.rootFieldNameFrom(schemaFile); fail(); - } catch (final JsonSchemaParseException expected) { + } catch (final SchemaLoadingException expected) { assertThat(expected.getMessage(), is("Failed to load json schema file '" + schemaFile.getAbsolutePath() + "'. File does not have a '.json' extension")); } } @@ -58,7 +58,7 @@ public void shouldFailIfTheFileNameIsOnlyTheExtendion() throws Exception { try { nameGenerator.rootFieldNameFrom(schemaFile); fail(); - } catch (final JsonSchemaParseException expected) { + } catch (final SchemaLoadingException expected) { assertThat(expected.getMessage(), is("Failed to load json schema file '" + schemaFile.getAbsolutePath() + "'. File name is invalid")); } } @@ -70,7 +70,7 @@ public void shouldFailIfTheFileNameIsOnlyADot() throws Exception { try { nameGenerator.rootFieldNameFrom(schemaFile); fail(); - } catch (final JsonSchemaParseException expected) { + } catch (final SchemaLoadingException expected) { assertThat(expected.getMessage(), is("Failed to load json schema file '" + schemaFile.getAbsolutePath() + "'. File name is invalid")); } } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperFactoryTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaFactoryTest.java similarity index 58% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperFactoryTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaFactoryTest.java index 8fa6694..7cd10c5 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperFactoryTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaFactoryTest.java @@ -4,7 +4,7 @@ import static org.junit.Assert.assertThat; import static org.mockito.Mockito.mock; -import uk.gov.justice.generation.pojo.visitable.acceptor.JsonSchemaAcceptorFactory; +import uk.gov.justice.generation.pojo.visitable.acceptor.AcceptorFactory; import org.everit.json.schema.ObjectSchema; import org.junit.Test; @@ -14,18 +14,18 @@ @RunWith(MockitoJUnitRunner.class) -public class JsonSchemaWrapperFactoryTest { +public class VisitableSchemaFactoryTest { @InjectMocks - private JsonSchemaWrapperFactory jsonSchemaWrapperFactory; + private VisitableSchemaFactory visitableSchemaFactory; @Test public void shouldCreateANewJsonSchemaWrapper() throws Exception { final ObjectSchema objectSchema = mock(ObjectSchema.class); - final JsonSchemaWrapper jsonSchemaWrapper = jsonSchemaWrapperFactory.createWith(objectSchema, mock(JsonSchemaAcceptorFactory.class)); + final VisitableSchema visitableSchema = visitableSchemaFactory.createWith(objectSchema, mock(AcceptorFactory.class)); - assertThat(jsonSchemaWrapper.getSchema(), is(objectSchema)); + assertThat(visitableSchema.getSchema(), is(objectSchema)); } } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaTest.java similarity index 51% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaTest.java index 572cd5e..069e90d 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/JsonSchemaWrapperTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/VisitableSchemaTest.java @@ -6,8 +6,8 @@ import static org.mockito.Mockito.when; import uk.gov.justice.generation.pojo.core.UnsupportedSchemaException; -import uk.gov.justice.generation.pojo.visitable.acceptor.JsonSchemaAcceptor; -import uk.gov.justice.generation.pojo.visitable.acceptor.JsonSchemaAcceptorFactory; +import uk.gov.justice.generation.pojo.visitable.acceptor.Acceptable; +import uk.gov.justice.generation.pojo.visitable.acceptor.AcceptorFactory; import uk.gov.justice.generation.pojo.visitor.Visitor; import java.util.Map; @@ -30,7 +30,7 @@ @RunWith(MockitoJUnitRunner.class) -public class JsonSchemaWrapperTest { +public class VisitableSchemaTest { @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -39,7 +39,7 @@ public class JsonSchemaWrapperTest { private Visitor visitor; @Mock - private JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private AcceptorFactory acceptorFactory; @Test public void shouldVisitObjectSchema() { @@ -47,16 +47,16 @@ public void shouldVisitObjectSchema() { final ObjectSchema objectSchema = ObjectSchema.builder().id(fieldName).build(); final Map acceptorMap = mock(Map.class); - final JsonSchemaAcceptor jsonSchemaAcceptor = mock(JsonSchemaAcceptor.class); + final Acceptable acceptable = mock(Acceptable.class); - when(jsonSchemaAcceptorFactory.acceptorMap()).thenReturn(acceptorMap); + when(acceptorFactory.acceptorMap()).thenReturn(acceptorMap); when(acceptorMap.containsKey(ObjectSchema.class)).thenReturn(true); - when(acceptorMap.get(ObjectSchema.class)).thenReturn(jsonSchemaAcceptor); + when(acceptorMap.get(ObjectSchema.class)).thenReturn(acceptable); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapper(objectSchema, jsonSchemaAcceptorFactory); - jsonSchemaWrapper.accept(fieldName, visitor); + final VisitableSchema visitableSchema = new VisitableSchema(objectSchema, acceptorFactory); + visitableSchema.accept(fieldName, visitor); - verify(jsonSchemaAcceptor).accept(fieldName, visitor, objectSchema); + verify(acceptable).accept(fieldName, visitor, objectSchema); } @Test @@ -66,16 +66,16 @@ public void shouldVisitStringSchema() { final StringSchema stringSchema = StringSchema.builder().build(); final Map acceptorMap = mock(Map.class); - final JsonSchemaAcceptor jsonSchemaAcceptor = mock(JsonSchemaAcceptor.class); + final Acceptable acceptable = mock(Acceptable.class); - when(jsonSchemaAcceptorFactory.acceptorMap()).thenReturn(acceptorMap); + when(acceptorFactory.acceptorMap()).thenReturn(acceptorMap); when(acceptorMap.containsKey(StringSchema.class)).thenReturn(true); - when(acceptorMap.get(StringSchema.class)).thenReturn(jsonSchemaAcceptor); + when(acceptorMap.get(StringSchema.class)).thenReturn(acceptable); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapper(stringSchema, jsonSchemaAcceptorFactory); - jsonSchemaWrapper.accept(fieldName, visitor); + final VisitableSchema visitableSchema = new VisitableSchema(stringSchema, acceptorFactory); + visitableSchema.accept(fieldName, visitor); - verify(jsonSchemaAcceptor).accept(fieldName, visitor, stringSchema); + verify(acceptable).accept(fieldName, visitor, stringSchema); } @Test @@ -84,16 +84,16 @@ public void shouldVisitBooleanSchema() { final BooleanSchema booleanSchema = BooleanSchema.builder().build(); final Map acceptorMap = mock(Map.class); - final JsonSchemaAcceptor jsonSchemaAcceptor = mock(JsonSchemaAcceptor.class); + final Acceptable acceptable = mock(Acceptable.class); - when(jsonSchemaAcceptorFactory.acceptorMap()).thenReturn(acceptorMap); + when(acceptorFactory.acceptorMap()).thenReturn(acceptorMap); when(acceptorMap.containsKey(BooleanSchema.class)).thenReturn(true); - when(acceptorMap.get(BooleanSchema.class)).thenReturn(jsonSchemaAcceptor); + when(acceptorMap.get(BooleanSchema.class)).thenReturn(acceptable); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapper(booleanSchema, jsonSchemaAcceptorFactory); - jsonSchemaWrapper.accept(fieldName, visitor); + final VisitableSchema visitableSchema = new VisitableSchema(booleanSchema, acceptorFactory); + visitableSchema.accept(fieldName, visitor); - verify(jsonSchemaAcceptor).accept(fieldName, visitor, booleanSchema); + verify(acceptable).accept(fieldName, visitor, booleanSchema); } @Test @@ -102,16 +102,16 @@ public void shouldVisitNumberSchema() { final NumberSchema numberSchema = NumberSchema.builder().build(); final Map acceptorMap = mock(Map.class); - final JsonSchemaAcceptor jsonSchemaAcceptor = mock(JsonSchemaAcceptor.class); + final Acceptable acceptable = mock(Acceptable.class); - when(jsonSchemaAcceptorFactory.acceptorMap()).thenReturn(acceptorMap); + when(acceptorFactory.acceptorMap()).thenReturn(acceptorMap); when(acceptorMap.containsKey(NumberSchema.class)).thenReturn(true); - when(acceptorMap.get(NumberSchema.class)).thenReturn(jsonSchemaAcceptor); + when(acceptorMap.get(NumberSchema.class)).thenReturn(acceptable); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapper(numberSchema, jsonSchemaAcceptorFactory); - jsonSchemaWrapper.accept(fieldName, visitor); + final VisitableSchema visitableSchema = new VisitableSchema(numberSchema, acceptorFactory); + visitableSchema.accept(fieldName, visitor); - verify(jsonSchemaAcceptor).accept(fieldName, visitor, numberSchema); + verify(acceptable).accept(fieldName, visitor, numberSchema); } @Test @@ -120,16 +120,16 @@ public void shouldVisitEnumSchema() { final EnumSchema enumSchema = EnumSchema.builder().build(); final Map acceptorMap = mock(Map.class); - final JsonSchemaAcceptor jsonSchemaAcceptor = mock(JsonSchemaAcceptor.class); + final Acceptable acceptable = mock(Acceptable.class); - when(jsonSchemaAcceptorFactory.acceptorMap()).thenReturn(acceptorMap); + when(acceptorFactory.acceptorMap()).thenReturn(acceptorMap); when(acceptorMap.containsKey(EnumSchema.class)).thenReturn(true); - when(acceptorMap.get(EnumSchema.class)).thenReturn(jsonSchemaAcceptor); + when(acceptorMap.get(EnumSchema.class)).thenReturn(acceptable); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapper(enumSchema, jsonSchemaAcceptorFactory); - jsonSchemaWrapper.accept(fieldName, visitor); + final VisitableSchema visitableSchema = new VisitableSchema(enumSchema, acceptorFactory); + visitableSchema.accept(fieldName, visitor); - verify(jsonSchemaAcceptor).accept(fieldName, visitor, enumSchema); + verify(acceptable).accept(fieldName, visitor, enumSchema); } @Test @@ -138,16 +138,16 @@ public void shouldReferenceSchema() { final ReferenceSchema referenceSchema = ReferenceSchema.builder().build(); final Map acceptorMap = mock(Map.class); - final JsonSchemaAcceptor jsonSchemaAcceptor = mock(JsonSchemaAcceptor.class); + final Acceptable acceptable = mock(Acceptable.class); - when(jsonSchemaAcceptorFactory.acceptorMap()).thenReturn(acceptorMap); + when(acceptorFactory.acceptorMap()).thenReturn(acceptorMap); when(acceptorMap.containsKey(ReferenceSchema.class)).thenReturn(true); - when(acceptorMap.get(ReferenceSchema.class)).thenReturn(jsonSchemaAcceptor); + when(acceptorMap.get(ReferenceSchema.class)).thenReturn(acceptable); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapper(referenceSchema, jsonSchemaAcceptorFactory); - jsonSchemaWrapper.accept(fieldName, visitor); + final VisitableSchema visitableSchema = new VisitableSchema(referenceSchema, acceptorFactory); + visitableSchema.accept(fieldName, visitor); - verify(jsonSchemaAcceptor).accept(fieldName, visitor, referenceSchema); + verify(acceptable).accept(fieldName, visitor, referenceSchema); } @Test @@ -156,16 +156,16 @@ public void shouldVisitArraySchema() { final ArraySchema arraySchema = ArraySchema.builder().build(); final Map acceptorMap = mock(Map.class); - final JsonSchemaAcceptor jsonSchemaAcceptor = mock(JsonSchemaAcceptor.class); + final Acceptable acceptable = mock(Acceptable.class); - when(jsonSchemaAcceptorFactory.acceptorMap()).thenReturn(acceptorMap); + when(acceptorFactory.acceptorMap()).thenReturn(acceptorMap); when(acceptorMap.containsKey(ArraySchema.class)).thenReturn(true); - when(acceptorMap.get(ArraySchema.class)).thenReturn(jsonSchemaAcceptor); + when(acceptorMap.get(ArraySchema.class)).thenReturn(acceptable); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapper(arraySchema, jsonSchemaAcceptorFactory); - jsonSchemaWrapper.accept(fieldName, visitor); + final VisitableSchema visitableSchema = new VisitableSchema(arraySchema, acceptorFactory); + visitableSchema.accept(fieldName, visitor); - verify(jsonSchemaAcceptor).accept(fieldName, visitor, arraySchema); + verify(acceptable).accept(fieldName, visitor, arraySchema); } @Test @@ -174,16 +174,16 @@ public void shouldVisitCombinedSchema() { final CombinedSchema combinedSchema = CombinedSchema.builder().criterion(ANY_CRITERION).build(); final Map acceptorMap = mock(Map.class); - final JsonSchemaAcceptor jsonSchemaAcceptor = mock(JsonSchemaAcceptor.class); + final Acceptable acceptable = mock(Acceptable.class); - when(jsonSchemaAcceptorFactory.acceptorMap()).thenReturn(acceptorMap); + when(acceptorFactory.acceptorMap()).thenReturn(acceptorMap); when(acceptorMap.containsKey(CombinedSchema.class)).thenReturn(true); - when(acceptorMap.get(CombinedSchema.class)).thenReturn(jsonSchemaAcceptor); + when(acceptorMap.get(CombinedSchema.class)).thenReturn(acceptable); - final JsonSchemaWrapper jsonSchemaWrapper = new JsonSchemaWrapper(combinedSchema, jsonSchemaAcceptorFactory); - jsonSchemaWrapper.accept(fieldName, visitor); + final VisitableSchema visitableSchema = new VisitableSchema(combinedSchema, acceptorFactory); + visitableSchema.accept(fieldName, visitor); - verify(jsonSchemaAcceptor).accept(fieldName, visitor, combinedSchema); + verify(acceptable).accept(fieldName, visitor, combinedSchema); } @Test @@ -195,7 +195,7 @@ public void shouldThrowExceptionIfUnknownSchemaProcessed() throws Exception { final String fieldName = "myDummy"; final DummySchema dummySchema = new DummySchema(builder, fieldName); - new JsonSchemaWrapper(dummySchema, jsonSchemaAcceptorFactory).accept(fieldName, mock(Visitor.class)); + new VisitableSchema(dummySchema, acceptorFactory).accept(fieldName, mock(Visitor.class)); } private class DummySchema extends Schema { diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArraySchemaAcceptorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArrayAcceptorTest.java similarity index 64% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArraySchemaAcceptorTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArrayAcceptorTest.java index 93df4c0..08daa29 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArraySchemaAcceptorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ArrayAcceptorTest.java @@ -5,7 +5,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapper; +import uk.gov.justice.generation.pojo.visitable.VisitableSchema; import uk.gov.justice.generation.pojo.visitor.Visitor; import org.everit.json.schema.ArraySchema; @@ -18,13 +18,13 @@ import org.mockito.runners.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class ArraySchemaAcceptorTest { +public class ArrayAcceptorTest { @Mock - private JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private AcceptorFactory acceptorFactory; @InjectMocks - private ArraySchemaAcceptor arraySchemaAcceptor; + private ArrayAcceptor arrayAcceptor; @Test public void shouldAcceptArraySchemaWithAnAllItemSchema() throws Exception { @@ -36,12 +36,12 @@ public void shouldAcceptArraySchemaWithAnAllItemSchema() throws Exception { when(arraySchema.getAllItemSchema()).thenReturn(allItemSchema); - arraySchemaAcceptor.accept(fieldName, visitor, arraySchema); + arrayAcceptor.accept(fieldName, visitor, arraySchema); - final InOrder inOrder = inOrder(visitor, jsonSchemaAcceptorFactory); + final InOrder inOrder = inOrder(visitor, acceptorFactory); inOrder.verify(visitor).enter(fieldName, arraySchema); - inOrder.verify(jsonSchemaAcceptorFactory).visitSchema(fieldName, visitor, allItemSchema); + inOrder.verify(acceptorFactory).visitSchema(fieldName, visitor, allItemSchema); inOrder.verify(visitor).leave(arraySchema); } @@ -53,19 +53,19 @@ public void shouldAcceptArraySchemaWithAListOfItemSchemas() throws Exception { final ArraySchema arraySchema = mock(ArraySchema.class); final Schema itemSchema_1 = mock(Schema.class); final Schema itemSchema_2 = mock(Schema.class); - final JsonSchemaWrapper jsonSchemaWrapper_1 = mock(JsonSchemaWrapper.class); - final JsonSchemaWrapper jsonSchemaWrapper_2 = mock(JsonSchemaWrapper.class); + final VisitableSchema visitableSchema_1 = mock(VisitableSchema.class); + final VisitableSchema visitableSchema_2 = mock(VisitableSchema.class); when(arraySchema.getAllItemSchema()).thenReturn(null); when(arraySchema.getItemSchemas()).thenReturn(asList(itemSchema_1, itemSchema_2)); - arraySchemaAcceptor.accept(fieldName, visitor, arraySchema); + arrayAcceptor.accept(fieldName, visitor, arraySchema); - final InOrder inOrder = inOrder(visitor, jsonSchemaAcceptorFactory); + final InOrder inOrder = inOrder(visitor, acceptorFactory); inOrder.verify(visitor).enter(fieldName, arraySchema); - inOrder.verify(jsonSchemaAcceptorFactory).visitSchema(fieldName, visitor, itemSchema_1); - inOrder.verify(jsonSchemaAcceptorFactory).visitSchema(fieldName, visitor, itemSchema_2); + inOrder.verify(acceptorFactory).visitSchema(fieldName, visitor, itemSchema_1); + inOrder.verify(acceptorFactory).visitSchema(fieldName, visitor, itemSchema_2); inOrder.verify(visitor).leave(arraySchema); } } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanSchemaAcceptorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanAcceptorTest.java similarity index 83% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanSchemaAcceptorTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanAcceptorTest.java index d7e2b6b..b5dd9a1 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanSchemaAcceptorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/BooleanAcceptorTest.java @@ -8,14 +8,14 @@ import org.everit.json.schema.BooleanSchema; import org.junit.Test; -public class BooleanSchemaAcceptorTest { +public class BooleanAcceptorTest { @Test public void shouldVisitBooleanSchema() throws Exception { final String fieldName = "fieldName"; final BooleanSchema booleanSchema = mock(BooleanSchema.class); final Visitor visitor = mock(Visitor.class); - final BooleanSchemaAcceptor booleanSchemaAcceptor = new BooleanSchemaAcceptor(); + final BooleanAcceptor booleanSchemaAcceptor = new BooleanAcceptor(); booleanSchemaAcceptor.accept(fieldName, visitor, booleanSchema); diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedSchemaAcceptorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedAcceptorTest.java similarity index 72% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedSchemaAcceptorTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedAcceptorTest.java index 7a98553..8a4bd64 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedSchemaAcceptorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/CombinedAcceptorTest.java @@ -20,13 +20,13 @@ import org.mockito.runners.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class CombinedSchemaAcceptorTest { +public class CombinedAcceptorTest { @Mock - private JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private AcceptorFactory acceptorFactory; @InjectMocks - private CombinedSchemaAcceptor combinedSchemaAcceptor; + private CombinedAcceptor combinedAcceptor; @Test public void shouldAcceptCombinedSchema() throws Exception { @@ -41,13 +41,13 @@ public void shouldAcceptCombinedSchema() throws Exception { when(combinedSchema.getSubschemas()).thenReturn(propertySchemas); - combinedSchemaAcceptor.accept(fieldName, visitor, combinedSchema); + combinedAcceptor.accept(fieldName, visitor, combinedSchema); - final InOrder inOrder = inOrder(visitor, jsonSchemaAcceptorFactory); + final InOrder inOrder = inOrder(visitor, acceptorFactory); inOrder.verify(visitor).enter(fieldName, combinedSchema); - inOrder.verify(jsonSchemaAcceptorFactory).visitSchema("fieldName", visitor, childSchema_1); - inOrder.verify(jsonSchemaAcceptorFactory).visitSchema("fieldName", visitor, childSchema_2); + inOrder.verify(acceptorFactory).visitSchema("fieldName", visitor, childSchema_1); + inOrder.verify(acceptorFactory).visitSchema("fieldName", visitor, childSchema_2); inOrder.verify(visitor).leave(combinedSchema); } } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultJsonSchemaAcceptorFactoryTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultAcceptorFactoryTest.java similarity index 64% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultJsonSchemaAcceptorFactoryTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultAcceptorFactoryTest.java index 6fe6d43..5858d97 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultJsonSchemaAcceptorFactoryTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/DefaultAcceptorFactoryTest.java @@ -7,8 +7,8 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapper; -import uk.gov.justice.generation.pojo.visitable.JsonSchemaWrapperFactory; +import uk.gov.justice.generation.pojo.visitable.VisitableSchema; +import uk.gov.justice.generation.pojo.visitable.VisitableSchemaFactory; import uk.gov.justice.generation.pojo.visitor.Visitor; import java.util.Map; @@ -29,27 +29,27 @@ import org.mockito.runners.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class DefaultJsonSchemaAcceptorFactoryTest { +public class DefaultAcceptorFactoryTest { @Mock - private JsonSchemaWrapperFactory jsonSchemaWrapperFactory; + private VisitableSchemaFactory visitableSchemaFactory; @InjectMocks - private DefaultJsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private DefaultAcceptorFactory jsonSchemaAcceptorFactory; @Test public void shouldReturnAcceptorMap() throws Exception { - final Map, JsonSchemaAcceptor> acceptorMap = jsonSchemaAcceptorFactory.acceptorMap(); + final Map, Acceptable> acceptorMap = jsonSchemaAcceptorFactory.acceptorMap(); assertThat(acceptorMap.size(), is(8)); - assertThat(acceptorMap.get(ArraySchema.class), is(instanceOf(ArraySchemaAcceptor.class))); - assertThat(acceptorMap.get(CombinedSchema.class), is(instanceOf(CombinedSchemaAcceptor.class))); - assertThat(acceptorMap.get(ObjectSchema.class), is(instanceOf(ObjectSchemaAcceptor.class))); - assertThat(acceptorMap.get(ReferenceSchema.class), is(instanceOf(ReferenceSchemaAcceptor.class))); - assertThat(acceptorMap.get(StringSchema.class), is(instanceOf(StringSchemaAcceptor.class))); - assertThat(acceptorMap.get(BooleanSchema.class), is(instanceOf(BooleanSchemaAcceptor.class))); - assertThat(acceptorMap.get(NumberSchema.class), is(instanceOf(NumberSchemaAcceptor.class))); - assertThat(acceptorMap.get(EnumSchema.class), is(instanceOf(EnumSchemaAcceptor.class))); + assertThat(acceptorMap.get(ArraySchema.class), is(instanceOf(ArrayAcceptor.class))); + assertThat(acceptorMap.get(CombinedSchema.class), is(instanceOf(CombinedAcceptor.class))); + assertThat(acceptorMap.get(ObjectSchema.class), is(instanceOf(ObjectAcceptor.class))); + assertThat(acceptorMap.get(ReferenceSchema.class), is(instanceOf(ReferenceAcceptor.class))); + assertThat(acceptorMap.get(StringSchema.class), is(instanceOf(StringAcceptor.class))); + assertThat(acceptorMap.get(BooleanSchema.class), is(instanceOf(BooleanAcceptor.class))); + assertThat(acceptorMap.get(NumberSchema.class), is(instanceOf(NumberAcceptor.class))); + assertThat(acceptorMap.get(EnumSchema.class), is(instanceOf(EnumAcceptor.class))); } @Test @@ -57,13 +57,13 @@ public void shouldWrapAndAcceptSchema() throws Exception { final String fieldName = "fieldName"; final Visitor visitor = mock(Visitor.class); final Schema schema = mock(Schema.class); - final JsonSchemaWrapper jsonSchemaWrapper = mock(JsonSchemaWrapper.class); + final VisitableSchema visitableSchema = mock(VisitableSchema.class); - when(jsonSchemaWrapperFactory.createWith(schema, jsonSchemaAcceptorFactory)).thenReturn(jsonSchemaWrapper); + when(visitableSchemaFactory.createWith(schema, jsonSchemaAcceptorFactory)).thenReturn(visitableSchema); jsonSchemaAcceptorFactory.visitSchema(fieldName, visitor, schema); - verify(jsonSchemaWrapperFactory).createWith(schema, jsonSchemaAcceptorFactory); - verify(jsonSchemaWrapper).accept(fieldName, visitor); + verify(visitableSchemaFactory).createWith(schema, jsonSchemaAcceptorFactory); + verify(visitableSchema).accept(fieldName, visitor); } } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumSchemaAcceptorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumAcceptorTest.java similarity index 75% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumSchemaAcceptorTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumAcceptorTest.java index 7b1af4f..ae16c6a 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumSchemaAcceptorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/EnumAcceptorTest.java @@ -8,16 +8,16 @@ import org.everit.json.schema.EnumSchema; import org.junit.Test; -public class EnumSchemaAcceptorTest { +public class EnumAcceptorTest { @Test public void shouldVisitEnumSchema() throws Exception { final String fieldName = "fieldName"; final EnumSchema enumSchema = mock(EnumSchema.class); final Visitor visitor = mock(Visitor.class); - final EnumSchemaAcceptor enumSchemaAcceptor = new EnumSchemaAcceptor(); + final EnumAcceptor enumAcceptor = new EnumAcceptor(); - enumSchemaAcceptor.accept(fieldName, visitor, enumSchema); + enumAcceptor.accept(fieldName, visitor, enumSchema); verify(visitor).visit(fieldName, enumSchema); } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberSchemaAcceptorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberAcceptorTest.java similarity index 74% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberSchemaAcceptorTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberAcceptorTest.java index cfb5017..8dc5ca3 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberSchemaAcceptorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/NumberAcceptorTest.java @@ -8,16 +8,16 @@ import org.everit.json.schema.NumberSchema; import org.junit.Test; -public class NumberSchemaAcceptorTest { +public class NumberAcceptorTest { @Test public void shouldVisitNumberSchema() throws Exception { final String fieldName = "fieldName"; final NumberSchema numberSchema = mock(NumberSchema.class); final Visitor visitor = mock(Visitor.class); - final NumberSchemaAcceptor numberSchemaAcceptor = new NumberSchemaAcceptor(); + final NumberAcceptor numberAcceptor = new NumberAcceptor(); - numberSchemaAcceptor.accept(fieldName, visitor, numberSchema); + numberAcceptor.accept(fieldName, visitor, numberSchema); verify(visitor).visit(fieldName, numberSchema); } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectSchemaAcceptorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectAcceptorTest.java similarity index 73% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectSchemaAcceptorTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectAcceptorTest.java index c99bcfe..8485cb5 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectSchemaAcceptorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ObjectAcceptorTest.java @@ -19,13 +19,13 @@ import org.mockito.runners.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class ObjectSchemaAcceptorTest { +public class ObjectAcceptorTest { @Mock - private JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private AcceptorFactory acceptorFactory; @InjectMocks - private ObjectSchemaAcceptor objectSchemaAcceptor; + private ObjectAcceptor objectAcceptor; @Test public void shouldAcceptObjectSchema() throws Exception { @@ -42,13 +42,13 @@ public void shouldAcceptObjectSchema() throws Exception { when(objectSchema.getPropertySchemas()).thenReturn(propertySchemas); - objectSchemaAcceptor.accept(fieldName, visitor, objectSchema); + objectAcceptor.accept(fieldName, visitor, objectSchema); - final InOrder inOrder = inOrder(visitor, jsonSchemaAcceptorFactory); + final InOrder inOrder = inOrder(visitor, acceptorFactory); inOrder.verify(visitor).enter(fieldName, objectSchema); - inOrder.verify(jsonSchemaAcceptorFactory).visitSchema("childSchema_1", visitor, childSchema_1); - inOrder.verify(jsonSchemaAcceptorFactory).visitSchema("childSchema_2", visitor, childSchema_2); + inOrder.verify(acceptorFactory).visitSchema("childSchema_1", visitor, childSchema_1); + inOrder.verify(acceptorFactory).visitSchema("childSchema_2", visitor, childSchema_2); inOrder.verify(visitor).leave(objectSchema); } } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceSchemaAcceptorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceAcceptorTest.java similarity index 73% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceSchemaAcceptorTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceAcceptorTest.java index c7e1f68..40eac58 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceSchemaAcceptorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/ReferenceAcceptorTest.java @@ -15,13 +15,13 @@ import org.mockito.runners.MockitoJUnitRunner; @RunWith(MockitoJUnitRunner.class) -public class ReferenceSchemaAcceptorTest { +public class ReferenceAcceptorTest { @Mock - private JsonSchemaAcceptorFactory jsonSchemaAcceptorFactory; + private AcceptorFactory acceptorFactory; @InjectMocks - private ReferenceSchemaAcceptor referenceSchemaAcceptor; + private ReferenceAcceptor referenceAcceptor; @Test public void shouldAcceptAReferenceSchema() throws Exception { @@ -32,8 +32,8 @@ public void shouldAcceptAReferenceSchema() throws Exception { when(referenceSchema.getReferredSchema()).thenReturn(referredSchema); - referenceSchemaAcceptor.accept(fieldName, visitor, referenceSchema); + referenceAcceptor.accept(fieldName, visitor, referenceSchema); - verify(jsonSchemaAcceptorFactory).visitSchema(fieldName, visitor, referredSchema); + verify(acceptorFactory).visitSchema(fieldName, visitor, referredSchema); } } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringSchemaAcceptorTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringAcceptorTest.java similarity index 74% rename from pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringSchemaAcceptorTest.java rename to pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringAcceptorTest.java index 9569d78..0b58caa 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringSchemaAcceptorTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/visitable/acceptor/StringAcceptorTest.java @@ -8,16 +8,16 @@ import org.everit.json.schema.StringSchema; import org.junit.Test; -public class StringSchemaAcceptorTest { +public class StringAcceptorTest { @Test public void shouldVisitStringSchema() throws Exception { final String fieldName = "fieldName"; final StringSchema stringSchema = mock(StringSchema.class); final Visitor visitor = mock(Visitor.class); - final StringSchemaAcceptor stringSchemaAcceptor = new StringSchemaAcceptor(); + final StringAcceptor stringAcceptor = new StringAcceptor(); - stringSchemaAcceptor.accept(fieldName, visitor, stringSchema); + stringAcceptor.accept(fieldName, visitor, stringSchema); verify(visitor).visit(fieldName, stringSchema); } diff --git a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/write/NonDuplicatingSourceWriterTest.java b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/write/NonDuplicatingSourceWriterTest.java index 2bcda36..a830d81 100644 --- a/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/write/NonDuplicatingSourceWriterTest.java +++ b/pojo-generator-core/src/test/java/uk/gov/justice/generation/pojo/write/NonDuplicatingSourceWriterTest.java @@ -61,7 +61,7 @@ public void shouldWriteANewJavaFile() throws Exception { final InOrder inOrder = inOrder(sourceWriter, logger); inOrder.verify(sourceWriter).write(classGenerator, sourceRootDirectory); - inOrder.verify(logger).info("Wrote new Java file '%s'", fileName); + inOrder.verify(logger).info("Wrote new Java file '{}'", "MyFunkyNewPojo.java"); } @Test @@ -79,12 +79,12 @@ public void shouldNotWriteANewJavaFileIfTheFileAlreadyExists() throws Exception when(classGenerator.getClassName()).thenReturn(className); when(javaSourceFileProvider.getJavaFile(sourceRootDirectory, className)).thenReturn(sourceFile); when(sourceFile.exists()).thenReturn(true); - when(sourceFile.getAbsolutePath()).thenReturn("org/test"); + when(sourceFile.getAbsolutePath()).thenReturn("org/test/MyExistingPojo.java"); assertThat(nonDuplicatingSourceWriter.write(classGenerator, generationContext), is(sourceFile)); verifyZeroInteractions(sourceWriter); - verify(logger).info("Skipping generation, Java file already exists '%s'", "org/test"); + verify(logger).info("Skipping generation, Java file already exists: '{}'", "org/test/MyExistingPojo.java"); } @Test diff --git a/pojo-plugin-it/pom.xml b/pojo-plugin-it/pom.xml index fcbc244..63c97bf 100644 --- a/pojo-plugin-it/pom.xml +++ b/pojo-plugin-it/pom.xml @@ -53,7 +53,7 @@ internal-jsons - uk.gov.justice.generation.SchemaToJavaGenerator + uk.gov.justice.generation.SchemaPojoGenerator uk.gov.justice.generation.io.files.parser.FileTypeParser @@ -86,4 +86,4 @@ - \ No newline at end of file +