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

Revert "[jOOQ/jOOQ#16716] Generate MyTable.let(Function<? super MyTable,

Browse Source 
? extends R>) utilities on generated tables"
This commit is contained in:
Lukas Eder 2024-05-27 10:43:57 +02:00
parent e2f288d5a1
commit 6626120db8
6 changed files with 2 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,7 +191,6 @@ abstract class AbstractGenerator implements Generator {
boolean generateWhereMethodOverrides = true;
boolean generateRenameMethodOverrides = true;
boolean generateAsMethodOverrides = true;
boolean generateLetMethods = true;
protected GeneratorStrategyWrapper strategy;
protected String targetEncoding = "UTF-8";
@ -1537,16 +1536,6 @@ abstract class AbstractGenerator implements Generator {
this.generateAsMethodOverrides = asMethodOverrides;
}
@Override
public boolean generateLetMethods() {
return generateLetMethods;
}
@Override
public void setGenerateLetMethods(boolean generateLetMethods) {
this.generateLetMethods = generateLetMethods;
}
// ----
@Override

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

@ -973,8 +973,6 @@ public class GenerationTool {
generator.setGenerateRenameMethodOverrides(g.getGenerate().isRenameMethodOverrides());
if (g.getGenerate().isAsMethodOverrides() != null)
generator.setGenerateAsMethodOverrides(g.getGenerate().isAsMethodOverrides());
if (g.getGenerate().isLetMethods() != null)
generator.setGenerateLetMethods(g.getGenerate().isLetMethods());
if (!isBlank(d.getSchemaVersionProvider()))

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

@ -1442,16 +1442,6 @@ public interface Generator {
*/
void setGenerateRenameMethodOverrides(boolean renameMethodOverrides);
/**
* Whether to generate let methods on {@link Table} types.
*/
boolean generateLetMethods();
/**
* Whether to generate let methods on {@link Table} types.
*/
void setGenerateLetMethods(boolean letMethods);
/**
* Whether to generate overrides for {@link Table#as(Name)} and related
* overloads.

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

@ -39,6 +39,7 @@ package org.jooq.codegen;
import static java.util.Arrays.asList;
import static java.util.Collections.nCopies;
import static java.util.Collections.singletonList;
import static java.util.function.Function.identity;
import static java.util.stream.Collectors.counting;
@ -84,6 +85,7 @@ import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
@ -114,8 +116,6 @@ import org.jooq.Domain;
import org.jooq.EnumType;
import org.jooq.Field;
import org.jooq.ForeignKey;
import org.jooq.Function1;
import org.jooq.Functions;
import org.jooq.Generated;
import org.jooq.Identity;
import org.jooq.Index;
@ -7708,13 +7708,6 @@ public class JavaGenerator extends AbstractGenerator {
out.println("}");
}
if (generateLetMethods()) {
out.javadoc("Apply this table to a function, see also {@link %s#let(%s)}", Functions.class, Function1.class);
out.println("%s<R> R let(%s<? super %s, ? extends R> function) {", visibilityPublic(), Function.class, className);
out.println("return function.apply(this);");
out.println("}");
}
if (generateWhereMethodOverrides() && !table.isTableValuedFunction()) {
Consumer<Runnable> idt = r -> {
out.javadoc("Create an inline derived table from this table");

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

@ -270,8 +270,6 @@ public class Generate implements Serializable, XMLAppendable
protected Boolean renameMethodOverrides = true;
@XmlElement(defaultValue = "true")
protected Boolean asMethodOverrides = true;
@XmlElement(defaultValue = "true")
protected Boolean letMethods = true;
@XmlElement(defaultValue = "false")
protected Boolean hiddenColumnsInRecords = false;
@XmlElement(defaultValue = "false")
@ -3073,30 +3071,6 @@ public class Generate implements Serializable, XMLAppendable
this.asMethodOverrides = value;
}
/**
* Whether to generate <code>let</code> methods on generated {@link org.jooq.Table} types.
*
* @return
* possible object is
* {@link Boolean }
*
*/
public Boolean isLetMethods() {
return letMethods;
}
/**
* Whether to generate <code>let</code> methods on generated {@link org.jooq.Table} types.
*
* @param value
* allowed object is
* {@link Boolean }
*
*/
public void setLetMethods(Boolean value) {
this.letMethods = value;
}
/**
* Whether hidden columns should be generated in records.
* <p>
@ -4273,15 +4247,6 @@ public class Generate implements Serializable, XMLAppendable
return this;
}
/**
* Whether to generate <code>let</code> methods on generated {@link org.jooq.Table} types.
*
*/
public Generate withLetMethods(Boolean value) {
setLetMethods(value);
return this;
}
/**
* Whether hidden columns should be generated in records.
* <p>
@ -4434,7 +4399,6 @@ public class Generate implements Serializable, XMLAppendable
builder.append("whereMethodOverrides", whereMethodOverrides);
builder.append("renameMethodOverrides", renameMethodOverrides);
builder.append("asMethodOverrides", asMethodOverrides);
builder.append("letMethods", letMethods);
builder.append("hiddenColumnsInRecords", hiddenColumnsInRecords);
builder.append("hiddenColumnsInPojos", hiddenColumnsInPojos);
builder.append("hiddenColumnsInInterfaces", hiddenColumnsInInterfaces);
@ -5512,15 +5476,6 @@ public class Generate implements Serializable, XMLAppendable
return false;
}
}
if (letMethods == null) {
if (other.letMethods!= null) {
return false;
}
} else {
if (!letMethods.equals(other.letMethods)) {
return false;
}
}
if (hiddenColumnsInRecords == null) {
if (other.hiddenColumnsInRecords!= null) {
return false;
@ -5672,7 +5627,6 @@ public class Generate implements Serializable, XMLAppendable
result = ((prime*result)+((whereMethodOverrides == null)? 0 :whereMethodOverrides.hashCode()));
result = ((prime*result)+((renameMethodOverrides == null)? 0 :renameMethodOverrides.hashCode()));
result = ((prime*result)+((asMethodOverrides == null)? 0 :asMethodOverrides.hashCode()));
result = ((prime*result)+((letMethods == null)? 0 :letMethods.hashCode()));
result = ((prime*result)+((hiddenColumnsInRecords == null)? 0 :hiddenColumnsInRecords.hashCode()));
result = ((prime*result)+((hiddenColumnsInPojos == null)? 0 :hiddenColumnsInPojos.hashCode()));
result = ((prime*result)+((hiddenColumnsInInterfaces == null)? 0 :hiddenColumnsInInterfaces.hashCode()));

4
jOOQ-meta/src/main/resources/org/jooq/meta/xsd/jooq-codegen-3.20.0.xsd
View File

@ -3005,10 +3005,6 @@ This flag is ignored in the commercial Java 6 distribution of jOOQ 3.9+ ]]></jxb
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Whether to generate overrides for {@link org.jooq.Table#as(org.jooq.Name)} and related overloads.]]></jxb:javadoc></jxb:property></appinfo></annotation>
</element>
<element name="letMethods" type="boolean" minOccurs="0" maxOccurs="1" default="true">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Whether to generate <code>let</code> methods on generated {@link org.jooq.Table} types.]]></jxb:javadoc></jxb:property></appinfo></annotation>
</element>
<element name="hiddenColumnsInRecords" type="boolean" minOccurs="0" maxOccurs="1" default="false">
<annotation><appinfo><jxb:property><jxb:javadoc><![CDATA[Whether hidden columns should be generated in records.
<p>