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

[jOOQ/jOOQ#5412] Reverted the feature

Browse Source
This commit is contained in:
Lukas Eder 2019-07-03 15:26:46 +02:00
parent 156386586f
commit 514f2eda6d
6 changed files with 0 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
jOOQ-codegen/src/main/java/org/jooq/codegen/AbstractGenerator.java
View File

@ -75,8 +75,6 @@ abstract class AbstractGenerator implements Generator {
boolean generateEmbeddables = true;
boolean generateRecords = true;
boolean generateRecordsImplementingRecordN = true;
boolean generateRecordToPojoMappers = true;
boolean generateRecordFromPojoUnmappers = true;
boolean generatePojos = false;
boolean generatePojosEqualsAndHashCode = false;
boolean generatePojosToString = true;
@ -391,26 +389,6 @@ abstract class AbstractGenerator implements Generator {
this.generateRecordsImplementingRecordN = generateRecordsImplementingRecordN;
}
@Override
public boolean generateRecordToPojoMappers() {
return generateRecords() && generatePojos() && generateRecordToPojoMappers;
}
@Override
public void setGenerateRecordToPojoMappers(boolean generateRecordToPojoMappers) {
this.generateRecordToPojoMappers = generateRecordToPojoMappers;
}
@Override
public boolean generateRecordFromPojoUnmappers() {
return generateRecords() && generatePojos() && generateRecordFromPojoUnmappers;
}
@Override
public void setGenerateRecordFromPojoUnmappers(boolean generateRecordFromPojoUnmappers) {
this.generateRecordFromPojoUnmappers = generateRecordFromPojoUnmappers;
}
@Override
public boolean generatePojos() {

4
jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
View File

@ -668,10 +668,6 @@ public class GenerationTool {
generator.setGenerateRecords(g.getGenerate().isRecords());
if (g.getGenerate().isRecordsImplementingRecordN() != null)
generator.setGenerateRecordsImplementingRecordN(g.getGenerate().isRecordsImplementingRecordN());
if (g.getGenerate().isRecordToPojoMappers() != null)
generator.setGenerateRecordToPojoMappers(g.getGenerate().isRecordToPojoMappers());
if (g.getGenerate().isRecordFromPojoUnmappers() != null)
generator.setGenerateRecordFromPojoUnmappers(g.getGenerate().isRecordFromPojoUnmappers());
if (g.getGenerate().isPojos() != null)
generator.setGeneratePojos(g.getGenerate().isPojos());
if (g.getGenerate().isImmutablePojos() != null)

20
jOOQ-codegen/src/main/java/org/jooq/codegen/Generator.java
View File

@ -232,26 +232,6 @@ public interface Generator {
*/
void setGenerateRecordsImplementingRecordN(boolean generateRecordsImplementingRecordN);
/**
* Whether out of the box record to POJO mappers should be generated.
*/
boolean generateRecordToPojoMappers();
/**
* Whether out of the box record to POJO mappers should be generated.
*/
void setGenerateRecordToPojoMappers(boolean generateRecordToPojoMappers);
/**
* Whether out of the box record from POJO unmappers should be generated.
*/
boolean generateRecordFromPojoUnmappers();
/**
* Whether out of the box record from POJO unmappers should be generated.
*/
void setGenerateRecordFromPojoUnmappers(boolean generateRecordFromPojoUnmappers);
/**
* Whether POJO's should be generated in addition to records
*/

83
jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
View File

@ -94,8 +94,6 @@ import org.jooq.OrderField;
import org.jooq.Package;
import org.jooq.Parameter;
import org.jooq.Record;
import org.jooq.RecordMapper;
import org.jooq.RecordUnmapper;
import org.jooq.Result;
import org.jooq.Row;
import org.jooq.Schema;
@ -1592,87 +1590,6 @@ public class JavaGenerator extends AbstractGenerator {
out.tab(1).println("}");
}
if (generateRecordToPojoMappers()) {
final String pojoName = out.ref(getStrategy().getFullJavaClassName(tableUdtOrEmbeddable, Mode.POJO));
// Feature not supported in the Scala generator
if (scala) {
}
else {
out.println();
out.tab(1).println("public %s<%s, %s> mapper() {", RecordMapper.class, className, pojoName);
out.tab(2).println("return new %s<%s, %s>() {", RecordMapper.class, className, pojoName);
out.tab(3).override();
out.tab(3).println("public %s map(%s record) {", pojoName, className);
if (generateImmutablePojos()) {
out.tab(4).println("return new %s(", pojoName);
for (int i = 0; i < degree; i++) {
final TypedElementDefinition<?> column = columns.get(i);
final String columnGetter = getStrategy().getJavaGetterName(column, Mode.RECORD);
out.tab(5).println("%s()[[%s]]", columnGetter, list(i == degree - 1 ? null : ","));
}
out.tab(4).println(");");
}
else {
out.tab(4).println("%s result = new %s();", pojoName, pojoName);
out.println();
for (int i = 0; i < degree; i++) {
final TypedElementDefinition<?> column = columns.get(i);
final String columnGetter = getStrategy().getJavaGetterName(column, Mode.RECORD);
final String columnSetter = getStrategy().getJavaSetterName(column, Mode.POJO);
out.tab(4).println("result.%s(%s());", columnSetter, columnGetter);
}
out.println();
out.tab(4).println("return result;");
}
out.tab(3).println("}");
out.tab(2).println("};");
out.tab(1).println("}");
}
}
if (generateRecordFromPojoUnmappers()) {
final String pojoName = out.ref(getStrategy().getFullJavaClassName(tableUdtOrEmbeddable, Mode.POJO));
// Feature not supported in the Scala generator
if (scala) {
}
else {
out.println();
out.tab(1).println("public %s<%s, %s> unmapper() {", RecordUnmapper.class, pojoName, className);
out.tab(2).println("return new %s<%s, %s>() {", RecordUnmapper.class, pojoName, className);
out.tab(3).override();
out.tab(3).println("public %s unmap(%s pojo) {", className, pojoName);
out.tab(4).println("%s result = new %s();", className, className);
out.println();
for (int i = 0; i < degree; i++) {
final TypedElementDefinition<?> column = columns.get(i);
final String columnGetter = getStrategy().getJavaGetterName(column, Mode.POJO);
final String columnSetter = getStrategy().getJavaSetterName(column, Mode.RECORD);
out.tab(4).println("result.%s(pojo.%s());", columnSetter, columnGetter);
}
out.println();
out.tab(4).println("result.attach(configuration());");
out.tab(4).println("return result;");
out.tab(3).println("}");
out.tab(2).println("};");
out.tab(1).println("}");
}
}
if (tableUdtOrEmbeddable instanceof TableDefinition)
generateRecordClassFooter((TableDefinition) tableUdtOrEmbeddable, out);
else if (tableUdtOrEmbeddable instanceof EmbeddableDefinition)

92
jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java
View File

@ -65,10 +65,6 @@ public class Generate implements Serializable
protected Boolean records = true;
@XmlElement(defaultValue = "true")
protected Boolean recordsImplementingRecordN = true;
@XmlElement(defaultValue = "true")
protected Boolean recordToPojoMappers = true;
@XmlElement(defaultValue = "true")
protected Boolean recordFromPojoUnmappers = true;
@XmlElement(defaultValue = "false")
protected Boolean pojos = false;
@XmlElement(defaultValue = "false")
@ -605,54 +601,6 @@ public class Generate implements Serializable
this.recordsImplementingRecordN = value;
}
/**
* If both {@link #records} and {@link #pojos} are generated, then an auxiliary default {@link org.jooq.RecordMapper} can be generated as well, that bypasses reflection.
*
* @return
* possible object is
* {@link Boolean }
*
*/
public Boolean isRecordToPojoMappers() {
return recordToPojoMappers;
}
/**
* Sets the value of the recordToPojoMappers property.
*
* @param value
* allowed object is
* {@link Boolean }
*
*/
public void setRecordToPojoMappers(Boolean value) {
this.recordToPojoMappers = value;
}
/**
* If both {@link #records} and {@link #pojos} are generated, then an auxiliary default {@link org.jooq.RecordUnmapper} can be generated as well, that bypasses reflection.
*
* @return
* possible object is
* {@link Boolean }
*
*/
public Boolean isRecordFromPojoUnmappers() {
return recordFromPojoUnmappers;
}
/**
* Sets the value of the recordFromPojoUnmappers property.
*
* @param value
* allowed object is
* {@link Boolean }
*
*/
public void setRecordFromPojoUnmappers(Boolean value) {
this.recordFromPojoUnmappers = value;
}
/**
* Generate POJOs.
*
@ -1921,16 +1869,6 @@ public class Generate implements Serializable
return this;
}
public Generate withRecordToPojoMappers(Boolean value) {
setRecordToPojoMappers(value);
return this;
}
public Generate withRecordFromPojoUnmappers(Boolean value) {
setRecordFromPojoUnmappers(value);
return this;
}
public Generate withPojos(Boolean value) {
setPojos(value);
return this;
@ -2264,16 +2202,6 @@ public class Generate implements Serializable
sb.append(recordsImplementingRecordN);
sb.append("</recordsImplementingRecordN>");
}
if (recordToPojoMappers!= null) {
sb.append("<recordToPojoMappers>");
sb.append(recordToPojoMappers);
sb.append("</recordToPojoMappers>");
}
if (recordFromPojoUnmappers!= null) {
sb.append("<recordFromPojoUnmappers>");
sb.append(recordFromPojoUnmappers);
sb.append("</recordFromPojoUnmappers>");
}
if (pojos!= null) {
sb.append("<pojos>");
sb.append(pojos);
@ -2691,24 +2619,6 @@ public class Generate implements Serializable
return false;
}
}
if (recordToPojoMappers == null) {
if (other.recordToPojoMappers!= null) {
return false;
}
} else {
if (!recordToPojoMappers.equals(other.recordToPojoMappers)) {
return false;
}
}
if (recordFromPojoUnmappers == null) {
if (other.recordFromPojoUnmappers!= null) {
return false;
}
} else {
if (!recordFromPojoUnmappers.equals(other.recordFromPojoUnmappers)) {
return false;
}
}
if (pojos == null) {
if (other.pojos!= null) {
return false;
@ -3166,8 +3076,6 @@ public class Generate implements Serializable
result = ((prime*result)+((embeddables == null)? 0 :embeddables.hashCode()));
result = ((prime*result)+((records == null)? 0 :records.hashCode()));
result = ((prime*result)+((recordsImplementingRecordN == null)? 0 :recordsImplementingRecordN.hashCode()));
result = ((prime*result)+((recordToPojoMappers == null)? 0 :recordToPojoMappers.hashCode()));
result = ((prime*result)+((recordFromPojoUnmappers == null)? 0 :recordFromPojoUnmappers.hashCode()));
result = ((prime*result)+((pojos == null)? 0 :pojos.hashCode()));
result = ((prime*result)+((pojosEqualsAndHashCode == null)? 0 :pojosEqualsAndHashCode.hashCode()));
result = ((prime*result)+((pojosToString == null)? 0 :pojosToString.hashCode()));

8
jOOQ-meta/src/main/resources/xsd/jooq-codegen-3.12.0.xsd
View File

@ -1075,14 +1075,6 @@ jOOQ version used for source code.]]></jxb:javadoc></jxb:property></appinfo></an
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Generate TableRecord classes that implement Record[N] super types]]></jxb:javadoc></jxb:property></appinfo></annotation>
</element>
<element name="recordToPojoMappers" type="boolean" default="true" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[If both {@link #records} and {@link #pojos} are generated, then an auxiliary default {@link org.jooq.RecordMapper} can be generated as well, that bypasses reflection.]]></jxb:javadoc></jxb:property></appinfo></annotation>
</element>
<element name="recordFromPojoUnmappers" type="boolean" default="true" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[If both {@link #records} and {@link #pojos} are generated, then an auxiliary default {@link org.jooq.RecordUnmapper} can be generated as well, that bypasses reflection.]]></jxb:javadoc></jxb:property></appinfo></annotation>
</element>
<element name="pojos" type="boolean" default="false" minOccurs="0" maxOccurs="1">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Generate POJOs.]]></jxb:javadoc></jxb:property></appinfo></annotation>
</element>