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

Add audit table suffix config property #19733

Merged
merged 1 commit into from
Aug 27, 2021
Merged
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
@@ -0,0 +1,28 @@
package io.quarkus.hibernate.orm.envers;

import static org.hamcrest.Matchers.is;

import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import io.quarkus.test.QuarkusUnitTest;
import io.restassured.RestAssured;

public class EnversAuditTableSuffixTestCase {

@RegisterExtension
static QuarkusUnitTest runner = new QuarkusUnitTest()
.setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
.addClasses(MyAuditedEntity.class, MyRevisionEntity.class, MyRevisionListener.class,
EnversTestAuditTableSuffixResource.class)
.addAsResource("application-with-store-data-at-delete.properties", "application.properties"));

@Test
public void testAuditTableSuffix() {
RestAssured.when().get("/audit-table-suffix").then()
.body(is("OK"));
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package io.quarkus.hibernate.orm.envers;

import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.persistence.EntityManager;
import javax.ws.rs.GET;
import javax.ws.rs.Path;

import org.eclipse.microprofile.config.inject.ConfigProperty;
import org.hibernate.envers.boot.internal.EnversService;
import org.hibernate.envers.configuration.internal.AuditEntitiesConfiguration;
import org.hibernate.internal.SessionImpl;

@Path("/audit-table-suffix")
@ApplicationScoped
public class EnversTestAuditTableSuffixResource {

@Inject
EntityManager em;

@Inject
@ConfigProperty(name = "quarkus.hibernate-envers.audit-table-suffix")
String configuredSuffix;

@GET
public String getAuditTableName() {
AuditEntitiesConfiguration auditEntitiesConfiguration = ((((SessionImpl) em.getDelegate())
.getFactory().getServiceRegistry()).getParentServiceRegistry())
.getService(EnversService.class).getAuditEntitiesConfiguration();

String calculatedAuditTableName = auditEntitiesConfiguration.getAuditTableName("entity", "table");
String expectedAuditTableName = "table" + configuredSuffix;
if (expectedAuditTableName.equals(calculatedAuditTableName)) {
return "OK";
}
return "Obtained audit table name " + calculatedAuditTableName + " is not same as expected: " + expectedAuditTableName;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ quarkus.datasource.jdbc.url=jdbc:h2:mem:test

quarkus.hibernate-orm.database.generation=drop-and-create
quarkus.hibernate-envers.store-data-at-delete=true
quarkus.hibernate-envers.audit-table-suffix=_SUFFIX
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,11 @@ public class HibernateEnversBuildTimeConfig {
*/
@ConfigItem(defaultValue = "false")
public boolean storeDataAtDelete;

/**
* Defines a suffix for historical data table.
*/
@ConfigItem(defaultValue = "_AUD")
public String auditTableSuffix;

}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ private HibernateEnversIntegrationListener(HibernateEnversBuildTimeConfig buildT
@Override
public void contributeBootProperties(BiConsumer<String, Object> propertyCollector) {
addConfig(propertyCollector, EnversSettings.STORE_DATA_AT_DELETE, buildTimeConfig.storeDataAtDelete);
addConfig(propertyCollector, EnversSettings.AUDIT_TABLE_SUFFIX, buildTimeConfig.auditTableSuffix);
}

public static <T> void addConfig(BiConsumer<String, Object> propertyCollector, String configPath, T value) {
Expand Down