chore(cleanup): remove unused objects/tables Blob + QueriableLogParam…

…eter (#3285) Relates to https://bonitasoft.atlassian.net/browse/BPM-351
bonitasoft · Dec 17, 2024 · 871fec9 · 871fec9
1 parent 8641831
commit 871fec9
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 352 deletions.
diff --git a/.../src/test/java/org/bonitasoft/engine/queriablelogger/model/QueriableLogParameterTest.java b/.../src/test/java/org/bonitasoft/engine/queriablelogger/model/QueriableLogParameterTest.java
diff --git a/bonita-integration-tests/bonita-query-tests/src/test/resources/testContext.xml b/bonita-integration-tests/bonita-query-tests/src/test/resources/testContext.xml
@@ -188,7 +188,6 @@
                 <value>org.bonitasoft.engine.core.process.instance.model.archive.business.data.SAFlowNodeSimpleRefBusinessDataInstance</value>
                 <value>org.bonitasoft.engine.core.process.instance.model.archive.business.data.SAProcessMultiRefBusinessDataInstance</value>
                 <value>org.bonitasoft.engine.queriablelogger.model.SQueriableLog</value>
-                <value>org.bonitasoft.engine.queriablelogger.model.SQueriableLogParameter</value>
             </list>
         </property>
         <property name="mappingResources">

diff --git a/...ore/bonita-login/src/test/resources/bonita/server/tenants/1/conf/bonita-tenant.properties b/...ore/bonita-login/src/test/resources/bonita/server/tenants/1/conf/bonita-tenant.properties
diff --git a/bpm/bonita-core/bonita-process-engine/src/main/resources/bonita-community.xml b/bpm/bonita-core/bonita-process-engine/src/main/resources/bonita-community.xml
@@ -269,11 +269,6 @@
         <constructor-arg name="sequenceId" value="30" />
         <constructor-arg name="rangeSize" value="${bonita.platform.sequence.30:${bonita.platform.sequence.defaultRangeSize}}" />
     </bean>
-    <bean class="org.bonitasoft.engine.sequence.SequenceMapping">
-        <constructor-arg name="className" value="org.bonitasoft.engine.queriablelogger.model.SQueriableLogParameter" />
-        <constructor-arg name="sequenceId" value="31" />
-        <constructor-arg name="rangeSize" value="${bonita.platform.sequence.31:${bonita.platform.sequence.defaultRangeSize}}" />
-    </bean>
     <bean class="org.bonitasoft.engine.sequence.SequenceMapping">
         <constructor-arg name="className" value="org.bonitasoft.engine.scheduler.model.SJobDescriptor" />
         <constructor-arg name="sequenceId" value="70" />
@@ -1033,7 +1028,6 @@
                 <value>org.bonitasoft.engine.core.process.instance.model.archive.business.data.SAFlowNodeSimpleRefBusinessDataInstance</value>
                 <value>org.bonitasoft.engine.core.process.instance.model.archive.business.data.SAProcessMultiRefBusinessDataInstance</value>
                 <value>org.bonitasoft.engine.queriablelogger.model.SQueriableLog</value>
-                <value>org.bonitasoft.engine.queriablelogger.model.SQueriableLogParameter</value>
                 <value>org.bonitasoft.engine.core.process.instance.model.SBPMFailure</value>
                 <value>org.bonitasoft.engine.core.process.instance.model.SABPMFailure</value>
             </set>

diff --git a/...bonita-core/bonita-process-engine/src/main/resources/bonita-platform-community.properties b/...bonita-core/bonita-process-engine/src/main/resources/bonita-platform-community.properties
@@ -89,8 +89,6 @@ bonita.platform.sequence.70=2000
 # Job description
 bonita.platform.sequence.30=10000
 # queriable log
-bonita.platform.sequence.31=200000
-# queriable log parameter
 bonita.platform.sequence.10010=1000
 # ProcessInstance
 bonita.platform.sequence.10011=20000

diff --git a/platform/platform-resources/src/main/resources/sql/h2/cleanTables.sql b/platform/platform-resources/src/main/resources/sql/h2/cleanTables.sql
@@ -43,7 +43,6 @@ DELETE FROM user_login;
 DELETE FROM user_;
 DELETE FROM role;
 DELETE FROM group_;
-DELETE FROM queriablelog_p;
 DELETE FROM queriable_log;
 DELETE FROM page;
 DELETE FROM sequence WHERE tenantId <> -1;

diff --git a/platform/platform-resources/src/main/resources/sql/h2/createTables.sql b/platform/platform-resources/src/main/resources/sql/h2/createTables.sql
@@ -822,19 +822,6 @@ CREATE TABLE queriable_log (
   PRIMARY KEY (tenantid, id)
 );
 
-CREATE TABLE queriablelog_p (
-  tenantid BIGINT NOT NULL,
-  id BIGINT NOT NULL,
-  queriableLogId BIGINT NOT NULL,
-  name VARCHAR(50) NOT NULL,
-  stringValue VARCHAR(255),
-  blobId BIGINT,
-  valueType VARCHAR(30),
-  PRIMARY KEY (tenantid, id)
-);
-
-CREATE INDEX idx_queriablelog ON queriablelog_p (queriableLogId);
-ALTER TABLE queriablelog_p ADD CONSTRAINT fk_queriableLogId FOREIGN KEY (tenantid, queriableLogId) REFERENCES queriable_log(tenantid, id);
 CREATE TABLE page (
   tenantId BIGINT NOT NULL,
   id BIGINT NOT NULL,
@@ -863,12 +850,6 @@ CREATE TABLE sequence (
   nextid BIGINT NOT NULL,
   PRIMARY KEY (tenantid, id)
 );
-CREATE TABLE blob_ (
-    tenantId BIGINT NOT NULL,
-	id BIGINT NOT NULL,
-	blobValue MEDIUMBLOB,
-	PRIMARY KEY (tenantid, id)
-);
 
 CREATE TABLE platform (
   id BIGINT NOT NULL,

diff --git a/platform/platform-resources/src/main/resources/sql/h2/dropTables.sql b/platform/platform-resources/src/main/resources/sql/h2/dropTables.sql
@@ -45,10 +45,8 @@ DROP TABLE user_login;
 DROP TABLE user_;
 DROP TABLE role;
 DROP TABLE group_;
-DROP TABLE queriablelog_p;
 DROP TABLE queriable_log;
 DROP TABLE page;
-DROP TABLE blob_;
 DROP TABLE profilemember;
 DROP TABLE profile;
 DROP TABLE job_log;

diff --git a/platform/platform-resources/src/main/resources/sql/h2/postCreateStructure.sql b/platform/platform-resources/src/main/resources/sql/h2/postCreateStructure.sql
@@ -2,8 +2,6 @@
 ALTER TABLE actor ADD CONSTRAINT fk_actor_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);
 ALTER TABLE actormember ADD CONSTRAINT fk_actormember_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);
 ALTER TABLE actormember ADD CONSTRAINT fk_actormember_actorId FOREIGN KEY (tenantid, actorId) REFERENCES actor(tenantid, id);
--- ALTER TABLE queriable_log ADD CONSTRAINT fk_queriable_log_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);
-ALTER TABLE queriablelog_p ADD CONSTRAINT fk_queriablelog_p_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);
 ALTER TABLE category ADD CONSTRAINT fk_category_tenantId FOREIGN KEY (tenantid) REFERENCES tenant (id);
 ALTER TABLE command ADD CONSTRAINT fk_command_tenantId FOREIGN KEY (tenantid) REFERENCES tenant (id);
 ALTER TABLE connector_instance ADD CONSTRAINT fk_connector_instance_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);

