github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#7827] MiniJAXB should only omit optional elements

Browse Source 
While marshalling MiniJAXB should only omit an XML element if the
corresponding @XmlElement annotation has `required = false`. With
`required = true` the output should instead have an empty XML element.
This commit is contained in:
Knut Wannheden 2019-07-09 17:55:22 +02:00
parent 02603d5c86
commit d4e24de598
23 changed files with 120 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java
View File

@ -164,11 +164,9 @@ public class CatalogMappingType implements Serializable
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
if ((inputCatalog!= null)&&(!"".equals(inputCatalog))) {
sb.append("<inputCatalog>");
sb.append(inputCatalog);
sb.append("</inputCatalog>");
}
sb.append("<inputCatalog>");
sb.append(((inputCatalog == null)?"":inputCatalog));
sb.append("</inputCatalog>");
if ((outputCatalog!= null)&&(!"".equals(outputCatalog))) {
sb.append("<outputCatalog>");
sb.append(outputCatalog);

8
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java
View File

@ -187,11 +187,9 @@ public class Configuration implements Serializable
sb.append(jdbc);
sb.append("</jdbc>");
}
if (generator!= null) {
sb.append("<generator>");
sb.append(generator);
sb.append("</generator>");
}
sb.append("<generator>");
sb.append(((generator == null)?"":generator));
sb.append("</generator>");
return sb.toString();
}

8
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java
View File

@ -186,11 +186,9 @@ public class CustomType implements Serializable
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
if ((name!= null)&&(!"".equals(name))) {
sb.append("<name>");
sb.append(name);
sb.append("</name>");
}
sb.append("<name>");
sb.append(((name == null)?"":name));
sb.append("</name>");
if ((type!= null)&&(!"".equals(type))) {
sb.append("<type>");
sb.append(type);

8
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableField.java
View File

@ -113,11 +113,9 @@ public class EmbeddableField implements Serializable
sb.append(name);
sb.append("</name>");
}
if ((expression!= null)&&(!"".equals(expression))) {
sb.append("<expression>");
sb.append(expression);
sb.append("</expression>");
}
sb.append("<expression>");
sb.append(((expression == null)?"":expression));
sb.append("</expression>");
return sb.toString();
}

16
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EnumType.java
View File

@ -109,16 +109,12 @@ public class EnumType implements Serializable
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
if ((name!= null)&&(!"".equals(name))) {
sb.append("<name>");
sb.append(name);
sb.append("</name>");
}
if ((literals!= null)&&(!"".equals(literals))) {
sb.append("<literals>");
sb.append(literals);
sb.append("</literals>");
}
sb.append("<name>");
sb.append(((name == null)?"":name));
sb.append("</name>");
sb.append("<literals>");
sb.append(((literals == null)?"":literals));
sb.append("</literals>");
return sb.toString();
}

8
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java
View File

@ -292,11 +292,9 @@ public class Jdbc implements Serializable
sb.append(driver);
sb.append("</driver>");
}
if ((url!= null)&&(!"".equals(url))) {
sb.append("<url>");
sb.append(url);
sb.append("</url>");
}
sb.append("<url>");
sb.append(((url == null)?"":url));
sb.append("</url>");
if ((schema!= null)&&(!"".equals(schema))) {
sb.append("<schema>");
sb.append(schema);

8
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java
View File

@ -114,11 +114,9 @@ public class MatcherRule implements Serializable
sb.append(transform);
sb.append("</transform>");
}
if ((expression!= null)&&(!"".equals(expression))) {
sb.append("<expression>");
sb.append(expression);
sb.append("</expression>");
}
sb.append("<expression>");
sb.append(((expression == null)?"":expression));
sb.append("</expression>");
return sb.toString();
}

16
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Property.java
View File

@ -96,16 +96,12 @@ public class Property implements Serializable
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
if ((key!= null)&&(!"".equals(key))) {
sb.append("<key>");
sb.append(key);
sb.append("</key>");
}
if ((value!= null)&&(!"".equals(value))) {
sb.append("<value>");
sb.append(value);
sb.append("</value>");
}
sb.append("<key>");
sb.append(((key == null)?"":key));
sb.append("</key>");
sb.append("<value>");
sb.append(((value == null)?"":value));
sb.append("</value>");
return sb.toString();
}

8
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SchemaMappingType.java
View File

