diff --git a/bonita-integration-tests/bonita-query-tests/src/test/java/org/bonitasoft/engine/parameter/ParameterTest.java b/bonita-integration-tests/bonita-query-tests/src/test/java/org/bonitasoft/engine/parameter/ParameterTest.java index a1e9db3d99..b064ffe018 100644 --- a/bonita-integration-tests/bonita-query-tests/src/test/java/org/bonitasoft/engine/parameter/ParameterTest.java +++ b/bonita-integration-tests/bonita-query-tests/src/test/java/org/bonitasoft/engine/parameter/ParameterTest.java @@ -49,11 +49,10 @@ public void should_save_and_get_parameter() { testRepository.flush(); Map parameterAsMap = jdbcTemplate .queryForObject("SELECT * FROM proc_parameter WHERE name = 'parameterName'", - new JdbcRowMapper("TENANTID", "ID", "PROCESS_ID")); + new JdbcRowMapper("ID", "PROCESS_ID")); assertThat(parameterFromQuery).isEqualTo(sParameter); assertThat(parameterAsMap).containsOnly( - entry("TENANTID", 0L), // remove when tenant notion disappears completely entry("ID", sParameter.getId()), entry("PROCESS_ID", 12345L), entry("NAME", "parameterName"), diff --git a/bonita-integration-tests/bonita-query-tests/src/test/java/org/bonitasoft/engine/queriablelogger/model/QueriableLogTest.java b/bonita-integration-tests/bonita-query-tests/src/test/java/org/bonitasoft/engine/queriablelogger/model/QueriableLogTest.java index 9c043a401b..623f1ddc30 100644 --- a/bonita-integration-tests/bonita-query-tests/src/test/java/org/bonitasoft/engine/queriablelogger/model/QueriableLogTest.java +++ b/bonita-integration-tests/bonita-query-tests/src/test/java/org/bonitasoft/engine/queriablelogger/model/QueriableLogTest.java @@ -76,7 +76,7 @@ public void should_be_able_to_add_queriable_log() { testRepository.flush(); List> queriableLogs = jdbcTemplate.query("SELECT * from queriable_log", - new JdbcRowMapper("ID", "TENANTID", "NUMERICINDEX1", "NUMERICINDEX2", "NUMERICINDEX3", + new JdbcRowMapper("ID", "NUMERICINDEX1", "NUMERICINDEX2", "NUMERICINDEX3", "NUMERICINDEX4", "NUMERICINDEX5", "THREADNUMBER", "LOG_TIMESTAMP")); assertThat(queriableLogs).hasSize(2); @@ -93,7 +93,6 @@ public void should_be_able_to_add_queriable_log() { entry("PRODUCTVERSION", "productVersion1"), entry("SEVERITY", "BUSINESS"), entry("RAWMESSAGE", "message1"), - entry("TENANTID", 0L), // remove when tenant notion disappears completely entry("THREADNUMBER", queriableLog.getThreadNumber()), entry("USERID", "userId1"), entry("WEEKOFYEAR", queriableLog.getWeekOfYear()), @@ -117,7 +116,6 @@ public void should_be_able_to_add_queriable_log() { entry("PRODUCTVERSION", "productVersion2"), entry("SEVERITY", "BUSINESS"), entry("RAWMESSAGE", "message2"), - entry("TENANTID", 0L), // remove when tenant notion disappears completely entry("THREADNUMBER", queriableLog.getThreadNumber()), entry("USERID", "userId2"), entry("WEEKOFYEAR", queriableLog1.getWeekOfYear()), diff --git a/bpm/bonita-core/bonita-parameter/src/main/java/org/bonitasoft/engine/parameter/SParameter.java b/bpm/bonita-core/bonita-parameter/src/main/java/org/bonitasoft/engine/parameter/SParameter.java index 2e004a098d..6eada9f06c 100644 --- a/bpm/bonita-core/bonita-parameter/src/main/java/org/bonitasoft/engine/parameter/SParameter.java +++ b/bpm/bonita-core/bonita-parameter/src/main/java/org/bonitasoft/engine/parameter/SParameter.java @@ -13,12 +13,14 @@ **/ package org.bonitasoft.engine.parameter; -import javax.persistence.*; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; import lombok.Data; import lombok.NoArgsConstructor; -import org.bonitasoft.engine.persistence.PersistentObject; -import org.bonitasoft.engine.persistence.PersistentObjectId; +import org.bonitasoft.engine.persistence.PlatformPersistentObject; import org.hibernate.annotations.Type; /** @@ -28,13 +30,10 @@ @NoArgsConstructor @Entity @Table(name = "proc_parameter") -@IdClass(PersistentObjectId.class) -public class SParameter implements PersistentObject { +public class SParameter implements PlatformPersistentObject { @Id private long id; - @Id - private long tenantId; private String name; @Column diff --git a/platform/platform-resources/src/main/resources/sql/h2/createTables.sql b/platform/platform-resources/src/main/resources/sql/h2/createTables.sql index 9810fbf99a..732f10d6f3 100644 --- a/platform/platform-resources/src/main/resources/sql/h2/createTables.sql +++ b/platform/platform-resources/src/main/resources/sql/h2/createTables.sql @@ -803,7 +803,6 @@ CREATE TABLE icon ( ); CREATE TABLE queriable_log ( - tenantid BIGINT NOT NULL, id BIGINT NOT NULL, log_timestamp BIGINT NOT NULL, whatYear SMALLINT NOT NULL, @@ -826,7 +825,7 @@ CREATE TABLE queriable_log ( numericIndex3 BIGINT, numericIndex4 BIGINT, numericIndex5 BIGINT, - PRIMARY KEY (tenantid, id) + CONSTRAINT pk_queriable_log PRIMARY KEY (id) ); CREATE TABLE sequence ( @@ -925,13 +924,13 @@ CREATE TABLE form_mapping ( ALTER TABLE form_mapping ADD CONSTRAINT fk_form_mapping_key FOREIGN KEY (page_mapping_id) REFERENCES page_mapping(id); CREATE TABLE proc_parameter ( - tenantId BIGINT NOT NULL, id BIGINT NOT NULL, process_id BIGINT NOT NULL, name VARCHAR(255) NOT NULL, value CLOB NULL, - PRIMARY KEY (tenantId, id) + CONSTRAINT pk_proc_parameter PRIMARY KEY (id) ); + CREATE TABLE bar_resource ( id BIGINT NOT NULL, process_id BIGINT NOT NULL, diff --git a/platform/platform-resources/src/main/resources/sql/postgres/createTables.sql b/platform/platform-resources/src/main/resources/sql/postgres/createTables.sql index d7c6885cb3..8f8e33c32d 100644 --- a/platform/platform-resources/src/main/resources/sql/postgres/createTables.sql +++ b/platform/platform-resources/src/main/resources/sql/postgres/createTables.sql @@ -799,7 +799,6 @@ CREATE TABLE icon ( ); CREATE TABLE queriable_log ( - tenantid INT8 NOT NULL, id INT8 NOT NULL, log_timestamp INT8 NOT NULL, whatYear SMALLINT NOT NULL, @@ -822,7 +821,7 @@ CREATE TABLE queriable_log ( numericIndex3 INT8, numericIndex4 INT8, numericIndex5 INT8, - PRIMARY KEY (tenantid, id) + CONSTRAINT pk_queriable_log PRIMARY KEY (id) ); CREATE TABLE sequence ( @@ -921,12 +920,11 @@ CREATE TABLE form_mapping ( ALTER TABLE form_mapping ADD CONSTRAINT fk_form_mapping_key FOREIGN KEY (page_mapping_id) REFERENCES page_mapping(id); CREATE TABLE proc_parameter ( - tenantId INT8 NOT NULL, id INT8 NOT NULL, process_id INT8 NOT NULL, name VARCHAR(255) NOT NULL, value TEXT NULL, - PRIMARY KEY (tenantId, id) + CONSTRAINT pk_proc_parameter PRIMARY KEY (id) ); CREATE TABLE bar_resource ( diff --git a/services/bonita-log/src/main/java/org/bonitasoft/engine/queriablelogger/model/SQueriableLog.java b/services/bonita-log/src/main/java/org/bonitasoft/engine/queriablelogger/model/SQueriableLog.java index 5e4e41439c..3190bacd10 100644 --- a/services/bonita-log/src/main/java/org/bonitasoft/engine/queriablelogger/model/SQueriableLog.java +++ b/services/bonita-log/src/main/java/org/bonitasoft/engine/queriablelogger/model/SQueriableLog.java @@ -21,24 +21,21 @@ import javax.persistence.EnumType; import javax.persistence.Enumerated; import javax.persistence.Id; -import javax.persistence.IdClass; import javax.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.bonitasoft.engine.persistence.PersistentObject; -import org.bonitasoft.engine.persistence.PersistentObjectId; +import org.bonitasoft.engine.persistence.PlatformPersistentObject; @Entity @Data @AllArgsConstructor @NoArgsConstructor @Builder(toBuilder = true) -@IdClass(PersistentObjectId.class) @Table(name = "queriable_log") -public class SQueriableLog implements PersistentObject { +public class SQueriableLog implements PlatformPersistentObject { public static final int STATUS_FAIL = 0; public static final int STATUS_OK = 1; @@ -64,8 +61,6 @@ public class SQueriableLog implements PersistentObject { public static final String NUMERIC_INDEX4 = "numericIndex4"; public static final String NUMERIC_INDEX5 = "numericIndex5"; - @Id - private long tenantId; @Id private long id; @Column(name = "log_timestamp")