From 6b248fdc874854ab852b14eff23bad814221cf2d Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 15 Nov 2024 13:24:29 +0100 Subject: [PATCH] [jOOQ/jOOQ#17624] Correct order of excludes / includes, copy paste error --- .../java/org/jooq/codegen/AbstractGenerator.java | 12 ++++++------ .../main/java/org/jooq/codegen/GenerationTool.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/AbstractGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/AbstractGenerator.java index 64d16296ec..104210e4a6 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/AbstractGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/AbstractGenerator.java @@ -660,8 +660,8 @@ abstract class AbstractGenerator implements Generator { public boolean generateRecordsIncluded(Definition definition) { return generateRecords() && !database.filterExcludeInclude(asList(definition), - generateRecordsIncludes(), - generateRecordsExcludes() + generateRecordsExcludes(), + generateRecordsIncludes() ).isEmpty(); } @@ -734,8 +734,8 @@ abstract class AbstractGenerator implements Generator { public boolean generatePojosIncluded(Definition definition) { return generatePojos() && !database.filterExcludeInclude(asList(definition), - generatePojosIncludes(), - generatePojosExcludes() + generatePojosExcludes(), + generatePojosIncludes() ).isEmpty(); } @@ -858,8 +858,8 @@ abstract class AbstractGenerator implements Generator { public boolean generateDaosIncluded(Definition definition) { return generateDaos() && !database.filterExcludeInclude(asList(definition), - generateDaosIncludes(), - generateDaosExcludes() + generateDaosExcludes(), + generateDaosIncludes() ).isEmpty(); } diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java index e53e57b2e6..45037d26b7 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java +++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java @@ -813,7 +813,7 @@ public class GenerationTool { if (g.getGenerate().getRecordsIncludes() != null) generator.setGenerateRecordsIncludes(g.getGenerate().getRecordsIncludes()); if (g.getGenerate().getRecordsExcludes() != null) - generator.setGenerateRecordsIncludes(g.getGenerate().getRecordsExcludes()); + generator.setGenerateRecordsExcludes(g.getGenerate().getRecordsExcludes()); if (g.getGenerate().isRecordsImplementingRecordN() != null) generator.setGenerateRecordsImplementingRecordN(g.getGenerate().isRecordsImplementingRecordN()); if (g.getGenerate().isEnumsAsScalaSealedTraits() != null)