Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#817 - removing oracle database dependency preserving most of code. #1969

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
*/
package org.kie.kogito.index.oracle;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.quarkus.http.OracleHttpTestProfile;

import io.quarkus.test.junit.QuarkusIntegrationTest;
import io.quarkus.test.junit.TestProfile;

@QuarkusIntegrationTest
@TestProfile(OracleHttpTestProfile.class)
@Disabled
public class ProcessDataIndexOracleHttpIT extends AbstractProcessDataIndexOracleIT {
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@
*/
package org.kie.kogito.index.oracle;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.quarkus.kafka.OracleKafkaTestProfile;

import io.quarkus.test.junit.QuarkusIntegrationTest;
import io.quarkus.test.junit.TestProfile;

@QuarkusIntegrationTest
@TestProfile(OracleKafkaTestProfile.class)
@Disabled
public class ProcessDataIndexOracleKafkaIT extends AbstractProcessDataIndexOracleIT {
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,16 +84,6 @@
<groupId>org.kie.kogito</groupId>
<artifactId>kogito-test-utils</artifactId>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.testcontainers</groupId>
<artifactId>oracle-xe</artifactId>
</exclusion>
<exclusion>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc11</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ kogito.data-index.blocking=true
#Kafka
quarkus.kafka.health.enabled=true

quarkus.datasource.db-kind=oracle
#fails without oracle jdbc driver in classpath
#quarkus.datasource.db-kind=oracle

#required to avoid build failure due lack of oracle jdbc driver
quarkus.datasource.jdbc=false

#Hibernate
quarkus.hibernate-orm.jdbc.timezone=UTC
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
*/
package org.kie.kogito.index.service;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.service.test.KeycloakTestProfile;

import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;

@QuarkusTest
@TestProfile(KeycloakTestProfile.class)
@Disabled
class KeycloakOracleIndexingServiceIT extends AbstractKeycloakIntegrationIndexingServiceIT {

}
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
*/
package org.kie.kogito.index.service;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;

import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;

@QuarkusTest
@TestProfile(InMemoryMessageTestProfile.class)
@Disabled
class OracleIndexingServiceIT extends AbstractIndexingServiceIT {

}
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
*/
package org.kie.kogito.index.service.messaging;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.service.test.InMemoryMessageTestProfile;

import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;

@QuarkusTest
@TestProfile(InMemoryMessageTestProfile.class)
@Disabled
class OracleMessagingHttpConsumerIT extends AbstractMessagingHttpConsumerIT {

}
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
*/
package org.kie.kogito.index.service.messaging;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.service.test.KafkaMessageTestProfile;

import io.quarkus.test.junit.QuarkusTest;
import io.quarkus.test.junit.TestProfile;

@QuarkusTest
@TestProfile(KafkaMessageTestProfile.class)
@Disabled
class OracleMessagingKafkaConsumerIT extends AbstractMessagingKafkaConsumerIT {

}
42 changes: 0 additions & 42 deletions data-index/data-index-storage/data-index-storage-oracle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
<groupId>org.kie.kogito</groupId>
<artifactId>data-index-storage-jpa</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jdbc-oracle</artifactId>
</dependency>
<dependency>
<groupId>org.kie.kogito</groupId>
<artifactId>data-index-storage-api</artifactId>
Expand Down Expand Up @@ -95,42 +91,4 @@
</plugins>
</build>

<profiles>
<profile>
<id>schema</id>
<activation>
<property>
<name>generate.schema</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>java</executable>
<arguments>
<argument>-classpath</argument>
<!-- automatically creates the classpath using all project dependencies,
also adding the project build directory -->
<classpath/>
<argument>org.kie.kogito.index.oracle.schema.DDLSchemaExporter</argument>
</arguments>
<classpathScope>test</classpathScope>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>

</project>
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.time.ZonedDateTime;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.jpa.mapper.JobEntityMapper;
import org.kie.kogito.index.jpa.model.JobEntity;
Expand All @@ -33,6 +34,7 @@
import static org.assertj.core.api.Assertions.assertThat;

@QuarkusTest
@Disabled
class JobEntityMapperIT {

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Set;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.jpa.mapper.ProcessDefinitionEntityMapper;
import org.kie.kogito.index.jpa.model.NodeEntity;
Expand All @@ -38,6 +39,7 @@
import static org.assertj.core.api.Assertions.assertThat;

@QuarkusTest
@Disabled
class ProcessDefinitionEntityMapperIT {

ProcessDefinition pd = new ProcessDefinition();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Set;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.jpa.mapper.ProcessInstanceEntityMapper;
import org.kie.kogito.index.jpa.model.MilestoneEntity;
Expand All @@ -46,6 +47,7 @@
import static org.assertj.core.api.Assertions.assertThat;

@QuarkusTest
@Disabled
class ProcessInstanceEntityMapperIT {

ObjectMapper jsonMapper = new ObjectMapper();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.Set;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.jpa.mapper.UserTaskInstanceEntityMapper;
import org.kie.kogito.index.jpa.model.AttachmentEntity;
Expand All @@ -45,6 +46,7 @@
import static org.assertj.core.api.Assertions.assertThat;

@QuarkusTest
@Disabled
class UserTaskInstanceEntityMapperIT {

UserTaskInstance userTaskInstance = new UserTaskInstance();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.kie.kogito.index.oracle.query;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.jpa.storage.JobEntityStorage;
import org.kie.kogito.index.model.Job;
import org.kie.kogito.index.test.query.AbstractJobQueryIT;
Expand All @@ -31,6 +32,7 @@

@QuarkusTest
@QuarkusTestResource(OracleSqlQuarkusTestResource.class)
@Disabled
class JobEntityQueryIT extends AbstractJobQueryIT {

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.kie.kogito.index.oracle.query;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.jpa.storage.ProcessDefinitionEntityStorage;
import org.kie.kogito.index.model.ProcessDefinition;
import org.kie.kogito.index.test.query.AbstractProcessDefinitionQueryIT;
Expand All @@ -31,6 +32,7 @@

@QuarkusTest
@QuarkusTestResource(OracleSqlQuarkusTestResource.class)
@Disabled
class ProcessDefinitionEntityQueryIT extends AbstractProcessDefinitionQueryIT {

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.kie.kogito.index.oracle.query;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.jpa.storage.ProcessInstanceEntityStorage;
import org.kie.kogito.index.test.query.AbstractProcessInstanceQueryIT;
import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource;
Expand All @@ -29,6 +30,7 @@

@QuarkusTest
@QuarkusTestResource(OracleSqlQuarkusTestResource.class)
@Disabled
class ProcessInstanceEntityQueryIT extends AbstractProcessInstanceQueryIT {

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.kie.kogito.index.oracle.query;

import org.junit.jupiter.api.Disabled;
import org.kie.kogito.index.jpa.storage.UserTaskInstanceEntityStorage;
import org.kie.kogito.index.test.query.AbstractUserTaskInstanceQueryIT;
import org.kie.kogito.testcontainers.quarkus.OracleSqlQuarkusTestResource;
Expand All @@ -29,6 +30,7 @@

@QuarkusTest
@QuarkusTestResource(OracleSqlQuarkusTestResource.class)
@Disabled
class UserTaskInstanceEntityQueryIT extends AbstractUserTaskInstanceQueryIT {

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.function.Function;

import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.kie.kogito.index.jpa.model.ProcessInstanceEntity;
Expand Down Expand Up @@ -55,6 +56,7 @@
import static org.mockito.Mockito.when;

@ExtendWith(MockitoExtension.class)
@Disabled
class DomainQueryTest {

private static final Class rootType = ProcessInstanceEntity.class;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.UUID;

import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.jpa.model.JobEntity;
import org.kie.kogito.index.jpa.model.JobEntityRepository;
Expand All @@ -36,6 +37,7 @@

@QuarkusTest
@QuarkusTestResource(OracleSqlQuarkusTestResource.class)
@Disabled
public class JobStorageIT extends AbstractStorageIT<JobEntity, Job> {

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Set;

import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.jpa.model.ProcessDefinitionEntity;
import org.kie.kogito.index.jpa.model.ProcessDefinitionEntityRepository;
Expand All @@ -37,6 +38,7 @@

@QuarkusTest
@QuarkusTestResource(OracleSqlQuarkusTestResource.class)
@Disabled
class ProcessDefinitionStorageIT extends AbstractStorageIT<ProcessDefinitionEntity, ProcessDefinition> {

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.UUID;

import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.jpa.model.ProcessInstanceEntityRepository;
import org.kie.kogito.index.model.ProcessInstanceState;
Expand All @@ -34,6 +35,7 @@

@QuarkusTest
@QuarkusTestResource(OracleSqlQuarkusTestResource.class)
@Disabled
public class ProcessInstanceStorageIT {

@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.UUID;

import org.apache.commons.lang3.RandomStringUtils;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.kie.kogito.index.jpa.model.UserTaskInstanceEntityRepository;
import org.kie.kogito.index.model.UserTaskInstance;
Expand All @@ -37,6 +38,7 @@

@QuarkusTest
@QuarkusTestResource(OracleSqlQuarkusTestResource.class)
@Disabled
public class UserTaskInstanceStorageIT {

@Inject
Expand Down
Loading
Loading