diff --git a/platform/platform-resources/src/main/resources/sql/h2/preDropStructure.sql b/platform/platform-resources/src/main/resources/sql/h2/preDropStructure.sql
@@ -2,8 +2,6 @@
 ALTER TABLE actor DROP CONSTRAINT fk_actor_tenantId;
 ALTER TABLE actormember DROP CONSTRAINT fk_actormember_tenantId;
 ALTER TABLE actormember DROP CONSTRAINT fk_actormember_actorId;
--- ALTER TABLE queriable_log DROP CONSTRAINT fk_queriable_log_tenantId;
-ALTER TABLE queriablelog_p DROP CONSTRAINT fk_queriablelog_p_tenantId;
 ALTER TABLE category DROP CONSTRAINT fk_category_tenantId;
 ALTER TABLE command DROP CONSTRAINT fk_command_tenantId;
 ALTER TABLE connector_instance DROP CONSTRAINT fk_connector_instance_tenantId;

diff --git a/platform/platform-resources/src/main/resources/sql/postgres/cleanTables.sql b/platform/platform-resources/src/main/resources/sql/postgres/cleanTables.sql
@@ -42,7 +42,6 @@ DELETE FROM user_login;
 DELETE FROM user_;
 DELETE FROM role;
 DELETE FROM group_;
-DELETE FROM queriablelog_p;
 DELETE FROM queriable_log;
 DELETE FROM page;
 DELETE FROM sequence WHERE tenantId <> -1;

