Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

METAGEN-86 Using simple flag for tracking XML metadata completeness

This commit is contained in:
Gunnar Morling 2013-08-08 10:46:51 +02:00 committed by Strong Liu
parent d49407b23d
commit 190b736f6c
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tooling/metamodel-generator/src/main/java/org/hibernate/jpamodelgen/Context.java
View File

@ -61,10 +61,10 @@ public final class Context {
private final List<String> ormXmlFiles; private final List<String> ormXmlFiles;
/** /**
* Keeping track which (if any) of the mapping files is xml-mapping-metadata-complete. If all are metadata complete * Whether all mapping files are xml-mapping-metadata-complete. In this case no annotation processing will take
* no annotation processing will take place. * place.
*/ */
private List<Boolean> fullyXmlConfigured; private Boolean fullyXmlConfigured = null;
private boolean addGeneratedAnnotation = true; private boolean addGeneratedAnnotation = true;
private boolean addGenerationDate; private boolean addGenerationDate;
private boolean addSuppressWarningsAnnotation; private boolean addSuppressWarningsAnnotation;
@ -72,7 +72,6 @@ public final class Context {
public Context(ProcessingEnvironment pe) { public Context(ProcessingEnvironment pe) {
this.pe = pe; this.pe = pe;
this.fullyXmlConfigured = new ArrayList<Boolean>();
if ( pe.getOptions().get( JPAMetaModelEntityProcessor.PERSISTENCE_XML_OPTION ) != null ) { if ( pe.getOptions().get( JPAMetaModelEntityProcessor.PERSISTENCE_XML_OPTION ) != null ) {
String tmp = pe.getOptions().get( JPAMetaModelEntityProcessor.PERSISTENCE_XML_OPTION ); String tmp = pe.getOptions().get( JPAMetaModelEntityProcessor.PERSISTENCE_XML_OPTION );
@ -200,16 +199,16 @@ public final class Context {
} }
public boolean isFullyXmlConfigured() { public boolean isFullyXmlConfigured() {
if ( fullyXmlConfigured.isEmpty() ) { return Boolean.TRUE == fullyXmlConfigured;
return false;
}
else {
return !fullyXmlConfigured.contains( Boolean.FALSE );
}
} }
public void mappingDocumentFullyXmlConfigured(boolean fullyXmlConfigured) { public void mappingDocumentFullyXmlConfigured(boolean fullyXmlConfigured) {
this.fullyXmlConfigured.add( fullyXmlConfigured ); if ( this.fullyXmlConfigured == null ) {
this.fullyXmlConfigured = fullyXmlConfigured;
}
else {
this.fullyXmlConfigured = this.fullyXmlConfigured && fullyXmlConfigured;
}
} }
public AccessType getPersistenceUnitDefaultAccessType() { public AccessType getPersistenceUnitDefaultAccessType() {
@ -231,7 +230,7 @@ public final class Context {
sb.append( "{accessTypeInformation=" ).append( accessTypeInformation ); sb.append( "{accessTypeInformation=" ).append( accessTypeInformation );
sb.append( ", logDebug=" ).append( logDebug ); sb.append( ", logDebug=" ).append( logDebug );
sb.append( ", lazyXmlParsing=" ).append( lazyXmlParsing ); sb.append( ", lazyXmlParsing=" ).append( lazyXmlParsing );
sb.append( ", isPersistenceUnitCompletelyXmlConfigured=" ).append( fullyXmlConfigured ); sb.append( ", fullyXmlConfigured=" ).append( fullyXmlConfigured );
sb.append( ", ormXmlFiles=" ).append( ormXmlFiles ); sb.append( ", ormXmlFiles=" ).append( ormXmlFiles );
sb.append( ", persistenceXmlLocation='" ).append( persistenceXmlLocation ).append( '\'' ); sb.append( ", persistenceXmlLocation='" ).append( persistenceXmlLocation ).append( '\'' );
sb.append( '}' ); sb.append( '}' );