arch-jedi/nx01
1
0
Fork 0
Code Issues Pull requests Releases Packages Activity Actions

X4O Formatted x4o driver tests cases

Browse source
This commit is contained in:
Willem Cazander 2025-11-07 21:58:06 +01:00
parent bd4a04a813
commit ed096a1427
74 changed files with 1640 additions and 1453 deletions
Download patch file Download diff file Expand all files Collapse all files

44
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageModule.java
View file

@ -43,14 +43,14 @@ import org.x4o.xml.element.ElementNamespace;
public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase implements X4OLanguageModuleLocal {
private Logger logger = null;
private String providerName=null;
private String providerHost=null;
private String providerName = null;
private String providerHost = null;
private List<ElementBindingHandler> elementBindingHandlers = null;
private List<ElementConfiguratorGlobal> elementConfiguratorGlobals = null;
private List<ElementInterface> elementInterfaces = null;
private Map<String,ElementNamespace> elementNamespaces = null;
private Map<X4OLanguageModuleLoaderResult,String> loaderResults = null;
private Map<String, ElementNamespace> elementNamespaces = null;
private Map<X4OLanguageModuleLoaderResult, String> loaderResults = null;
/**
* Creates a new empty ElementLanguage.
@ -61,8 +61,8 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase
elementBindingHandlers = new ArrayList<ElementBindingHandler>(4);
elementConfiguratorGlobals = new ArrayList<ElementConfiguratorGlobal>(4);
elementInterfaces = new ArrayList<ElementInterface>(20);
elementNamespaces = new HashMap<String,ElementNamespace>(10);
loaderResults = new HashMap<X4OLanguageModuleLoaderResult,String>(10);
elementNamespaces = new HashMap<String, ElementNamespace>(10);
loaderResults = new HashMap<X4OLanguageModuleLoaderResult, String>(10);
}
/**
@ -97,20 +97,18 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase
* @see org.x4o.xml.lang.X4OLanguageModuleLocal#addElementBindingHandler(ElementBindingHandler)
*/
public void addElementBindingHandler(ElementBindingHandler elementBindingHandler) {
if (elementBindingHandler==null) {
if (elementBindingHandler == null) {
throw new NullPointerException("Can't add null binding handler.");
}
if (elementBindingHandler.getId()==null) {
if (elementBindingHandler.getId() == null) {
throw new NullPointerException("Can't add with null id property.");
}
// Check so doc tree does not loop; see EldDocHtmlWriter.findChilderen()
/*
for (Class<?> cl:elementBindingHandler.getBindChildClasses()) {
if (elementBindingHandler.getBindParentClass().equals(cl)) {
throw new IllegalStateException("Can't add binding handler: "+elementBindingHandler.getId()+" with same parent as child class.");
}
}*/
logger.finer("Adding ElementBindingHandler: "+elementBindingHandler);
* for (Class<?> cl:elementBindingHandler.getBindChildClasses()) { if (elementBindingHandler.getBindParentClass().equals(cl)) { throw new
* IllegalStateException("Can't add binding handler: "+elementBindingHandler.getId()+" with same parent as child class."); } }
*/
logger.finer("Adding ElementBindingHandler: " + elementBindingHandler);
elementBindingHandlers.add(elementBindingHandler);
}
@ -125,13 +123,13 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase
* @see org.x4o.xml.lang.X4OLanguageModuleLocal#addElementConfiguratorGlobal(ElementConfiguratorGlobal)
*/
public void addElementConfiguratorGlobal(ElementConfiguratorGlobal elementConfigurator) {
if (elementConfigurator==null) {
if (elementConfigurator == null) {
throw new NullPointerException("Can't add null");
}
if (elementConfigurator.getId()==null) {
if (elementConfigurator.getId() == null) {
throw new NullPointerException("Can't add with null id property.");
}
logger.finer("Adding ElementConfiguratorGlobal: "+elementConfigurator);
logger.finer("Adding ElementConfiguratorGlobal: " + elementConfigurator);
elementConfiguratorGlobals.add(elementConfigurator);
}
@ -146,13 +144,13 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase
* @see org.x4o.xml.lang.X4OLanguageModuleLocal#addElementInterface(org.x4o.xml.element.ElementInterface)
*/
public void addElementInterface(ElementInterface elementInterface) {
if (elementInterface==null) {
if (elementInterface == null) {
throw new NullPointerException("Can't add null.");
}
if (elementInterface.getId()==null) {
if (elementInterface.getId() == null) {
throw new NullPointerException("Can't add with null id property.");
}
if (elementInterface.getInterfaceClass()==null) {
if (elementInterface.getInterfaceClass() == null) {
throw new NullPointerException("ElementInterface not correctly configured getInterfaceClass returns null.");
}
elementInterfaces.add(elementInterface);
@ -169,13 +167,13 @@ public abstract class AbstractX4OLanguageModule extends AbstractElementMetaBase
* @see org.x4o.xml.lang.X4OLanguageModuleLocal#addElementNamespace(org.x4o.xml.element.ElementNamespace)
*/
public void addElementNamespace(ElementNamespace elementNamespace) {
if (elementNamespace==null) {
if (elementNamespace == null) {
throw new NullPointerException("Can't add null.");
}
if (elementNamespace.getUri()==null) {
if (elementNamespace.getUri() == null) {
throw new NullPointerException("Can add ElementNamespace without uri.");
}
logger.fine("Adding namespaceUri: "+elementNamespace.getUri());
logger.fine("Adding namespaceUri: " + elementNamespace.getUri());
elementNamespaces.put(elementNamespace.getUri(), elementNamespace);
}

23
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/AbstractX4OLanguageSession.java
View file

@ -69,7 +69,7 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo
}
logger = Logger.getLogger(AbstractX4OLanguageSession.class.getName());
logger.finest("Creating new ParsingContext");
this.language=language;
this.language = language;
dirtyElements = new ArrayList<>(20);
phaseSkip = new ArrayList<>(5);
phaseListeners = new HashMap<>(3);
@ -90,7 +90,7 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo
* @see org.x4o.xml.lang.X4OLanguageSessionLocal#setExpressionLanguageContext(javax.el.ELContext)
*/
public void setExpressionLanguageContext(ELContext context) {
if (eLContext!=null) {
if (eLContext != null) {
throw new IllegalStateException("Can only set elContext once.");
}
eLContext = context;
@ -107,7 +107,7 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo
* @see org.x4o.xml.lang.X4OLanguageSessionLocal#setExpressionLanguageFactory(javax.el.ExpressionFactory)
*/
public void setExpressionLanguageFactory(ExpressionFactory expressionFactory) {
if (this.expressionFactory!=null) {
if (this.expressionFactory != null) {
throw new IllegalStateException("Can only set expressionFactory once.");
}
this.expressionFactory = expressionFactory;
@ -124,7 +124,7 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo
* @param elementAttributeValueParser the elementAttributeValueParser to set
*/
public void setElementAttributeValueParser(ElementAttributeValueParser elementAttributeValueParser) {
if (this.elementAttributeValueParser!=null) {
if (this.elementAttributeValueParser != null) {
throw new IllegalStateException("Can only set elementAttributeValueParser once.");
}
this.elementAttributeValueParser = elementAttributeValueParser;
@ -141,7 +141,7 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo
* @param elementObjectPropertyValue the elementObjectPropertyValue to set
*/
public void setElementObjectPropertyValue(ElementObjectPropertyValue elementObjectPropertyValue) {
if (this.elementObjectPropertyValue!=null) {
if (this.elementObjectPropertyValue != null) {
throw new IllegalStateException("Can only set elementObjectPropertyValue once.");
}
this.elementObjectPropertyValue = elementObjectPropertyValue;
@ -175,10 +175,10 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo
* @see org.x4o.xml.lang.X4OLanguageSession#setRootElement(org.x4o.xml.element.Element)
*/
public void setRootElement(Element element) {
if (element==null) {
if (element == null) {
throw new NullPointerException("May not set rootElement to null");
}
rootElement=element;
rootElement = element;
}
/**
@ -192,14 +192,14 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo
* @see org.x4o.xml.lang.X4OLanguageSession#hasX4ODebugWriter()
*/
public boolean hasX4ODebugWriter() {
return debugWriter!=null;
return debugWriter != null;
}
/**
* @see org.x4o.xml.lang.X4OLanguageSessionLocal#setX4ODebugWriter(org.x4o.xml.io.X4ODebugWriter)
*/
public void setX4ODebugWriter(X4ODebugWriter debugWriter) {
this.debugWriter=debugWriter;
this.debugWriter = debugWriter;
}
/**
@ -234,7 +234,7 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo
* @see org.x4o.xml.lang.X4OLanguageSessionLocal#setPhaseStop(java.lang.String)
*/
public void setPhaseStop(String phaseId) {
this.phaseStop=phaseId;
this.phaseStop = phaseId;
}
/**
@ -246,8 +246,9 @@ public abstract class AbstractX4OLanguageSession implements X4OLanguageSessionLo
/**
* Gets the phase listeners for a phase.
*
* @param phaseId The phaseId of for the listeners.
* @return The x4o phase listeners.
* @return The x4o phase listeners.
*/
public List<X4OPhaseListener> storePhaseListeners(String phaseId) {
List<X4OPhaseListener> result = phaseListeners.get(phaseId);

9
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguage.java
View file

@ -151,13 +151,16 @@ public class DefaultX4OLanguage implements X4OLanguageLocal {
languageSession.setExpressionLanguageFactory(X4OExpressionFactory.createExpressionFactory());
}
if (languageSession.getExpressionLanguageContext() == null) {
languageSession.setExpressionLanguageContext(X4OExpressionFactory.createELContext(languageSession.getLanguage().getLanguageConfiguration().getDefaultExpressionLanguageContext()));
languageSession.setExpressionLanguageContext(
X4OExpressionFactory.createELContext(languageSession.getLanguage().getLanguageConfiguration().getDefaultExpressionLanguageContext()));
}
if (languageSession.getElementAttributeValueParser() == null) {
languageSession.setElementAttributeValueParser(X4OLanguageClassLoader.newInstance(ElementAttributeValueParser.class, getLanguageConfiguration().getDefaultElementAttributeValueParser()));
languageSession.setElementAttributeValueParser(X4OLanguageClassLoader.newInstance(ElementAttributeValueParser.class,
getLanguageConfiguration().getDefaultElementAttributeValueParser()));
}
if (languageSession.getElementObjectPropertyValue() == null) {
languageSession.setElementObjectPropertyValue(X4OLanguageClassLoader.newInstance(ElementObjectPropertyValue.class, getLanguageConfiguration().getDefaultElementObjectPropertyValue()));
languageSession.setElementObjectPropertyValue(X4OLanguageClassLoader.newInstance(ElementObjectPropertyValue.class,
getLanguageConfiguration().getDefaultElementObjectPropertyValue()));
}
} catch (ClassNotFoundException e) {
throw new RuntimeException(e.getMessage(), e);

14
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageConfiguration.java
View file

@ -54,6 +54,7 @@ public class DefaultX4OLanguageConfiguration extends AbstractX4OLanguageConfigur
public DefaultX4OLanguageConfiguration() {
}
//@formatter:off
public void fillDefaults() {
if (getLanguageResourcePathPrefix()==null) { setLanguageResourcePathPrefix( X4OLanguageConfiguration.DEFAULT_LANG_PATH_PREFIX); }
if (getLanguageResourceModulesFileName()==null) { setLanguageResourceModulesFileName( X4OLanguageConfiguration.DEFAULT_LANG_MODULES_FILE);}
@ -74,28 +75,29 @@ public class DefaultX4OLanguageConfiguration extends AbstractX4OLanguageConfigur
if (getDefaultLanguageLoader()==null) { setDefaultLanguageLoader( DefaultX4OLanguageLoader.class); }
if (getDefaultExpressionLanguageContext()==null) { setDefaultExpressionLanguageContext( X4OELContext.class); }
}
//@formatter:on
/**
* @see org.x4o.xml.lang.X4OLanguageConfigurationLocal#createProxy()
*/
public X4OLanguageConfiguration createProxy() {
Object proxy = Proxy.newProxyInstance(X4OLanguageClassLoader.getClassLoader(), new Class[]{X4OLanguageConfiguration.class}, new InvocationHandler() {
Object proxy = Proxy.newProxyInstance(X4OLanguageClassLoader.getClassLoader(), new Class[] { X4OLanguageConfiguration.class }, new InvocationHandler() {
public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
X4OLanguageConfigurationLocal local = DefaultX4OLanguageConfiguration.this;
int argsLength = 0;
if (args!=null) {
if (args != null) {
argsLength = args.length;
}
Class<?>[] invokeArgs = new Class[argsLength];
for (int i=0;i<argsLength;i++) {
//Object o = args[i];
invokeArgs[i] = X4OLanguageSession.class; //o.getClass(); todo fix
for (int i = 0; i < argsLength; i++) {
// Object o = args[i];
invokeArgs[i] = X4OLanguageSession.class; // o.getClass(); todo fix
}
Method localMethod = local.getClass().getMethod(method.getName(), invokeArgs);
Object result = localMethod.invoke(local, args);
return result; // result is reflection safe interface hiding.
}
});
return (X4OLanguageConfiguration)proxy;
return (X4OLanguageConfiguration) proxy;
}
}

63
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageLoader.java
View file

@ -65,8 +65,9 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader {
/**
* Write log message to debug writer.
* @param language The X4O language we are loading.
* @param message The message to log to the debug output.
*
* @param language The X4O language we are loading.
* @param message The message to log to the debug output.
*/
private void logMessage(X4OLanguageSession session, String message) {
logger.finest(message + " from: " + session.getLanguage().getLanguageName());
@ -80,7 +81,8 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader {
}
@Override
public void loadLanguage(X4OLanguageSession session, X4OLanguageLocal languageLocal, String language, String languageVersion) throws X4OLanguageLoaderException {
public void loadLanguage(X4OLanguageSession session, X4OLanguageLocal languageLocal, String language, String languageVersion)
throws X4OLanguageLoaderException {
logger.finer("Loading all modules for language: " + language);
List<VersionedResources> modulesAll = loadLanguageModules(session, languageLocal, language);
modulesAll = filterVersionModules(modulesAll, languageLocal, languageVersion);
@ -93,31 +95,32 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader {
String languagePrefix = languageLocal.getLanguageConfiguration().getLanguageResourcePathPrefix();
String resource = languagePrefix + "/" + language + "/" + value;
if (language.equals(EldDriver.LANGUAGE_NAME)) {
loader = new EldModuleLoader(resource,true); // load cel
loader = new EldModuleLoader(resource, true); // load cel
} else {
loader = new EldModuleLoader(resource,false); // load eld
loader = new EldModuleLoader(resource, false); // load eld
}
loadModule(session, languageLocal, loader, value, versionedResources);
}
for (String value : versionedResources.moduleLoaders) {
try {
loader = (X4OLanguageModuleLoader)X4OLanguageClassLoader.newInstance(value);
loader = (X4OLanguageModuleLoader) X4OLanguageClassLoader.newInstance(value);
} catch (Exception ee) {
throw new X4OLanguageLoaderException("Could not load class: " + value + " error: " + ee.getMessage(),ee);
throw new X4OLanguageLoaderException("Could not load class: " + value + " error: " + ee.getMessage(), ee);
}
loadModule(session, languageLocal, loader, value, versionedResources);
}
for (String value : versionedResources.siblingLoaders) {
try {
loader = (X4OLanguageModuleLoader)X4OLanguageClassLoader.newInstance(value);
loader = (X4OLanguageModuleLoader) X4OLanguageClassLoader.newInstance(value);
} catch (Exception ee) {
throw new X4OLanguageLoaderException("Could not load class: " + value + " error: " + ee.getMessage(),ee);
throw new X4OLanguageLoaderException("Could not load class: " + value + " error: " + ee.getMessage(), ee);
}
loadModule(session, languageLocal, loader, value, versionedResources);
if (loader instanceof X4OLanguageModuleLoaderSibling) {
// mmm
X4OPhaseInitLanguageSiblings sibPhase = (X4OPhaseInitLanguageSiblings)languageLocal.getPhaseManager().getPhase(X4OPhaseLanguageInit.INIT_LANG_SIB);
sibPhase.addLanguageModuleLoaderSibling((X4OLanguageModuleLoaderSibling)loader);
X4OPhaseInitLanguageSiblings sibPhase = (X4OPhaseInitLanguageSiblings) languageLocal.getPhaseManager()
.getPhase(X4OPhaseLanguageInit.INIT_LANG_SIB);
sibPhase.addLanguageModuleLoaderSibling((X4OLanguageModuleLoaderSibling) loader);
}
}
for (String value : versionedResources.elbResources) {
@ -131,11 +134,13 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader {
}
}
private List<VersionedResources> filterVersionModules(List<VersionedResources> resources, X4OLanguageLocal languageLocal, String languageVersion) throws X4OLanguageLoaderException {
private List<VersionedResources> filterVersionModules(List<VersionedResources> resources, X4OLanguageLocal languageLocal, String languageVersion)
throws X4OLanguageLoaderException {
List<VersionedResources> result = new ArrayList<VersionedResources>(resources.size());
X4OLanguageVersionFilter lvf;
try {
lvf = X4OLanguageClassLoader.newInstance(X4OLanguageVersionFilter.class, languageLocal.getLanguageConfiguration().getDefaultLanguageVersionFilter());
lvf = X4OLanguageClassLoader.newInstance(X4OLanguageVersionFilter.class,
languageLocal.getLanguageConfiguration().getDefaultLanguageVersionFilter());
} catch (ClassNotFoundException e) {
throw new X4OLanguageLoaderException(e);
}
@ -173,17 +178,19 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader {
}
}
private void loadModule(X4OLanguageSession session, X4OLanguageLocal languageLocal, X4OLanguageModuleLoader loader, String resource, VersionedResources versionedResources) throws X4OLanguageLoaderException {
private void loadModule(X4OLanguageSession session, X4OLanguageLocal languageLocal, X4OLanguageModuleLoader loader, String resource,
VersionedResources versionedResources) throws X4OLanguageLoaderException {
X4OLanguageModuleLocal module;
try {
module = X4OLanguageClassLoader.newInstance(X4OLanguageModuleLocal.class, languageLocal.getLanguageConfiguration().getDefaultElementLanguageModule());
module = X4OLanguageClassLoader.newInstance(X4OLanguageModuleLocal.class,
languageLocal.getLanguageConfiguration().getDefaultElementLanguageModule());
} catch (ClassNotFoundException e) {
throw new X4OLanguageLoaderException(e);
}
logMessage(session,"Created module: " + module);
logMessage(session, "Created module: " + module);
long startTime = System.currentTimeMillis();
try {
logMessage(session,"Starting modules: " + module + " for language: " + languageLocal.getLanguageName());
logMessage(session, "Starting modules: " + module + " for language: " + languageLocal.getLanguageName());
loader.loadLanguageModule(session, languageLocal, module);
} catch (X4OLanguageModuleLoaderException e) {
throw new X4OLanguageLoaderException(e); // FIXME info
@ -203,10 +210,12 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader {
/**
* Loads all modules of an language.
* @param languageLocal The ElementLanguage to load for.
* @param language The language to load.
*
* @param languageLocal The ElementLanguage to load for.
* @param language The language to load.
*/
protected List<VersionedResources> loadLanguageModules(X4OLanguageSession session, X4OLanguageLocal languageLocal, String language) throws X4OLanguageLoaderException {
protected List<VersionedResources> loadLanguageModules(X4OLanguageSession session, X4OLanguageLocal languageLocal, String language)
throws X4OLanguageLoaderException {
List<VersionedResources> result = new ArrayList<VersionedResources>(15);
StringBuilder buf = new StringBuilder(150);
buf.append(languageLocal.getLanguageConfiguration().getLanguageResourcePathPrefix());
@ -225,26 +234,28 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader {
result.addAll(loadLanguageModulesXml(u.openStream(), u.toString()));
}
e = Thread.currentThread().getContextClassLoader().getResources("/"+buf.toString());
e = Thread.currentThread().getContextClassLoader().getResources("/" + buf.toString());
while (e.hasMoreElements()) {
URL u = e.nextElement();
logMessage(session, "Loading root modules: " + u + " for: " + language);
result.addAll(loadLanguageModulesXml(u.openStream(), u.toString()));
}
return result;
} catch (IOException | SAXException | ParserConfigurationException e) {
} catch (IOException | SAXException | ParserConfigurationException e) {
throw new X4OLanguageLoaderException(e);
}
}
/**
* Parser xml inputstream to languge modules.
* @param in The inputstream to parser.
*
* @param in The inputstream to parser.
* @throws IOException
* @throws SAXException
* @throws ParserConfigurationException
*/
protected List<VersionedResources> loadLanguageModulesXml(InputStream in, String loadedFrom) throws IOException, SAXException, ParserConfigurationException {
protected List<VersionedResources> loadLanguageModulesXml(InputStream in, String loadedFrom)
throws IOException, SAXException, ParserConfigurationException {
if (in == null) {
throw new NullPointerException("Can't parse null input stream");
}
@ -255,7 +266,7 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader {
XMLReader reader = parser.getXMLReader();
reader.setContentHandler(xth);
reader.setProperty("http://xml.org/sax/properties/lexical-handler", xth);
reader.setProperty("http://xml.org/sax/properties/declaration-handler",xth);
reader.setProperty("http://xml.org/sax/properties/declaration-handler", xth);
try {
reader.parse(new InputSource(in));
return xth.getResult();
@ -295,7 +306,7 @@ public class DefaultX4OLanguageLoader implements X4OLanguageLoader {
}
@Override
public void endElement(String namespaceUri, String tag,String qName) throws SAXException {
public void endElement(String namespaceUri, String tag, String qName) throws SAXException {
// Get and clear text
String value = buf.toString();

3
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageModule.java
View file

@ -20,8 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang;
package org.x4o.xml.lang;
/**
* An DefaultElementLanguageModule.

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageSession.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang;
package org.x4o.xml.lang;
import org.x4o.xml.io.X4OConnectionException;
import org.x4o.xml.lang.phase.X4OPhaseException;

16
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/DefaultX4OLanguageVersionFilter.java
View file

@ -24,7 +24,6 @@ package org.x4o.xml.lang;
import java.util.List;
/**
* DefaultX4OLanguageVersionFilter makes best filter match attempt.
*
@ -35,26 +34,27 @@ public class DefaultX4OLanguageVersionFilter implements X4OLanguageVersionFilter
/**
* Filters to the best version.
*
* @see org.x4o.xml.lang.X4OLanguageVersionFilter#filterVersion(java.lang.String, java.util.List)
* @return The perfect or best match or null if no match for requested language.
* @param requestVersion The language version to search for.
* @param versions The list of version to search in.
* @param requestVersion The language version to search for.
* @param versions The list of version to search in.
*/
public String filterVersion(String requestVersion, List<String> versions) {
for (int i=0;i<versions.size();i++) {
for (int i = 0; i < versions.size(); i++) {
String version = versions.get(i);
if (version.equals(requestVersion)) {
return version; // full match
}
}
String requestVersionDot = requestVersion;
if (requestVersion.length()>2) {
requestVersionDot = requestVersion.substring(0,requestVersion.length()-2);
if (requestVersion.length() > 2) {
requestVersionDot = requestVersion.substring(0, requestVersion.length() - 2);
}
for (int i=0;i<versions.size();i++) {
for (int i = 0; i < versions.size(); i++) {
String version = versions.get(i);
if (version.endsWith(".*")) {
String versionDot = version.substring(0,version.length()-2);
String versionDot = version.substring(0, version.length() - 2);
if (versionDot.equals(requestVersionDot)) {
return version; // star match
}

32
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguage.java
View file

@ -41,17 +41,19 @@ public interface X4OLanguage {
/**
* Returns the language name of this x4o xml language.
* @return Returns the language name.
*
* @return Returns the language name.
*/
String getLanguageName();
/**
* @return Returns the language version of this language instance.
* @return Returns the language version of this language instance.
*/
String getLanguageVersion();
/**
* Returns the phase manager which runs the phases
*
* @return Returns the phase manager.
*/
X4OPhaseManager getPhaseManager();
@ -63,44 +65,50 @@ public interface X4OLanguage {
/**
* Creates and fills the initial element language used to store the language.
* @return The newly created X4OLanguageSession.
*
* @return The newly created X4OLanguageSession.
*/
X4OLanguageSession createLanguageSession();
/**
* Search language for object and create element for it.
* @param context The X4O language context to create for.
*
* @param context The X4O language context to create for.
* @param objectClass The object to search for.
* @return Returns an new Element instance for the object.
* @return Returns an new Element instance for the object.
*/
Element createElementInstance(X4OLanguageSession context,Class<?> objectClass);
Element createElementInstance(X4OLanguageSession context, Class<?> objectClass);
/**
* Gets all ElementBindingHandlers which are possible for parent.
*
* @param parent The parent element object or class to search for.
* @return Returns an List with all ElementBindingHandler for the search.
* @return Returns an List with all ElementBindingHandler for the search.
*/
List<ElementBindingHandler> findElementBindingHandlers(Object parent);
/**
* Gets all ElementBindingHandlers for parent and child combination.
*
* @param parent The parent element object or class to search for.
* @param child The parent element object or class to search for.
* @return Returns an List with all ElementBindingHandler for the search pair.
* @param child The parent element object or class to search for.
* @return Returns an List with all ElementBindingHandler for the search pair.
*/
List<ElementBindingHandler> findElementBindingHandlers(Object parent,Object child);
List<ElementBindingHandler> findElementBindingHandlers(Object parent, Object child);
/**
* Returns list of ElementInterfaces for an element.
*
* @param object The element object or class to search for.
* @return The list of elementInterfaces.
* @return The list of elementInterfaces.
*/
List<ElementInterface> findElementInterfaces(Object object);
/**
* Returns the namespace context for an namespace uri.
*
* @param namespaceUri the namespace uri.
* @return The ElementNamespace.
* @return The ElementNamespace.
*/
ElementNamespace findElementNamespace(String namespaceUri);

46
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageClassLoader.java
View file

@ -42,7 +42,8 @@ public final class X4OLanguageClassLoader {
/**
* Gets the thread classloader or the normal classloader.
* @return Returns the ClassLoader.
*
* @return Returns the ClassLoader.
*/
public static ClassLoader getClassLoader() {
ClassLoader cl = Thread.currentThread().getContextClassLoader();
@ -53,12 +54,11 @@ public final class X4OLanguageClassLoader {
}
/**
* Loads a Class from the ContextClassLoader and if that is not set, then
* uses the class of the String className instance.
* Loads a Class from the ContextClassLoader and if that is not set, then uses the class of the String className instance.
*
* @param className The class name to load
* @return The loaded class
* @throws ClassNotFoundException if class not loaded.
* @param className The class name to load
* @return The loaded class
* @throws ClassNotFoundException if class not loaded.
*/
public static Class<?> loadClass(String className) throws ClassNotFoundException {
return getClassLoader().loadClass(className);
@ -66,10 +66,11 @@ public final class X4OLanguageClassLoader {
/**
* Creates new instance of clazz.
*
* @param resultType The result type to cast to..
* @param clazz The class to make object from.
* @return The object of the clazz.
* @throws ClassNotFoundException On any construct access or invoke error.
* @param clazz The class to make object from.
* @return The object of the clazz.
* @throws ClassNotFoundException On any construct access or invoke error.
*/
@SuppressWarnings("unchecked")
public static <T> T newInstance(Class<T> resultType, Class<?> clazz) throws ClassNotFoundException {
@ -78,23 +79,26 @@ public final class X4OLanguageClassLoader {
/**
* Creates new instance of clazz.
* @param clazz The class to make object from.
* @return The object of the clazz.
* @throws ClassNotFoundException On any construct access or invoke error.
*
* @param clazz The class to make object from.
* @return The object of the clazz.
* @throws ClassNotFoundException On any construct access or invoke error.
*/
public static Object newInstance(Class<?> clazz) throws ClassNotFoundException {
try {
return clazz.getConstructor().newInstance();
} catch (IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | InstantiationException | IllegalAccessException e) {
} catch (IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | InstantiationException
| IllegalAccessException e) {
throw new ClassNotFoundException(e.getMessage(), e);
}
}
/**
* Creates new instance of className.
* @param className The className to create object from.
* @return The object of the className.
* @throws ClassNotFoundException When className is not found or can't be created.
*
* @param className The className to create object from.
* @return The object of the className.
* @throws ClassNotFoundException When className is not found or can't be created.
*/
public static Object newInstance(String className) throws ClassNotFoundException {
return newInstance(loadClass(className));
@ -102,8 +106,9 @@ public final class X4OLanguageClassLoader {
/**
* Gets a resource from the classloader to an url.
* @param resourceName The resource to get from the classloader.
* @return The url to the resource or null if not found.
*
* @param resourceName The resource to get from the classloader.
* @return The url to the resource or null if not found.
* @see java.lang.ClassLoader#getResource(String)
*/
public static URL getResource(String resourceName) {
@ -112,8 +117,9 @@ public final class X4OLanguageClassLoader {
/**
* Gets a resource from the classloader to an inputstream.
* @param resourceName The resource to get from the classloader.
* @return The inputstream to the resource or null if not found.
*
* @param resourceName The resource to get from the classloader.
* @return The inputstream to the resource or null if not found.
* @see java.lang.ClassLoader#getResourceAsStream(String)
*/
public static InputStream getResourceAsStream(String resourceName) {

21
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfiguration.java
View file

@ -37,44 +37,55 @@ public interface X4OLanguageConfiguration {
public static final String DEFAULT_LANG_MODULES_FILE = "-modules.xml";
/**
* @return Returns the path prefix for loading language resources.
* @return Returns the path prefix for loading language resources.
*/
String getLanguageResourcePathPrefix();
/**
* @return Returns the filename (postfix) of the modules definition file.
* @return Returns the filename (postfix) of the modules definition file.
*/
String getLanguageResourceModulesFileName();
// Core interfaces are also in class for text reference without instance
Class<?> getDefaultElementNamespace();
Class<?> getDefaultElementInterface();
Class<?> getDefaultElement();
Class<?> getDefaultElementClass();
Class<?> getDefaultElementClassAttribute();
// Other needed interfaces in class form also
Class<?> getDefaultElementLanguageModule();
Class<?> getDefaultElementBodyComment();
Class<?> getDefaultElementBodyCharacters();
Class<?> getDefaultElementBodyWhitespace();
Class<?> getDefaultElementNamespaceInstanceProvider();
Class<?> getDefaultElementAttributeValueParser();
Class<?> getDefaultElementObjectPropertyValue();
Class<?> getDefaultElementNamespaceAttributeComparator();
/**
* @return Returns the X4OLanguageVersionFilter which filters the best version to use.
* @return Returns the X4OLanguageVersionFilter which filters the best version to use.
*/
Class<?> getDefaultLanguageVersionFilter();
/**
* @return Returns the X4OLanguageLoader which loads languages into the element context.
* @return Returns the X4OLanguageLoader which loads languages into the element context.
*/
Class<?> getDefaultLanguageLoader();
/**
* @return Returns the Expression Language Context which holds the el objects.
* @return Returns the Expression Language Context which holds the el objects.
*/
Class<?> getDefaultExpressionLanguageContext();
}

14
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageConfigurationLocal.java
View file

@ -33,24 +33,38 @@ public interface X4OLanguageConfigurationLocal extends X4OLanguageConfiguration
X4OLanguageConfiguration createProxy();
void setLanguageResourcePathPrefix(String value);
void setLanguageResourceModulesFileName(String value);
void setDefaultElementNamespace(Class<?> value);
void setDefaultElementInterface(Class<?> value);
void setDefaultElement(Class<?> value);
void setDefaultElementClass(Class<?> value);
void setDefaultElementClassAttribute(Class<?> value);
void setDefaultElementLanguageModule(Class<?> value);
void setDefaultElementBodyComment(Class<?> value);
void setDefaultElementBodyCharacters(Class<?> value);
void setDefaultElementBodyWhitespace(Class<?> value);
void setDefaultElementNamespaceInstanceProvider(Class<?> value);
void setDefaultElementAttributeValueParser(Class<?> value);
void setDefaultElementObjectPropertyValue(Class<?> value);
void setDefaultElementNamespaceAttributeComparator(Class<?> value);
void setDefaultLanguageVersionFilter(Class<?> value);
void setDefaultLanguageLoader(Class<?> value);
void setDefaultExpressionLanguageContext(Class<?> value);
}

11
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoader.java
View file

@ -32,11 +32,12 @@ public interface X4OLanguageLoader {
/**
* Loads the language modules.
* @param session The session we run in.
* @param language The local Language to load for.
* @param languageName The language name to load.
* @param languageVersion The language version to load.
* @throws X4OLanguageLoaderException When there is an error.
*
* @param session The session we run in.
* @param language The local Language to load for.
* @param languageName The language name to load.
* @param languageVersion The language version to load.
* @throws X4OLanguageLoaderException When there is an error.
*/
void loadLanguage(X4OLanguageSession session, X4OLanguageLocal language, String languageName, String languageVersion) throws X4OLanguageLoaderException;
}

17
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLoaderException.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang;
package org.x4o.xml.lang;
/**
* Is throw when there is en Exception within an Element.
@ -42,7 +42,8 @@ public class X4OLanguageLoaderException extends Exception {
/**
* Constructs an X4OLanguageLoaderException with a detail message.
* @param message The message of this Exception
*
* @param message The message of this Exception
*/
public X4OLanguageLoaderException(String message) {
super(message);
@ -50,7 +51,8 @@ public class X4OLanguageLoaderException extends Exception {
/**
* Creates an X4OLanguageLoaderException from a parent exception.
* @param e The exception.
*
* @param e The exception.
*/
public X4OLanguageLoaderException(Exception e) {
super(e);
@ -58,10 +60,11 @@ public class X4OLanguageLoaderException extends Exception {
/**
* Constructs an X4OLanguageLoaderException with a detail message.
* @param message The message of this Exception
* @param e The exception.
*
* @param message The message of this Exception
* @param e The exception.
*/
public X4OLanguageLoaderException(String message,Exception e) {
super(message,e);
public X4OLanguageLoaderException(String message, Exception e) {
super(message, e);
}
}

1
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageLocal.java
View file

@ -37,6 +37,7 @@ public interface X4OLanguageLocal extends X4OLanguage {
/**
* Adds an X4OLanguageModule to this language.
*
* @param languageModule The element language module to add.
*/
void addLanguageModule(X4OLanguageModule languageModule);

20
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModule.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang;
package org.x4o.xml.lang;
import java.util.List;
@ -40,6 +40,7 @@ public interface X4OLanguageModule /* extends ElementMetaBase TODO add local lay
// temp here see local
String getId();
String getDescription();
/**
@ -54,26 +55,30 @@ public interface X4OLanguageModule /* extends ElementMetaBase TODO add local lay
/**
* Gets all ElementBindingHandlers.
* @return Returns an List with all ElementBindingHandlers.
*
* @return Returns an List with all ElementBindingHandlers.
*/
List<ElementBindingHandler> getElementBindingHandlers();
/**
* Gets all ElementConfiguratorGlobals.
* @return All gloval ElementConfigurators.
*
* @return All gloval ElementConfigurators.
*/
List<ElementConfiguratorGlobal> getElementConfiguratorGlobals();
/**
* Returns list of ElementInterfaces in this context.
* @return The list of elementInterfaces.
*
* @return The list of elementInterfaces.
*/
List<ElementInterface> getElementInterfaces();
/**
* Returns the namespace context for an namespace uri.
*
* @param namespaceUri the namespace uri.
* @return The ElementNamespace.
* @return The ElementNamespace.
*/
ElementNamespace getElementNamespace(String namespaceUri);
@ -84,8 +89,9 @@ public interface X4OLanguageModule /* extends ElementMetaBase TODO add local lay
/**
* Gets module loader meta result info.
* @param key The key to get info of.
* @return The value of the info.
*
* @param key The key to get info of.
* @return The value of the info.
*/
String getLoaderResult(X4OLanguageModuleLoaderResult key);
}

10
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoader.java
View file

@ -23,8 +23,7 @@
package org.x4o.xml.lang;
/**
* X4OLanguageModuleLoader Loads all elements and other options
* into the X4OLanguageModule for the X4OLanguageLocal language.
* X4OLanguageModuleLoader Loads all elements and other options into the X4OLanguageModule for the X4OLanguageLocal language.
*
* @author Willem Cazander
* @version 1.0 Jul 8, 2006
@ -33,10 +32,11 @@ public interface X4OLanguageModuleLoader {
/**
* Starts the ElementProvider.
* @param session The session we run in.
*
* @param session The session we run in.
* @param language The local Language to load for.
* @param module The language module to load it into.
* @throws X4OLanguageModuleLoaderException Gets thrown when modules could not be correctly loaded.
* @param module The language module to load it into.
* @throws X4OLanguageModuleLoaderException Gets thrown when modules could not be correctly loaded.
*/
void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal module) throws X4OLanguageModuleLoaderException;
}

25
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderException.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang;
package org.x4o.xml.lang;
import org.x4o.xml.element.ElementException;
@ -37,27 +37,30 @@ public class X4OLanguageModuleLoaderException extends ElementException {
/**
* Creates module loader exception.
* @param elementLanguageModuleLoader The loader module which creates this exception.
* @param message The message of the exception.
*
* @param elementLanguageModuleLoader The loader module which creates this exception.
* @param message The message of the exception.
*/
public X4OLanguageModuleLoaderException(X4OLanguageModuleLoader elementLanguageModuleLoader,String message) {
public X4OLanguageModuleLoaderException(X4OLanguageModuleLoader elementLanguageModuleLoader, String message) {
super(message);
this.elementLanguageModuleLoader=elementLanguageModuleLoader;
this.elementLanguageModuleLoader = elementLanguageModuleLoader;
}
/**
* Creates module loader exception.
* @param elementLanguageModuleLoader The loader module which creates this exception.
* @param message The message of the exception.
* @param exception The root cause of the exception.
*
* @param elementLanguageModuleLoader The loader module which creates this exception.
* @param message The message of the exception.
* @param exception The root cause of the exception.
*/
public X4OLanguageModuleLoaderException(X4OLanguageModuleLoader elementLanguageModuleLoader,String message,Exception exception) {
super(message,exception);
this.elementLanguageModuleLoader=elementLanguageModuleLoader;
public X4OLanguageModuleLoaderException(X4OLanguageModuleLoader elementLanguageModuleLoader, String message, Exception exception) {
super(message, exception);
this.elementLanguageModuleLoader = elementLanguageModuleLoader;
}
/**
* Returns the module loader which created the exception.
*
* @return Returns the module loader.
*/
public X4OLanguageModuleLoader getElementProvider() {

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderResult.java
View file

@ -30,10 +30,12 @@ package org.x4o.xml.lang;
*/
public enum X4OLanguageModuleLoaderResult {
//@formatter:off
LOAD_MODULE_RESOURCE,
LOAD_FROM_RESOURCE,
LOAD_VERSION,
LOAD_CLASS,
LOAD_TIME,
LOAD_DATE;
//@formatter:on
}

7
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLoaderSibling.java
View file

@ -22,8 +22,6 @@
*/
package org.x4o.xml.lang;
/**
* ElementLanguageModuleLoaderSibling provides sibling language loading support.
*
@ -35,9 +33,10 @@ public interface X4OLanguageModuleLoaderSibling extends X4OLanguageModuleLoader
/**
* Loads in the sibling language.
* @param session The session we run in.
*
* @param session The session we run in.
* @param language The local Language to load for.
* @param loader The loader to use to load the x4o languages.
* @param loader The loader to use to load the x4o languages.
* @throws X4OLanguageLoaderException Gets thrown when there is an error loading the sibling language.
*/
void loadLanguageSibling(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageLoader loader) throws X4OLanguageLoaderException;

21
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageModuleLocal.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang;
package org.x4o.xml.lang;
import org.x4o.xml.element.ElementBindingHandler;
import org.x4o.xml.element.ElementConfiguratorGlobal;
@ -34,7 +34,7 @@ import org.x4o.xml.element.ElementNamespace;
* @author Willem Cazander
* @version 1.0 Mar 7, 2014
*/
public interface X4OLanguageModuleLocal extends X4OLanguageModule,ElementMetaBase {
public interface X4OLanguageModuleLocal extends X4OLanguageModule, ElementMetaBase {
/**
* @param providerName the providerName to set.
@ -48,32 +48,37 @@ public interface X4OLanguageModuleLocal extends X4OLanguageModule,ElementMetaBas
/**
* Adds an ElementBindingHanlder.
* @param elementBindingHandler The ElementBindingHandler to add.
*
* @param elementBindingHandler The ElementBindingHandler to add.
*/
void addElementBindingHandler(ElementBindingHandler elementBindingHandler);
/**
* Adds an ElementConfiguratorGlobal.
* @param elementConfigurator The ElementConfigurtor to add.
*
* @param elementConfigurator The ElementConfigurtor to add.
*/
void addElementConfiguratorGlobal(ElementConfiguratorGlobal elementConfigurator);
/**
* Adds an ElementInterface.
* @param elementInterface The elementInterface to add.
*
* @param elementInterface The elementInterface to add.
*/
void addElementInterface(ElementInterface elementInterface);
/**
* Adds an namespace to this langauge module.
*
* @param elementNamespace Adds an ElementNamespace to this langauge module.
*/
void addElementNamespace(ElementNamespace elementNamespace);
/**
* Sets module loader meta result info.
* @param key The key of the info.
* @param value The value of the info.
*
* @param key The key of the info.
* @param value The value of the info.
*/
void putLoaderResult(X4OLanguageModuleLoaderResult key,String value);
void putLoaderResult(X4OLanguageModuleLoaderResult key, String value);
}

36
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSession.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang;
package org.x4o.xml.lang;
import java.util.List;
@ -43,80 +43,86 @@ import org.x4o.xml.lang.phase.X4OPhase;
public interface X4OLanguageSession extends AutoCloseable {
/**
* @return Returns the language from which this session in created.
* @return Returns the language from which this session in created.
*/
X4OLanguage getLanguage();
/**
* Gets the EL Context.
* @return Returns the ELContext.
*
* @return Returns the ELContext.
*/
ELContext getExpressionLanguageContext();
/**
* Gets the ExpressionFactory.
* @return Returns the ExpressionFactory.
*
* @return Returns the ExpressionFactory.
*/
ExpressionFactory getExpressionLanguageFactory();
/**
* @return Returns the ElementAttributeValueParser.
* @return Returns the ElementAttributeValueParser.
*/
ElementAttributeValueParser getElementAttributeValueParser();
/**
* @return Returns the ElementObjectPropertyValue.
* @return Returns the ElementObjectPropertyValue.
*/
ElementObjectPropertyValue getElementObjectPropertyValue();
/**
* Marks an (new) Element as dirty and run the phases from this start phase.
*
* @param element The Element which needs the magic.
* @param element The Element which needs the magic.
*/
void addDirtyElement(Element element);
/**
* Get all Dirty Elements.
* @return Returns List with dirty elements.
*
* @return Returns List with dirty elements.
*/
List<Element> getDirtyElements();
/**
* Returns the root Element which starts the xml tree.
* @return Returns the root element of the document instance we parse.
*
* @return Returns the root element of the document instance we parse.
*/
Element getRootElement();
/**
* Sets the root element.
* @param element The root element to set.
*
* @param element The root element to set.
*/
void setRootElement(Element element);
/**
* @return Returns null or an X4ODebugWriter to write parsing steps and debug data to.
* @return Returns null or an X4ODebugWriter to write parsing steps and debug data to.
*/
X4ODebugWriter getX4ODebugWriter();
/**
* @return Returns true if this config has a debug writer.
* @return Returns true if this config has a debug writer.
*/
boolean hasX4ODebugWriter();
/**
* Returns the current X4OPhase of the parser.
* @return Returns the current phase.
*
* @return Returns the current phase.
*/
X4OPhase getPhaseCurrent();
/**
* @return Returns the phase this session will stop processing.
* @return Returns the phase this session will stop processing.
*/
String getPhaseStop();
/**
* @return Returns a list of phases we skip while processing.
* @return Returns a list of phases we skip while processing.
*/
List<String> getPhaseSkip();

19
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageSessionLocal.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang;
package org.x4o.xml.lang;
import java.util.List;
@ -42,8 +42,8 @@ import org.x4o.xml.lang.phase.X4OPhaseListener;
public interface X4OLanguageSessionLocal extends X4OLanguageSession {
/**
* Returns list of phase listeners which where added to it.
* TODO: bad api here
* Returns list of phase listeners which where added to it. TODO: bad api here
*
* @param phaseId The phaseId of for the listeners.
* @return All X4OPhaseListeners.
*/
@ -51,13 +51,15 @@ public interface X4OLanguageSessionLocal extends X4OLanguageSession {
/**
* Sets the EL Context.
* @param context The ELContext to set.
*
* @param context The ELContext to set.
*/
void setExpressionLanguageContext(ELContext context);
/**
* Sets the ExpressionFactory.
* @param expressionFactory The ExpressionFactory to set.
*
* @param expressionFactory The ExpressionFactory to set.
*/
void setExpressionLanguageFactory(ExpressionFactory expressionFactory);
@ -67,18 +69,19 @@ public interface X4OLanguageSessionLocal extends X4OLanguageSession {
void setElementAttributeValueParser(ElementAttributeValueParser elementAttributeValueParser);
/**
* @param elementObjectPropertyValue The elementObjectPropertyValue to set.
* @param elementObjectPropertyValue The elementObjectPropertyValue to set.
*/
void setElementObjectPropertyValue(ElementObjectPropertyValue elementObjectPropertyValue);
/**
* @param debugWriter The debug writer to set
* @param debugWriter The debug writer to set
*/
void setX4ODebugWriter(X4ODebugWriter debugWriter);
/**
* Sets the phase of the context.
* @param phase The current phase to set.
*
* @param phase The current phase to set.
*/
void setPhaseCurrent(X4OPhase phase);

8
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/X4OLanguageVersionFilter.java
View file

@ -35,9 +35,9 @@ public interface X4OLanguageVersionFilter {
/**
* Finds the version to load or returns null if no match is found.
*
* @param languageVersion The languageVersion to requested.
* @param versions The versions provided by the module.
* @return The version to load.
* @param languageVersion The languageVersion to requested.
* @param versions The versions provided by the module.
* @return The version to load.
*/
String filterVersion(String languageVersion,List<String> versions);
String filterVersion(String languageVersion, List<String> versions);
}

17
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELIDAttributeHandler.java
View file

@ -30,7 +30,6 @@ import org.x4o.xml.element.AbstractElementNamespaceAttribute;
import org.x4o.xml.element.Element;
import org.x4o.xml.element.ElementConfiguratorException;
/**
* Stores an ElementObject into the EL context.
*
@ -44,17 +43,23 @@ public class ELIDAttributeHandler extends AbstractElementNamespaceAttribute {
*/
public void doConfigElement(Element element) throws ElementConfiguratorException {
String attributeValue = element.getAttributes().get(getAttributeName());
if(attributeValue==null) { return; }
if(element.getElementObject()==null) {
if (attributeValue == null) {
return;
}
if (element.getElementObject() == null) {
if (this.isConfigAction()) {
throw new NullPointerException("Can't bind null object to el context");
}
this.setConfigAction(true);
return;
}
if(element.getElementObject()==null) { throw new NullPointerException("Can't bind null object to el context"); }
ValueExpression ee = element.getLanguageSession().getExpressionLanguageFactory().createValueExpression(element.getLanguageSession().getExpressionLanguageContext(),"${"+attributeValue+"}", element.getElementObject().getClass());
Logger.getLogger(ELIDAttributeHandler.class.getName()).finer("Set Variable in ELContext: "+"${"+attributeValue+"}"+" object SET: "+element.getElementObject());
if (element.getElementObject() == null) {
throw new NullPointerException("Can't bind null object to el context");
}
ValueExpression ee = element.getLanguageSession().getExpressionLanguageFactory().createValueExpression(
element.getLanguageSession().getExpressionLanguageContext(), "${" + attributeValue + "}", element.getElementObject().getClass());
Logger.getLogger(ELIDAttributeHandler.class.getName())
.finer("Set Variable in ELContext: " + "${" + attributeValue + "}" + " object SET: " + element.getElementObject());
ee.setValue(element.getLanguageSession().getExpressionLanguageContext(), element.getElementObject());
}
}

10
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ELReferenceElement.java
View file

@ -29,7 +29,6 @@ import javax.el.ValueExpression;
import org.x4o.xml.element.AbstractElement;
import org.x4o.xml.element.ElementException;
/**
* An ELReferenceElement.<br>
* Fills the ElementObject with an object from el.
@ -42,9 +41,12 @@ public class ELReferenceElement extends AbstractElement {
@Override
public void doElementRun() throws ElementException {
String attributeValue = getAttributes().get("el.ref");
if("".equals(attributeValue) | attributeValue==null) { throw new ElementException("Set the el.ref attribute"); }
ValueExpression ee = getLanguageSession().getExpressionLanguageFactory().createValueExpression(getLanguageSession().getExpressionLanguageContext(),"${"+attributeValue+"}",Object.class);
Logger.getLogger(ELReferenceElement.class.getName()).finer("Get Variable in ELContext: ${"+attributeValue+"}");
if ("".equals(attributeValue) | attributeValue == null) {
throw new ElementException("Set the el.ref attribute");
}
ValueExpression ee = getLanguageSession().getExpressionLanguageFactory().createValueExpression(getLanguageSession().getExpressionLanguageContext(),
"${" + attributeValue + "}", Object.class);
Logger.getLogger(ELReferenceElement.class.getName()).finer("Get Variable in ELContext: ${" + attributeValue + "}");
setElementObject(ee.getValue(getLanguageSession().getExpressionLanguageContext()));
}
}

3
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MetaLanguageSiblingLoader.java
View file

@ -51,7 +51,8 @@ public class MetaLanguageSiblingLoader implements X4OLanguageModuleLoaderSibling
public static final String META_LANGUAGE_DESCRIPTION = "X4O Meta XML Language Module.";
@Override
public void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal module) throws X4OLanguageModuleLoaderException {
public void loadLanguageModule(X4OLanguageSession session, X4OLanguageLocal language, X4OLanguageModuleLocal module)
throws X4OLanguageModuleLoaderException {
module.setId(META_LANGUAGE);
module.setProviderHost(META_LANGUAGE_HOST);
module.setProviderName(MetaLanguageSiblingLoader.class.getSimpleName());

9
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/MethodElement.java
View file

@ -28,7 +28,6 @@ import java.lang.reflect.Method;
import org.x4o.xml.element.AbstractElement;
import org.x4o.xml.element.ElementException;
/**
* MethodElement invokes an method on a element object.
*
@ -44,17 +43,17 @@ public class MethodElement extends AbstractElement {
*/
@Override
public void doElementRun() throws ElementException {
if (getParent()==null) {
if (getParent() == null) {
throw new IllegalStateException("need to have parent.");
}
Object parent = getParent().getElementObject();
if (parent==null) {
if (parent == null) {
throw new IllegalStateException("need to have parent ElementObject.");
}
String methodString = getAttributes().get("method");
Method[] ms = parent.getClass().getMethods();
try {
for (Method m:ms) {
for (Method m : ms) {
if (methodString.equalsIgnoreCase(m.getName())) {
m.invoke(parent);
return;
@ -67,6 +66,6 @@ public class MethodElement extends AbstractElement {
} catch (InvocationTargetException e) {
throw new ElementException(e);
}
throw new ElementException("could not find method on parent element object: "+methodString+" on; "+parent);
throw new ElementException("could not find method on parent element object: " + methodString + " on; " + parent);
}
}

4
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/ParentObjectElement.java
View file

@ -35,7 +35,7 @@ public class ParentObjectElement extends AbstractElement {
@Override
public Object getElementObject() {
if (getParent()==null) {
if (getParent() == null) {
return null;
}
return getParent().getElementObject();
@ -43,7 +43,7 @@ public class ParentObjectElement extends AbstractElement {
@Override
public void setElementObject(Object object) {
if (getParent()==null) {
if (getParent() == null) {
return;
}
getParent().setElementObject(object);

23
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/meta/PropertyElement.java
View file

@ -30,7 +30,6 @@ import org.x4o.xml.eld.lang.BeanElement;
import org.x4o.xml.element.AbstractElement;
import org.x4o.xml.element.ElementException;
/**
* An PropertyElement.<br>
*
@ -47,7 +46,7 @@ public class PropertyElement extends AbstractElement {
@SuppressWarnings({ "unchecked", "rawtypes" })
public void doElementRun() throws ElementException {
if (getParent().getElementObject()==null) {
if (getParent().getElementObject() == null) {
throw new IllegalStateException("need to have parent ElementObject");
}
@ -55,46 +54,46 @@ public class PropertyElement extends AbstractElement {
String valueString = getAttributes().get("value");
Object value = valueString;
if (name==null) {
if (name == null) {
name = getAttributes().get("name");
}
if (name==null) {
if (name == null) {
name = getAttributes().get("field");
}
// convert value object
try {
value = getLanguageSession().getElementAttributeValueParser().getParameterValue(name,valueString,this);
value = getLanguageSession().getElementAttributeValueParser().getParameterValue(name, valueString, this);
} catch (ObjectConverterException ece) {
throw new ElementException(ece);
}
if (getParent() instanceof BeanElement) {
BeanElement bean = (BeanElement)getParent();
BeanElement bean = (BeanElement) getParent();
bean.addConstuctorArgument(value);
return;
}
if (name==null) {
if (name == null) {
throw new IllegalStateException("Can't set properties without key.");
}
// check map interface
if (getParent().getElementObject() instanceof Map) {
((Map)getParent().getElementObject()).put(name,value);
((Map) getParent().getElementObject()).put(name, value);
return;
}
// check for setProperty(String,Object) method
Method[] methodes = getParent().getElementObject().getClass().getMethods();
for (int i=0;i<methodes.length;i++) {
for (int i = 0; i < methodes.length; i++) {
Method method = methodes[i];
if (method.getName().toLowerCase().equals("setproperty")) {
try {
method.invoke(getParent().getElementObject(),new Object[]{name,value});
method.invoke(getParent().getElementObject(), new Object[] { name, value });
return;
} catch (Exception e) {
throw new ElementException("Could not invoke setproperty of "+method.getName()+" on: "+getParent().getElementObject(),e);
throw new ElementException("Could not invoke setproperty of " + method.getName() + " on: " + getParent().getElementObject(), e);
}
}
}
@ -104,7 +103,7 @@ public class PropertyElement extends AbstractElement {
getLanguageSession().getElementObjectPropertyValue().setProperty(getParent().getElementObject(), name, value);
return;
} catch (Exception e) {
throw new ElementException("Could not set property on parent element object: "+name,e);
throw new ElementException("Could not set property on parent element object: " + name, e);
}
}
}

8
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/AbstractX4OPhase.java
View file

@ -20,13 +20,12 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
import org.x4o.xml.element.Element;
import org.x4o.xml.element.ElementException;
import org.x4o.xml.lang.X4OLanguageSession;
/**
* AbstractX4OPhaseHandler a base class for creating a phase handler.
*
@ -50,6 +49,7 @@ public abstract class AbstractX4OPhase implements X4OPhase {
/**
* If returns true then this handler will run on all elements.
*
* @return defaults to true.
*/
public boolean isElementPhase() {
@ -58,6 +58,7 @@ public abstract class AbstractX4OPhase implements X4OPhase {
/**
* Abstract method.
*
* @param element The element to run phase for.
* @throws X4OPhaseException when phase has error.
*/
@ -65,6 +66,7 @@ public abstract class AbstractX4OPhase implements X4OPhase {
/**
* Empty method.
*
* @param elementLanguage The language to run phase for.
* @throws X4OPhaseException when phase has error.
*/
@ -76,7 +78,7 @@ public abstract class AbstractX4OPhase implements X4OPhase {
return;
}
try {
languageSession.getX4ODebugWriter().debugPhaseMessage(message,this.getClass());
languageSession.getX4ODebugWriter().debugPhaseMessage(message, this.getClass());
} catch (ElementException ee) {
throw new X4OPhaseException(this, ee);
}

99
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/DefaultX4OPhaseManager.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
import java.util.ArrayList;
import java.util.Collections;
@ -32,8 +32,7 @@ import org.x4o.xml.lang.X4OLanguageSession;
import org.x4o.xml.lang.X4OLanguageSessionLocal;
/**
* X4OPhaseManager stores the X4OPhaseHandler and puts them in the right order.
* And will execute the phases when runPhases is called.
* X4OPhaseManager stores the X4OPhaseHandler and puts them in the right order. And will execute the phases when runPhases is called.
*
* @author Willem Cazander
* @version 1.0 Jan 6, 2008
@ -49,8 +48,8 @@ public class DefaultX4OPhaseManager implements X4OPhaseManagerLocal {
public DefaultX4OPhaseManager() {
x4oPhases = new ArrayList<X4OPhase>(25);
}
/*
/*
//@formatter:off
PHASE_ORDER = { *startupX4OPhase,
*createLanguagePhase,
*createLanguageSiblingsPhase,
@ -64,7 +63,7 @@ PHASE_ORDER = { *startupX4OPhase,
*releasePhase
};
* = runOnce
//@formatter:on
*/
public X4OPhase getPhase(String phaseName) {
@ -86,22 +85,24 @@ PHASE_ORDER = { *startupX4OPhase,
/**
* Adds an X4OPhaseHandler.
* @param phase The X4OPhaseHandler to add.
*
* @param phase The X4OPhaseHandler to add.
*/
public void addX4OPhase(X4OPhase phase) {
if (phase==null) {
if (phase == null) {
throw new NullPointerException("Can't add null phase handler.");
}
// context is created in first phase.
//if (X4OPhase.FIRST_PHASE.equals(elementLanguage.getCurrentX4OPhase())==false) {
// context is created in first phase.
// if (X4OPhase.FIRST_PHASE.equals(elementLanguage.getCurrentX4OPhase())==false) {
// throw new IllegalStateException("Can't add new phases after first phase is completed.");
//}
// }
x4oPhases.add(phase);
}
/**
* Returns all the X4OPhaseHandlers.
* @return Returns all X4OPhaseHandlers.
*
* @return Returns all X4OPhaseHandlers.
*/
public List<X4OPhase> getAllPhases() {
return new ArrayList<X4OPhase>(x4oPhases);
@ -109,7 +110,8 @@ PHASE_ORDER = { *startupX4OPhase,
/**
* Returns all the X4OPhaseHandlers in ordered list.
* @return Returns all X4OPhaseHandler is order.
*
* @return Returns all X4OPhaseHandler is order.
*/
public List<X4OPhase> getOrderedPhases(X4OPhaseType type) {
List<X4OPhase> result = new ArrayList<X4OPhase>(x4oPhases.size());
@ -124,6 +126,7 @@ PHASE_ORDER = { *startupX4OPhase,
/**
* Runs all the phases in the right order.
*
* @throws X4OPhaseException When a running handlers throws one.
*/
public void runPhases(X4OLanguageSession languageSession, X4OPhaseType type) throws X4OPhaseException {
@ -161,7 +164,7 @@ PHASE_ORDER = { *startupX4OPhase,
// do the run interface
phase.runPhase(languageSession);
// run the element phase if possible
// run the element phase if possible
executePhaseRoot(languageSession, phase);
} finally {
// run the listeners again
@ -178,11 +181,12 @@ PHASE_ORDER = { *startupX4OPhase,
/**
* Runs phase on single element.
* @param e The Element to process.
* @param p The phase to run.
*
* @param e The Element to process.
* @param p The phase to run.
* @throws X4OPhaseException When a running handlers throws one.
*/
public void runPhasesForElement(Element e,X4OPhaseType type,X4OPhase p) throws X4OPhaseException {
public void runPhasesForElement(Element e, X4OPhaseType type, X4OPhase p) throws X4OPhaseException {
X4OLanguageSession languageSession = e.getLanguageSession();
List<String> phaseSkip = languageSession.getPhaseSkip();
String phaseStop = languageSession.getPhaseStop();
@ -198,12 +202,12 @@ PHASE_ORDER = { *startupX4OPhase,
}
// set phase
((X4OLanguageSessionLocal)languageSession).setPhaseCurrent(phase);
((X4OLanguageSessionLocal) languageSession).setPhaseCurrent(phase);
// do the run interface
phase.runPhase(languageSession);
// run the element phase if possible
// run the element phase if possible
executePhaseRoot(languageSession, phase);
if (phaseStop != null && phaseStop.equals(phase.getId())) {
@ -214,6 +218,7 @@ PHASE_ORDER = { *startupX4OPhase,
/**
* Run release phase manual if auto release is disabled by config.
*
* @throws X4OPhaseException When a running handlers throws one.
*/
public void doReleasePhaseManual(X4OLanguageSession languageSession) throws X4OPhaseException {
@ -227,10 +232,10 @@ PHASE_ORDER = { *startupX4OPhase,
}
if (releaseRequested == null) {
return; // No manual release requested
//throw new IllegalStateException("No manual release requested.");
// throw new IllegalStateException("No manual release requested.");
}
if (languageSession.getRootElement() == null) {
return; // no root element , empty xml document ?
return; // no root element , empty xml document ?
}
if (languageSession.getRootElement().getElementClass() == null) {
throw new IllegalStateException("Release phase has already been runned.");
@ -248,12 +253,12 @@ PHASE_ORDER = { *startupX4OPhase,
}
// set phase
((X4OLanguageSessionLocal)languageSession).setPhaseCurrent(h);
((X4OLanguageSessionLocal) languageSession).setPhaseCurrent(h);
// do the run interface
h.runPhase(languageSession);
// run the element phase if possible
// run the element phase if possible
executePhaseRoot(languageSession, h);
}
@ -273,69 +278,35 @@ PHASE_ORDER = { *startupX4OPhase,
}
}
return 0;
/*
if (p1==p2) {
return 0;
}
if (p1==X4OPhase.debugPhase) {
return 0;
}
if (p2==X4OPhase.debugPhase) {
return 0;
}
int i1 = phaseOrder(p1);
int i2 = phaseOrder(p2);
if (i1>i2) {
return 1;
}
if (i1<i2) {
return -1;
}
return 0;
*/
}
/*
private int phaseOrder(X4OPhase check) {
int result=0;
for (X4OPhase p:X4OPhase.PHASE_ORDER) {
if (p==check) {
return result;
}
result++;
}
return -1;
}
*/
}
/**
* Execute element phase handler on full tree.
* @param phase The phase to run.
*
* @param phase The phase to run.
* @throws X4OPhaseException When a running handlers throws one.
*/
private void executePhaseRoot(X4OLanguageSession elementLanguage, X4OPhase phase) throws X4OPhaseException {
if (elementLanguage.getRootElement() == null) {
return;
}
executePhaseTree(elementLanguage.getRootElement(),phase);
executePhaseTree(elementLanguage.getRootElement(), phase);
}
/**
* todo: rewrite to itterator for big deep trees.
*
* @param element The element in the tree.
* @param phase The phase to run.
* @param element The element in the tree.
* @param phase The phase to run.
* @throws X4OPhaseException
*/
private void executePhaseTree(Element element, X4OPhase phase) throws X4OPhaseException {
if (element.getElementClass() != null && element.getElementClass().getSkipPhases().contains(phase.getId()) == false) {
phase.runElementPhase(element);
}
for (Element e:element.getChilderen()) {
executePhaseTree(e,phase);
for (Element e : element.getChilderen()) {
executePhaseTree(e, phase);
}
}
}

26
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhase.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
import org.x4o.xml.element.Element;
import org.x4o.xml.lang.X4OLanguageSession;
@ -37,7 +37,8 @@ public interface X4OPhase {
/**
* Returns the X4OPhase for which this handler was written.
* @return Returns the phase for which this handler works.
*
* @return Returns the phase for which this handler works.
*/
String getId();
@ -45,29 +46,32 @@ public interface X4OPhase {
/**
* Returns a flag indicating that this phase is runnable multiple times.
* @return True if phase is restricted to run once.
*
* @return True if phase is restricted to run once.
*/
boolean isRunOnce();
/**
* Runs this phase.
* @param elementLanguage The elementLanguage running this phase.
* @throws X4OPhaseException When error has happend.
*
* @param elementLanguage The elementLanguage running this phase.
* @throws X4OPhaseException When error has happend.
*/
void runPhase(X4OLanguageSession elementLanguage) throws X4OPhaseException;
/**
* runPhase is called but should do nothig.
* When elementPhase is enables x4o tries to merge all element phases so
* we don't need to loop element tree to often.
* @return True if to run in config.
* runPhase is called but should do nothig. When elementPhase is enables x4o tries to merge all element phases so we don't need to loop element tree to
* often.
*
* @return True if to run in config.
*/
boolean isElementPhase();
/**
* Run this phase for this Element.
* @param element The element to run this phase for.
* @throws X4OPhaseException Is thrown when error has happen.
*
* @param element The element to run this phase for.
* @throws X4OPhaseException Is thrown when error has happen.
*/
void runElementPhase(Element element) throws X4OPhaseException;
}

36
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseException.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
/**
* Is throw when there is en Exception within an Element.
@ -37,38 +37,42 @@ public class X4OPhaseException extends Exception {
/**
* Creates an ElementException from a parent exception.
* @param exceptionPhase The handler which throwed.
* @param e The Exception.
*
* @param exceptionPhase The handler which throwed.
* @param e The Exception.
*/
public X4OPhaseException(X4OPhase exceptionPhase,Exception e) {
public X4OPhaseException(X4OPhase exceptionPhase, Exception e) {
super(e);
this.exceptionPhase=exceptionPhase;
this.exceptionPhase = exceptionPhase;
}
/**
* Creates an ElementException from a parent exception.
* @param exceptionPhase The handler which throwed.
* @param message The message of the error.
*
* @param exceptionPhase The handler which throwed.
* @param message The message of the error.
*/
public X4OPhaseException(X4OPhase exceptionPhase,String message) {
public X4OPhaseException(X4OPhase exceptionPhase, String message) {
super(message);
this.exceptionPhase=exceptionPhase;
this.exceptionPhase = exceptionPhase;
}
/**
* Creates an ElementException from a parent exception.
* @param exceptionPhase The handler which throwed.
* @param message The message of the error.
* @param e The Exception.
*
* @param exceptionPhase The handler which throwed.
* @param message The message of the error.
* @param e The Exception.
*/
public X4OPhaseException(X4OPhase exceptionPhase,String message,Exception e) {
super(message,e);
this.exceptionPhase=exceptionPhase;
public X4OPhaseException(X4OPhase exceptionPhase, String message, Exception e) {
super(message, e);
this.exceptionPhase = exceptionPhase;
}
/**
* Returns the X4OPhaseHandler which created this Exception.
* @return An X4OPhaseHandler
*
* @return An X4OPhaseHandler
*/
public X4OPhase getX4OPhaseHandler() {
return exceptionPhase;

55
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageInit.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
import java.util.ArrayList;
import java.util.List;
@ -65,53 +65,63 @@ public class X4OPhaseLanguageInit {
public X4OPhaseType getType() {
return X4OPhaseType.INIT;
}
public String getId() {
return INIT_START;
}
public String[] getPhaseDependencies() {
return new String[]{};
return new String[] {};
}
public boolean isElementPhase() {
return false;
}
public void runElementPhase(Element element) throws X4OPhaseException {
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
logger.finest("Run init start phase");
}
};
/**
* Loads all the modules a language.
* Then creates the ElementProviders
* Loads all the modules a language. Then creates the ElementProviders
*/
class X4OPhaseInitLanguage extends AbstractX4OPhase {
public X4OPhaseType getType() {
return X4OPhaseType.INIT;
}
public String getId() {
return INIT_LANG;
}
public String[] getPhaseDependencies() {
return new String[]{INIT_START};
return new String[] { INIT_START };
}
public boolean isElementPhase() {
return false;
}
public void runElementPhase(Element element) throws X4OPhaseException {
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
try {
debugPhaseMessage(languageSession, "Load main language: " + languageSession.getLanguage().getLanguageName());
X4OLanguageLoader loader = X4OLanguageClassLoader.newInstance(X4OLanguageLoader.class, languageSession.getLanguage().getLanguageConfiguration().getDefaultLanguageLoader());
X4OLanguageLocal language = (X4OLanguageLocal)languageSession.getLanguage();
loader.loadLanguage(languageSession, language, language.getLanguageName(), language.getLanguageVersion());
X4OLanguageLoader loader = X4OLanguageClassLoader.newInstance(X4OLanguageLoader.class,
languageSession.getLanguage().getLanguageConfiguration().getDefaultLanguageLoader());
X4OLanguageLocal language = (X4OLanguageLocal) languageSession.getLanguage();
loader.loadLanguage(languageSession, language, language.getLanguageName(), language.getLanguageVersion());
if (languageSession.hasX4ODebugWriter()) {
languageSession.getX4ODebugWriter().debugElementLanguageModules(languageSession);
}
} catch (Exception e) {
throw new X4OPhaseException(this,e);
throw new X4OPhaseException(this, e);
}
}
};
@ -121,30 +131,38 @@ public class X4OPhaseLanguageInit {
*/
public class X4OPhaseInitLanguageSiblings extends AbstractX4OPhase {
private List<X4OLanguageModuleLoaderSibling> siblingLoaders = new ArrayList<X4OLanguageModuleLoaderSibling>(2);
// mmmm think of better then cast
public void addLanguageModuleLoaderSibling(X4OLanguageModuleLoaderSibling loader) {
siblingLoaders.add(loader);
}
public X4OPhaseType getType() {
return X4OPhaseType.INIT;
}
public String getId() {
return INIT_LANG_SIB;
}
public String[] getPhaseDependencies() {
return new String[] {INIT_LANG};
return new String[] { INIT_LANG };
}
public boolean isElementPhase() {
return false;
}
public void runElementPhase(Element element) throws X4OPhaseException {
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
try {
if (siblingLoaders.isEmpty()==false) {
X4OLanguageLoader loader = X4OLanguageClassLoader.newInstance(X4OLanguageLoader.class, languageSession.getLanguage().getLanguageConfiguration().getDefaultLanguageLoader());
X4OLanguageLocal language = (X4OLanguageLocal)languageSession.getLanguage();
for (X4OLanguageModuleLoaderSibling siblingLoader:siblingLoaders) {
if (siblingLoaders.isEmpty() == false) {
X4OLanguageLoader loader = X4OLanguageClassLoader.newInstance(X4OLanguageLoader.class,
languageSession.getLanguage().getLanguageConfiguration().getDefaultLanguageLoader());
X4OLanguageLocal language = (X4OLanguageLocal) languageSession.getLanguage();
for (X4OLanguageModuleLoaderSibling siblingLoader : siblingLoaders) {
debugPhaseMessage(languageSession, "Loading sibling langauge loader: " + siblingLoader);
siblingLoader.loadLanguageSibling(languageSession, language, loader);
}
@ -154,7 +172,7 @@ public class X4OPhaseLanguageInit {
siblingLoaders.clear();
}
} catch (Exception e) {
throw new X4OPhaseException(this,e);
throw new X4OPhaseException(this, e);
}
}
};
@ -166,17 +184,22 @@ public class X4OPhaseLanguageInit {
public X4OPhaseType getType() {
return X4OPhaseType.INIT;
}
public String getId() {
return INIT_END;
}
public String[] getPhaseDependencies() {
return new String[]{INIT_LANG_SIB};
return new String[] { INIT_LANG_SIB };
}
public boolean isElementPhase() {
return false;
}
public void runElementPhase(Element element) throws X4OPhaseException {
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
logger.finest("Run init end phase");
}

299
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageRead.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
import java.util.ArrayList;
import java.util.Collections;
@ -117,26 +117,31 @@ public class X4OPhaseLanguageRead {
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_BEGIN;
}
public String[] getPhaseDependencies() {
return new String[]{};
return new String[] {};
}
public boolean isElementPhase() {
return false;
}
public void runElementPhase(Element element) throws X4OPhaseException {
// not used.
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
// print the properties and classes for this language/config
if (languageSession.hasX4ODebugWriter()) {
try {
//languageSession.getX4ODebugWriter().debugLanguageProperties(languageSession);
// languageSession.getX4ODebugWriter().debugLanguageProperties(languageSession);
languageSession.getX4ODebugWriter().debugLanguageDefaultClasses(languageSession);
} catch (ElementException e) {
throw new X4OPhaseException(this,e);
throw new X4OPhaseException(this, e);
}
}
}
@ -147,27 +152,32 @@ public class X4OPhaseLanguageRead {
*/
class X4OPhaseReadConfigElement extends AbstractX4OPhase {
private X4OPhaseReadRunConfigurator runConf = null;
public X4OPhaseReadConfigElement(X4OPhaseReadRunConfigurator runConf) {
this.runConf=runConf;
this.runConf = runConf;
}
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_CONFIG_ELEMENT;
}
public String[] getPhaseDependencies() {
return new String[] {READ_BEGIN};
return new String[] { READ_BEGIN };
}
public void runElementPhase(Element element) throws X4OPhaseException {
// First phase is to rename attributes, maybe move so sax phase
for (ElementClassAttribute eca:element.getElementClass().getElementClassAttributes()) {
for (ElementClassAttribute eca : element.getElementClass().getElementClassAttributes()) {
List<String> aliases = eca.getAttributeAliases();
if (aliases.isEmpty()) {
continue;
}
for (String alias:aliases) {
for (String alias : aliases) {
if (element.getAttributes().containsKey(alias)) {
String attributeValue = element.getAttributes().get(alias);
element.getAttributes().put(eca.getId(), attributeValue);
@ -176,9 +186,9 @@ public class X4OPhaseLanguageRead {
}
}
logger.finest("Do ElementClass Config Configurators: "+element.getElementClass().getElementConfigurators().size());
for (ElementConfigurator ec:element.getElementClass().getElementConfigurators()) {
runConf.runElementConfigurator(ec,element,this);
logger.finest("Do ElementClass Config Configurators: " + element.getElementClass().getElementConfigurators().size());
for (ElementConfigurator ec : element.getElementClass().getElementConfigurators()) {
runConf.runElementConfigurator(ec, element, this);
}
}
};
@ -188,27 +198,32 @@ public class X4OPhaseLanguageRead {
*/
class X4OPhaseReadConfigElementInterface extends AbstractX4OPhase {
private X4OPhaseReadRunConfigurator runConf = null;
public X4OPhaseReadConfigElementInterface(X4OPhaseReadRunConfigurator runConf) {
this.runConf=runConf;
this.runConf = runConf;
}
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_CONFIG_ELEMENT_INTERFACE;
}
public String[] getPhaseDependencies() {
return new String[] {READ_CONFIG_ELEMENT};
return new String[] { READ_CONFIG_ELEMENT };
}
public void runElementPhase(Element element) throws X4OPhaseException {
if (element.getElementObject()==null) {
if (element.getElementObject() == null) {
logger.finest("Null elementObject skipping, interfaces");
return;
}
for (ElementInterface ei:element.getLanguageSession().getLanguage().findElementInterfaces(element.getElementObject())) {
logger.finest("Do ElementInterface Config Configurators: "+ei.getElementConfigurators().size());
for (ElementConfigurator ec:ei.getElementConfigurators()) {
runConf.runElementConfigurator(ec,element,this);
for (ElementInterface ei : element.getLanguageSession().getLanguage().findElementInterfaces(element.getElementObject())) {
logger.finest("Do ElementInterface Config Configurators: " + ei.getElementConfigurators().size());
for (ElementConfigurator ec : ei.getElementConfigurators()) {
runConf.runElementConfigurator(ec, element, this);
}
}
}
@ -219,23 +234,28 @@ public class X4OPhaseLanguageRead {
*/
class X4OPhaseReadConfigGlobalElement extends AbstractX4OPhase {
private X4OPhaseReadRunConfigurator runConf = null;
public X4OPhaseReadConfigGlobalElement(X4OPhaseReadRunConfigurator runConf) {
this.runConf=runConf;
this.runConf = runConf;
}
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_CONFIG_GLOBAL_ELEMENT;
}
public String[] getPhaseDependencies() {
return new String[] {READ_CONFIG_ELEMENT,READ_CONFIG_ELEMENT_INTERFACE};
return new String[] { READ_CONFIG_ELEMENT, READ_CONFIG_ELEMENT_INTERFACE };
}
public void runElementPhase(Element element) throws X4OPhaseException {
for (X4OLanguageModule mod:element.getLanguageSession().getLanguage().getLanguageModules()) {
logger.finest("Do Element Config Global Configurators: "+mod.getElementConfiguratorGlobals().size());
for (ElementConfiguratorGlobal ec:mod.getElementConfiguratorGlobals()) {
runConf.runElementConfigurator(ec,element,this);
for (X4OLanguageModule mod : element.getLanguageSession().getLanguage().getLanguageModules()) {
logger.finest("Do Element Config Global Configurators: " + mod.getElementConfiguratorGlobals().size());
for (ElementConfiguratorGlobal ec : mod.getElementConfiguratorGlobals()) {
runConf.runElementConfigurator(ec, element, this);
}
}
}
@ -247,46 +267,52 @@ public class X4OPhaseLanguageRead {
class X4OPhaseReadConfigGlobalAttribute extends AbstractX4OPhase {
Comparator<ElementNamespaceAttribute> elementNamespaceAttributeComparator = null;
private X4OPhaseReadRunConfigurator runConf = null;
public X4OPhaseReadConfigGlobalAttribute(X4OPhaseReadRunConfigurator runConf) {
this.runConf=runConf;
this.runConf = runConf;
}
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_CONFIG_GLOBAL_ATTRIBUTE;
}
public String[] getPhaseDependencies() {
return new String[] {READ_CONFIG_GLOBAL_ELEMENT};
return new String[] { READ_CONFIG_GLOBAL_ELEMENT };
}
@SuppressWarnings("unchecked")
public void runElementPhase(Element element) throws X4OPhaseException {
if (elementNamespaceAttributeComparator==null) {
if (elementNamespaceAttributeComparator == null) {
try {
elementNamespaceAttributeComparator = (Comparator<ElementNamespaceAttribute>)X4OLanguageClassLoader.newInstance(element.getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementNamespaceAttributeComparator());
elementNamespaceAttributeComparator = (Comparator<ElementNamespaceAttribute>) X4OLanguageClassLoader
.newInstance(element.getLanguageSession().getLanguage().getLanguageConfiguration().getDefaultElementNamespaceAttributeComparator());
} catch (ClassNotFoundException e) {
throw new X4OPhaseException(this,e);
throw new X4OPhaseException(this, e);
}
}
// do global parameters
logger.finest("Do Element Global AttributeHandlers.");
List<ElementNamespaceAttribute> handlers = new ArrayList<ElementNamespaceAttribute>();
for (X4OLanguageModule mod:element.getLanguageSession().getLanguage().getLanguageModules()) {
for (ElementNamespace ns:mod.getElementNamespaces()) {
for (ElementNamespaceAttribute global:ns.getElementNamespaceAttributes()) {
for (X4OLanguageModule mod : element.getLanguageSession().getLanguage().getLanguageModules()) {
for (ElementNamespace ns : mod.getElementNamespaces()) {
for (ElementNamespaceAttribute global : ns.getElementNamespaceAttributes()) {
String attribute = element.getAttributes().get(global.getAttributeName());
if (attribute!=null) {
if (attribute != null) {
handlers.add(global);
}
}
}
}
Collections.sort(handlers,elementNamespaceAttributeComparator);
Collections.sort(handlers, elementNamespaceAttributeComparator);
List<ElementConfigurator> handlers2 = new ArrayList<ElementConfigurator>(handlers.size());
handlers2.addAll(handlers);
for (ElementConfigurator ec:handlers) {
runConf.runElementConfigurator(ec,element,this);
for (ElementConfigurator ec : handlers) {
runConf.runElementConfigurator(ec, element, this);
}
}
};
@ -298,46 +324,49 @@ public class X4OPhaseLanguageRead {
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_RUN_ATTRIBUTE;
}
public String[] getPhaseDependencies() {
return new String[] {READ_CONFIG_GLOBAL_ATTRIBUTE};
return new String[] { READ_CONFIG_GLOBAL_ATTRIBUTE };
}
public void runElementPhase(Element element) throws X4OPhaseException {
// we only can config ElementObjects
if (element.getElementObject()==null) {
if (element.getElementObject() == null) {
return;
}
// do config
Map<String,String> attr = element.getAttributes();
Map<String, String> attr = element.getAttributes();
ElementAttributeValueParser attrParser = element.getLanguageSession().getElementAttributeValueParser();
Boolean autoAttributes = element.getElementClass().getAutoAttributes();
if (autoAttributes==null) {
if (autoAttributes == null) {
autoAttributes = true;
}
try {
for (String name:attr.keySet()) {
String valueString = (String)attr.get(name);
if (valueString==null) {
for (String name : attr.keySet()) {
String valueString = (String) attr.get(name);
if (valueString == null) {
continue;
}
Object value = valueString;
ElementClassAttribute attrClass = element.getElementClass().getElementClassAttributeByName(name);
if (attrClass!=null) {
if (attrClass.getRunResolveEL()==null || attrClass.getRunResolveEL() && attrParser.isELParameter(name, valueString, element)) {
if (attrClass != null) {
if (attrClass.getRunResolveEL() == null || attrClass.getRunResolveEL() && attrParser.isELParameter(name, valueString, element)) {
value = attrParser.getELParameterValue(valueString, element);
}
if (attrClass.getRunConverters()==null || attrClass.getRunConverters()) {
if (attrClass.getRunConverters() == null || attrClass.getRunConverters()) {
value = attrParser.getConvertedParameterValue(name, value, element);
}
if (attrClass.getRunBeanValue()==null || attrClass.getRunBeanValue()) {
if (attrClass.getRunBeanValue() == null || attrClass.getRunBeanValue()) {
element.getLanguageSession().getElementObjectPropertyValue().setProperty(element.getElementObject(), name, value);
}
} else if (autoAttributes) {
value = attrParser.getParameterValue(name,valueString,element);
value = attrParser.getParameterValue(name, valueString, element);
element.getLanguageSession().getElementObjectPropertyValue().setProperty(element.getElementObject(), name, value);
} else {
@ -345,24 +374,24 @@ public class X4OPhaseLanguageRead {
}
}
// check for defaults
for (ElementClassAttribute attrClass:element.getElementClass().getElementClassAttributes()) {
if (attrClass.getDefaultValue()!=null && attr.containsKey(attrClass.getId())==false) {
for (ElementClassAttribute attrClass : element.getElementClass().getElementClassAttributes()) {
if (attrClass.getDefaultValue() != null && attr.containsKey(attrClass.getId()) == false) {
Object value = null;
if (attrClass.getDefaultValue() instanceof String) {
value = attrParser.getParameterValue(attrClass.getId(),(String)attrClass.getDefaultValue(),element);
value = attrParser.getParameterValue(attrClass.getId(), (String) attrClass.getDefaultValue(), element);
} else {
value = attrClass.getDefaultValue();
}
if (attrClass.getRunBeanValue()==null || attrClass.getRunBeanValue()) {
if (attrClass.getRunBeanValue() == null || attrClass.getRunBeanValue()) {
element.getLanguageSession().getElementObjectPropertyValue().setProperty(element.getElementObject(), attrClass.getId(), value);
}
}
}
} catch (ObjectConverterException oce) {
throw new X4OPhaseException(this,"Error while converting parameters: "+oce.getMessage(),oce);
throw new X4OPhaseException(this, "Error while converting parameters: " + oce.getMessage(), oce);
} catch (ElementException e) {
throw new X4OPhaseException(this,"Error while setting parameters: "+e.getMessage(),e);
throw new X4OPhaseException(this, "Error while setting parameters: " + e.getMessage(), e);
}
}
};
@ -374,12 +403,15 @@ public class X4OPhaseLanguageRead {
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_FILL_TEMPLATE;
}
public String[] getPhaseDependencies() {
return new String[] {READ_RUN_ATTRIBUTE};
return new String[] { READ_RUN_ATTRIBUTE };
}
public void runElementPhase(Element element) throws X4OPhaseException {
}
};
@ -391,14 +423,17 @@ public class X4OPhaseLanguageRead {
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_TRANSFORM;
}
public String[] getPhaseDependencies() {
return new String[] {READ_FILL_TEMPLATE};
return new String[] { READ_FILL_TEMPLATE };
}
public void runElementPhase(Element element) throws X4OPhaseException {
if (element.isTransformingTree()==false) {
if (element.isTransformingTree() == false) {
return;
}
try {
@ -407,7 +442,7 @@ public class X4OPhaseLanguageRead {
}
element.doElementRun();
} catch (ElementException e) {
throw new X4OPhaseException(this,e);
throw new X4OPhaseException(this, e);
}
}
};
@ -417,18 +452,23 @@ public class X4OPhaseLanguageRead {
*/
class X4OPhaseReadRunDirty extends AbstractX4OPhase {
private X4OPhaseManager phaseManager = null;
public X4OPhaseReadRunDirty(X4OPhaseManager phaseManager) {
this.phaseManager = phaseManager;
}
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_RUN_DIRTY;
}
public String[] getPhaseDependencies() {
return new String[] {READ_TRANSFORM};
return new String[] { READ_TRANSFORM };
}
public void runElementPhase(Element element) throws X4OPhaseException {
List<Element> dirtyElements = element.getLanguageSession().getDirtyElements();
if (dirtyElements.isEmpty()) {
@ -437,7 +477,7 @@ public class X4OPhaseLanguageRead {
debugPhaseMessage(element.getLanguageSession(), "Dirty elements: " + dirtyElements.size());
X4OPhase p = phaseManager.getPhase(READ_BEGIN);
for (Element e : dirtyElements) {
phaseManager.runPhasesForElement(e,getType(), p);
phaseManager.runPhasesForElement(e, getType(), p);
}
element.getLanguageSession().getDirtyElements().clear();
}
@ -448,18 +488,23 @@ public class X4OPhaseLanguageRead {
*/
class X4OPhaseReadRunDirtyLast extends AbstractX4OPhase {
private X4OPhaseManager phaseManager = null;
public X4OPhaseReadRunDirtyLast(X4OPhaseManager phaseManager) {
this.phaseManager = phaseManager;
}
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_RUN_DIRTY_LAST;
}
public String[] getPhaseDependencies() {
return new String[] {READ_RUN};
return new String[] { READ_RUN };
}
public void runElementPhase(Element element) throws X4OPhaseException {
List<Element> dirtyElements = element.getLanguageSession().getDirtyElements();
if (dirtyElements.isEmpty()) {
@ -468,7 +513,7 @@ public class X4OPhaseLanguageRead {
debugPhaseMessage(element.getLanguageSession(), "Dirty elements last: " + dirtyElements.size());
X4OPhase p = phaseManager.getPhase(READ_BEGIN);
for (Element e : dirtyElements) {
phaseManager.runPhasesForElement(e,getType(), p);
phaseManager.runPhasesForElement(e, getType(), p);
}
element.getLanguageSession().getDirtyElements().clear();
}
@ -481,40 +526,43 @@ public class X4OPhaseLanguageRead {
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_BIND_ELEMENT;
}
public String[] getPhaseDependencies() {
return new String[] {READ_RUN_DIRTY};
return new String[] { READ_RUN_DIRTY };
}
public void runElementPhase(Element element) throws X4OPhaseException {
Element parentElement = element.getParent();
if(parentElement==null) {
if (parentElement == null) {
logger.finest("No parent element, so no binding needed.");
return;
}
Object parentObject = parentElement.getElementObject();
if(parentObject==null) {
if (parentObject == null) {
logger.finest("No parent object, so no binding needed.");
return;
}
Object childObject = element.getElementObject();
if (childObject==null) {
if (childObject == null) {
logger.finest("No child object, so no binding needed.");
return;
}
List<ElementBindingHandler> binds = element.getLanguageSession().getLanguage().findElementBindingHandlers(parentObject, childObject);
logger.finest("Calling bindings handlers; "+binds.size());
logger.finest("Calling bindings handlers; " + binds.size());
try {
for (ElementBindingHandler binding:binds) {
for (ElementBindingHandler binding : binds) {
if (element.getLanguageSession().hasX4ODebugWriter()) {
element.getLanguageSession().getX4ODebugWriter().debugElementBindingHandler(binding,element);
element.getLanguageSession().getX4ODebugWriter().debugElementBindingHandler(binding, element);
}
binding.bindChild(element);
}
} catch (ElementException e) {
throw new X4OPhaseException(this,"Error while binding",e);
throw new X4OPhaseException(this, "Error while binding", e);
}
}
};
@ -526,84 +574,97 @@ public class X4OPhaseLanguageRead {
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_RUN;
}
public String[] getPhaseDependencies() {
return new String[] {READ_BIND_ELEMENT};
return new String[] { READ_BIND_ELEMENT };
}
public void runElementPhase(Element element) throws X4OPhaseException {
if (element.isTransformingTree()) {
return; // has already runned.
}
try {
//if (element.getlanguageSession().hasX4ODebugWriter()) {
// element.getlanguageSession().getX4ODebugWriter().debugElement(element);
//}
// if (element.getlanguageSession().hasX4ODebugWriter()) {
// element.getlanguageSession().getX4ODebugWriter().debugElement(element);
// }
element.doElementRun();
} catch (ElementException e) {
throw new X4OPhaseException(this,e);
throw new X4OPhaseException(this, e);
}
}
};
class X4OPhaseReadRunConfigurator extends AbstractX4OPhase {
private List<RunConfigurator> runConf = null;
protected X4OPhaseReadRunConfigurator() {
runConf = new ArrayList<RunConfigurator>(10);
}
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_RUN_CONFIGURATOR;
}
public String[] getPhaseDependencies() {
return new String[] {READ_RUN};
return new String[] { READ_RUN };
}
public boolean isElementPhase() {
return false;
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
for (RunConfigurator conf:runConf) {
for (RunConfigurator conf : runConf) {
try {
if (languageSession.hasX4ODebugWriter()) {
languageSession.getX4ODebugWriter().debugElementConfigurator(conf.elementConfigurator,conf.element);
languageSession.getX4ODebugWriter().debugElementConfigurator(conf.elementConfigurator, conf.element);
}
conf.elementConfigurator.doConfigElement(conf.element);
} catch (ElementException e) {
throw new X4OPhaseException(this,e);
throw new X4OPhaseException(this, e);
}
}
}
@Override
public void runElementPhase(Element element) throws X4OPhaseException {
}
class RunConfigurator {
Element element;
ElementConfigurator elementConfigurator;
RunConfigurator(Element element,ElementConfigurator elementConfigurator) {
this.element=element;
this.elementConfigurator=elementConfigurator;
RunConfigurator(Element element, ElementConfigurator elementConfigurator) {
this.element = element;
this.elementConfigurator = elementConfigurator;
}
}
public void runElementConfigurator(ElementConfigurator ec,Element e,X4OPhase phase) throws X4OPhaseException {
public void runElementConfigurator(ElementConfigurator ec, Element e, X4OPhase phase) throws X4OPhaseException {
if (ec.isConfigAction()) {
runConf.add(new RunConfigurator(e,ec));
runConf.add(new RunConfigurator(e, ec));
return;
}
try {
if (e.getLanguageSession().hasX4ODebugWriter()) {
e.getLanguageSession().getX4ODebugWriter().debugElementConfigurator(ec,e);
e.getLanguageSession().getX4ODebugWriter().debugElementConfigurator(ec, e);
}
ec.doConfigElement(e);
// may request rerun of config
if (ec.isConfigAction()) {
runConf.add(new RunConfigurator(e,ec));
runConf.add(new RunConfigurator(e, ec));
}
} catch (ElementException ee) {
throw new X4OPhaseException(phase,ee);
throw new X4OPhaseException(phase, ee);
}
}
}
@ -615,25 +676,30 @@ public class X4OPhaseLanguageRead {
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_END;
}
public String[] getPhaseDependencies() {
return new String[]{READ_RUN_CONFIGURATOR};
return new String[] { READ_RUN_CONFIGURATOR };
}
public boolean isElementPhase() {
return false;
}
public void runElementPhase(Element element) throws X4OPhaseException {
// not used.
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
// print the properties and classes for this language/config
if (languageSession.hasX4ODebugWriter()) {
try {
languageSession.getX4ODebugWriter().debugLanguageDefaultClasses(languageSession);
} catch (ElementException e) {
throw new X4OPhaseException(this,e);
throw new X4OPhaseException(this, e);
}
}
}
@ -641,61 +707,50 @@ public class X4OPhaseLanguageRead {
/**
*
* @return The X4OPhaseHandler for this phase.
* @return The X4OPhaseHandler for this phase.
*/
public X4OPhase releasePhase() {
// for debug output TODO: redo release counters
/*
class ReleasePhaseListener implements X4OPhaseListener {
private int elementsReleased = 0;
public void preRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException {
elementsReleased=0;
}
public void endRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException {
if (languageSession.hasX4ODebugWriter()==false) {
return;
}
try {
AttributesImpl atts = new AttributesImpl();
atts.addAttribute ("", "elements", "", "", elementsReleased+"");
languageSession.getX4ODebugWriter().getContentWriter().startElement (X4ODebugWriter.DEBUG_URI, "executeReleases", "", atts);
languageSession.getX4ODebugWriter().getContentWriter().endElement (X4ODebugWriter.DEBUG_URI, "executeReleases" , "");
} catch (SAXException e) {
throw new X4OPhaseException(phase,e);
}
}
* class ReleasePhaseListener implements X4OPhaseListener { private int elementsReleased = 0; public void preRunPhase(X4OPhase phase,X4OLanguageSession
* languageSession) throws X4OPhaseException { elementsReleased=0; } public void endRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws
* X4OPhaseException { if (languageSession.hasX4ODebugWriter()==false) { return; } try { AttributesImpl atts = new AttributesImpl(); atts.addAttribute
* ("", "elements", "", "", elementsReleased+""); languageSession.getX4ODebugWriter().getContentWriter().startElement (X4ODebugWriter.DEBUG_URI,
* "executeReleases", "", atts); languageSession.getX4ODebugWriter().getContentWriter().endElement (X4ODebugWriter.DEBUG_URI, "executeReleases" , ""); }
* catch (SAXException e) { throw new X4OPhaseException(phase,e); } }
*
* public void addReleasedElement() { elementsReleased++; } }
*/
public void addReleasedElement() {
elementsReleased++;
}
}
*/
//final ReleasePhaseListener releaseCounter = new ReleasePhaseListener();
// final ReleasePhaseListener releaseCounter = new ReleasePhaseListener();
X4OPhase result = new AbstractX4OPhase() {
public X4OPhaseType getType() {
return X4OPhaseType.XML_READ;
}
public String getId() {
return READ_RELEASE;
}
public String[] getPhaseDependencies() {
return new String[] {READ_END};
return new String[] { READ_END };
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
}
public void runElementPhase(Element element) throws X4OPhaseException {
public void runElementPhase(Element element) throws X4OPhaseException {
try {
element.release();
} catch (ElementException e) {
throw new X4OPhaseException(this,e);
}// finally {
// releaseCounter.addReleasedElement();
//}
throw new X4OPhaseException(this, e);
} // finally {
// releaseCounter.addReleasedElement();
// }
}
};
//result.addPhaseListener(releaseCounter);
// result.addPhaseListener(releaseCounter);
return result;
}
}

93
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseLanguageWrite.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
import java.util.logging.Logger;
@ -56,7 +56,7 @@ public class X4OPhaseLanguageWrite {
manager.addX4OPhase(new X4OPhaseWriteBegin());
manager.addX4OPhase(new X4OPhaseWriteFillTree());
manager.addX4OPhase(new X4OPhaseWriteEnd());
//manager.addX4OPhase(new X4OPhaseWriteRelease());
// manager.addX4OPhase(new X4OPhaseWriteRelease());
}
/**
@ -66,18 +66,23 @@ public class X4OPhaseLanguageWrite {
public X4OPhaseType getType() {
return X4OPhaseType.XML_WRITE;
}
public String getId() {
return WRITE_BEGIN;
}
public String[] getPhaseDependencies() {
return new String[]{};
return new String[] {};
}
public boolean isElementPhase() {
return false;
}
public void runElementPhase(Element element) throws X4OPhaseException {
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
logger.finest("Run init begin phase");
}
};
@ -89,74 +94,81 @@ public class X4OPhaseLanguageWrite {
public X4OPhaseType getType() {
return X4OPhaseType.XML_WRITE;
}
public String getId() {
return WRITE_FILL_TREE;
}
public String[] getPhaseDependencies() {
return new String[]{WRITE_BEGIN};
return new String[] { WRITE_BEGIN };
}
public boolean isElementPhase() {
return false;
}
public void runElementPhase(Element element) throws X4OPhaseException {
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
try {
Element root = languageSession.getRootElement();
// TODO: check for read tree then write support as ec is not null then ..
if (root.getElementClass()==null) {
root = fillElementTree(languageSession,root.getElementObject());
if (root.getElementClass() == null) {
root = fillElementTree(languageSession, root.getElementObject());
}
} catch (Exception e) {
throw new X4OPhaseException(this,e);
throw new X4OPhaseException(this, e);
}
}
private Element fillElementTree(X4OLanguageSession languageSession,Object object) throws ElementNamespaceInstanceProviderException, ElementBindingHandlerException {
Element element = findRootElement(languageSession,object.getClass());
private Element fillElementTree(X4OLanguageSession languageSession, Object object)
throws ElementNamespaceInstanceProviderException, ElementBindingHandlerException {
Element element = findRootElement(languageSession, object.getClass());
element.setElementObject(object);
languageSession.setRootElement(element);
for (ElementBindingHandler bind:languageSession.getLanguage().findElementBindingHandlers(object)) {
for (ElementBindingHandler bind : languageSession.getLanguage().findElementBindingHandlers(object)) {
bind.createChilderen(element);
fillTree(languageSession,element);
fillTree(languageSession, element);
}
return element;
}
private void fillTree(X4OLanguageSession languageSession,Element element) throws ElementNamespaceInstanceProviderException, ElementBindingHandlerException {
for (Element e:element.getChilderen()) {
private void fillTree(X4OLanguageSession languageSession, Element element)
throws ElementNamespaceInstanceProviderException, ElementBindingHandlerException {
for (Element e : element.getChilderen()) {
Object object = e.getElementObject();
for (ElementBindingHandler bind:languageSession.getLanguage().findElementBindingHandlers(object)) {
for (ElementBindingHandler bind : languageSession.getLanguage().findElementBindingHandlers(object)) {
bind.createChilderen(e);
fillTree(languageSession,e);
fillTree(languageSession, e);
}
}
}
private Element findRootElement(X4OLanguageSession languageSession,Class<?> objectClass) throws ElementNamespaceInstanceProviderException {
private Element findRootElement(X4OLanguageSession languageSession, Class<?> objectClass) throws ElementNamespaceInstanceProviderException {
// redo this mess, add nice find for root
for (X4OLanguageModule modContext:languageSession.getLanguage().getLanguageModules()) {
for (ElementNamespace nsContext:modContext.getElementNamespaces()) {
if (nsContext.getLanguageRoot()!=null && nsContext.getLanguageRoot()) {
for (ElementClass ec:nsContext.getElementClasses()) {
if (ec.getObjectClass()!=null && ec.getObjectClass().equals(objectClass)) {
for (X4OLanguageModule modContext : languageSession.getLanguage().getLanguageModules()) {
for (ElementNamespace nsContext : modContext.getElementNamespaces()) {
if (nsContext.getLanguageRoot() != null && nsContext.getLanguageRoot()) {
for (ElementClass ec : nsContext.getElementClasses()) {
if (ec.getObjectClass() != null && ec.getObjectClass().equals(objectClass)) {
return nsContext.getElementNamespaceInstanceProvider().createElementInstance(languageSession, ec.getId());
}
}
}
}
}
for (X4OLanguageModule modContext:languageSession.getLanguage().getLanguageModules()) {
for (ElementNamespace nsContext:modContext.getElementNamespaces()) {
for (ElementClass ec:nsContext.getElementClasses()) {
if (ec.getObjectClass()!=null && ec.getObjectClass().equals(objectClass)) {
for (X4OLanguageModule modContext : languageSession.getLanguage().getLanguageModules()) {
for (ElementNamespace nsContext : modContext.getElementNamespaces()) {
for (ElementClass ec : nsContext.getElementClasses()) {
if (ec.getObjectClass() != null && ec.getObjectClass().equals(objectClass)) {
return nsContext.getElementNamespaceInstanceProvider().createElementInstance(languageSession, ec.getId());
}
}
}
}
throw new IllegalArgumentException("Could not find ElementClass for: "+objectClass.getName());
throw new IllegalArgumentException("Could not find ElementClass for: " + objectClass.getName());
}
};
@ -167,18 +179,23 @@ public class X4OPhaseLanguageWrite {
public X4OPhaseType getType() {
return X4OPhaseType.XML_WRITE;
}
public String getId() {
return WRITE_END;
}
public String[] getPhaseDependencies() {
return new String[]{WRITE_FILL_TREE};
return new String[] { WRITE_FILL_TREE };
}
public boolean isElementPhase() {
return false;
}
public void runElementPhase(Element element) throws X4OPhaseException {
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
logger.finest("Run init end phase");
}
};
@ -187,22 +204,26 @@ public class X4OPhaseLanguageWrite {
public X4OPhaseType getType() {
return X4OPhaseType.XML_WRITE;
}
public String getId() {
return WRITE_RELEASE;
}
public String[] getPhaseDependencies() {
return new String[] {WRITE_END};
return new String[] { WRITE_END };
}
public void runPhase(X4OLanguageSession languageSession) throws X4OPhaseException {
}
public void runElementPhase(Element element) throws X4OPhaseException {
public void runElementPhase(Element element) throws X4OPhaseException {
try {
element.release();
} catch (ElementException e) {
throw new X4OPhaseException(this,e);
}/* finally {
releaseCounter.addReleasedElement();
}*/
throw new X4OPhaseException(this, e);
} /*
* finally { releaseCounter.addReleasedElement(); }
*/
}
}
}

24
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseListener.java
View file

@ -20,14 +20,12 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
import org.x4o.xml.lang.X4OLanguageSession;
/**
* An X4OPhaseListener can be placed on an X4OPhaseHandler and is called
* before and after the phase has runned.
* An X4OPhaseListener can be placed on an X4OPhaseHandler and is called before and after the phase has runned.
*
* @author Willem Cazander
* @version 1.0 Dec 31, 2008
@ -36,17 +34,19 @@ public interface X4OPhaseListener {
/**
* Gets called before the X4OPhaseHandler is run.
* @param phase The phase to be run.
* @param languageSession The X4O language session of the driver.
* @throws X4OPhaseException Is throws when listeners has error.
*
* @param phase The phase to be run.
* @param languageSession The X4O language session of the driver.
* @throws X4OPhaseException Is throws when listeners has error.
*/
void preRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException;
void preRunPhase(X4OPhase phase, X4OLanguageSession languageSession) throws X4OPhaseException;
/**
* Gets called after the X4OPhaseHandler is runned.
* @param phase The phase just run.
* @param languageSession The X4O language session of the driver.
* @throws X4OPhaseException Is throws when listeners has error.
*
* @param phase The phase just run.
* @param languageSession The X4O language session of the driver.
* @throws X4OPhaseException Is throws when listeners has error.
*/
void endRunPhase(X4OPhase phase,X4OLanguageSession languageSession) throws X4OPhaseException;
void endRunPhase(X4OPhase phase, X4OLanguageSession languageSession) throws X4OPhaseException;
}

26
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManager.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
import java.util.List;
@ -28,8 +28,7 @@ import org.x4o.xml.element.Element;
import org.x4o.xml.lang.X4OLanguageSession;
/**
* X4OPhaseManager stores the X4OPhaseHandler and puts them in the right order.
* And will execute the phases when runPhases is called.
* X4OPhaseManager stores the X4OPhaseHandler and puts them in the right order. And will execute the phases when runPhases is called.
*
* @author Willem Cazander
* @version 1.0 Jan 6, 2008
@ -38,35 +37,40 @@ public interface X4OPhaseManager {
/**
* Gets an X4OPhase object by the phaseName.
* @param phaseName The phaseName to lookup.
* @return The X4OPhase requested or null.
*
* @param phaseName The phaseName to lookup.
* @return The X4OPhase requested or null.
*/
X4OPhase getPhase(String phaseName);
/**
* Gets all the keys of the phases registrated whith this phase manager.
* @return The phase keys.
*
* @return The phase keys.
*/
List<String> getPhaseKeys();
/**
* Runs release phase if it was requested not to run it automaticly.
* @param languageSession The session to release.
*
* @param languageSession The session to release.
* @throws X4OPhaseException When a running handlers throws one.
*/
void doReleasePhaseManual(X4OLanguageSession languageSession) throws X4OPhaseException;
/**
* Runs all the phases in the right order.
*
* @throws X4OPhaseException When a running handlers throws one.
*/
void runPhases(X4OLanguageSession elementContext,X4OPhaseType type) throws X4OPhaseException;
void runPhases(X4OLanguageSession elementContext, X4OPhaseType type) throws X4OPhaseException;
/**
* Runs phase on single element.
* @param e The Element to process.
* @param p The phase to run.
*
* @param e The Element to process.
* @param p The phase to run.
* @throws X4OPhaseException When a running handlers throws one.
*/
void runPhasesForElement(Element e,X4OPhaseType type,X4OPhase p) throws X4OPhaseException;
void runPhasesForElement(Element e, X4OPhaseType type, X4OPhase p) throws X4OPhaseException;
}

3
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseManagerLocal.java
View file

@ -20,8 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
/**
* X4OPhaseManagerLocal has the local config methods.

2
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/phase/X4OPhaseType.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.phase;
package org.x4o.xml.lang.phase;
/**
* X4OPhaseType defines which phase type there are to put phases in to execute.

20
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/AbstractX4OLanguageTask.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.task;
package org.x4o.xml.lang.task;
import java.util.List;
@ -39,15 +39,15 @@ public abstract class AbstractX4OLanguageTask implements X4OLanguageTask {
private final String description;
private final SAX3PropertyConfig propertyConfig;
public AbstractX4OLanguageTask(String id,SAX3PropertyConfig propertyConfig) {
this(id,id,id,propertyConfig);
public AbstractX4OLanguageTask(String id, SAX3PropertyConfig propertyConfig) {
this(id, id, id, propertyConfig);
}
public AbstractX4OLanguageTask(String id,String name,String description,SAX3PropertyConfig propertyConfig) {
this.id=id;
this.name=name;
this.description=description;
this.propertyConfig=propertyConfig;
public AbstractX4OLanguageTask(String id, String name, String description, SAX3PropertyConfig propertyConfig) {
this.id = id;
this.name = name;
this.description = description;
this.propertyConfig = propertyConfig;
}
protected abstract X4OLanguageTaskExecutor createTaskExecutorChecked(SAX3PropertyConfig config);
@ -66,11 +66,11 @@ public abstract class AbstractX4OLanguageTask implements X4OLanguageTask {
}
StringBuilder buf = new StringBuilder(100);
buf.append("Error missing value(s) for key(s) {");
for (int i=0;i<keys.size();i++) {
for (int i = 0; i < keys.size(); i++) {
buf.append('"');
buf.append(keys.get(i));
buf.append('"');
if (i<keys.size()-1) {
if (i < keys.size() - 1) {
buf.append(',');
}
buf.append('}');

14
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTask.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.task;
package org.x4o.xml.lang.task;
import org.x4o.sax3.io.SAX3PropertyConfig;
@ -33,28 +33,28 @@ import org.x4o.sax3.io.SAX3PropertyConfig;
public interface X4OLanguageTask {
/**
* @return Returns the task id.
* @return Returns the task id.
*/
String getId();
/**
* @return Returns the task name.
* @return Returns the task name.
*/
String getName();
/**
* @return Returns the task description.
* @return Returns the task description.
*/
String getDescription();
/**
* @return Returns newly created PropertyConfig for configuring this task.
* @return Returns newly created PropertyConfig for configuring this task.
*/
SAX3PropertyConfig createTaskConfig();
/**
* @param config The config with which the task will be runned.
* @return The task executor for running the task.
* @param config The config with which the task will be runned.
* @return The task executor for running the task.
*/
X4OLanguageTaskExecutor createTaskExecutor(SAX3PropertyConfig config);
}

12
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTaskException.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.task;
package org.x4o.xml.lang.task;
import org.x4o.sax3.io.SAX3PropertyConfig;
@ -35,14 +35,14 @@ public class X4OLanguageTaskException extends Exception {
private static final long serialVersionUID = 8490969221732950292L;
private SAX3PropertyConfig propertyConfig = null;
public X4OLanguageTaskException(SAX3PropertyConfig propertyConfig,String message) {
public X4OLanguageTaskException(SAX3PropertyConfig propertyConfig, String message) {
super(message);
this.propertyConfig=propertyConfig;
this.propertyConfig = propertyConfig;
}
public X4OLanguageTaskException(SAX3PropertyConfig propertyConfig,String message,Exception exception) {
super(message,exception);
this.propertyConfig=propertyConfig;
public X4OLanguageTaskException(SAX3PropertyConfig propertyConfig, String message, Exception exception) {
super(message, exception);
this.propertyConfig = propertyConfig;
}
public SAX3PropertyConfig getPropertyConfig() {

8
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OLanguageTaskExecutor.java
View file

@ -20,11 +20,10 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.task;
package org.x4o.xml.lang.task;
import org.x4o.xml.lang.X4OLanguage;
/**
* X4OLanguageTaskExecutor runs the language task.
*
@ -35,8 +34,9 @@ public interface X4OLanguageTaskExecutor {
/**
* Executes a task for which this executor is created.
* @param language The language for which we run the task.
* @throws X4OLanguageTaskException Can be thrown in case of error.
*
* @param language The language for which we run the task.
* @throws X4OLanguageTaskException Can be thrown in case of error.
*/
void execute(X4OLanguage language) throws X4OLanguageTaskException;
}

8
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticLanguageTask.java
View file

@ -36,12 +36,12 @@ import org.xml.sax.SAXException;
*/
public class X4OStaticLanguageTask extends AbstractX4OLanguageTask {
public static final String TASK_ID = "x4o-static";
public static final String TASK_ID = "x4o-static";
private static final String TASK_NAME = "X4O Static Task";
private static final String TASK_DESC = "Writes static support resources of X4O.";
public X4OStaticLanguageTask() {
super(TASK_ID,TASK_NAME,TASK_DESC,X4OStaticWriter.DEFAULT_PROPERTY_CONFIG);
super(TASK_ID, TASK_NAME, TASK_DESC, X4OStaticWriter.DEFAULT_PROPERTY_CONFIG);
}
/**
@ -53,9 +53,9 @@ public class X4OStaticLanguageTask extends AbstractX4OLanguageTask {
try {
new X4OStaticWriter(config).writeStatic();
} catch (SAXException e) {
throw new X4OLanguageTaskException(config,e.getMessage(),e);
throw new X4OLanguageTaskException(config, e.getMessage(), e);
} catch (IOException e) {
throw new X4OLanguageTaskException(config,e.getMessage(),e);
throw new X4OLanguageTaskException(config, e.getMessage(), e);
}
}
};

15
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/X4OStaticWriter.java
View file

@ -41,9 +41,9 @@ import org.xml.sax.SAXException;
*/
public class X4OStaticWriter {
private final static String PROPERTY_CONTEXT_PREFIX = SAX3PropertyConfig.X4O_PROPERTIES_PREFIX+"x4o-static/";
//@formatter:off
public final static SAX3PropertyConfig DEFAULT_PROPERTY_CONFIG;
private final static String PROPERTY_CONTEXT_PREFIX = SAX3PropertyConfig.X4O_PROPERTIES_PREFIX+"x4o-static/";
public final static String OUTPUT_PATH = PROPERTY_CONTEXT_PREFIX+"output/path";
public final static String OUTPUT_OASIS_XMLNS_CATALOG = PROPERTY_CONTEXT_PREFIX+"output/oasis-xml-catalog";
@ -53,18 +53,19 @@ public class X4OStaticWriter {
new PropertyConfigItem(OUTPUT_OASIS_XMLNS_CATALOG, Boolean.class, false)
);
}
//@formatter:on
private final SAX3PropertyConfig propertyConfig;
public X4OStaticWriter(SAX3PropertyConfig parentConfig) {
this.propertyConfig=new SAX3PropertyConfig(DEFAULT_PROPERTY_CONFIG,PROPERTY_CONTEXT_PREFIX);
this.propertyConfig = new SAX3PropertyConfig(DEFAULT_PROPERTY_CONFIG, PROPERTY_CONTEXT_PREFIX);
this.propertyConfig.copyParentProperties(parentConfig);
}
public void writeStatic() throws SAXException, IOException {
File basePath = propertyConfig.getPropertyFile(OUTPUT_PATH);
Boolean outputOasis = propertyConfig.getPropertyBoolean(OUTPUT_OASIS_XMLNS_CATALOG);
if (basePath==null) {
if (basePath == null) {
throw new NullPointerException("Can't write resources to null output path.");
}
if (!basePath.exists()) {
@ -77,17 +78,17 @@ public class X4OStaticWriter {
}
}
private void copyResourceToFile(String resource,File output) throws IOException {
private void copyResourceToFile(String resource, File output) throws IOException {
ClassLoader cl = X4OLanguageClassLoader.getClassLoader();
InputStream inputStream = cl.getResourceAsStream(resource);
try {
copyStreamToFile(inputStream,output);
copyStreamToFile(inputStream, output);
} catch (SecurityException | IOException | InterruptedException e) {
throw new IOException(e);
}
}
private void copyStreamToFile(InputStream inputStream,File output) throws SecurityException, IOException, InterruptedException {
private void copyStreamToFile(InputStream inputStream, File output) throws SecurityException, IOException, InterruptedException {
OutputStream outputStream = new FileOutputStream(output);
try {
byte[] buffer = new byte[4096];

101
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskCommandLine.java
View file

@ -20,7 +20,7 @@
* TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package org.x4o.xml.lang.task.run;
package org.x4o.xml.lang.task.run;
import java.io.File;
import java.io.FileInputStream;
@ -76,10 +76,10 @@ public class X4OTaskCommandLine {
try {
long startTime = System.currentTimeMillis();
executeLanguageTask();
long totalTime = System.currentTimeMillis()-startTime;
System.out.println("Succesfully executed task: "+task.getId()+" in "+totalTime+" ms.");
long totalTime = System.currentTimeMillis() - startTime;
System.out.println("Succesfully executed task: " + task.getId() + " in " + totalTime + " ms.");
} catch (Exception e) {
System.err.println("Error while executing task: "+e.getMessage());
System.err.println("Error while executing task: " + e.getMessage());
e.printStackTrace();
System.exit(1);
}
@ -102,14 +102,14 @@ public class X4OTaskCommandLine {
return;
}
System.err.println("Missing properties;");
for (String key:keys) {
System.err.println(" - "+key);
for (String key : keys) {
System.err.println(" - " + key);
}
System.exit(1);
}
private void viewHelp(List<String> argu) {
for (String arg:argu) {
for (String arg : argu) {
if ("-help".equals(arg) || "-h".equals(arg)) {
System.out.println("X4O Language Task Command Line Usage;");
System.out.println("-languages <lang> (-l) = Selects langauge.");
@ -133,11 +133,11 @@ public class X4OTaskCommandLine {
}
private void viewListings(List<String> argu) {
for (String arg:argu) {
for (String arg : argu) {
if ("-list-languages".equals(arg) || "-ll".equals(arg)) {
System.out.println("X4O Languages;");
for (String language:X4ODriverManager.getX4OLanguages()) {
System.out.println("- "+language);
for (String language : X4ODriverManager.getX4OLanguages()) {
System.out.println("- " + language);
}
System.out.println();
System.exit(0);
@ -146,14 +146,14 @@ public class X4OTaskCommandLine {
if ("-list-language-tasks".equals(arg) || "-llt".equals(arg)) {
System.out.println("X4O Language Tasks;");
int prefix = 12;
for (X4OLanguageTask task:X4ODriverManager.getX4OLanguageTasks()) {
for (X4OLanguageTask task : X4ODriverManager.getX4OLanguageTasks()) {
int lId = task.getId().length();
System.out.print(task.getId());
for (int i=0;i<prefix-lId;i++) {
for (int i = 0; i < prefix - lId; i++) {
System.out.print(" "); // classic, todo use formatter
}
System.out.println(" - "+task.getName());
for (int i=0;i<prefix+3;i++) {
System.out.println(" - " + task.getName());
for (int i = 0; i < prefix + 3; i++) {
System.out.print(" ");
}
System.out.println(task.getDescription());
@ -166,25 +166,25 @@ public class X4OTaskCommandLine {
}
private void viewKeyListing(Iterator<String> arguIterator) {
if (task==null) {
if (task == null) {
return;
}
while (arguIterator.hasNext()) {
String arg = arguIterator.next();
if ("-list-keys".equals(arg) || "-lk".equals(arg)) {
System.out.println(task.getName()+" config keys;");
System.out.println(task.getName() + " config keys;");
SAX3PropertyConfig config = task.createTaskConfig();
for (String key:config.getPropertyKeys()) {
for (String key : config.getPropertyKeys()) {
Class<?> keyType = config.getPropertyType(key);
Object valueDefault = config.getPropertyDefault(key);
String def = "";
if (valueDefault!=null) {
def = "(default=\""+unescapeDefault(valueDefault.toString())+"\")";
if (valueDefault != null) {
def = "(default=\"" + unescapeDefault(valueDefault.toString()) + "\")";
}
if (config.isPropertyRequired(key)) {
def = "(required=\"true\")";
}
System.out.println(String.format("%1$-65s - %2$-8s %3$s", key,keyType.getSimpleName(),def));
System.out.println(String.format("%1$-65s - %2$-8s %3$s", key, keyType.getSimpleName(), def));
}
System.out.println();
System.exit(0);
@ -194,16 +194,19 @@ public class X4OTaskCommandLine {
}
private String unescapeDefault(String defaultValue) {
StringBuilder buf = new StringBuilder(defaultValue.length()+10);
for (char c:defaultValue.toCharArray()) {
if (c=='\n') {
buf.append("\\n");continue;
StringBuilder buf = new StringBuilder(defaultValue.length() + 10);
for (char c : defaultValue.toCharArray()) {
if (c == '\n') {
buf.append("\\n");
continue;
}
if (c=='\t') {
buf.append("\\t");continue;
if (c == '\t') {
buf.append("\\t");
continue;
}
if (c=='\r') {
buf.append("\\r");continue;
if (c == '\r') {
buf.append("\\r");
continue;
}
buf.append(c);
}
@ -214,15 +217,15 @@ public class X4OTaskCommandLine {
while (arguIterator.hasNext()) {
String arg = arguIterator.next();
if ("-language".equals(arg) || "-l".equals(arg)) {
if (arguIterator.hasNext()==false) {
systemErrExit("No argument for "+arg+" given.");
if (arguIterator.hasNext() == false) {
systemErrExit("No argument for " + arg + " given.");
}
String languageName = arguIterator.next();
driver = X4ODriverManager.getX4ODriver(languageName);
break;
}
}
if (driver==null) {
if (driver == null) {
systemErrExit("No -language or -l argument with language given.");
}
}
@ -231,15 +234,15 @@ public class X4OTaskCommandLine {
while (arguIterator.hasNext()) {
String arg = arguIterator.next();
if ("-task".equals(arg) || "-t".equals(arg)) {
if (arguIterator.hasNext()==false) {
systemErrExit("No argument for "+arg+" given.");
if (arguIterator.hasNext() == false) {
systemErrExit("No argument for " + arg + " given.");
}
String taskId = arguIterator.next();
task = driver.getLanguageTask(taskId);
break;
}
}
if (task==null) {
if (task == null) {
systemErrExit("No -task or -t argument with task given.");
}
}
@ -249,15 +252,15 @@ public class X4OTaskCommandLine {
while (arguIterator.hasNext()) {
String arg = arguIterator.next();
if ("-property".equals(arg) || "-p".equals(arg)) {
if (arguIterator.hasNext()==false) {
systemErrExit("No argument for "+arg+" given.");
if (arguIterator.hasNext() == false) {
systemErrExit("No argument for " + arg + " given.");
}
String valuePair = arguIterator.next();
String[] values = valuePair.split("=");
if (values.length==1) {
systemErrExit("No property value given for key "+valuePair);
if (values.length == 1) {
systemErrExit("No property value given for key " + valuePair);
}
config.setPropertyParsedValue(values[0],values[1]);
config.setPropertyParsedValue(values[0], values[1]);
}
}
}
@ -266,24 +269,24 @@ public class X4OTaskCommandLine {
while (arguIterator.hasNext()) {
String arg = arguIterator.next();
if ("-load-props".equals(arg) || "-lp".equals(arg)) {
if (arguIterator.hasNext()==false) {
systemErrExit("No argument for "+arg+" given.");
if (arguIterator.hasNext() == false) {
systemErrExit("No argument for " + arg + " given.");
}
loadProperties(arguIterator.next(),false);
loadProperties(arguIterator.next(), false);
}
if ("-load-props-xml".equals(arg) || "-lpx".equals(arg)) {
if (arguIterator.hasNext()==false) {
systemErrExit("No argument for "+arg+" given.");
if (arguIterator.hasNext() == false) {
systemErrExit("No argument for " + arg + " given.");
}
loadProperties(arguIterator.next(),true);
loadProperties(arguIterator.next(), true);
}
}
}
private void loadProperties(String file,boolean isXml) {
private void loadProperties(String file, boolean isXml) {
File propFile = new File(file);
if (!propFile.exists()) {
systemErrExit("File does not exsits; "+propFile);
systemErrExit("File does not exsits; " + propFile);
}
Properties p = new Properties();
InputStream in = null;
@ -294,13 +297,13 @@ public class X4OTaskCommandLine {
} else {
p.load(in);
}
for (Object keyObj:p.keySet()) {
for (Object keyObj : p.keySet()) {
String key = keyObj.toString();
String value = p.getProperty(key);
config.setPropertyParsedValue(key, value);
}
} catch (IOException e) {
systemErrExit("Fatal-Error: "+e.getMessage());
systemErrExit("Fatal-Error: " + e.getMessage());
} finally {
try {
in.close();

15
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskProperty.java
View file

@ -66,22 +66,23 @@ public class X4OTaskProperty {
/**
* Parsed line like 'key=value' into a X4OTaskProperty object.
* @param line The text line to parse.
* @return The filled X4OTaskProperty.
*
* @param line The text line to parse.
* @return The filled X4OTaskProperty.
*/
static public X4OTaskProperty parseLine(String line) {
if (line==null) {
if (line == null) {
throw new NullPointerException("Can't parse null line.");
}
int idx = line.indexOf('=');
if (idx<0) {
if (idx < 0) {
throw new IllegalArgumentException("Can't parse line with '=' sign.");
}
if (idx==line.length()) {
if (idx == line.length()) {
throw new IllegalArgumentException("Can't parse line empty value.");
}
String key = line.substring(0,idx);
String value = line.substring(idx+1);
String key = line.substring(0, idx);
String value = line.substring(idx + 1);
X4OTaskProperty result = new X4OTaskProperty();
result.setKey(key);
result.setValue(value);

3
nx01-x4o-driver/src/main/java/org/x4o/xml/lang/task/run/X4OTaskRunner.java
View file

@ -37,8 +37,7 @@ import org.x4o.xml.lang.task.X4OLanguageTaskException;
import org.x4o.xml.lang.task.X4OLanguageTaskExecutor;
/**
* X4OTaskRunner finds all x4o objects and configs and then run the x4o langauge
* task.
* X4OTaskRunner finds all x4o objects and configs and then run the x4o langauge task.
*
* @author Willem Cazander
* @version 1.0 Aug 30, 2013

99
nx01-x4o-driver/src/test/java/org/x4o/xml/X4ODriverManagerTest.java
View file

@ -41,23 +41,23 @@ public class X4ODriverManagerTest {
@Test
public void testDefaultLanguageVersionSelect() throws Exception {
String version = X4ODriverManager.getDefaultLanguageVersion(new String[]{"1.0","2.0","3.0"});
String version = X4ODriverManager.getDefaultLanguageVersion(new String[] { "1.0", "2.0", "3.0" });
Assertions.assertNotNull(version);
Assertions.assertEquals("3.0",version);
Assertions.assertEquals("3.0", version);
}
@Test
public void testDefaultLanguageVersionEmpty() throws Exception {
String version = X4ODriverManager.getDefaultLanguageVersion(new String[]{});
String version = X4ODriverManager.getDefaultLanguageVersion(new String[] {});
Assertions.assertNotNull(version);
Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION,version);
Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION, version);
}
@Test
public void testDefaultLanguageVersionNull() throws Exception {
String version = X4ODriverManager.getDefaultLanguageVersion(null);
Assertions.assertNotNull(version);
Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION,version);
Assertions.assertEquals(X4ODriver.DEFAULT_LANGUAGE_VERSION, version);
}
@Test
@ -101,17 +101,14 @@ public class X4ODriverManagerTest {
e = catchE;
}
Assertions.assertNotNull(e);
/* TODO
assertNotNull(e);
assertNotNull(e.getCause());
assertNotNull(e.getCause().getCause());
assertEquals(X4OPhaseException.class, e.getCause().getClass());
assertEquals(X4OLanguageLoaderException.class, e.getCause().getCause().getClass());
assertTrue("Error message string is missing language",e.getMessage().contains("language"));
assertTrue("Error message string is missing test",e.getMessage().contains("test"));
assertTrue("Error message string is missing modules",e.getMessage().contains("modules"));
assertTrue("Error message string is missing 2.0",e.getMessage().contains("2.0"));
*/
/*
* TODO assertNotNull(e); assertNotNull(e.getCause()); assertNotNull(e.getCause().getCause()); assertEquals(X4OPhaseException.class,
* e.getCause().getClass()); assertEquals(X4OLanguageLoaderException.class, e.getCause().getCause().getClass());
* assertTrue("Error message string is missing language",e.getMessage().contains("language"));
* assertTrue("Error message string is missing test",e.getMessage().contains("test"));
* assertTrue("Error message string is missing modules",e.getMessage().contains("modules"));
* assertTrue("Error message string is missing 2.0",e.getMessage().contains("2.0"));
*/
}
@Test
@ -133,11 +130,11 @@ public class X4ODriverManagerTest {
@Test
public void testLanguagesLoopSpeed() throws Exception {
long startTime = System.currentTimeMillis();
for (int i=0;i<100;i++) {
for (int i = 0; i < 100; i++) {
testLanguageCount();
}
long loopTime = System.currentTimeMillis() - startTime;
Assertions.assertEquals(true, loopTime<500, "Language list loop is slow;"+loopTime);
Assertions.assertEquals(true, loopTime < 500, "Language list loop is slow;" + loopTime);
}
@Test
@ -158,8 +155,15 @@ public class X4ODriverManagerTest {
Exception e = null;
try {
X4ODriverManager.registerX4ODriver(new X4ODriver<Object>() {
@Override public String[] getLanguageVersions() { return new String[]{"1.0"}; }
@Override public String getLanguageName() { return null; }
@Override
public String[] getLanguageVersions() {
return new String[] { "1.0" };
}
@Override
public String getLanguageName() {
return null;
}
});
} catch (Exception catchE) {
@ -175,8 +179,15 @@ public class X4ODriverManagerTest {
Exception e = null;
try {
X4ODriverManager.registerX4ODriver(new X4ODriver<Object>() {
@Override public String[] getLanguageVersions() { return new String[]{"1.0"}; }
@Override public String getLanguageName() { return ""; }
@Override
public String[] getLanguageVersions() {
return new String[] { "1.0" };
}
@Override
public String getLanguageName() {
return "";
}
});
} catch (Exception catchE) {
@ -192,8 +203,15 @@ public class X4ODriverManagerTest {
Exception e = null;
try {
X4ODriverManager.registerX4ODriver(new X4ODriver<Object>() {
@Override public String[] getLanguageVersions() { return null; }
@Override public String getLanguageName() { return "junit-driver-test"; }
@Override
public String[] getLanguageVersions() {
return null;
}
@Override
public String getLanguageName() {
return "junit-driver-test";
}
});
} catch (Exception catchE) {
@ -209,8 +227,15 @@ public class X4ODriverManagerTest {
Exception e = null;
try {
X4ODriverManager.registerX4ODriver(new X4ODriver<Object>() {
@Override public String[] getLanguageVersions() { return new String[]{}; }
@Override public String getLanguageName() { return "junit-driver-test"; }
@Override
public String[] getLanguageVersions() {
return new String[] {};
}
@Override
public String getLanguageName() {
return "junit-driver-test";
}
});
} catch (Exception catchE) {
@ -239,8 +264,15 @@ public class X4ODriverManagerTest {
Exception e = null;
try {
X4ODriverManager.deregisterX4ODriver(new X4ODriver<Object>() {
@Override public String[] getLanguageVersions() { return new String[]{"1.0"}; }
@Override public String getLanguageName() { return null; }
@Override
public String[] getLanguageVersions() {
return new String[] { "1.0" };
}
@Override
public String getLanguageName() {
return null;
}
});
} catch (Exception catchE) {
@ -256,8 +288,15 @@ public class X4ODriverManagerTest {
Exception e = null;
try {
X4ODriver<?> driver = new X4ODriver<Object>() {
@Override public String[] getLanguageVersions() { return new String[]{"1.0"}; }
@Override public String getLanguageName() { return "junit-driver-test"; }
@Override
public String[] getLanguageVersions() {
return new String[] { "1.0" };
}
@Override
public String getLanguageName() {
return "junit-driver-test";
}
};
X4ODriverManager.registerX4ODriver(driver);
Assertions.assertEquals(driver.hashCode(), X4ODriverManager.getX4ODriver("junit-driver-test").hashCode());

54
nx01-x4o-driver/src/test/java/org/x4o/xml/conv/DefaultObjectConverterProviderTest.java
View file

@ -46,7 +46,7 @@ public class DefaultObjectConverterProviderTest {
@Test
public void testConverterClone() throws Exception {
DefaultObjectConverterProvider p = new DefaultObjectConverterProvider(true);
for (ObjectConverter conv:p.getObjectConverters()) {
for (ObjectConverter conv : p.getObjectConverters()) {
Assertions.assertNotNull(conv);
ObjectConverter clone = conv.clone();
Assertions.assertNotNull(clone);
@ -60,12 +60,12 @@ public class DefaultObjectConverterProviderTest {
Assertions.assertNotNull(conv);
Object result = conv.convertTo("true", locale);
Assertions.assertNotNull(result);
Assertions.assertEquals(Boolean.class,result.getClass(), "Result is not Boolean.class");
Assertions.assertEquals(true,result, "Result is not true");
Assertions.assertEquals(Boolean.class, result.getClass(), "Result is not Boolean.class");
Assertions.assertEquals(true, result, "Result is not true");
Object resultBack = conv.convertBack(result, locale);
Assertions.assertNotNull(resultBack);
Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("true",resultBack, "resultBack is not true");
Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("true", resultBack, "resultBack is not true");
}
@Test
@ -75,12 +75,12 @@ public class DefaultObjectConverterProviderTest {
Assertions.assertNotNull(conv);
Object result = conv.convertTo("123", locale);
Assertions.assertNotNull(result);
Assertions.assertEquals(Integer.class,result.getClass(), "Result is not Integer.class");
Assertions.assertEquals(123,result, "Result is not 123");
Assertions.assertEquals(Integer.class, result.getClass(), "Result is not Integer.class");
Assertions.assertEquals(123, result, "Result is not 123");
Object resultBack = conv.convertBack(result, locale);
Assertions.assertNotNull(resultBack);
Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("123",resultBack, "resultBack is not 123");
Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("123", resultBack, "resultBack is not 123");
}
@Test
@ -90,12 +90,12 @@ public class DefaultObjectConverterProviderTest {
Assertions.assertNotNull(conv);
Object result = conv.convertTo("123.23", locale);
Assertions.assertNotNull(result);
Assertions.assertEquals(Float.class,result.getClass(), "Result is not Float.class");
Assertions.assertEquals(123.23F,result, "Result is not 123.23");
Assertions.assertEquals(Float.class, result.getClass(), "Result is not Float.class");
Assertions.assertEquals(123.23F, result, "Result is not 123.23");
Object resultBack = conv.convertBack(result, locale);
Assertions.assertNotNull(resultBack);
Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("123.23",resultBack, "resultBack is not 123.23");
Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("123.23", resultBack, "resultBack is not 123.23");
}
@Test
@ -105,12 +105,12 @@ public class DefaultObjectConverterProviderTest {
Assertions.assertNotNull(conv);
Object result = conv.convertTo("12323", locale);
Assertions.assertNotNull(result);
Assertions.assertEquals(Long.class,result.getClass(), "Result is not Long.class");
Assertions.assertEquals(12323L,result, "Result is not 12323");
Assertions.assertEquals(Long.class, result.getClass(), "Result is not Long.class");
Assertions.assertEquals(12323L, result, "Result is not 12323");
Object resultBack = conv.convertBack(result, locale);
Assertions.assertNotNull(resultBack);
Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("12323",resultBack, "resultBack is not 12323");
Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("12323", resultBack, "resultBack is not 12323");
}
@Test
@ -120,12 +120,12 @@ public class DefaultObjectConverterProviderTest {
Assertions.assertNotNull(conv);
Object result = conv.convertTo("1232.3", locale);
Assertions.assertNotNull(result);
Assertions.assertEquals(Double.class,result.getClass(), "Result is not Double.class");
Assertions.assertEquals(1232.3D,result, "Result is not 1232.3");
Assertions.assertEquals(Double.class, result.getClass(), "Result is not Double.class");
Assertions.assertEquals(1232.3D, result, "Result is not 1232.3");
Object resultBack = conv.convertBack(result, locale);
Assertions.assertNotNull(resultBack);
Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("1232.3",resultBack, "resultBack is not 1232.3");
Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("1232.3", resultBack, "resultBack is not 1232.3");
}
@Test
@ -135,12 +135,12 @@ public class DefaultObjectConverterProviderTest {
Assertions.assertNotNull(conv);
Object result = conv.convertTo("http://www.x4o.org", locale);
Assertions.assertNotNull(result);
Assertions.assertEquals(URL.class,result.getClass(), "Result is not Url.class");
Assertions.assertEquals(new URL("http://www.x4o.org"),result, "Result is not http://www.x4o.org");
Assertions.assertEquals(URL.class, result.getClass(), "Result is not Url.class");
Assertions.assertEquals(new URL("http://www.x4o.org"), result, "Result is not http://www.x4o.org");
Object resultBack = conv.convertBack(result, locale);
Assertions.assertNotNull(resultBack);
Assertions.assertEquals(String.class,resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("http://www.x4o.org",resultBack, "resultBack is not http://www.x4o.org");
Assertions.assertEquals(String.class, resultBack.getClass(), "resultBack is not String.class");
Assertions.assertEquals("http://www.x4o.org", resultBack, "resultBack is not http://www.x4o.org");
}
@Test
@ -179,7 +179,7 @@ public class DefaultObjectConverterProviderTest {
Exception e = null;
try {
conv.convertTo("nonEnumError", locale);
conv.convertTo("nonEnumError", locale);
} catch (Exception catchE) {
e = catchE;
}
@ -193,7 +193,7 @@ public class DefaultObjectConverterProviderTest {
EnumConverter conv = new EnumConverter();
Exception e = null;
try {
conv.convertTo("nonEnumError", locale);
conv.convertTo("nonEnumError", locale);
} catch (Exception catchE) {
e = catchE;
}

48
nx01-x4o-driver/src/test/java/org/x4o/xml/core/AttributeBeanTest.java
View file

@ -49,11 +49,11 @@ public class AttributeBeanTest {
TestObjectRoot root = reader.readResource("tests/attributes/test-body.xml");
Assertions.assertNotNull(root);
List<TestObjectChild> childs = root.getTestObjectChilds();
Assertions.assertEquals(2,childs.size());
Assertions.assertEquals(2, childs.size());
TestObjectChild child0 = childs.get(0);
TestObjectChild child1 = childs.get(1);
Assertions.assertEquals("attr-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕",child0.getName());
Assertions.assertEquals("body-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕",child1.getName());
Assertions.assertEquals("attr-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕", child0.getName());
Assertions.assertEquals("body-name-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕", child1.getName());
}
@Test
@ -68,35 +68,35 @@ public class AttributeBeanTest {
TestBean b = root.getTestBeans().get(0);
TestBean beanPublic = root.getTestBeans().get(1);
Assertions.assertEquals(123 ,0+ b.getPrivateIntegerTypeField());
Assertions.assertEquals(123 ,0+ b.getPrivateIntegerObjectField());
Assertions.assertEquals(123, 0 + b.getPrivateIntegerTypeField());
Assertions.assertEquals(123, 0 + b.getPrivateIntegerObjectField());
Assertions.assertEquals(123l ,0+ b.getPrivateLongTypeField());
Assertions.assertEquals(123l ,0+ b.getPrivateLongObjectField());
Assertions.assertEquals(123l, 0 + b.getPrivateLongTypeField());
Assertions.assertEquals(123l, 0 + b.getPrivateLongObjectField());
Assertions.assertEquals(123.45d ,0+ b.getPrivateDoubleTypeField());
Assertions.assertEquals(123.45d ,0+ b.getPrivateDoubleObjectField());
Assertions.assertEquals(123.45d, 0 + b.getPrivateDoubleTypeField());
Assertions.assertEquals(123.45d, 0 + b.getPrivateDoubleObjectField());
Assertions.assertEquals(123.45f ,0+ b.getPrivateFloatTypeField());
Assertions.assertEquals(123.45f ,0+ b.getPrivateFloatObjectField());
Assertions.assertEquals(123.45f, 0 + b.getPrivateFloatTypeField());
Assertions.assertEquals(123.45f, 0 + b.getPrivateFloatObjectField());
Assertions.assertEquals(67 ,0+ b.getPrivateByteTypeField());
Assertions.assertEquals(67 ,0+ b.getPrivateByteObjectField());
Assertions.assertEquals(67, 0 + b.getPrivateByteTypeField());
Assertions.assertEquals(67, 0 + b.getPrivateByteObjectField());
Assertions.assertEquals(true, b.isPrivateBooleanTypeField());
Assertions.assertEquals(new Boolean(true), b.getPrivateBooleanObjectField());
Assertions.assertEquals(true, b.isPrivateBooleanTypeField());
Assertions.assertEquals(new Boolean(true), b.getPrivateBooleanObjectField());
Assertions.assertEquals('W' ,0+ b.getPrivateCharTypeField());
Assertions.assertEquals('C' ,0+ b.getPrivateCharObjectField());
Assertions.assertEquals('W', 0 + b.getPrivateCharTypeField());
Assertions.assertEquals('C', 0 + b.getPrivateCharObjectField());
Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕" ,b.getPrivateStringObjectField());
//Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,b.getPrivateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ()); // SAX fails
Assertions.assertEquals("x4o-仙上主天" ,b.getPrivateStringObjectFieldUnicode仙上主天());
Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕", b.getPrivateStringObjectField());
// Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,b.getPrivateStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ()); // SAX fails
Assertions.assertEquals("x4o-仙上主天", b.getPrivateStringObjectFieldUnicode仙上主天());
//TODO: add again: assertEquals(true ,null!=b.getPrivateDateObjectField());
// TODO: add again: assertEquals(true ,null!=b.getPrivateDateObjectField());
Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕" ,beanPublic.publicStringObjectField);
//Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,beanPublic.publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ); // SAX fails
Assertions.assertEquals("x4o-仙上主天" ,beanPublic.publicStringObjectFieldUnicode仙上主天);
Assertions.assertEquals("x4o-𑀳𑁂𑀮𑀺𑀉𑁄𑀤𑁄𑀭𑁂𑀡𑀪𑀸𑀕", beanPublic.publicStringObjectField);
// Assertions.assertEquals("x4o-ᒡᒢᑊᒻᒻᓫᔿ" ,beanPublic.publicStringObjectFieldUnicodeᒡᒢᑊᒻᒻᓫᔿ); // SAX fails
Assertions.assertEquals("x4o-仙上主天", beanPublic.publicStringObjectFieldUnicode仙上主天);
}
}

26
nx01-x4o-driver/src/test/java/org/x4o/xml/core/EmptyXmlTest.java
View file

@ -50,7 +50,7 @@ public class EmptyXmlTest {
Assertions.assertEquals(true, e.getMessage().contains("non-excisting-file.xml"));
return;
}
Assertions.assertEquals(true,false);
Assertions.assertEquals(true, false);
}
@Test
@ -60,10 +60,10 @@ public class EmptyXmlTest {
try {
reader.readResource("tests/empty-xml/non-excisting-resource.xml");
} catch (NullPointerException e) {
Assertions.assertEquals(true,e.getMessage().contains("Could not find resource"));
Assertions.assertEquals(true, e.getMessage().contains("Could not find resource"));
return;
}
Assertions.assertEquals(true,false);
Assertions.assertEquals(true, false);
}
@Test
@ -76,7 +76,7 @@ public class EmptyXmlTest {
// Assertions.assertEquals("No ElementNamespace found for empty namespace.", e.getMessage());
return;
}
Assertions.assertEquals(true,false);
Assertions.assertEquals(true, false);
}
@Test
@ -86,10 +86,10 @@ public class EmptyXmlTest {
try {
reader.readResource("tests/empty-xml/empty-real.xml");
} catch (SAXException e) {
Assertions.assertEquals(true,e.getMessage().contains("Premature end of file."));
Assertions.assertEquals(true, e.getMessage().contains("Premature end of file."));
return;
}
Assertions.assertEquals(true,false);
Assertions.assertEquals(true, false);
}
@Test
@ -100,13 +100,13 @@ public class EmptyXmlTest {
reader.readResource("tests/empty-xml/empty-xml.xml");
} catch (SAXException e) {
boolean hasError = e.getMessage().contains("Premature end of file."); // java6+ sax message
if (hasError==false) {
if (hasError == false) {
hasError = e.getMessage().contains("A well-formed document requires a root element."); // xercesImpl sax message
}
Assertions.assertEquals(true,hasError);
Assertions.assertEquals(true, hasError);
return;
}
Assertions.assertEquals(true,false);
Assertions.assertEquals(true, false);
}
@Test
@ -120,9 +120,9 @@ public class EmptyXmlTest {
TestObjectRoot root = reader.readResource("tests/empty-xml/empty-x4o.xml");
Assertions.assertNotNull(root);
Assertions.assertEquals(true,root.getTestBeans().isEmpty());
Assertions.assertEquals(true,root.getTestObjectChilds().isEmpty());
Assertions.assertEquals(true,root.getTestObjectParents().isEmpty());
Assertions.assertEquals(true,root.getTestObjects().isEmpty());
Assertions.assertEquals(true, root.getTestBeans().isEmpty());
Assertions.assertEquals(true, root.getTestObjectChilds().isEmpty());
Assertions.assertEquals(true, root.getTestObjectParents().isEmpty());
Assertions.assertEquals(true, root.getTestObjects().isEmpty());
}
}

6
nx01-x4o-driver/src/test/java/org/x4o/xml/core/NamespaceUriTest.java
View file

@ -46,7 +46,7 @@ public class NamespaceUriTest {
reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE);
try (X4OLanguageSession session = reader.createLanguageSession()) {
reader.readResourceSession(session, "tests/namespace/uri-simple.xml");
Assertions.assertEquals(true,session.getRootElement().getChilderen().size()==1);
Assertions.assertEquals(true, session.getRootElement().getChilderen().size() == 1);
}
}
@ -58,7 +58,7 @@ public class NamespaceUriTest {
reader.setProperty(DefaultX4OReader.DOC_EMPTY_NAMESPACE_URI, "http://test.junit.x4o.org/xml/ns/junit-test-lang");
try (X4OLanguageSession session = reader.createLanguageSession()) {
reader.readResourceSession(session, "tests/namespace/uri-empty.xml");
Assertions.assertEquals(true,session.getRootElement().getChilderen().size()==1);
Assertions.assertEquals(true, session.getRootElement().getChilderen().size() == 1);
}
}
@ -69,7 +69,7 @@ public class NamespaceUriTest {
reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE);
try (X4OLanguageSession session = reader.createLanguageSession()) {
reader.readResourceSession(session, "tests/namespace/uri-schema.xml");
Assertions.assertEquals(true,session.getRootElement().getChilderen().size()==1);
Assertions.assertEquals(true, session.getRootElement().getChilderen().size() == 1);
}
}
}

20
nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4ODebugWriterTest.java
View file

@ -60,7 +60,7 @@ public class X4ODebugWriterTest {
}
static public String readFile(File file) throws IOException {
BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),Charset.forName("UTF-8")));
BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")));
try {
StringBuilder sb = new StringBuilder();
String line = br.readLine();
@ -70,7 +70,7 @@ public class X4ODebugWriterTest {
line = br.readLine();
}
String out = sb.toString();
//System.out.println(out);
// System.out.println(out);
return out;
} finally {
br.close();
@ -93,11 +93,11 @@ public class X4ODebugWriterTest {
Assertions.assertTrue(debugFile.exists(), "Debug file does not exists.");
String debug = readFile(debugFile);
Assertions.assertNotNull(debug);
Assertions.assertFalse(debug.length()==0, "no debug content");
Assertions.assertTrue(debug.length()>20, "debug content to small");
Assertions.assertFalse(debug.length() == 0, "no debug content");
Assertions.assertTrue(debug.length() > 20, "debug content to small");
//System.out.println("=================== Reader Output ======================");
//System.out.println(debug);
// System.out.println("=================== Reader Output ======================");
// System.out.println(debug);
debugFile.delete();
}
@ -118,11 +118,11 @@ public class X4ODebugWriterTest {
Assertions.assertTrue(debugFile.exists(), "Debug file does not exists.");
String debug = readFile(debugFile);
Assertions.assertNotNull(debug);
Assertions.assertFalse(debug.length()==0, "no debug content");
Assertions.assertTrue(debug.length()>20, "debug content to small");
Assertions.assertFalse(debug.length() == 0, "no debug content");
Assertions.assertTrue(debug.length() > 20, "debug content to small");
//System.out.println("=================== Writer Output ======================");
//System.out.println(debug);
// System.out.println("=================== Writer Output ======================");
// System.out.println(debug);
debugFile.delete();
}
}

20
nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OEntityResolverTest.java
View file

@ -52,7 +52,7 @@ public class X4OEntityResolverTest {
public void testElementLangugeNull() throws Exception {
Exception e = null;
try {
new X4OEntityResolver(null,null);
new X4OEntityResolver(null, null);
} catch (Exception catchE) {
e = catchE;
}
@ -68,7 +68,7 @@ public class X4OEntityResolverTest {
try (X4OLanguageSession session = language.createLanguageSession()) {
X4OLanguageLocal.class.cast(language).init(session);
X4OEntityResolver resolver = new X4OEntityResolver(session, DefaultX4OReader.DEFAULT_PROPERTY_CONFIG);
InputSource input = resolver.resolveEntity("","http://cel.x4o.org/xml/ns/cel-root-1.0.xsd");
InputSource input = resolver.resolveEntity("", "http://cel.x4o.org/xml/ns/cel-root-1.0.xsd");
Assertions.assertNotNull(input);
}
}
@ -77,10 +77,10 @@ public class X4OEntityResolverTest {
public void testResolveMissing() throws Exception {
X4ODriver<TestObjectRoot> driver = new TestDriver();
// NOTE: this session is not inited, see fix code above.
X4OEntityResolver resolver = new X4OEntityResolver(driver.createLanguage().createLanguageSession(),DefaultX4OReader.DEFAULT_PROPERTY_CONFIG);
X4OEntityResolver resolver = new X4OEntityResolver(driver.createLanguage().createLanguageSession(), DefaultX4OReader.DEFAULT_PROPERTY_CONFIG);
Exception e = null;
try {
resolver.resolveEntity("","http://cel.x4o.org/xml/ns/cel-root-1.0.xsd-missing-resource");
resolver.resolveEntity("", "http://cel.x4o.org/xml/ns/cel-root-1.0.xsd-missing-resource");
} catch (Exception catchE) {
e = catchE;
}
@ -93,13 +93,13 @@ public class X4OEntityResolverTest {
public void testResolveProperty() throws Exception {
X4ODriver<TestObjectRoot> driver = new TestDriver();
X4OLanguageSession language = driver.createLanguage().createLanguageSession();
SAX3PropertyConfig conf = new SAX3PropertyConfig(DefaultX4OReader.DEFAULT_PROPERTY_CONFIG,SAX3PropertyConfig.X4O_PROPERTIES_PREFIX+"reader/x4o/");
SAX3PropertyConfig conf = new SAX3PropertyConfig(DefaultX4OReader.DEFAULT_PROPERTY_CONFIG, SAX3PropertyConfig.X4O_PROPERTIES_PREFIX + "reader/x4o/");
conf.setProperty(DefaultX4OReader.SAX_ENTITY_RESOLVER, new TestEntityResolver());
X4OEntityResolver resolver = new X4OEntityResolver(language,conf);
X4OEntityResolver resolver = new X4OEntityResolver(language, conf);
Exception e = null;
InputSource input = null;
try {
input = resolver.resolveEntity("","http://cel.x4o.org/xml/ns/cel-root-1.0.xsd");
input = resolver.resolveEntity("", "http://cel.x4o.org/xml/ns/cel-root-1.0.xsd");
} catch (Exception catchE) {
e = catchE;
}
@ -111,12 +111,12 @@ public class X4OEntityResolverTest {
public void testResolvePropertyNull() throws Exception {
X4ODriver<TestObjectRoot> driver = new TestDriver();
X4OLanguageSession language = driver.createLanguage().createLanguageSession();
SAX3PropertyConfig conf = new SAX3PropertyConfig(DefaultX4OReader.DEFAULT_PROPERTY_CONFIG,SAX3PropertyConfig.X4O_PROPERTIES_PREFIX+"reader/x4o/");
SAX3PropertyConfig conf = new SAX3PropertyConfig(DefaultX4OReader.DEFAULT_PROPERTY_CONFIG, SAX3PropertyConfig.X4O_PROPERTIES_PREFIX + "reader/x4o/");
conf.setProperty(DefaultX4OReader.SAX_ENTITY_RESOLVER, new TestEntityResolver());
X4OEntityResolver resolver = new X4OEntityResolver(language,conf);
X4OEntityResolver resolver = new X4OEntityResolver(language, conf);
Exception e = null;
try {
resolver.resolveEntity("","http://cel.x4o.org/xml/ns/cel-root-1.0.xsd-null");
resolver.resolveEntity("", "http://cel.x4o.org/xml/ns/cel-root-1.0.xsd-null");
} catch (Exception catchE) {
e = catchE;
}

6
nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OParserConfigurationTest.java
View file

@ -50,9 +50,9 @@ public class X4OParserConfigurationTest {
@Test
public void testParserConfigurationLanguage() {
Assertions.assertEquals("test",driver.getLanguageName());
Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_MODULES_FILE,config.getLanguageResourceModulesFileName());
Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_PATH_PREFIX,config.getLanguageResourcePathPrefix());
Assertions.assertEquals("test", driver.getLanguageName());
Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_MODULES_FILE, config.getLanguageResourceModulesFileName());
Assertions.assertEquals(X4OLanguageConfiguration.DEFAULT_LANG_PATH_PREFIX, config.getLanguageResourcePathPrefix());
}
@Test

27
nx01-x4o-driver/src/test/java/org/x4o/xml/core/X4OPhaseManagerTest.java
View file

@ -35,8 +35,8 @@ import org.x4o.xml.lang.phase.X4OPhaseType;
import org.x4o.xml.test.TestDriver;
/**
* Tests some code for testing x4o phases.
* *
* Tests some code for testing x4o phases. *
*
* @author Willem Cazander
* @version 1.0 Jan 15, 2009
*/
@ -53,32 +53,23 @@ public class X4OPhaseManagerTest {
public void testPhases() throws Exception {
TestDriver driver = TestDriver.getInstance();
X4OLanguageSession context = driver.createLanguage().createLanguageSession();
DefaultX4OPhaseManager manager = (DefaultX4OPhaseManager)context.getLanguage().getPhaseManager();
DefaultX4OPhaseManager manager = (DefaultX4OPhaseManager) context.getLanguage().getPhaseManager();
Collection<X4OPhase> phasesAll = manager.getAllPhases();
List<X4OPhase> phases = manager.getOrderedPhases(X4OPhaseType.XML_READ);
Assertions.assertNotNull(phases);
Assertions.assertFalse(phases.isEmpty());
Assertions.assertNotNull(phasesAll);
Assertions.assertFalse(phasesAll.isEmpty());
for (X4OPhase phase:phases) {
for (X4OPhase phase : phases) {
Assertions.assertNotNull(phase);
Assertions.assertNotNull(phase.getId());
}
}
/*
public void testPhaseManager() throws Exception {
TestDriver driver = TestDriver.getInstance();
ElementLanguage context = driver.createLanguageSession();
X4OPhaseManager manager = context.getLanguage().getPhaseManager();
Exception e = null;
try {
manager.addX4OPhaseHandler(null);
} catch (NullPointerException ee) {
e = ee;
}
Assertions.assertEquals(true, e!=null );
}
*/
* public void testPhaseManager() throws Exception { TestDriver driver = TestDriver.getInstance(); ElementLanguage context = driver.createLanguageSession();
* X4OPhaseManager manager = context.getLanguage().getPhaseManager();
*
* Exception e = null; try { manager.addX4OPhaseHandler(null); } catch (NullPointerException ee) { e = ee; } Assertions.assertEquals(true, e!=null ); }
*/
}

4
nx01-x4o-driver/src/test/java/org/x4o/xml/eld/EldValidatingTest.java
View file

@ -41,9 +41,9 @@ public class EldValidatingTest {
public void testValidation() throws Exception {
X4ODriver<TestObjectRoot> driver = TestDriver.getInstance();
X4OReader<TestObjectRoot> reader = driver.createReader();
//reader.getContentConfig().setProperty("",true);
// reader.getContentConfig().setProperty("",true);
reader.setProperty(DefaultX4OReader.VALIDATION_INPUT_DOC, true);
//parser.setProperty(DefaultX4OReader.VALIDATION_SCHEMA_PATH, "/tmp");
// parser.setProperty(DefaultX4OReader.VALIDATION_SCHEMA_PATH, "/tmp");
try {
// TODO: reader.readResource("META-INF/eld/eld-lang.eld");
} finally {

48
nx01-x4o-driver/src/test/java/org/x4o/xml/eld/doc/X4OWriteLanguageDocExecutorTest.java
View file

@ -44,58 +44,46 @@ import org.x4o.xml.test.TestDriver;
public class X4OWriteLanguageDocExecutorTest {
private File createOutputPath(String dir) throws Exception {
File result = new File("target/tests"+File.separator+dir);
if (result.exists()==false) {
File result = new File("target/tests" + File.separator + dir);
if (result.exists() == false) {
result.mkdirs();
}
return result;
}
public void testDoc(String language,String outputPostfix) throws Exception {
public void testDoc(String language, String outputPostfix) throws Exception {
X4ODriver<?> driver = X4ODriverManager.getX4ODriver(language);
X4OLanguageTask task = driver.getLanguageTask(EldDocLanguageTask.TASK_ID);
SAX3PropertyConfig config = task.createTaskConfig();
File outputPath = createOutputPath(outputPostfix);
config.setProperty(EldDocWriter.OUTPUT_PATH,outputPath);
config.setProperty(EldDocWriter.OUTPUT_PATH, outputPath);
X4OTaskRunner.runTaskLanguage(task, driver.createLanguage(), config);
Assertions.assertTrue(outputPath.exists());
Assertions.assertTrue(outputPath.list()!=null);
Assertions.assertTrue(outputPath.list().length>2);
Assertions.assertTrue(outputPath.list() != null);
Assertions.assertTrue(outputPath.list().length > 2);
}
@Test
public void testCelDoc() throws Exception {
testDoc(CelDriver.LANGUAGE_NAME,"junit-doc-cel");
testDoc(CelDriver.LANGUAGE_NAME, "junit-doc-cel");
}
@Test
public void testEldDoc() throws Exception {
testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld");
testDoc(EldDriver.LANGUAGE_NAME, "junit-doc-eld");
}
@Test
public void testUnitDoc() throws Exception {
testDoc(TestDriver.LANGUAGE_NAME,"junit-doc-test");
testDoc(TestDriver.LANGUAGE_NAME, "junit-doc-test");
}
/*
@Test
public void testSwiXml2Doc() throws Exception {
testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld");
EldDocLanguageTask writer = new EldDocLanguageTask();
writer.setBasePath(createOutputTargetPath("junit-swixml2"));
writer.setLanguageName(SwiXmlDriver.LANGUAGE_NAME);
writer.setLanguageVersion(SwiXmlDriver.LANGUAGE_VERSION_2);
writer.execute();
}
@Test
public void testSwiXml3Doc() throws Exception {
testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld");
EldDocLanguageTask writer = new EldDocLanguageTask();
writer.setBasePath(createOutputTargetPath("junit-swixml3"));
writer.setLanguageName(SwiXmlDriver.LANGUAGE_NAME);
writer.setLanguageVersion(SwiXmlDriver.LANGUAGE_VERSION_3);
writer.execute();
}
*/
/*
* @Test public void testSwiXml2Doc() throws Exception { testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); EldDocLanguageTask writer = new
* EldDocLanguageTask(); writer.setBasePath(createOutputTargetPath("junit-swixml2")); writer.setLanguageName(SwiXmlDriver.LANGUAGE_NAME);
* writer.setLanguageVersion(SwiXmlDriver.LANGUAGE_VERSION_2); writer.execute(); }
*
* @Test public void testSwiXml3Doc() throws Exception { testDoc(EldDriver.LANGUAGE_NAME,"junit-doc-eld"); EldDocLanguageTask writer = new
* EldDocLanguageTask(); writer.setBasePath(createOutputTargetPath("junit-swixml3")); writer.setLanguageName(SwiXmlDriver.LANGUAGE_NAME);
* writer.setLanguageVersion(SwiXmlDriver.LANGUAGE_VERSION_3); writer.execute(); }
*/
}

50
nx01-x4o-driver/src/test/java/org/x4o/xml/eld/xsd/EldXsdLanguageTaskTest.java
View file

@ -49,71 +49,71 @@ import org.x4o.xml.test.swixml.SwiXmlDriver;
public class EldXsdLanguageTaskTest {
private File createOutputPath(String dir) throws Exception {
File result = new File("target/tests"+File.separator+dir);
if (result.exists()==false) {
File result = new File("target/tests" + File.separator + dir);
if (result.exists() == false) {
result.mkdirs();
}
return result;
}
@Test
private File testSchema(String language,String outputPostfix,Map<String,Object> props) throws Exception {
private File testSchema(String language, String outputPostfix, Map<String, Object> props) throws Exception {
X4ODriver<?> driver = X4ODriverManager.getX4ODriver(language);
X4OLanguageTask task = driver.getLanguageTask(EldXsdLanguageTask.TASK_ID);
SAX3PropertyConfig config = task.createTaskConfig();
File outputPath = createOutputPath(outputPostfix);
config.setProperty(EldXsdWriter.OUTPUT_PATH,outputPath);
config.setProperty(EldXsdWriter.OUTPUT_DOCUMENTATION,false);
config.setProperty(SAX3WriterXml.PROLOG_LICENCE_FILE,new File("../licence.txt"));
config.setProperty(SAX3WriterXml.PROLOG_USER_COMMENT,"Generated by junit-test-run in class: "+this.getClass().getSimpleName());
if (props!=null) {
for (String key:props.keySet()) {
File outputPath = createOutputPath(outputPostfix);
config.setProperty(EldXsdWriter.OUTPUT_PATH, outputPath);
config.setProperty(EldXsdWriter.OUTPUT_DOCUMENTATION, false);
config.setProperty(SAX3WriterXml.PROLOG_LICENCE_FILE, new File("../licence.txt"));
config.setProperty(SAX3WriterXml.PROLOG_USER_COMMENT, "Generated by junit-test-run in class: " + this.getClass().getSimpleName());
if (props != null) {
for (String key : props.keySet()) {
Object value = props.get(key);
config.setProperty(key, value);
}
}
X4OTaskRunner.runTaskLanguage(task, driver.createLanguage(), config);
Assertions.assertTrue(outputPath.exists());
Assertions.assertTrue(outputPath.list()!=null);
Assertions.assertTrue(outputPath.list() != null);
return outputPath;
}
@Test
public void testEldSchema() throws Exception {
File outputPath = testSchema(EldDriver.LANGUAGE_NAME,"junit-xsd-eld",null);
Assertions.assertTrue(outputPath.list().length>2);
File outputPath = testSchema(EldDriver.LANGUAGE_NAME, "junit-xsd-eld", null);
Assertions.assertTrue(outputPath.list().length > 2);
}
@Test
public void testEldCoreSchema() throws Exception {
File outputPath = testSchema(CelDriver.LANGUAGE_NAME,"junit-xsd-cel",null);
Assertions.assertTrue(outputPath.list().length>1);
File outputPath = testSchema(CelDriver.LANGUAGE_NAME, "junit-xsd-cel", null);
Assertions.assertTrue(outputPath.list().length > 1);
}
@Test
public void testSwiXmlSchema() throws Exception {
File outputPath = testSchema(SwiXmlDriver.LANGUAGE_NAME,"junit-xsd-swixml",null);
Assertions.assertTrue(outputPath.list().length>1);
File outputPath = testSchema(SwiXmlDriver.LANGUAGE_NAME, "junit-xsd-swixml", null);
Assertions.assertTrue(outputPath.list().length > 1);
}
@Test
public void testFilterNamespace() throws Exception {
Map<String,Object> props = new HashMap<String,Object>();
Map<String, Object> props = new HashMap<String, Object>();
props.put(EldXsdWriter.FILTER_NAMESPACE, EldModuleLoaderCore.CEL_ROOT_URI);
File outputPath = testSchema(CelDriver.LANGUAGE_NAME,"junit-one-ns",props);
Assertions.assertTrue(outputPath.list().length==1);
File outputPath = testSchema(CelDriver.LANGUAGE_NAME, "junit-one-ns", props);
Assertions.assertTrue(outputPath.list().length == 1);
}
@Test
public void testFilterElement() throws Exception {
Map<String,Object> props = new HashMap<String,Object>();
Map<String, Object> props = new HashMap<String, Object>();
props.put(EldXsdWriter.FILTER_NAMESPACE, EldModuleLoaderCore.CEL_CORE_URI);
props.put(EldXsdWriter.FILTER_ELEMENT, "elementInterface");
props.put(EldXsdWriter.PROLOG_GENERATED_ENABLE, false);
props.put(EldXsdWriter.PROLOG_XMLNS_INFO_ENABLE, false);
props.put(SAX3WriterXml.PROLOG_LICENCE_ENABLE,false);
File outputPath = testSchema(CelDriver.LANGUAGE_NAME,"junit-one-element",props);
Assertions.assertTrue(outputPath.list().length==1);
props.put(SAX3WriterXml.PROLOG_LICENCE_ENABLE, false);
File outputPath = testSchema(CelDriver.LANGUAGE_NAME, "junit-one-element", props);
Assertions.assertTrue(outputPath.list().length == 1);
String text = X4OWriterTest.readFile(new File("target/tests/junit-one-element/cel-core-1.0.xsd"));
Assertions.assertNotNull(text);
@ -123,6 +123,6 @@ public class EldXsdLanguageTaskTest {
Assertions.assertFalse(text.contains("bindingHandler"));
Assertions.assertFalse(text.contains("classConverter"));
Assertions.assertTrue(text.length()<10000);
Assertions.assertTrue(text.length() < 10000);
}
}

10
nx01-x4o-driver/src/test/java/org/x4o/xml/element/DefaultElementObjectPropertyValueTest.java
View file

@ -45,7 +45,7 @@ public class DefaultElementObjectPropertyValueTest {
public static void setUp() throws Exception {
// enable all logs
InputStream loggingProperties = DefaultElementObjectPropertyValueTest.class.getResourceAsStream("/META-INF/logging.properties");
LogManager.getLogManager().readConfiguration( loggingProperties );
LogManager.getLogManager().readConfiguration(loggingProperties);
loggingProperties.close();
}
@ -69,7 +69,7 @@ public class DefaultElementObjectPropertyValueTest {
TestObjectChild obj = new TestObjectChild();
helper.setProperty(obj, "price", 666);
Assertions.assertEquals(666,helper.getProperty(obj, "price"));
Assertions.assertEquals(666, helper.getProperty(obj, "price"));
}
@Test
@ -83,7 +83,7 @@ public class DefaultElementObjectPropertyValueTest {
} catch (ElementObjectPropertyValueException not) {
error = true;
}
Assertions.assertEquals(true,error);
Assertions.assertEquals(true, error);
}
@Test
@ -91,9 +91,9 @@ public class DefaultElementObjectPropertyValueTest {
TestBean obj = new TestBean();
helper.setProperty(obj, "privateStringObjectField", "foo");
Assertions.assertEquals("foo",helper.getProperty(obj, "privateStringObjectField"));
Assertions.assertEquals("foo", helper.getProperty(obj, "privateStringObjectField"));
helper.setProperty(obj, "privateStringObjectFieldUnicode仙上主天", "bar");
Assertions.assertEquals("bar",helper.getProperty(obj, "privateStringObjectFieldUnicode仙上主天"));
Assertions.assertEquals("bar", helper.getProperty(obj, "privateStringObjectFieldUnicode仙上主天"));
}
}

19
nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderSessionTest.java
View file

@ -64,7 +64,7 @@ public class X4OReaderSessionTest {
File xmlFile = copyResourceToTempFile();
TestObjectRoot root = reader.readFile(xmlFile.getAbsolutePath());
Assertions.assertNotNull(root);
Assertions.assertTrue(root.getTestBeans().size()>0);
Assertions.assertTrue(root.getTestBeans().size() > 0);
TestBean bean = root.getTestBeans().get(0);
Assertions.assertNotNull(bean);
}
@ -93,7 +93,7 @@ public class X4OReaderSessionTest {
File xmlFile = copyResourceToTempFile();
TestObjectRoot root = reader.readFile(xmlFile);
Assertions.assertNotNull(root);
Assertions.assertTrue(root.getTestBeans().size()>0);
Assertions.assertTrue(root.getTestBeans().size() > 0);
TestBean bean = root.getTestBeans().get(0);
Assertions.assertNotNull(bean);
}
@ -180,17 +180,14 @@ public class X4OReaderSessionTest {
public void testReadString() throws Exception {
TestDriver driver = TestDriver.getInstance();
X4OReaderSession<TestObjectRoot> reader = driver.createReaderSession();
TestObjectRoot root = reader.readString(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+
"<root:root xmlns:root=\"http://test.junit.x4o.org/xml/ns/junit-test-root\" xmlns=\"http://test.junit.x4o.org/xml/ns/junit-test-lang\">"+
"<testBean privateIntegerTypeField=\"987654321\"/>"+
"</root:root>"
);
TestObjectRoot root = reader.readString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<root:root xmlns:root=\"http://test.junit.x4o.org/xml/ns/junit-test-root\" xmlns=\"http://test.junit.x4o.org/xml/ns/junit-test-lang\">"
+ "<testBean privateIntegerTypeField=\"987654321\"/>" + "</root:root>");
Assertions.assertNotNull(root);
Assertions.assertTrue(root.getTestBeans().size()>0);
Assertions.assertTrue(root.getTestBeans().size() > 0);
TestBean bean = root.getTestBeans().get(0);
Assertions.assertNotNull(bean);
Assertions.assertEquals("987654321", ""+bean.getPrivateIntegerTypeField());
Assertions.assertEquals("987654321", "" + bean.getPrivateIntegerTypeField());
}
@Test
@ -216,7 +213,7 @@ public class X4OReaderSessionTest {
URL xmlUrl = Thread.currentThread().getContextClassLoader().getResource("tests/attributes/test-bean.xml");
TestObjectRoot root = reader.readUrl(xmlUrl);
Assertions.assertNotNull(root);
Assertions.assertTrue(root.getTestBeans().size()>0);
Assertions.assertTrue(root.getTestBeans().size() > 0);
TestBean bean = root.getTestBeans().get(0);
Assertions.assertNotNull(bean);
}

21
nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OReaderTest.java
View file

@ -71,7 +71,7 @@ public class X4OReaderTest {
inputStream.close();
}
Assertions.assertNotNull(root);
Assertions.assertTrue(root.getTestBeans().size()>0);
Assertions.assertTrue(root.getTestBeans().size() > 0);
TestBean bean = root.getTestBeans().get(0);
Assertions.assertNotNull(bean);
}
@ -104,17 +104,14 @@ public class X4OReaderTest {
public void testReadString() throws Exception {
X4ODriver<TestObjectRoot> driver = TestDriver.getInstance();
X4OReader<TestObjectRoot> reader = driver.createReader();
TestObjectRoot root = reader.readString(
"<?xml version=\"1.0\" encoding=\"UTF-8\"?>"+
"<root:root xmlns:root=\"http://test.junit.x4o.org/xml/ns/junit-test-root\" xmlns=\"http://test.junit.x4o.org/xml/ns/junit-test-lang\">"+
"<testBean privateIntegerTypeField=\"987654321\"/>"+
"</root:root>"
);
TestObjectRoot root = reader.readString("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<root:root xmlns:root=\"http://test.junit.x4o.org/xml/ns/junit-test-root\" xmlns=\"http://test.junit.x4o.org/xml/ns/junit-test-lang\">"
+ "<testBean privateIntegerTypeField=\"987654321\"/>" + "</root:root>");
Assertions.assertNotNull(root);
Assertions.assertTrue(root.getTestBeans().size()>0);
Assertions.assertTrue(root.getTestBeans().size() > 0);
TestBean bean = root.getTestBeans().get(0);
Assertions.assertNotNull(bean);
Assertions.assertEquals("987654321", ""+bean.getPrivateIntegerTypeField());
Assertions.assertEquals("987654321", "" + bean.getPrivateIntegerTypeField());
}
@Test
@ -140,7 +137,7 @@ public class X4OReaderTest {
URL xmlUrl = Thread.currentThread().getContextClassLoader().getResource("tests/attributes/test-bean.xml");
TestObjectRoot root = reader.readUrl(xmlUrl);
Assertions.assertNotNull(root);
Assertions.assertTrue(root.getTestBeans().size()>0);
Assertions.assertTrue(root.getTestBeans().size() > 0);
TestBean bean = root.getTestBeans().get(0);
Assertions.assertNotNull(bean);
}
@ -168,7 +165,7 @@ public class X4OReaderTest {
File xmlFile = copyResourceToTempFile();
TestObjectRoot root = reader.readFile(xmlFile.getAbsolutePath());
Assertions.assertNotNull(root);
Assertions.assertTrue(root.getTestBeans().size()>0);
Assertions.assertTrue(root.getTestBeans().size() > 0);
TestBean bean = root.getTestBeans().get(0);
Assertions.assertNotNull(bean);
}
@ -197,7 +194,7 @@ public class X4OReaderTest {
File xmlFile = copyResourceToTempFile();
TestObjectRoot root = reader.readFile(xmlFile);
Assertions.assertNotNull(root);
Assertions.assertTrue(root.getTestBeans().size()>0);
Assertions.assertTrue(root.getTestBeans().size() > 0);
TestBean bean = root.getTestBeans().get(0);
Assertions.assertNotNull(bean);
}

10
nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterSessionTest.java
View file

@ -57,7 +57,7 @@ public class X4OWriterSessionTest {
X4OLanguageSession context = driver.createLanguage().createLanguageSession();
Element rootElement = null;
try {
rootElement = (Element)context.getLanguage().getLanguageConfiguration().getDefaultElement().newInstance();
rootElement = (Element) context.getLanguage().getLanguageConfiguration().getDefaultElement().newInstance();
} catch (InstantiationException e) {
throw new SAXException(e);
} catch (IllegalAccessException e) {
@ -75,7 +75,7 @@ public class X4OWriterSessionTest {
X4OWriterSession<TestObjectRoot> writer = driver.createWriterSession();
writer.writeFileSession(createContext(), outputFile);
String text = X4OWriterTest.readFile( outputFile );
String text = X4OWriterTest.readFile(outputFile);
outputFile.delete();
Assertions.assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
@ -108,7 +108,7 @@ public class X4OWriterSessionTest {
X4OWriterSession<TestObjectRoot> writer = driver.createWriterSession();
writer.writeFileSession(createContext(), outputFile.getAbsolutePath());
String text = X4OWriterTest.readFile( outputFile );
String text = X4OWriterTest.readFile(outputFile);
outputFile.delete();
Assertions.assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
@ -142,11 +142,11 @@ public class X4OWriterSessionTest {
OutputStream outputStream = new FileOutputStream(outputFile);
try {
writer.writeSession(createContext(),outputStream);
writer.writeSession(createContext(), outputStream);
} finally {
outputStream.close();
}
String text = X4OWriterTest.readFile( outputFile );
String text = X4OWriterTest.readFile(outputFile);
outputFile.delete();
Assertions.assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));

20
nx01-x4o-driver/src/test/java/org/x4o/xml/io/X4OWriterTest.java
View file

@ -56,7 +56,7 @@ public class X4OWriterTest {
}
static public String readFile(File file) throws IOException {
BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file),Charset.forName("UTF-8")));
BufferedReader br = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charset.forName("UTF-8")));
try {
StringBuilder sb = new StringBuilder();
String line = br.readLine();
@ -66,7 +66,7 @@ public class X4OWriterTest {
line = br.readLine();
}
String out = sb.toString();
//System.out.println(out);
// System.out.println(out);
return out;
} finally {
br.close();
@ -83,8 +83,8 @@ public class X4OWriterTest {
X4OReader<Component> reader = driver.createReader();
X4OWriter<Component> writer = driver.createWriter(SwiXmlDriver.LANGUAGE_VERSION_3);
//reader.setProperty(key, value);
//writer.setProperty(key, value);
// reader.setProperty(key, value);
// writer.setProperty(key, value);
reader.addELBeanInstance(SwiXmlDriver.LANGUAGE_EL_SWING_ENGINE, engine);
Component root = reader.readResource("tests/swixml/swixml-accelerator-3.0.xml");
@ -92,8 +92,8 @@ public class X4OWriterTest {
Assertions.assertTrue(outputFile.exists(), "Debug file does not exists.");
//String text = new Scanner( outputFile ).useDelimiter("\\A").next();
//System.out.println("Output: '\n"+text+"\n' end in "+outputFile.getAbsolutePath());
// String text = new Scanner( outputFile ).useDelimiter("\\A").next();
// System.out.println("Output: '\n"+text+"\n' end in "+outputFile.getAbsolutePath());
outputFile.delete();
}
@ -107,7 +107,7 @@ public class X4OWriterTest {
TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml");
writer.writeFile(root, outputFile);
String text = readFile( outputFile );
String text = readFile(outputFile);
outputFile.delete();
Assertions.assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
@ -125,7 +125,7 @@ public class X4OWriterTest {
TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml");
writer.writeFile(root, outputFile.getAbsolutePath());
String text = readFile( outputFile );
String text = readFile(outputFile);
outputFile.delete();
Assertions.assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
@ -144,13 +144,13 @@ public class X4OWriterTest {
TestObjectRoot root = reader.readResource("tests/attributes/test-bean.xml");
OutputStream outputStream = new FileOutputStream(outputFile);
try {
writer.write(root,outputStream);
writer.write(root, outputStream);
} finally {
outputStream.close();
}
writer.writeFile(root, outputFile.getAbsolutePath());
String text = readFile( outputFile );
String text = readFile(outputFile);
outputFile.delete();
Assertions.assertTrue(text.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));

40
nx01-x4o-driver/src/test/java/org/x4o/xml/lang/DefaultX4OLanguageLoaderTest.java
View file

@ -49,10 +49,10 @@ public class DefaultX4OLanguageLoaderTest {
@BeforeAll
public static void setUp() throws Exception {
driver = TestDriver.getInstance();
language = (X4OLanguageLocal)driver.createLanguage();
language = (X4OLanguageLocal) driver.createLanguage();
session = language.createLanguageSession();
language.init(session);
loader = (DefaultX4OLanguageLoader)language.getLanguageConfiguration().getDefaultLanguageLoader().newInstance();
loader = (DefaultX4OLanguageLoader) language.getLanguageConfiguration().getDefaultLanguageLoader().newInstance();
}
@Test
@ -69,31 +69,31 @@ public class DefaultX4OLanguageLoaderTest {
@Test
public void testModulesSimple() throws Exception {
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-simple.xml");
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-simple.xml");
Assertions.assertNotNull(in);
List<VersionedResources> result = loader.loadLanguageModulesXml(in, "test-modules-simple.xml");
Assertions.assertNotNull(result);
Assertions.assertFalse(result.isEmpty());
Assertions.assertTrue(result.size()==1, "Simple test returned non-one result: "+result.size());
Assertions.assertTrue(result.size() == 1, "Simple test returned non-one result: " + result.size());
}
@Test
public void testModulesFull() throws Exception {
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-full.xml");
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-full.xml");
Assertions.assertNotNull(in);
List<VersionedResources> result = loader.loadLanguageModulesXml(in, "test-modules-full.xml");
Assertions.assertNotNull(result);
Assertions.assertFalse(result.isEmpty());
VersionedResources vr = result.get(0);
Assertions.assertTrue(vr.eldResources.size()>1);
Assertions.assertTrue(vr.moduleLoaders.size()>1);
Assertions.assertTrue(vr.elbResources.size()>1);
Assertions.assertTrue(vr.siblingLoaders.size()==1);
Assertions.assertTrue(vr.eldResources.size() > 1);
Assertions.assertTrue(vr.moduleLoaders.size() > 1);
Assertions.assertTrue(vr.elbResources.size() > 1);
Assertions.assertTrue(vr.siblingLoaders.size() == 1);
}
@Test
public void testModulesDuplicateLoaderNoError() throws Exception {
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml");
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml");
Assertions.assertNotNull(in);
List<VersionedResources> result = loader.loadLanguageModulesXml(in, "test-modules-err-loader.xml");
Assertions.assertNotNull(result);
@ -102,39 +102,39 @@ public class DefaultX4OLanguageLoaderTest {
@Test
public void testModulesDuplicateLoader() throws Exception {
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml");
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-loader.xml");
Assertions.assertNotNull(in);
List<VersionedResources> result = loader.loadLanguageModulesXml(in, "test-modules-err-loader.xml");
Assertions.assertNotNull(result);
Assertions.assertFalse(result.isEmpty());
Exception e=null;
Exception e = null;
try {
loader.validateModules(result);
} catch (Exception ee) {
e=ee;
e = ee;
}
Assertions.assertNotNull(e);
Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: "+e.getMessage());
Assertions.assertTrue(e.getMessage().contains("module-loader"), "No 'module-loader' found in message: "+e.getMessage());
Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: " + e.getMessage());
Assertions.assertTrue(e.getMessage().contains("module-loader"), "No 'module-loader' found in message: " + e.getMessage());
}
@Test
public void testModulesDuplicateSiblingLoader() throws Exception {
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-sibling.xml");
InputStream in = Thread.currentThread().getContextClassLoader().getResourceAsStream("tests/modules/test-modules-err-sibling.xml");
Assertions.assertNotNull(in);
List<VersionedResources> result = loader.loadLanguageModulesXml(in, "test-modules-err-sibling.xml");
Assertions.assertNotNull(result);
Assertions.assertFalse(result.isEmpty());
Exception e=null;
Exception e = null;
try {
loader.validateModules(result);
} catch (Exception ee) {
e=ee;
e = ee;
}
Assertions.assertNotNull(e);
Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: "+e.getMessage());
Assertions.assertTrue(e.getMessage().contains("sibling-loader"), "No 'sibling-loader' found in message: "+e.getMessage());
Assertions.assertTrue(e.getMessage().contains("Duplicate"), "No 'Duplicate' found in message: " + e.getMessage());
Assertions.assertTrue(e.getMessage().contains("sibling-loader"), "No 'sibling-loader' found in message: " + e.getMessage());
}
}

4
nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/MTestDriver.java
View file

@ -28,7 +28,7 @@ import org.x4o.xml.X4ODriverManager;
public class MTestDriver extends X4ODriver<Object> {
public static final String LANGUAGE_NAME = "mtest";
public static final String[] LANGUAGE_VERSIONS = new String[]{X4ODriver.DEFAULT_LANGUAGE_VERSION};
public static final String[] LANGUAGE_VERSIONS = new String[] { X4ODriver.DEFAULT_LANGUAGE_VERSION };
@Override
public String getLanguageName() {
@ -41,6 +41,6 @@ public class MTestDriver extends X4ODriver<Object> {
}
static public MTestDriver getInstance() {
return (MTestDriver)X4ODriverManager.getX4ODriver(LANGUAGE_NAME);
return (MTestDriver) X4ODriverManager.getX4ODriver(LANGUAGE_NAME);
}
}

12
nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ParentObjectTest.java
View file

@ -47,10 +47,10 @@ public class ParentObjectTest {
reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE);
try (X4OLanguageSession session = reader.createLanguageSession()) {
reader.readResourceSession(session, "junit/test-meta-parent-element.xml");
Assertions.assertEquals(1,session.getRootElement().getChilderen().size());
Assertions.assertEquals(1, session.getRootElement().getChilderen().size());
Element childElement = session.getRootElement().getChilderen().get(0);
JLabel test = (JLabel)childElement.getElementObject();
Assertions.assertEquals("parentTest",test.getText());
JLabel test = (JLabel) childElement.getElementObject();
Assertions.assertEquals("parentTest", test.getText());
}
}
@ -73,9 +73,9 @@ public class ParentObjectTest {
Assertions.assertNull(o);
e.setElementObject("test");
o = e.getElementObject();
Assertions.assertEquals("test",o);
Assertions.assertEquals("test", o);
o = ep.getElementObject();
Assertions.assertEquals("test",o);
Assertions.assertEquals(e.getElementObject(),ep.getElementObject());
Assertions.assertEquals("test", o);
Assertions.assertEquals(e.getElementObject(), ep.getElementObject());
}
}

12
nx01-x4o-driver/src/test/java/org/x4o/xml/lang/meta/ReferenceStoreTest.java
View file

@ -45,7 +45,7 @@ public class ReferenceStoreTest {
reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE);
try (X4OLanguageSession session = reader.createLanguageSession()) {
reader.readResourceSession(session, "junit/test-meta-generic.xml");
Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName());
Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName());
}
}
@ -56,7 +56,7 @@ public class ReferenceStoreTest {
reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE);
try (X4OLanguageSession session = reader.createLanguageSession()) {
reader.readResourceSession(session, "junit/test-meta-reference.xml");
Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName());
Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName());
}
}
@ -67,10 +67,10 @@ public class ReferenceStoreTest {
reader.addPhaseSkip(X4OPhaseLanguageRead.READ_RELEASE);
try (X4OLanguageSession session = reader.createLanguageSession()) {
reader.readResourceSession(session, "junit/test-meta-reference.xml");
Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName());
Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(1).getElementObject().getClass().getName());
Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(2).getElementObject().getClass().getName());
Assertions.assertEquals(Date.class.getName(),session.getRootElement().getChilderen().get(3).getElementObject().getClass().getName());
Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(0).getElementObject().getClass().getName());
Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(1).getElementObject().getClass().getName());
Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(2).getElementObject().getClass().getName());
Assertions.assertEquals(Date.class.getName(), session.getRootElement().getChilderen().get(3).getElementObject().getClass().getName());
}
}
}