From 8d6ae219dc23b5607c5a92222f5fda565d61a96d Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Thu, 4 Jun 2020 08:56:27 +0200 Subject: [PATCH] [jOOQ/jOOQ#681] Changed Domain.checks() to Domain.getChecks() --- jOOQ/src/main/java/org/jooq/Domain.java | 2 +- jOOQ/src/main/java/org/jooq/impl/DDL.java | 4 ++-- jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java | 2 +- jOOQ/src/main/java/org/jooq/impl/Diff.java | 2 +- jOOQ/src/main/java/org/jooq/impl/DomainImpl.java | 2 +- jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/Domain.java b/jOOQ/src/main/java/org/jooq/Domain.java index e1c63c2992..5b2b3bf9f4 100644 --- a/jOOQ/src/main/java/org/jooq/Domain.java +++ b/jOOQ/src/main/java/org/jooq/Domain.java @@ -59,5 +59,5 @@ public interface Domain extends Named, Typed { /** * The DOMAIN's condition. */ - List> checks(); + List> getChecks(); } diff --git a/jOOQ/src/main/java/org/jooq/impl/DDL.java b/jOOQ/src/main/java/org/jooq/impl/DDL.java index 2312a48a80..a49eadfd46 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DDL.java +++ b/jOOQ/src/main/java/org/jooq/impl/DDL.java @@ -187,11 +187,11 @@ final class DDL { ? s2.default_(domain.getDataType().default_()) : s2; - if (domain.checks().isEmpty()) + if (domain.getChecks().isEmpty()) return s3; List constraints = new ArrayList<>(); - for (Check check : domain.checks()) + for (Check check : domain.getChecks()) constraints.add(check.constraint()); return s3.constraints(constraints); diff --git a/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java b/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java index 4a1a3061ed..8ec876985a 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java +++ b/jOOQ/src/main/java/org/jooq/impl/DetachedMeta.java @@ -195,7 +195,7 @@ final class DetachedMeta extends AbstractMeta { } static DetachedDomain copyOf(Domain domain, Schema owner) { - return new DetachedDomain<>(owner, domain.getQualifiedName(), domain.getDataType(), domain.checks().toArray(EMPTY_CHECK)); + return new DetachedDomain<>(owner, domain.getQualifiedName(), domain.getDataType(), domain.getChecks().toArray(EMPTY_CHECK)); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/Diff.java b/jOOQ/src/main/java/org/jooq/impl/Diff.java index d438e7fb5d..bd2afd302f 100644 --- a/jOOQ/src/main/java/org/jooq/impl/Diff.java +++ b/jOOQ/src/main/java/org/jooq/impl/Diff.java @@ -265,7 +265,7 @@ final class Diff { else if (d2.getDataType().defaulted() && !d2.getDataType().defaultValue().equals(d1.getDataType().defaultValue())) r.queries.add(ctx.alterDomain(d1).setDefault((Field) d2.getDataType().defaultValue())); - appendChecks(r, d1, d1.checks(), d2.checks()); + appendChecks(r, d1, d1.getChecks(), d2.getChecks()); } } }; diff --git a/jOOQ/src/main/java/org/jooq/impl/DomainImpl.java b/jOOQ/src/main/java/org/jooq/impl/DomainImpl.java index ec8c75a3ff..a8d11880e8 100644 --- a/jOOQ/src/main/java/org/jooq/impl/DomainImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/DomainImpl.java @@ -85,7 +85,7 @@ class DomainImpl extends AbstractNamed implements Domain { } @Override - public final List> checks() { + public final List> getChecks() { return unmodifiableList(asList(checks)); } diff --git a/jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java b/jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java index 47fbeb0290..4e8466364b 100644 --- a/jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java +++ b/jOOQ/src/main/java/org/jooq/impl/InformationSchemaExport.java @@ -194,7 +194,7 @@ final class InformationSchemaExport { result.getDomains().add(id); - for (Check c : d.checks()) { + for (Check c : d.getChecks()) { org.jooq.util.xml.jaxb.DomainConstraint idc = new org.jooq.util.xml.jaxb.DomainConstraint(); org.jooq.util.xml.jaxb.CheckConstraint icc = new org.jooq.util.xml.jaxb.CheckConstraint();