ROO-2745: Post 1.2.0.M1 code refactor and clean up - docs and use exi…

…sting method
gavinlau · Oct 18, 2011 · 15deebc · 15deebc
1 parent 43eb782
commit 15deebc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/addon-dbre/src/main/java/org/springframework/roo/addon/dbre/DbreDatabaseListenerImpl.java b/addon-dbre/src/main/java/org/springframework/roo/addon/dbre/DbreDatabaseListenerImpl.java
@@ -67,6 +67,7 @@
 public class DbreDatabaseListenerImpl extends AbstractHashCodeTrackingMetadataNotifier implements IdentifierService, FileEventListener {
 
 	// Constants
+	private static final JavaSymbolName DB_MANAGED = new JavaSymbolName("dbManaged");
 	private static final String IDENTIFIER_TYPE = "identifierType";
 	private static final String VERSION_FIELD = "versionField";
 	private static final String VERSION = "version";
@@ -227,7 +228,7 @@ private Set<ClassOrInterfaceTypeDetails> getManagedIdentifiers() {
 		final Set<ClassOrInterfaceTypeDetails> identifierTypes = typeLocationService.findClassesOrInterfaceDetailsWithAnnotation(ROO_IDENTIFIER);
 		for (final ClassOrInterfaceTypeDetails managedIdentifierType : identifierTypes) {
 			final AnnotationMetadata identifierAnnotation = managedIdentifierType.getTypeAnnotation(ROO_IDENTIFIER);
-			final AnnotationAttributeValue<?> attrValue = identifierAnnotation.getAttribute(new JavaSymbolName("dbManaged"));
+			final AnnotationAttributeValue<?> attrValue = identifierAnnotation.getAttribute(DB_MANAGED);
 			if (attrValue != null && (Boolean) attrValue.getValue()) {
 				managedIdentifierTypes.add(managedIdentifierType);
 			}
@@ -238,7 +239,7 @@ private Set<ClassOrInterfaceTypeDetails> getManagedIdentifiers() {
 	private Table updateOrDeleteManagedEntity(final ClassOrInterfaceTypeDetails managedEntity, final Database database) {
 		// Update the attributes of the existing JPA-related annotation
 		final AnnotationMetadata jpaAnnotation = getJpaAnnotation(managedEntity);
-		Assert.state(jpaAnnotation != null, "Neither " + ROO_JPA_ACTIVE_RECORD.getSimpleTypeName() + " nor " + ROO_JPA_ENTITY.getSimpleTypeName() + " found on existing DBRE-managed entity " + managedEntity.getName().getFullyQualifiedTypeName());
+		Assert.state(jpaAnnotation != null, "Neither @" + ROO_JPA_ACTIVE_RECORD.getSimpleTypeName() + " nor @" + ROO_JPA_ENTITY.getSimpleTypeName() + " found on existing DBRE-managed entity " + managedEntity.getName().getFullyQualifiedTypeName());
 
 		// Find table in database using 'table' and 'schema' attributes from the JPA annotation
 		final AnnotationAttributeValue<?> tableAttribute = jpaAnnotation.getAttribute(new JavaSymbolName("table"));
@@ -407,7 +408,7 @@ private void createIdentifierClass(final JavaType identifierType) {
 		final List<AnnotationMetadataBuilder> identifierAnnotations = new ArrayList<AnnotationMetadataBuilder>();
 
 		final AnnotationMetadataBuilder identifierBuilder = new AnnotationMetadataBuilder(ROO_IDENTIFIER);
-		identifierBuilder.addBooleanAttribute("dbManaged", true);
+		identifierBuilder.addBooleanAttribute(DB_MANAGED.getSymbolName(), true);
 		identifierAnnotations.add(identifierBuilder);
 
 		// Produce identifier itself

diff --git a/support/src/main/java/org/springframework/roo/support/util/XmlUtils.java b/support/src/main/java/org/springframework/roo/support/util/XmlUtils.java
@@ -105,7 +105,7 @@ public static Document readXml(InputStream inputStream) {
 			if (!(inputStream instanceof BufferedInputStream)) {
 				inputStream = new BufferedInputStream(inputStream);
 			}
-			return factory.newDocumentBuilder().parse(inputStream);
+			return getDocumentBuilder().parse(inputStream);
 		} catch (final Exception e) {
 			throw new IllegalStateException("Could not open input stream", e);
 		} finally {