Skip to content

Commit

Permalink
formatting code
Browse files Browse the repository at this point in the history 
git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2612 1c488680-804c-0410-94cd-c6b725194a0e
  • Loading branch information
Victor Yarmolovich committed Apr 21, 2009
1 parent 021e0e5 commit a1801ab
Show file tree
Hide file tree
Showing 16 changed files with 444 additions and 447 deletions.
72 changes: 39 additions & 33 deletions impl/src/main/java/org/jboss/webbeans/xml/ParseXmlHelper.java
View file
Expand Up @@ -29,28 +29,30 @@ public class ParseXmlHelper
{
public static boolean isJavaEeNamespace(Element element)
{
return element.getNamespace().getURI().equalsIgnoreCase(XmlConstants.JAVA_EE_NAMESPACE);
return XmlConstants.JAVA_EE_NAMESPACE.equalsIgnoreCase(element.getNamespace().getURI());
}

public static <T> AnnotatedClass<? extends T> loadElementClass(Element element, Class<T> expectedType, XmlEnvironment environment, Map<String, Set<String>> packagesMap)
public static <T> AnnotatedClass<? extends T> loadElementClass(Element element, Class<T> expectedType, XmlEnvironment environment,
Map<String, Set<String>> packagesMap)
{
List<AnnotatedClass<? extends T>> classesList = tryLoadElementClass(element, expectedType, environment, packagesMap);
String className = element.getName();

if (classesList.size() == 0)
throw new DefinitionException("Could not find '" + className + "'");

return classesList.get(0);
}

public static <T> List<AnnotatedClass<? extends T>> tryLoadElementClass(Element element, Class<T> expectedType, XmlEnvironment environment, Map<String, Set<String>> packagesMap)

public static <T> List<AnnotatedClass<? extends T>> tryLoadElementClass(Element element, Class<T> expectedType, XmlEnvironment environment,
Map<String, Set<String>> packagesMap)
{
List<AnnotatedClass<? extends T>> classesList = new ArrayList<AnnotatedClass<? extends T>>();
String prefix = element.getNamespacePrefix();

for (Map.Entry<String, Set<String>> packagesEntry : packagesMap.entrySet())
{
if (prefix.equalsIgnoreCase(packagesEntry.getKey()))
if (packagesEntry.getKey().equalsIgnoreCase(prefix))
{
Set<String> packages = packagesEntry.getValue();
for (String packageName : packages)
Expand All @@ -67,22 +69,23 @@ public static <T> List<AnnotatedClass<? extends T>> tryLoadElementClass(Element
}
}
}
if(classesList.size() > 1)

if (classesList.size() > 1)
throw new DefinitionException("There are multiple packages containing a Java type with the same name '" + element.getName() + "'");

return classesList;
}

public static <T extends Annotation> Class<? extends T> loadAnnotationClass(Element element, Class<T> expectedType, XmlEnvironment environment, Map<String, Set<String>> packagesMap)

public static <T extends Annotation> Class<? extends T> loadAnnotationClass(Element element, Class<T> expectedType, XmlEnvironment environment,
Map<String, Set<String>> packagesMap)
{
List<Class<? extends T>> classesList = new ArrayList<Class<? extends T>>();
String className = element.getName();
String prefix = element.getNamespacePrefix();

for (Map.Entry<String, Set<String>> packagesEntry : packagesMap.entrySet())
{
if (prefix.equalsIgnoreCase(packagesEntry.getKey()))
if (packagesEntry.getKey().equalsIgnoreCase(prefix))
{
Set<String> packages = packagesEntry.getValue();
for (String packageName : packages)
Expand All @@ -94,7 +97,7 @@ public static <T extends Annotation> Class<? extends T> loadAnnotationClass(Elem
}
catch (ResourceLoadingException e)
{
//work with this when 'classesList.size() == 0'
// work with this when 'classesList.size() == 0'
}
catch (ClassCastException e)
{
Expand Down Expand Up @@ -130,7 +133,7 @@ public static void checkRootAttributes(Element root, Map<String, Set<String>> pa
{
urn = attrVal;
URL namespaceFile = environment.loadFileByUrn(urn, XmlConstants.NAMESPACE_FILE_NAME);

if (namespaceFile != null)
{
packagesSet.addAll(parseNamespaceFile(namespaceFile));
Expand All @@ -141,11 +144,13 @@ public static void checkRootAttributes(Element root, Map<String, Set<String>> pa
packagesSet.add(packageName);
}
}
if (attribute.getName().equalsIgnoreCase(XmlConstants.SCHEMA_LOCATION) && attrVal.startsWith(XmlConstants.HTTP_PREFIX) && urn.trim().length() > 0)
if (XmlConstants.SCHEMA_LOCATION.equalsIgnoreCase(attribute.getName()) &&
attrVal.startsWith(XmlConstants.HTTP_PREFIX) && urn.trim().length() > 0)
{
URL schemaUrl = environment.loadFileByUrn(urn, XmlConstants.SCHEMA_FILE_NAME);
if (schemaUrl == null)
throw new DefinitionException("Could not find '" + XmlConstants.SCHEMA_FILE_NAME + "' file according to specified URN '" + urn + "'");
throw new DefinitionException("Could not find '" + XmlConstants.SCHEMA_FILE_NAME +
"' file according to specified URN '" + urn + "'");
validateXmlWithXsd(xmlUrl, schemaUrl);
}
}
Expand All @@ -162,15 +167,15 @@ public static void checkRootDeclaredNamespaces(Element root, Map<String, Set<Str
Namespace namespace = (Namespace) namespacesIterator.next();
String prefix = namespace.getPrefix();
String uri = namespace.getURI();

if (uri.startsWith(XmlConstants.URN_PREFIX))
{
Set<String> packagesSet = new HashSet<String>();

URL schemaUrl = environment.loadFileByUrn(uri, XmlConstants.SCHEMA_FILE_NAME);
if(schemaUrl != null)
if (schemaUrl != null)
validateXmlWithXsd(xmlUrl, schemaUrl);

URL namespaceFile = environment.loadFileByUrn(uri, XmlConstants.NAMESPACE_FILE_NAME);
if (namespaceFile != null)
{
Expand All @@ -186,9 +191,9 @@ public static void checkRootDeclaredNamespaces(Element root, Map<String, Set<Str
}
}
}

private static void validateXmlWithXsd(URL xmlUrl, URL schemaUrl)
{
{
try
{
final StreamSource stream = new StreamSource(xmlUrl.toExternalForm());
Expand All @@ -197,12 +202,12 @@ private static void validateXmlWithXsd(URL xmlUrl, URL schemaUrl)
final Validator validator = schema.newValidator();
validator.validate(stream);
}
catch(SAXException e)
catch (SAXException e)
{
String message = "SAXException while validate " + xmlUrl + " with " + schemaUrl;
throw new DefinitionException(message, e);
}
catch(IOException e)
catch (IOException e)
{
String message = "IOException while validate " + xmlUrl + " with " + schemaUrl;
throw new DefinitionException(message, e);
Expand All @@ -213,22 +218,22 @@ public static List<Element> findElementsInEeNamespace(Element elementParent, Str
{
String elementPrefix = "";
String elementUri = XmlConstants.JAVA_EE_NAMESPACE;

return findElements(elementParent, elementName, elementPrefix, elementUri);
}

public static List<Element> findElements(Element elementParent, String elementName, String elementPrefix, String elementUri)
{
List<Element> elements = new ArrayList<Element>();
Namespace elementNamespace = new Namespace(elementPrefix, elementUri);
QName qName = new QName(elementName, elementNamespace);
Iterator<?> elementIterator = elementParent.elementIterator(qName);
while(elementIterator.hasNext())
while (elementIterator.hasNext())
{
Element element = (Element)elementIterator.next();
Element element = (Element) elementIterator.next();
elements.add(element);
}

return elements;
}

Expand Down Expand Up @@ -271,11 +276,12 @@ private static void addElementToPackagesMap(Map<String, Set<String>> packagesMap
packagesMap.put(prefix, packagesSet);
}
}

public static void checkForUniqueElements(List<Class<? extends Annotation>> list){

public static void checkForUniqueElements(List<Class<? extends Annotation>> list)
{
Set<Class<? extends Annotation>> set = new HashSet<Class<? extends Annotation>>(list);
if(list.size() != set.size())
throw new DefinitionException("A certain annotation type is declared more than once as a binding type, " +
"interceptor binding type or stereotype using XML");
if (list.size() != set.size())
throw new DefinitionException("A certain annotation type is declared more than once as a binding type, " +
"interceptor binding type or stereotype using XML");
}
}
30 changes: 15 additions & 15 deletions impl/src/main/java/org/jboss/webbeans/xml/XmlConstants.java
View file
Expand Up @@ -7,11 +7,11 @@ public class XmlConstants
public static final String DEPLOY = "Deploy";

public static final String INTERCEPTORS = "Interceptors";

public static final String INTERCEPTOR = "Interceptor";

public static final String DECORATORS = "Decorators";

public static final String DECORATOR = "Decorator";

public static final String BINDING_TYPE = "BindingType";
Expand All @@ -29,44 +29,44 @@ public class XmlConstants
public static final String EJB = "EJB";

public static final String EJB_NAME = "ejbName";

public static final String EJB_LINK = "ejbLink";

public static final String WEB_SERVICE_REF = "WebServiceRef";

public static final String WSDL_LOCATION = "wsdlLocation";

public static final String TOPIC = "Topic";

public static final String QUEUE = "Queue";

public static final String URN_PREFIX = "urn:java:";

public static final String HTTP_PREFIX = "http://";

public static final String SCHEMA_LOCATION = "schemaLocation";

public static final String MAPPED_NAME = "mappedName";

public static final String UNIT_NAME = "unitName";

public static final String STANDARD = "Standard";

public static final String NAMESPACE_FILE_NAME = "namespace";

public static final String SCHEMA_FILE_NAME = "schema.xsd";

public static final String NAMESPACE_FILE_DELIMETER = " ";

public static final String PRODUCES = "Produces";

public static final String VALUE = "value";

public static final String ARRAY = "Array";

public static final String JNDI_NAME = "name";

public static final String JAVA_GLOBAL = "java:global/";

public static final String JAVA_APP = "java:app/";
}

0 comments on commit a1801ab

Please sign in to comment.