From commits-return-50645-archive-asf-public=cust-asf.ponee.io@cxf.apache.org Thu Dec 13 12:31:49 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 22180180676 for ; Thu, 13 Dec 2018 12:31:48 +0100 (CET) Received: (qmail 83775 invoked by uid 500); 13 Dec 2018 11:31:48 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 83750 invoked by uid 99); 13 Dec 2018 11:31:48 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Dec 2018 11:31:48 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 6278E81EF8; Thu, 13 Dec 2018 11:31:47 +0000 (UTC) Date: Thu, 13 Dec 2018 11:31:48 +0000 To: "commits@cxf.apache.org" Subject: [cxf-fediz] 01/02: Revert "FEDIZ-235 - Explicity set unique=false for the OpenJPA Index values" MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: coheigea@apache.org In-Reply-To: <154470070731.14306.5789656956125756756@gitbox.apache.org> References: <154470070731.14306.5789656956125756756@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: cxf-fediz X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 28cb7ee78f44f08bc65a8fe71462cfa8ef6110ef X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181213113147.6278E81EF8@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit 28cb7ee78f44f08bc65a8fe71462cfa8ef6110ef Author: Colm O hEigeartaigh AuthorDate: Thu Dec 13 10:17:45 2018 +0000 Revert "FEDIZ-235 - Explicity set unique=false for the OpenJPA Index values" This reverts commit 8f294bffa85a9954a68be6342314e2c7df169560. --- .../org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java | 2 +- .../java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimEntity.java | 2 +- .../org/apache/cxf/fediz/service/idp/service/jpa/EntitlementEntity.java | 2 +- .../java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java | 2 +- .../java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java | 2 +- .../org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java index fb8176b..a6c930a 100644 --- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java +++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ApplicationEntity.java @@ -37,7 +37,7 @@ public class ApplicationEntity { @Id private int id; - @Index(unique = false) + @Index @NotNull private String realm; //wtrealm, whr diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimEntity.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimEntity.java index b9481d9..e967844 100644 --- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimEntity.java +++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/ClaimEntity.java @@ -30,7 +30,7 @@ public class ClaimEntity { @Id private int id; - @Index(unique = false) + @Index @NotNull private String claimType; diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementEntity.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementEntity.java index e77bddb..dbb169b 100644 --- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementEntity.java +++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/EntitlementEntity.java @@ -29,7 +29,7 @@ public class EntitlementEntity { @Id private int id; - @Index(unique = false) + @Index private String name; private String description; diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java index a542bd6..27cd33e 100644 --- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java +++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/IdpEntity.java @@ -46,7 +46,7 @@ public class IdpEntity { // Unique // fed:TargetScope - @Index(unique = false) + @Index @NotNull private String realm; // wtrealm, whr diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java index c902e43..eb7c141 100644 --- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java +++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/RoleEntity.java @@ -34,7 +34,7 @@ public class RoleEntity { @Id private int id; - @Index(unique = false) + @Index private String name; private String description; diff --git a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java index 2df5fe0..9ee23a9 100644 --- a/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java +++ b/services/idp-core/src/main/java/org/apache/cxf/fediz/service/idp/service/jpa/TrustedIdpEntity.java @@ -44,7 +44,7 @@ public class TrustedIdpEntity { private int id; //@Column(name = "REALM", nullable = true, length = FIELD_LENGTH) - @Index(unique = false) + @Index @NotNull private String realm; //wtrealm, whr