@ -125,11 +125,9 @@ public class SchemaMappingType implements Serializable
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
if ((inputSchema!= null)&&(!"".equals(inputSchema))) {
sb.append("<inputSchema>");
sb.append(inputSchema);
sb.append("</inputSchema>");
}
sb.append("<inputSchema>");
sb.append(((inputSchema == null)?"":inputSchema));
sb.append("</inputSchema>");
if ((outputSchema!= null)&&(!"".equals(outputSchema))) {
sb.append("<outputSchema>");
sb.append(outputSchema);

8
jOOQ/src/main/java/org/jooq/conf/MappedTable.java
View File

@ -142,11 +142,9 @@ public class MappedTable
sb.append(inputExpression.pattern());
sb.append("</inputExpression>");
}
if ((output!= null)&&(!"".equals(output))) {
sb.append("<output>");
sb.append(output);
sb.append("</output>");
}
sb.append("<output>");
sb.append(((output == null)?"":output));
sb.append("</output>");
return sb.toString();
}

8
jOOQ/src/main/java/org/jooq/conf/ParseSearchSchema.java
View File

@ -97,11 +97,9 @@ public class ParseSearchSchema
sb.append(catalog);
sb.append("</catalog>");
}
if ((schema!= null)&&(!"".equals(schema))) {
sb.append("<schema>");
sb.append(schema);
sb.append("</schema>");
}
sb.append("<schema>");
sb.append(((schema == null)?"":schema));
sb.append("</schema>");
return sb.toString();
}

24
jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java
View File

@ -575,21 +575,15 @@ public class Column implements Serializable
sb.append(tableSchema);
sb.append("</table_schema>");
}
if ((tableName!= null)&&(!"".equals(tableName))) {
sb.append("<table_name>");
sb.append(tableName);
sb.append("</table_name>");
}
if ((columnName!= null)&&(!"".equals(columnName))) {
sb.append("<column_name>");
sb.append(columnName);
sb.append("</column_name>");
}
if ((dataType!= null)&&(!"".equals(dataType))) {
sb.append("<data_type>");
sb.append(dataType);
sb.append("</data_type>");
}
sb.append("<table_name>");
sb.append(((tableName == null)?"":tableName));
sb.append("</table_name>");
sb.append("<column_name>");
sb.append(((columnName == null)?"":columnName));
sb.append("</column_name>");
sb.append("<data_type>");
sb.append(((dataType == null)?"":dataType));
sb.append("</data_type>");
if (characterMaximumLength!= null) {
sb.append("<character_maximum_length>");
sb.append(characterMaximumLength);

24
jOOQ/src/main/java/org/jooq/util/xml/jaxb/ElementType.java
View File

@ -413,21 +413,15 @@ public class ElementType implements Serializable
sb.append(objectSchema);
sb.append("</object_schema>");
}
if ((objectName!= null)&&(!"".equals(objectName))) {
sb.append("<object_name>");
sb.append(objectName);
sb.append("</object_name>");
}
if ((objectType!= null)&&(!"".equals(objectType))) {
sb.append("<object_type>");
sb.append(objectType);
sb.append("</object_type>");
}
if ((dataType!= null)&&(!"".equals(dataType))) {
sb.append("<data_type>");
sb.append(dataType);
sb.append("</data_type>");
}
sb.append("<object_name>");
sb.append(((objectName == null)?"":objectName));
sb.append("</object_name>");
sb.append("<object_type>");
sb.append(((objectType == null)?"":objectType));
sb.append("</object_type>");
sb.append("<data_type>");
sb.append(((dataType == null)?"":dataType));
sb.append("</data_type>");
if (characterMaximumLength!= null) {
sb.append("<character_maximum_length>");
sb.append(characterMaximumLength);

16
jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java
View File

@ -315,11 +315,9 @@ public class Index implements Serializable
sb.append(indexSchema);
sb.append("</index_schema>");
}
if ((indexName!= null)&&(!"".equals(indexName))) {
sb.append("<index_name>");
sb.append(indexName);
sb.append("</index_name>");
}
sb.append("<index_name>");
sb.append(((indexName == null)?"":indexName));
sb.append("</index_name>");
if ((tableCatalog!= null)&&(!"".equals(tableCatalog))) {
sb.append("<table_catalog>");
sb.append(tableCatalog);
@ -330,11 +328,9 @@ public class Index implements Serializable
sb.append(tableSchema);
sb.append("</table_schema>");
}
if ((tableName!= null)&&(!"".equals(tableName))) {
sb.append("<table_name>");
sb.append(tableName);
sb.append("</table_name>");
}
sb.append("<table_name>");
sb.append(((tableName == null)?"":tableName));
sb.append("</table_name>");
if (isUnique!= null) {
sb.append("<is_unique>");
sb.append(isUnique);

24
jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java
View File

@ -340,11 +340,9 @@ public class IndexColumnUsage implements Serializable
sb.append(indexSchema);
sb.append("</index_schema>");
}
if ((indexName!= null)&&(!"".equals(indexName))) {
sb.append("<index_name>");
sb.append(indexName);
sb.append("</index_name>");
}
sb.append("<index_name>");
sb.append(((indexName == null)?"":indexName));
sb.append("</index_name>");
if ((tableCatalog!= null)&&(!"".equals(tableCatalog))) {
sb.append("<table_catalog>");
sb.append(tableCatalog);
@ -355,16 +353,12 @@ public class IndexColumnUsage implements Serializable
sb.append(tableSchema);
sb.append("</table_schema>");
}
if ((tableName!= null)&&(!"".equals(tableName))) {
sb.append("<table_name>");
sb.append(tableName);
sb.append("</table_name>");
}
if ((columnName!= null)&&(!"".equals(columnName))) {
sb.append("<column_name>");
sb.append(columnName);
sb.append("</column_name>");
}
sb.append("<table_name>");
sb.append(((tableName == null)?"":tableName));
sb.append("</table_name>");
sb.append("<column_name>");
sb.append(((columnName == null)?"":columnName));
sb.append("</column_name>");
sb.append("<ordinal_position>");
sb.append(ordinalPosition);
sb.append("</ordinal_position>");

