Issue #22. Moved configuration exceptions to an extra package.

highsource · highsource · commit 082d19f41ff5 · 2015-04-27T08:52:38.000+02:00
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/JsonSchemaConfiguration.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/JsonSchemaConfiguration.java
@@ -13,11 +13,10 @@
 public class JsonSchemaConfiguration {
 
 	public static final String LOCAL_ELEMENT_NAME = "jsonSchema";
-	public static final String STANDARD_FILE_NAME_PATTERN = ModuleConfiguration.MODULE_NAME_PROPERTY +
-//			+ "." + MappingConfiguration.MAPPING_NAME_PROPERTY + 
-			".jsonschema";
+	public static final String STANDARD_FILE_NAME_PATTERN = ModuleConfiguration.MODULE_NAME_PROPERTY
+			+ ".jsonschema";
 
-	private String fileName;
+	private String fileName = STANDARD_FILE_NAME_PATTERN;
 	public static final QName JSON_SCHEMA_NAME = new QName(
 			ModulesConfiguration.NAMESPACE_URI, LOCAL_ELEMENT_NAME,
 			ModulesConfiguration.DEFAULT_PREFIX);
@@ -27,7 +26,7 @@ public JsonSchemaConfiguration() {
 	}
 
 	public JsonSchemaConfiguration(String fileName) {
-		super();
+		Validate.notNull(fileName);
 		this.fileName = fileName;
 	}
 
@@ -37,14 +36,13 @@ public String getFileName() {
 	}
 
 	public void setFileName(String fileName) {
+		Validate.notNull(fileName);
 		this.fileName = fileName;
 	}
 
 	public JsonSchema build(String moduleName) {
 		Validate.notNull(moduleName);
-		final String fileNamePattern = this.fileName == null ? STANDARD_FILE_NAME_PATTERN
-				: this.fileName;
-		final String fileName = fileNamePattern.replace(
+		final String fileName = getFileName().replace(
 				ModuleConfiguration.MODULE_NAME_PROPERTY, moduleName);
 		return new JsonSchema(fileName);
 	}
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/MappingConfiguration.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/MappingConfiguration.java
@@ -11,9 +11,9 @@
 
 import org.apache.commons.lang3.Validate;
 import org.hisrc.jsonix.analysis.ModelInfoGraphAnalyzer;
+import org.hisrc.jsonix.configuration.exception.MissingMappingWithIdException;
 import org.hisrc.jsonix.context.JsonixContext;
 import org.hisrc.jsonix.definition.Mapping;
-import org.hisrc.jsonix.jsonschema.JsonSchemaKeywords;
 import org.jvnet.jaxb2_commons.xml.bind.model.MElementInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MPackageInfo;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/MissingPackageException.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/MissingPackageException.java
@@ -3,6 +3,7 @@
 import java.text.MessageFormat;
 
 import org.apache.commons.lang3.Validate;
+import org.hisrc.jsonix.configuration.exception.ConfigurationException;
 
 public class MissingPackageException extends ConfigurationException {
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/ModulesConfiguration.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/ModulesConfiguration.java
@@ -17,6 +17,9 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.hisrc.jsonix.analysis.ModelInfoGraphAnalyzer;
+import org.hisrc.jsonix.configuration.exception.AmbiguousMappingNameException;
+import org.hisrc.jsonix.configuration.exception.MissingMappinWithNameException;
+import org.hisrc.jsonix.configuration.exception.MissingMappingWithIdException;
 import org.hisrc.jsonix.context.JsonixContext;
 import org.hisrc.jsonix.definition.Mapping;
 import org.hisrc.jsonix.definition.Module;
@@ -104,8 +107,8 @@ public <T, C extends T> Modules<T, C> build(JsonixContext context,
 		assignDefaultOutputConfigurations(moduleConfigurations);
 		assignDefaultJsonSchemaConfigurations(moduleConfigurations);
 
-		assignMappingNamesAndIds(context, moduleConfigurations);
-		assignModuleNames(context, moduleConfigurations);
+		assignMappingNamesAndIdsToMappingConfigurations(context, moduleConfigurations);
+		assignModuleNamesToModules(context, moduleConfigurations);
 
 		return buildModules(context, modelInfo, analyzer, moduleConfigurations);
 	}
@@ -121,7 +124,7 @@ private void assignModuleConfigurationsToMappingConfigurations(
 		}
 	}
 
-	private void assignMappingNamesAndIds(JsonixContext context,
+	private void assignMappingNamesAndIdsToMappingConfigurations(JsonixContext context,
 			final List<ModuleConfiguration> moduleConfigurations) {
 		// Generate ids where missing
 		final Map<String, MappingConfiguration> idToMappingConfiguration = new HashMap<String, MappingConfiguration>();
@@ -138,7 +141,7 @@ private void assignMappingNamesAndIds(JsonixContext context,
 		}
 	}
 
-	private void assignModuleNames(JsonixContext context,
+	private void assignModuleNamesToModules(JsonixContext context,
 			final List<ModuleConfiguration> moduleConfigurations) {
 		for (final ModuleConfiguration moduleConfiguration : moduleConfigurations) {
 			if (moduleConfiguration.getName() == null) {
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/ModulesConfigurationUnmarshaller.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/ModulesConfigurationUnmarshaller.java
@@ -43,6 +43,7 @@
 import javax.xml.bind.JAXBException;
 
 import org.apache.commons.lang3.Validate;
+import org.hisrc.jsonix.configuration.exception.ConfigurationUnmarshallingException;
 import org.hisrc.jsonix.context.JsonixContext;
 import org.jvnet.jaxb2_commons.util.CustomizationUtils;
 import org.slf4j.Logger;
@@ -53,7 +54,6 @@
 public class ModulesConfigurationUnmarshaller {
 
 	private final Logger logger;
-	@SuppressWarnings("unused")
 	private final JsonixContext context;
 	private final JAXBContext jaxbContext;
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/OutputConfiguration.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/OutputConfiguration.java
@@ -6,6 +6,7 @@
 import javax.xml.namespace.QName;
 
 import org.apache.commons.lang3.Validate;
+import org.hisrc.jsonix.configuration.exception.UnsupportedNamingException;
 import org.hisrc.jsonix.definition.Output;
 import org.hisrc.jsonix.naming.CompactNaming;
 import org.hisrc.jsonix.naming.Naming;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/AmbiguousMappingNameException.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/AmbiguousMappingNameException.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.configuration;
+package org.hisrc.jsonix.configuration.exception;
 
 import java.text.MessageFormat;
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/AmbiguousPackageMappingNameException.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/AmbiguousPackageMappingNameException.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.configuration;
+package org.hisrc.jsonix.configuration.exception;
 
 import java.text.MessageFormat;
 import java.util.Arrays;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/AmbiguousPackageSchemaIdException.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/AmbiguousPackageSchemaIdException.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.configuration;
+package org.hisrc.jsonix.configuration.exception;
 
 import java.text.MessageFormat;
 import java.util.Arrays;
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/ConfigurationException.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/ConfigurationException.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.configuration;
+package org.hisrc.jsonix.configuration.exception;
 
 public abstract class ConfigurationException extends RuntimeException {
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/ConfigurationUnmarshallingException.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/ConfigurationUnmarshallingException.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.configuration;
+package org.hisrc.jsonix.configuration.exception;
 
 import java.text.MessageFormat;
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/MissingMappinWithNameException.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/MissingMappinWithNameException.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.configuration;
+package org.hisrc.jsonix.configuration.exception;
 
 import java.text.MessageFormat;
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/MissingMappingWithIdException.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/MissingMappingWithIdException.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.configuration;
+package org.hisrc.jsonix.configuration.exception;
 
 import java.text.MessageFormat;
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/UnsupportedNamingException.java b/compiler/src/main/java/org/hisrc/jsonix/configuration/exception/UnsupportedNamingException.java
@@ -1,4 +1,4 @@
-package org.hisrc.jsonix.configuration;
+package org.hisrc.jsonix.configuration.exception;
 
 import java.text.MessageFormat;
 
diff --git a/compiler/src/main/java/org/hisrc/jsonix/definition/Modules.java b/compiler/src/main/java/org/hisrc/jsonix/definition/Modules.java
@@ -6,12 +6,9 @@
 import java.util.Map;
 
 import org.apache.commons.lang3.Validate;
-import org.hisrc.jsonix.configuration.AmbiguousPackageMappingNameException;
-import org.hisrc.jsonix.configuration.AmbiguousPackageSchemaIdException;
-import org.hisrc.jsonix.configuration.MappingConfiguration;
-import org.hisrc.jsonix.configuration.ModuleConfiguration;
+import org.hisrc.jsonix.configuration.exception.AmbiguousPackageMappingNameException;
+import org.hisrc.jsonix.configuration.exception.AmbiguousPackageSchemaIdException;
 import org.hisrc.jsonix.context.JsonixContext;
-import org.hisrc.jsonix.jsonschema.JsonSchemaKeywords;
 import org.jvnet.jaxb2_commons.xml.bind.model.MModelInfo;
 import org.slf4j.Logger;
 
@@ -33,7 +30,6 @@ public Modules(JsonixContext context, MModelInfo<T, C> modelInfo,
 		this.modules = modules;
 
 		for (Module<T, C> module : modules) {
-			final String moduleSchemaId = module.getSchemaId();
 			for (Mapping<T, C> mapping : module.getMappings()) {
 
 				final String packageName = mapping.getPackageName();
@@ -58,16 +54,17 @@ public Modules(JsonixContext context, MModelInfo<T, C> modelInfo,
 					final String knownSchemaId = packageSchemaIdMap
 							.get(packageName);
 					if (knownSchemaId == null) {
-						this.packageSchemaIdMap.put(packageName, mappingSchemaId);
+						this.packageSchemaIdMap.put(packageName,
+								mappingSchemaId);
 					} else if (!knownSchemaId.equals(mappingSchemaId)) {
 						logger.warn(MessageFormat
 								.format("Package [{0}] is mapped using at least two different schema ids [{1}] and [{2}]. "
-										+ "This package [{0}] will be referenced using the schema id [{1}]. "
 										+ "Packages may be mapped by several mappings but they have to have equal schema ids. "
-										+ "Please use the [jsonix:mapping/@schemaId] attribute and specify the same schema id in both mappings.",
-										packageName, knownSchemaId, mappingSchemaId));
-//						throw new AmbiguousPackageSchemaIdException(
-//								packageName, knownSchemaId, mappingSchemaId);
+										+ "Please use the [jsonix:module/@schemaId] or [jsonix:mapping/@schemaId] attribute and specify the same schema id in both mappings.",
+										packageName, knownSchemaId,
+										mappingSchemaId));
+						throw new AmbiguousPackageSchemaIdException(
+								packageName, knownSchemaId, mappingSchemaId);
 					}
 				}
 			}
@@ -94,5 +91,4 @@ public Collection<Module<T, C>> getModules() {
 	public String toString() {
 		return this.modules.toString();
 	}
-
 }
diff --git a/compiler/src/test/java/org/hisrc/jsonix/configuration/tests/AmbiguousPackageMappingExceptionTest.java b/compiler/src/test/java/org/hisrc/jsonix/configuration/tests/AmbiguousPackageMappingExceptionTest.java
@@ -1,13 +1,13 @@
 package org.hisrc.jsonix.configuration.tests;
 
-import org.hisrc.jsonix.configuration.AmbiguousPackageMappingNameException;
+import org.hisrc.jsonix.configuration.exception.AmbiguousPackageMappingNameException;
 import org.junit.Assert;
 import org.junit.Test;
 
 public class AmbiguousPackageMappingExceptionTest {
 
 	@Test
-	public void producesReasableMessage() {
+	public void producesReadableMessage() {
 		final Exception ex = new AmbiguousPackageMappingNameException("a", "b",
 				"c");
 		Assert.assertTrue(ex.getMessage().contains("b, c"));

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.hisrc.jsonix.configuration;`
	`1`	`+package org.hisrc.jsonix.configuration.exception;`
`2`	`2`
`3`	`3`	`import java.text.MessageFormat;`
`4`	`4`