[jbossws-commits] JBossWS SVN: r18638 - in spi/trunk/src/main/java/org/jboss/wsf/spi/metadata: webservices and 1 other directory.

Author: asoldano Date: 2014-05-13 16:20:00 -0400 (Tue, 13 May 2014) New Revision: 18638 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/SLSBMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java Log: [JBWS-3793] More changes to j2ee metadata Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java 2014-05-13 20:17:08 UTC (rev 18637) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBArchiveMetaData.java 2014-05-13 20:20:00 UTC (rev 18638) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -34,17 +34,98 @@ public class EJBArchiveMetaData { /** ArrayList<BeanMetaData> for the ejbs */ - private List<EJBMetaData> beans = Collections.emptyList(); + private final List<EJBMetaData> beans; /** The optional JBossWS config-name */ - private String configName; + private final String configName; /** The optional JBossWS config-file */ - private String configFile; + private final String configFile; /** The web context root to use for web services */ - private String webServiceContextRoot; + private final String webServiceContextRoot; /** The security-domain value assigned to the application */ - private String securityDomain; + private final String securityDomain; /** A HashMap<String, String> for webservice description publish locations */ - private PublishLocationAdapter publishLocationAdapter; + private final PublishLocationAdapter publishLocationAdapter; + + public static class Builder + { + private List<EJBMetaData> beans = Collections.emptyList(); + private String configName; + private String configFile; + private String webServiceContextRoot; + private String securityDomain; + private PublishLocationAdapter publishLocationAdapter; + + public EJBArchiveMetaData build() + { + return new EJBArchiveMetaData(beans, configName, configFile, webServiceContextRoot, securityDomain, + publishLocationAdapter); + } + + public List<EJBMetaData> getEnterpriseBeans() + { + return beans; + } + public void setEnterpriseBeans(List<EJBMetaData> beans) + { + this.beans = beans; + } + public String getConfigName() + { + return configName; + } + public void setConfigName(String configName) + { + this.configName = configName; + } + public String getConfigFile() + { + return configFile; + } + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + public String getWebServiceContextRoot() + { + return webServiceContextRoot; + } + public void setWebServiceContextRoot(String webServiceContextRoot) + { + this.webServiceContextRoot = webServiceContextRoot; + } + public String getSecurityDomain() + { + return securityDomain; + } + public void setSecurityDomain(String securityDomain) + { + this.securityDomain = securityDomain; + } + public PublishLocationAdapter getPublishLocationAdapter() + { + return publishLocationAdapter; + } + public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) + { + this.publishLocationAdapter = publishLocationAdapter; + } + + } + + public EJBArchiveMetaData(List<EJBMetaData> beans, String configName, String configFile, + String webServiceContextRoot, String securityDomain, PublishLocationAdapter publishLocationAdapter) + { + if (beans != null) { + this.beans = Collections.unmodifiableList(beans); + } else { + this.beans = Collections.emptyList(); + } + this.configName = configName; + this.configFile = configFile; + this.webServiceContextRoot = webServiceContextRoot; + this.securityDomain = securityDomain; + this.publishLocationAdapter = publishLocationAdapter; + } public EJBMetaData getBeanByEjbName(String ejbName) { @@ -63,56 +144,26 @@ return beans.iterator(); } - public void setEnterpriseBeans(List<EJBMetaData> beans) - { - this.beans = beans; - } - public String getConfigName() { return configName; } - public void setConfigName(String configName) - { - this.configName = configName; - } - public String getConfigFile() { return configFile; } - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - public String getWebServiceContextRoot() { return webServiceContextRoot; } - public void setWebServiceContextRoot(String contextRoot) - { - this.webServiceContextRoot = contextRoot; - } - public String getSecurityDomain() { return securityDomain; } - public void setSecurityDomain(String securityDomain) - { - this.securityDomain = securityDomain; - } - - public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) - { - this.publishLocationAdapter = publishLocationAdapter; - } - public String getWsdlPublishLocationByName(String name) { if (this.publishLocationAdapter != null) Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBMetaData.java 2014-05-13 20:17:08 UTC (rev 18637) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/EJBMetaData.java 2014-05-13 20:20:00 UTC (rev 18638) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -30,34 +30,45 @@ public abstract class EJBMetaData { // The ejb-name element specifies an enterprise bean's name. - private String ejbName; + private final String ejbName; // The ejb-class element contains the fully-qualified name of the enterprise bean's class. - private String ejbClass; + private final String ejbClass; // The home element contains the fully-qualified name of the enterprise bean's home interface. */ - private String homeClass; + private final String homeClass; // The local-home element contains the fully-qualified name of the enterprise bean's local home interface. - private String localHomeClass; + private final String localHomeClass; // The service-endpoint element contains the fully-qualified name of the beans service endpoint interface (SEI) - private String seiName; + private final String seiName; // The JNDI name under with the home interface should be bound - private String jndiName; + private final String jndiName; // The JNDI name under with the local home interface should be bound - private String localJndiName; + private final String localJndiName; // The optional port-component-name - private String portComponentName; + private final String portComponentName; // The optional port-component-uri - private String portComponentURI; + private final String portComponentURI; // The optional security meta data - private EJBSecurityMetaData securityMetaData; + private final EJBSecurityMetaData securityMetaData; - public String getEjbName() + protected EJBMetaData(String ejbName, String ejbClass, String homeClass, String localHomeClass, String seiName, + String jndiName, String localJndiName, String portComponentName, String portComponentURI, + EJBSecurityMetaData securityMetaData) { - return ejbName; + this.ejbName = ejbName; + this.ejbClass = ejbClass; + this.homeClass = homeClass; + this.localHomeClass = localHomeClass; + this.seiName = seiName; + this.jndiName = jndiName; + this.localJndiName = localJndiName; + this.portComponentName = portComponentName; + this.portComponentURI = portComponentURI; + this.securityMetaData = securityMetaData; } - public void setEjbName(String ejbName) + public String getEjbName() { - this.ejbName = ejbName; + return ejbName; } public String getEjbClass() @@ -65,21 +76,11 @@ return ejbClass; } - public void setEjbClass(String ejbClass) - { - this.ejbClass = ejbClass; - } - public String getServiceEndpointInterface() { return seiName; } - public void setServiceEndpointInterface(String seiName) - { - this.seiName = seiName; - } - public String getContainerObjectNameJndiName() { return getHome() != null ? getJndiName() : getLocalJndiName(); @@ -90,68 +91,34 @@ return homeClass; } - public void setHome(String homeClass) - { - this.homeClass = homeClass; - } - public String getJndiName() { return jndiName; } - public void setJndiName(String jndiName) - { - this.jndiName = jndiName; - } - public String getLocalHome() { return localHomeClass; } - public void setLocalHome(String localHomeClass) - { - this.localHomeClass = localHomeClass; - } - public String getLocalJndiName() { return localJndiName; } - public void setLocalJndiName(String localJndiName) - { - this.localJndiName = localJndiName; - } - public String getPortComponentName() { return portComponentName; } - public void setPortComponentName(String portComponentName) - { - this.portComponentName = portComponentName; - } - public String getPortComponentURI() { return portComponentURI; } - public void setPortComponentURI(String portComponentURI) - { - this.portComponentURI = portComponentURI; - } - public EJBSecurityMetaData getSecurityMetaData() { return securityMetaData; } - public void setSecurityMetaData(EJBSecurityMetaData securityMetaData) - { - this.securityMetaData = securityMetaData; - } } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java 2014-05-13 20:17:08 UTC (rev 18637) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSEArchiveMetaData.java 2014-05-13 20:20:00 UTC (rev 18638) @@ -21,6 +21,7 @@ */ package org.jboss.wsf.spi.metadata.j2ee; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -34,40 +35,139 @@ public class JSEArchiveMetaData { // The war context root as specified at the jboss-web.xml descriptor level. - private String contextRoot; + private final String contextRoot; // The servlet-mapping <servlet-name, url-pattern> - private Map<String, String> servletMappings = new HashMap<String, String>(); + private final Map<String, String> servletMappings; // The servlet <servlet-name, servlet-class> - private Map<String, String> servletClassNames = new HashMap<String, String>(); + private final Map<String, String> servletClassNames; // The optional JBossWS config-name - private String configName; + private final String configName; // The optional JBossWS config-file - private String configFile; + private final String configFile; // The security-domain value assigned to the application - private String securityDomain; + private final String securityDomain; // A HashMap<String, String> for webservice description publish locations - private PublishLocationAdapter publishLocationAdapter; + private final PublishLocationAdapter publishLocationAdapter; // web.xml security-constraints - private List<JSESecurityMetaData> securityMetaData; - - public String getContextRoot() + private final List<JSESecurityMetaData> securityMetaData; + + public static class Builder { - return contextRoot; + private String contextRoot; + private Map<String, String> servletMappings = new HashMap<String, String>(); + private Map<String, String> servletClassNames = new HashMap<String, String>(); + private String configName; + private String configFile; + private String securityDomain; + private PublishLocationAdapter publishLocationAdapter; + private List<JSESecurityMetaData> securityMetaData; + + public JSEArchiveMetaData build() + { + return new JSEArchiveMetaData(contextRoot, servletMappings, servletClassNames, configName, configFile, + securityDomain, publishLocationAdapter, securityMetaData); + } + + public String getContextRoot() + { + return contextRoot; + } + public void setContextRoot(String contextRoot) + { + this.contextRoot = contextRoot; + } + public Map<String, String> getServletMappings() + { + return servletMappings; + } + public void setServletMappings(Map<String, String> servletMappings) + { + this.servletMappings = servletMappings; + } + public Map<String, String> getServletClassNames() + { + return servletClassNames; + } + public void setServletClassNames(Map<String, String> servletClassNames) + { + this.servletClassNames = servletClassNames; + } + public String getConfigName() + { + return configName; + } + public void setConfigName(String configName) + { + this.configName = configName; + } + public String getConfigFile() + { + return configFile; + } + public void setConfigFile(String configFile) + { + this.configFile = configFile; + } + public String getSecurityDomain() + { + return securityDomain; + } + public void setSecurityDomain(String securityDomain) + { + this.securityDomain = securityDomain; + } + public PublishLocationAdapter getPublishLocationAdapter() + { + return publishLocationAdapter; + } + public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) + { + this.publishLocationAdapter = publishLocationAdapter; + } + public List<JSESecurityMetaData> getSecurityMetaData() + { + return securityMetaData; + } + public void setSecurityMetaData(List<JSESecurityMetaData> securityMetaData) + { + this.securityMetaData = securityMetaData; + } } - - public void setContextRoot(String contextRoot) + + protected JSEArchiveMetaData(String contextRoot, Map<String, String> servletMappings, + Map<String, String> servletClassNames, String configName, String configFile, String securityDomain, + PublishLocationAdapter publishLocationAdapter, List<JSESecurityMetaData> securityMetaData) { this.contextRoot = contextRoot; + if (servletMappings != null) { + this.servletMappings = Collections.unmodifiableMap(servletMappings); + } else { + this.servletMappings = Collections.emptyMap(); + } + if (servletClassNames != null) { + this.servletClassNames = Collections.unmodifiableMap(servletClassNames); + } else { + this.servletClassNames = Collections.emptyMap(); + } + this.configName = configName; + this.configFile = configFile; + this.securityDomain = securityDomain; + this.publishLocationAdapter = publishLocationAdapter; + if (securityMetaData != null) { + this.securityMetaData = Collections.unmodifiableList(securityMetaData); + } else { + this.securityMetaData = Collections.emptyList(); + } } - public Map<String, String> getServletMappings() + public String getContextRoot() { - return servletMappings; + return contextRoot; } - public void setServletMappings(Map<String, String> servletMappings) + public Map<String, String> getServletMappings() { - this.servletMappings = servletMappings; + return servletMappings; } public Map<String, String> getServletClassNames() @@ -75,56 +175,26 @@ return servletClassNames; } - public void setServletClassNames(Map<String, String> servletClassNames) - { - this.servletClassNames = servletClassNames; - } - public String getConfigName() { return configName; } - public void setConfigName(String configName) - { - this.configName = configName; - } - public String getConfigFile() { return configFile; } - public void setConfigFile(String configFile) - { - this.configFile = configFile; - } - public String getSecurityDomain() { return securityDomain; } - public void setSecurityDomain(String securityDomain) - { - this.securityDomain = securityDomain; - } - public List<JSESecurityMetaData> getSecurityMetaData() { return securityMetaData; } - public void setSecurityMetaData(List<JSESecurityMetaData> securityMetaData) - { - this.securityMetaData = securityMetaData; - } - - public void setPublishLocationAdapter(PublishLocationAdapter publishLocationAdapter) - { - this.publishLocationAdapter = publishLocationAdapter; - } - public String getWsdlPublishLocationByName(String name) { if (this.publishLocationAdapter != null) Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java 2014-05-13 20:17:08 UTC (rev 18637) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/JSESecurityMetaData.java 2014-05-13 20:20:00 UTC (rev 18638) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -22,8 +22,11 @@ package org.jboss.wsf.spi.metadata.j2ee; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.Map; +import java.util.Set; /** * @@ -33,16 +36,38 @@ public class JSESecurityMetaData { // The optional security-constraint/user-data-constraint/transport-guarantee - private String transportGuarantee; - // The HashMap for the security-constraint/web-resource-collection elements. - private HashMap<String, JSEResourceCollection> webResources = new HashMap<String, JSEResourceCollection>(); + private final String transportGuarantee; + // The Map for the security-constraint/web-resource-collection elements. + private final Map<String, JSEResourceCollection> webResources; - public JSEResourceCollection addWebResource(final String name) + public static class Builder { - JSEResourceCollection wrc = new JSEResourceCollection(name); - webResources.put(name, wrc); - return wrc; + private String transportGuarantee; + // The HashMap for the security-constraint/web-resource-collection elements. + private HashMap<String, JSEResourceCollection> webResources = new HashMap<String, JSEResourceCollection>(); + + public JSESecurityMetaData build() + { + return new JSESecurityMetaData(transportGuarantee, webResources); + } + + public void addWebResource(final String name, final Collection<String> urlPatterns) + { + JSEResourceCollection wrc = new JSEResourceCollection(name, urlPatterns); + webResources.put(name, wrc); + } + + public void setTransportGuarantee(final String transportGuarantee) + { + this.transportGuarantee = transportGuarantee; + } } + + protected JSESecurityMetaData(String transportGuarantee, HashMap<String, JSEResourceCollection> webResources) + { + this.transportGuarantee = transportGuarantee; + this.webResources = webResources; + } public Collection<JSEResourceCollection> getWebResources() { @@ -54,19 +79,19 @@ return transportGuarantee; } - public void setTransportGuarantee(String transportGuarantee) - { - this.transportGuarantee = transportGuarantee; - } - public static class JSEResourceCollection { - private String name; - private HashSet<String> urlPatterns = new HashSet<String>(); + private final String name; + private final Set<String> urlPatterns; - public JSEResourceCollection(final String name) + public JSEResourceCollection(final String name, Collection<String> urlPatterns) { this.name = name; + if (urlPatterns != null) { + this.urlPatterns = Collections.unmodifiableSet(new HashSet<String>(urlPatterns)); + } else { + this.urlPatterns = Collections.emptySet(); + } } public String getName() @@ -74,13 +99,8 @@ return name; } - public void addPattern(String pattern) + public Set<String> getUrlPatterns() { - urlPatterns.add(pattern); - } - - public HashSet<String> getUrlPatterns() - { return urlPatterns; } } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/SLSBMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/SLSBMetaData.java 2014-05-13 20:17:08 UTC (rev 18637) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/SLSBMetaData.java 2014-05-13 20:20:00 UTC (rev 18638) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -30,4 +30,110 @@ public class SLSBMetaData extends EJBMetaData { + protected SLSBMetaData(String ejbName, String ejbClass, String homeClass, String localHomeClass, String seiName, + String jndiName, String localJndiName, String portComponentName, String portComponentURI, + EJBSecurityMetaData securityMetaData) + { + super(ejbName, ejbClass, homeClass, localHomeClass, seiName, jndiName, localJndiName, portComponentName, + portComponentURI, securityMetaData); + } + + public static class Builder { + private String ejbName; + private String ejbClass; + private String homeClass; + private String localHomeClass; + private String seiName; + private String jndiName; + private String localJndiName; + private String portComponentName; + private String portComponentURI; + private EJBSecurityMetaData securityMetaData; + + public SLSBMetaData build() + { + return new SLSBMetaData(ejbName, ejbClass, homeClass, localHomeClass, seiName, jndiName, localJndiName, portComponentName, portComponentURI, securityMetaData); + } + + public String getEjbName() + { + return ejbName; + } + public void setEjbName(String ejbName) + { + this.ejbName = ejbName; + } + public String getEjbClass() + { + return ejbClass; + } + public void setEjbClass(String ejbClass) + { + this.ejbClass = ejbClass; + } + public String getHomeClass() + { + return homeClass; + } + public void setHomeClass(String homeClass) + { + this.homeClass = homeClass; + } + public String getLocalHomeClass() + { + return localHomeClass; + } + public void setLocalHomeClass(String localHomeClass) + { + this.localHomeClass = localHomeClass; + } + public String getSeiName() + { + return seiName; + } + public void setSeiName(String seiName) + { + this.seiName = seiName; + } + public String getJndiName() + { + return jndiName; + } + public void setJndiName(String jndiName) + { + this.jndiName = jndiName; + } + public String getLocalJndiName() + { + return localJndiName; + } + public void setLocalJndiName(String localJndiName) + { + this.localJndiName = localJndiName; + } + public String getPortComponentName() + { + return portComponentName; + } + public void setPortComponentName(String portComponentName) + { + this.portComponentName = portComponentName; + } + public String getPortComponentURI() + { + return portComponentURI; + } + public void setPortComponentURI(String portComponentURI) + { + this.portComponentURI = portComponentURI; + } + public EJBSecurityMetaData getSecurityMetaData() + { + return securityMetaData; + } + public void setSecurityMetaData(EJBSecurityMetaData securityMetaData) + { + this.securityMetaData = securityMetaData; + } + } } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2014-05-13 20:17:08 UTC (rev 18637) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/WebserviceDescriptionMetaData.java 2014-05-13 20:20:00 UTC (rev 18638) @@ -52,7 +52,7 @@ // The required <jaxrpc-mapping-file> element private final String jaxrpcMappingFile; // The required <port-component> elements - private final List<PortComponentMetaData> portComponents; // = new ArrayList<PortComponentMetaData>(); + private final List<PortComponentMetaData> portComponents; public WebserviceDescriptionMetaData(String webserviceDescriptionName, String wsdlFile, String jaxrpcMappingFile, PortComponentMetaData... portComponents)