24
jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java
View File

@ -298,11 +298,9 @@ public class KeyColumnUsage implements Serializable
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
if ((columnName!= null)&&(!"".equals(columnName))) {
sb.append("<column_name>");
sb.append(columnName);
sb.append("</column_name>");
}
sb.append("<column_name>");
sb.append(((columnName == null)?"":columnName));
sb.append("</column_name>");
if ((constraintCatalog!= null)&&(!"".equals(constraintCatalog))) {
sb.append("<constraint_catalog>");
sb.append(constraintCatalog);
@ -313,11 +311,9 @@ public class KeyColumnUsage implements Serializable
sb.append(constraintSchema);
sb.append("</constraint_schema>");
}
if ((constraintName!= null)&&(!"".equals(constraintName))) {
sb.append("<constraint_name>");
sb.append(constraintName);
sb.append("</constraint_name>");
}
sb.append("<constraint_name>");
sb.append(((constraintName == null)?"":constraintName));
sb.append("</constraint_name>");
sb.append("<ordinal_position>");
sb.append(ordinalPosition);
sb.append("</ordinal_position>");
@ -331,11 +327,9 @@ public class KeyColumnUsage implements Serializable
sb.append(tableSchema);
sb.append("</table_schema>");
}
if ((tableName!= null)&&(!"".equals(tableName))) {
sb.append("<table_name>");
sb.append(tableName);
sb.append("</table_name>");
}
sb.append("<table_name>");
sb.append(((tableName == null)?"":tableName));
sb.append("</table_name>");
return sb.toString();
}

16
jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java
View File

@ -574,19 +574,15 @@ public class Parameter implements Serializable
sb.append(specificPackage);
sb.append("</specific_package>");
}
if ((specificName!= null)&&(!"".equals(specificName))) {
sb.append("<specific_name>");
sb.append(specificName);
sb.append("</specific_name>");
}
sb.append("<specific_name>");
sb.append(((specificName == null)?"":specificName));
sb.append("</specific_name>");
sb.append("<ordinal_position>");
sb.append(ordinalPosition);
sb.append("</ordinal_position>");
if (parameterMode!= null) {
sb.append("<parameter_mode>");
sb.append(parameterMode);
sb.append("</parameter_mode>");
}
sb.append("<parameter_mode>");
sb.append(((parameterMode == null)?"":parameterMode));
sb.append("</parameter_mode>");
if ((parameterName!= null)&&(!"".equals(parameterName))) {
sb.append("<parameter_name>");
sb.append(parameterName);

16
jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java
View File

@ -251,11 +251,9 @@ public class ReferentialConstraint implements Serializable
sb.append(constraintSchema);
sb.append("</constraint_schema>");
}
if ((constraintName!= null)&&(!"".equals(constraintName))) {
sb.append("<constraint_name>");
sb.append(constraintName);
sb.append("</constraint_name>");
}
sb.append("<constraint_name>");
sb.append(((constraintName == null)?"":constraintName));
sb.append("</constraint_name>");
if ((uniqueConstraintCatalog!= null)&&(!"".equals(uniqueConstraintCatalog))) {
sb.append("<unique_constraint_catalog>");
sb.append(uniqueConstraintCatalog);
@ -266,11 +264,9 @@ public class ReferentialConstraint implements Serializable
sb.append(uniqueConstraintSchema);
sb.append("</unique_constraint_schema>");
}
if ((uniqueConstraintName!= null)&&(!"".equals(uniqueConstraintName))) {
sb.append("<unique_constraint_name>");
sb.append(uniqueConstraintName);
sb.append("</unique_constraint_name>");
}
sb.append("<unique_constraint_name>");
sb.append(((uniqueConstraintName == null)?"":uniqueConstraintName));
sb.append("</unique_constraint_name>");
return sb.toString();
}