diff --git a/platform/platform-resources/src/main/resources/sql/postgres/createTables.sql b/platform/platform-resources/src/main/resources/sql/postgres/createTables.sql
@@ -823,19 +823,6 @@ CREATE TABLE queriable_log (
   PRIMARY KEY (tenantid, id)
 );
 
-CREATE TABLE queriablelog_p (
-  tenantid INT8 NOT NULL,
-  id INT8 NOT NULL,
-  queriableLogId INT8 NOT NULL,
-  name VARCHAR(50) NOT NULL,
-  stringValue VARCHAR(255),
-  blobId INT8,
-  valueType VARCHAR(30),
-  PRIMARY KEY (tenantid, id)
-);
-
-CREATE INDEX idx_queriablelog ON queriablelog_p (queriableLogId);
-ALTER TABLE queriablelog_p ADD CONSTRAINT fk_queriableLogId FOREIGN KEY (tenantid, queriableLogId) REFERENCES queriable_log(tenantid, id);
 CREATE TABLE page (
   tenantId INT8 NOT NULL,
   id INT8 NOT NULL,
@@ -866,12 +853,6 @@ CREATE TABLE sequence (
   nextid INT8 NOT NULL,
   PRIMARY KEY (tenantid, id)
 );
-CREATE TABLE blob_ (
-    tenantId INT8 NOT NULL,
-	id INT8 NOT NULL,
-	blobValue BYTEA,
-	PRIMARY KEY (tenantid, id)
-);
 
 CREATE TABLE platform (
   id INT8 NOT NULL,

diff --git a/platform/platform-resources/src/main/resources/sql/postgres/dropTables.sql b/platform/platform-resources/src/main/resources/sql/postgres/dropTables.sql
@@ -45,10 +45,8 @@ DROP TABLE IF EXISTS user_login;
 DROP TABLE IF EXISTS user_;
 DROP TABLE IF EXISTS role;
 DROP TABLE IF EXISTS group_;
-DROP TABLE IF EXISTS queriablelog_p;
 DROP TABLE IF EXISTS queriable_log;
 DROP TABLE IF EXISTS page;
-DROP TABLE IF EXISTS blob_;
 DROP TABLE IF EXISTS profilemember;
 DROP TABLE IF EXISTS profile;
 DROP TABLE IF EXISTS job_log;

diff --git a/platform/platform-resources/src/main/resources/sql/postgres/postCreateStructure.sql b/platform/platform-resources/src/main/resources/sql/postgres/postCreateStructure.sql
@@ -2,8 +2,6 @@
 ALTER TABLE actor ADD CONSTRAINT fk_actor_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);
 ALTER TABLE actormember ADD CONSTRAINT fk_actormember_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);
 ALTER TABLE actormember ADD CONSTRAINT fk_actormember_actorId FOREIGN KEY (tenantid, actorId) REFERENCES actor(tenantid, id);
--- ALTER TABLE queriable_log ADD CONSTRAINT fk_queriable_log_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);
-ALTER TABLE queriablelog_p ADD CONSTRAINT fk_queriablelog_p_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);
 ALTER TABLE category ADD CONSTRAINT fk_category_tenantId FOREIGN KEY (tenantid) REFERENCES tenant (id);
 ALTER TABLE command ADD CONSTRAINT fk_command_tenantId FOREIGN KEY (tenantid) REFERENCES tenant (id);
 ALTER TABLE connector_instance ADD CONSTRAINT fk_connector_instance_tenantId FOREIGN KEY (tenantid) REFERENCES tenant(id);

diff --git a/platform/platform-resources/src/main/resources/sql/postgres/preDropStructure.sql b/platform/platform-resources/src/main/resources/sql/postgres/preDropStructure.sql
@@ -2,8 +2,6 @@
 ALTER TABLE actor DROP CONSTRAINT fk_actor_tenantId;
 ALTER TABLE actormember DROP CONSTRAINT fk_actormember_tenantId;
 ALTER TABLE actormember DROP CONSTRAINT fk_actormember_actorId;
--- ALTER TABLE queriable_log DROP CONSTRAINT fk_queriable_log_tenantId;
-ALTER TABLE queriablelog_p DROP CONSTRAINT fk_queriablelog_p_tenantId;
 ALTER TABLE category DROP CONSTRAINT fk_category_tenantId;
 ALTER TABLE command DROP CONSTRAINT fk_command_tenantId;
 ALTER TABLE connector_instance DROP CONSTRAINT fk_connector_instance_tenantId;

diff --git a/...log/src/main/java/org/bonitasoft/engine/queriablelogger/model/SQueriableLogParameter.java b/...log/src/main/java/org/bonitasoft/engine/queriablelogger/model/SQueriableLogParameter.java