diff --git a/src/main/java/com/avaje/ebeaninternal/util/EncodeUtil.java b/src/main/java/com/avaje/ebeaninternal/util/EncodeUtil.java index 946066c7e..765adefe8 100644 --- a/src/main/java/com/avaje/ebeaninternal/util/EncodeUtil.java +++ b/src/main/java/com/avaje/ebeaninternal/util/EncodeUtil.java @@ -92,7 +92,7 @@ public final class EncodeUtil { try { return new String(data, encoding); } catch (UnsupportedEncodingException e) { - throw new RuntimeException("Error decoding bytes with "+encoding, e); + throw new RuntimeException("Error decoding bytes with " + encoding, e); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/ObjectFactory.java b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/ObjectFactory.java index 9d13626d9..84f91d529 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/ObjectFactory.java +++ b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/ObjectFactory.java @@ -1,88 +1,78 @@ - package com.avaje.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlRegistry; /** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the com.avaje.ebeaninternal.xmlmapping.model package. - *
An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the com.avaje.ebeaninternal.xmlmapping.model package. + *
An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are * provided in this class. - * */ @XmlRegistry public class ObjectFactory { - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebeaninternal.xmlmapping.model - * - */ - public ObjectFactory() { - } + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.avaje.ebeaninternal.xmlmapping.model + */ + public ObjectFactory() { + } - /** - * Create an instance of {@link XmRawSql } - * - */ - public XmRawSql createRawSql() { - return new XmRawSql(); - } + /** + * Create an instance of {@link XmRawSql } + */ + public XmRawSql createRawSql() { + return new XmRawSql(); + } - /** - * Create an instance of {@link XmAliasMapping } - * - */ - public XmAliasMapping createAliasMapping() { - return new XmAliasMapping(); - } + /** + * Create an instance of {@link XmAliasMapping } + */ + public XmAliasMapping createAliasMapping() { + return new XmAliasMapping(); + } - /** - * Create an instance of {@link XmColumnMapping } - * - */ - public XmColumnMapping createColumnMapping() { - return new XmColumnMapping(); - } + /** + * Create an instance of {@link XmColumnMapping } + */ + public XmColumnMapping createColumnMapping() { + return new XmColumnMapping(); + } - /** - * Create an instance of {@link XmQuery } - * - */ - public XmQuery createQuery() { - return new XmQuery(); - } + /** + * Create an instance of {@link XmQuery } + */ + public XmQuery createQuery() { + return new XmQuery(); + } - /** - * Create an instance of {@link XmEbean } - * - */ - public XmEbean createEbean() { - return new XmEbean(); - } + /** + * Create an instance of {@link XmEbean } + */ + public XmEbean createEbean() { + return new XmEbean(); + } - /** - * Create an instance of {@link XmEntity } - * - */ - public XmEntity createEntity() { - return new XmEntity(); - } + /** + * Create an instance of {@link XmEntity } + */ + public XmEntity createEntity() { + return new XmEntity(); + } - /** - * Create an instance of {@link XmNamedQuery } - * - */ - public XmNamedQuery createNamedQuery() { - return new XmNamedQuery(); - } + /** + * Create an instance of {@link XmNamedQuery } + */ + public XmNamedQuery createNamedQuery() { + return new XmNamedQuery(); + } } diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmAliasMapping.java b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmAliasMapping.java index d28e745c8..35d69b86c 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmAliasMapping.java +++ b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmAliasMapping.java @@ -1,4 +1,3 @@ - package com.avaje.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlAccessType; @@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType; /** *
Java class for anonymous complex type. - * + *
*
The following schema fragment specifies the expected content contained within this class. - * + *
*
* <complexType> * <complexContent> @@ -23,65 +22,55 @@ import javax.xml.bind.annotation.XmlType; * </complexContent> * </complexType> *- * - * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") @XmlRootElement(name = "alias-mapping") public class XmAliasMapping { - @XmlAttribute(name = "alias", required = true) - protected String alias; - @XmlAttribute(name = "property", required = true) - protected String property; + @XmlAttribute(name = "alias", required = true) + protected String alias; + @XmlAttribute(name = "property", required = true) + protected String property; - /** - * Gets the value of the alias property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getAlias() { - return alias; - } + /** + * Gets the value of the alias property. + * + * @return possible object is + * {@link String } + */ + public String getAlias() { + return alias; + } - /** - * Sets the value of the alias property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setAlias(String value) { - this.alias = value; - } + /** + * Sets the value of the alias property. + * + * @param value allowed object is + * {@link String } + */ + public void setAlias(String value) { + this.alias = value; + } - /** - * Gets the value of the property property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getProperty() { - return property; - } + /** + * Gets the value of the property property. + * + * @return possible object is + * {@link String } + */ + public String getProperty() { + return property; + } - /** - * Sets the value of the property property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setProperty(String value) { - this.property = value; - } + /** + * Sets the value of the property property. + * + * @param value allowed object is + * {@link String } + */ + public void setProperty(String value) { + this.property = value; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmColumnMapping.java b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmColumnMapping.java index f00f8664d..6c9a94526 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmColumnMapping.java +++ b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmColumnMapping.java @@ -1,4 +1,3 @@ - package com.avaje.ebeaninternal.xmlmapping.model; import javax.xml.bind.annotation.XmlAccessType; @@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlType; /** *
Java class for anonymous complex type. - * + *
*
The following schema fragment specifies the expected content contained within this class. - * + *
*
* <complexType> * <complexContent> @@ -23,65 +22,55 @@ import javax.xml.bind.annotation.XmlType; * </complexContent> * </complexType> *- * - * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "") @XmlRootElement(name = "column-mapping") public class XmColumnMapping { - @XmlAttribute(name = "column", required = true) - protected String column; - @XmlAttribute(name = "property", required = true) - protected String property; + @XmlAttribute(name = "column", required = true) + protected String column; + @XmlAttribute(name = "property", required = true) + protected String property; - /** - * Gets the value of the column property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getColumn() { - return column; - } + /** + * Gets the value of the column property. + * + * @return possible object is + * {@link String } + */ + public String getColumn() { + return column; + } - /** - * Sets the value of the column property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setColumn(String value) { - this.column = value; - } + /** + * Sets the value of the column property. + * + * @param value allowed object is + * {@link String } + */ + public void setColumn(String value) { + this.column = value; + } - /** - * Gets the value of the property property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getProperty() { - return property; - } + /** + * Gets the value of the property property. + * + * @return possible object is + * {@link String } + */ + public String getProperty() { + return property; + } - /** - * Sets the value of the property property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setProperty(String value) { - this.property = value; - } + /** + * Sets the value of the property property. + * + * @param value allowed object is + * {@link String } + */ + public void setProperty(String value) { + this.property = value; + } } diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java index 6ec91de9a..bb8b4aae2 100644 --- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java +++ b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmEbean.java @@ -1,20 +1,19 @@ - package com.avaje.ebeaninternal.xmlmapping.model; -import java.util.ArrayList; -import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import java.util.ArrayList; +import java.util.List; /** *
Java class for anonymous complex type. - * + *
*
The following schema fragment specifies the expected content contained within this class. - * + *
*
* <complexType> * <complexContent> @@ -26,46 +25,42 @@ import javax.xml.bind.annotation.XmlType; * </complexContent> * </complexType> *- * - * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { - "entity" + "entity" }) @XmlRootElement(name = "ebean") public class XmEbean { - @XmlElement(required = true) - protected List
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a set method for the entity property.
- *
- *
- * For example, to add a new item, do as follows: - *
- * getEntity().add(newItem); - *- * - * - *
- * Objects of the following type(s) are allowed in the list
- * {@link XmEntity }
- *
- *
- */
- public List
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a
+ *
+ * For example, to add a new item, do as follows:
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link XmEntity }
+ */
+ public List Java class for anonymous complex type.
- *
+ *
* The following schema fragment specifies the expected content contained within this class.
- *
+ *
*
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a
- * For example, to add a new item, do as follows:
- *
- * Objects of the following type(s) are allowed in the list
- * {@link XmNamedQuery }
- *
- *
- */
- public List
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a
+ *
+ * For example, to add a new item, do as follows:
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link XmNamedQuery }
+ */
+ public List
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a
- * For example, to add a new item, do as follows:
- *
- * Objects of the following type(s) are allowed in the list
- * {@link XmRawSql }
- *
- *
- */
- public List
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a
+ *
+ * For example, to add a new item, do as follows:
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link XmRawSql }
+ */
+ public List Java class for anonymous complex type.
- *
+ *
* The following schema fragment specifies the expected content contained within this class.
- *
+ *
* Java class for anonymous complex type.
- *
+ *
* The following schema fragment specifies the expected content contained within this class.
- *
+ *
* Java class for anonymous complex type.
- *
+ *
* The following schema fragment specifies the expected content contained within this class.
- *
+ *
*
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a
- * For example, to add a new item, do as follows:
- *
- * Objects of the following type(s) are allowed in the list
- * {@link XmAliasMapping }
- *
- *
- */
- public List
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a
+ *
+ * For example, to add a new item, do as follows:
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link XmAliasMapping }
+ */
+ public List
- * This accessor method returns a reference to the live list,
- * not a snapshot. Therefore any modification you make to the
- * returned list will be present inside the JAXB object.
- * This is why there is not a
- * For example, to add a new item, do as follows:
- *
- * Objects of the following type(s) are allowed in the list
- * {@link XmColumnMapping }
- *
- *
- */
- public List
+ *
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a
+ *
+ * For example, to add a new item, do as follows:
+ *
+ *
+ *
+ * Objects of the following type(s) are allowed in the list
+ * {@link XmColumnMapping }
+ */
+ public Listset method for the entity property.
+ *
+ * getEntity().add(newItem);
+ *
+ *
* <complexType>
* <complexContent>
@@ -29,104 +28,94 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
*
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "namedQuery",
- "rawSql"
+ "namedQuery",
+ "rawSql"
})
@XmlRootElement(name = "entity")
public class XmEntity {
- @XmlElement(name = "named-query", required = true)
- protected Listset method for the namedQuery property.
- *
- *
- * getNamedQuery().add(newItem);
- *
- *
- *
- * set method for the namedQuery property.
+ *
+ * getNamedQuery().add(newItem);
+ *
+ * set method for the rawSql property.
- *
- *
- * getRawSql().add(newItem);
- *
- *
- *
- * set method for the rawSql property.
+ *
+ * getRawSql().add(newItem);
+ *
+ *
* <complexType>
* <complexContent>
@@ -26,67 +25,57 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
*
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "query"
+ "query"
})
@XmlRootElement(name = "named-query")
public class XmNamedQuery {
- @XmlElement(required = true)
- protected XmQuery query;
- @XmlAttribute(name = "name", required = true)
- protected String name;
+ @XmlElement(required = true)
+ protected XmQuery query;
+ @XmlAttribute(name = "name", required = true)
+ protected String name;
- /**
- * Gets the value of the query property.
- *
- * @return
- * possible object is
- * {@link XmQuery }
- *
- */
- public XmQuery getQuery() {
- return query;
- }
+ /**
+ * Gets the value of the query property.
+ *
+ * @return possible object is
+ * {@link XmQuery }
+ */
+ public XmQuery getQuery() {
+ return query;
+ }
- /**
- * Sets the value of the query property.
- *
- * @param value
- * allowed object is
- * {@link XmQuery }
- *
- */
- public void setQuery(XmQuery value) {
- this.query = value;
- }
+ /**
+ * Sets the value of the query property.
+ *
+ * @param value allowed object is
+ * {@link XmQuery }
+ */
+ public void setQuery(XmQuery value) {
+ this.query = value;
+ }
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- return name;
- }
+ /**
+ * Gets the value of the name property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getName() {
+ return name;
+ }
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
}
diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmQuery.java b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmQuery.java
index f331726ed..bf669bbb0 100644
--- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmQuery.java
+++ b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmQuery.java
@@ -1,4 +1,3 @@
-
package com.avaje.ebeaninternal.xmlmapping.model;
import javax.xml.bind.annotation.XmlAccessType;
@@ -10,9 +9,9 @@ import javax.xml.bind.annotation.XmlValue;
/**
*
* <complexType>
* <simpleContent>
@@ -21,41 +20,35 @@ import javax.xml.bind.annotation.XmlValue;
* </simpleContent>
* </complexType>
*
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "value"
+ "value"
})
@XmlRootElement(name = "query")
public class XmQuery {
- @XmlValue
- protected String value;
+ @XmlValue
+ protected String value;
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValue() {
- return value;
- }
+ /**
+ * Gets the value of the value property.
+ *
+ * @return possible object is
+ * {@link String }
+ */
+ public String getValue() {
+ return value;
+ }
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValue(String value) {
- this.value = value;
- }
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value allowed object is
+ * {@link String }
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
}
diff --git a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java
index e042d0965..9fd3237a0 100644
--- a/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java
+++ b/src/main/java/com/avaje/ebeaninternal/xmlmapping/model/XmRawSql.java
@@ -1,21 +1,20 @@
-
package com.avaje.ebeaninternal.xmlmapping.model;
-import java.util.ArrayList;
-import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
/**
*
* <complexType>
* <complexContent>
@@ -30,131 +29,117 @@ import javax.xml.bind.annotation.XmlType;
* </complexContent>
* </complexType>
*
- *
- *
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "", propOrder = {
- "aliasMapping",
- "columnMapping",
- "query"
+ "aliasMapping",
+ "columnMapping",
+ "query"
})
@XmlRootElement(name = "raw-sql")
public class XmRawSql {
- @XmlElement(name = "alias-mapping")
- protected Listset method for the aliasMapping property.
- *
- *
- * getAliasMapping().add(newItem);
- *
- *
- *
- * set method for the aliasMapping property.
+ *
+ * getAliasMapping().add(newItem);
+ *
+ * set method for the columnMapping property.
- *
- *
- * getColumnMapping().add(newItem);
- *
- *
- *
- * set method for the columnMapping property.
+ *
+ * getColumnMapping().add(newItem);
+ *
+ *