16
jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java
View File

@ -636,16 +636,12 @@ public class Routine implements Serializable
sb.append(routinePackage);
sb.append("</routine_package>");
}
if ((routineName!= null)&&(!"".equals(routineName))) {
sb.append("<routine_name>");
sb.append(routineName);
sb.append("</routine_name>");
}
if (routineType!= null) {
sb.append("<routine_type>");
sb.append(routineType);
sb.append("</routine_type>");
}
sb.append("<routine_name>");
sb.append(((routineName == null)?"":routineName));
sb.append("</routine_name>");
sb.append("<routine_type>");
sb.append(((routineType == null)?"":routineType));
sb.append("</routine_type>");
if ((dataType!= null)&&(!"".equals(dataType))) {
sb.append("<data_type>");
sb.append(dataType);

8
jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java
View File

@ -146,11 +146,9 @@ public class Schema implements Serializable
sb.append(catalogName);
sb.append("</catalog_name>");
}
if ((schemaName!= null)&&(!"".equals(schemaName))) {
sb.append("<schema_name>");
sb.append(schemaName);
sb.append("</schema_name>");
}
sb.append("<schema_name>");
sb.append(((schemaName == null)?"":schemaName));
sb.append("</schema_name>");
if ((comment!= null)&&(!"".equals(comment))) {
sb.append("<comment>");
sb.append(comment);

16
jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java
View File

@ -313,16 +313,12 @@ public class Sequence implements Serializable
sb.append(sequenceSchema);
sb.append("</sequence_schema>");
}
if ((sequenceName!= null)&&(!"".equals(sequenceName))) {
sb.append("<sequence_name>");
sb.append(sequenceName);
sb.append("</sequence_name>");
}
if ((dataType!= null)&&(!"".equals(dataType))) {
sb.append("<data_type>");
sb.append(dataType);
sb.append("</data_type>");
}
sb.append("<sequence_name>");
sb.append(((sequenceName == null)?"":sequenceName));
sb.append("</sequence_name>");
sb.append("<data_type>");
sb.append(((dataType == null)?"":dataType));
sb.append("</data_type>");
if (characterMaximumLength!= null) {
sb.append("<character_maximum_length>");
sb.append(characterMaximumLength);

8
jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java
View File

@ -184,11 +184,9 @@ public class Table implements Serializable
sb.append(tableSchema);
sb.append("</table_schema>");
}
if ((tableName!= null)&&(!"".equals(tableName))) {
sb.append("<table_name>");
sb.append(tableName);
sb.append("</table_name>");
}
sb.append("<table_name>");
sb.append(((tableName == null)?"":tableName));
sb.append("</table_name>");
if ((comment!= null)&&(!"".equals(comment))) {
sb.append("<comment>");
sb.append(comment);

24
jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java
View File

@ -317,16 +317,12 @@ public class TableConstraint implements Serializable
sb.append(constraintSchema);
sb.append("</constraint_schema>");
}
if ((constraintName!= null)&&(!"".equals(constraintName))) {
sb.append("<constraint_name>");
sb.append(constraintName);
sb.append("</constraint_name>");
}
if (constraintType!= null) {
sb.append("<constraint_type>");
sb.append(constraintType);
sb.append("</constraint_type>");
}
sb.append("<constraint_name>");
sb.append(((constraintName == null)?"":constraintName));
sb.append("</constraint_name>");
sb.append("<constraint_type>");
sb.append(((constraintType == null)?"":constraintType));
sb.append("</constraint_type>");
if ((tableCatalog!= null)&&(!"".equals(tableCatalog))) {
sb.append("<table_catalog>");
sb.append(tableCatalog);
@ -337,11 +333,9 @@ public class TableConstraint implements Serializable
sb.append(tableSchema);
sb.append("</table_schema>");
}
if ((tableName!= null)&&(!"".equals(tableName))) {
sb.append("<table_name>");
sb.append(tableName);
sb.append("</table_name>");
}
sb.append("<table_name>");
sb.append(((tableName == null)?"":tableName));
sb.append("</table_name>");
if ((comment!= null)&&(!"".equals(comment))) {
sb.append("<comment>");
sb.append(comment);