Skip to content

Commit

Permalink
WIP: Update of Hibernate
Browse files Browse the repository at this point in the history
Signed-off-by: Tony Tkacik <tony.tkacik@evolveum.com>
  • Loading branch information
tonydamage committed Apr 26, 2023
1 parent ef5acac commit f6a3abb
Show file tree
Hide file tree
Showing 109 changed files with 436 additions and 254 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
<testng.version>7.7.0</testng.version>
<xml.resolver.version>1.2</xml.resolver.version>
<xmlunit.version>2.8.2</xmlunit.version>
<hibernate.version>5.5.3.Final</hibernate.version>
<!-- hibernate.version>5.5.3.Final</hibernate.version -->
<!--
Default Spring Boot 2.7.3 uses H2 2.1.x, which is a big step from our current.
Every upgrade after v193 up to 1.4.200 had issues for use, some are probably fixed like this NPE bug
Expand Down Expand Up @@ -1531,7 +1531,7 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>4.9.2</version>
<version>4.10.1</version>
</dependency>
<dependency>
<groupId>net.ttddyy</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@ public void test100AddOperationExecution() throws Exception {
@Test
public void test110AddAssignments() throws Exception {
// Because of:
// Caused by: javax.persistence.EntityExistsException: A different object with the same identifier value was already associated with the session : [com.evolveum.midpoint.repo.sql.data.common.container.RAssignment#RContainerId{44c3e25d-e790-4142-958d-ff7ff3ff3a9f, 62}]
// Caused by: jakarta.persistence.EntityExistsException: A different object with the same identifier value was already associated with the session : [com.evolveum.midpoint.repo.sql.data.common.container.RAssignment#RContainerId{44c3e25d-e790-4142-958d-ff7ff3ff3a9f, 62}]
// at org.hibernate.internal.ExceptionConverterImpl.convert(ExceptionConverterImpl.java:118)
// at org.hibernate.internal.ExceptionConverterImpl.convert(ExceptionConverterImpl.java:157)
// at org.hibernate.internal.ExceptionConverterImpl.convert(ExceptionConverterImpl.java:164)
Expand Down
10 changes: 7 additions & 3 deletions repo/repo-sql-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,16 @@

<!-- HIBERNATE -->
<dependency>
<groupId>org.hibernate</groupId>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>javax.persistence-api</artifactId>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-ant</artifactId>
</dependency>
<dependency>
<groupId>jakarta.persistence</groupId>
<artifactId>jakaerta.persistence-api</artifactId>
</dependency>

<!-- H2 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ public enum Database {
ORACLE("oracle.jdbc.OracleDriver",
MidPointOracleDialect.class.getName(),
org.hibernate.dialect.OracleDialect.class.getName(),
org.hibernate.dialect.Oracle9Dialect.class.getName(),
org.hibernate.dialect.Oracle8iDialect.class.getName(),
org.hibernate.dialect.Oracle9iDialect.class.getName(),
org.hibernate.dialect.Oracle10gDialect.class.getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public LocalSessionFactoryBean sessionFactory(
hibernateProperties.setProperty("hibernate.hbm2ddl.auto", configuration.getHibernateHbm2ddl());
hibernateProperties.setProperty("hibernate.id.new_generator_mappings", "true");
hibernateProperties.setProperty("hibernate.jdbc.batch_size", "20");
hibernateProperties.setProperty("javax.persistence.validation.mode", "none");
hibernateProperties.setProperty("jakarta.persistence.validation.mode", "none");
hibernateProperties.setProperty("hibernate.transaction.coordinator_class", "jdbc");
hibernateProperties.setProperty("hibernate.hql.bulk_id_strategy",
"org.hibernate.hql.spi.id.inline.InlineIdsOrClauseBulkIdStrategy");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import static com.evolveum.midpoint.repo.sql.data.audit.RAuditItem.COLUMN_RECORD_ID;

import java.util.Objects;
import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.ForeignKey;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import static com.evolveum.midpoint.repo.sql.data.audit.RAuditPropertyValue.TABLE_NAME;

import java.util.Objects;
import javax.persistence.*;
import jakarta.persistence.*;

import com.evolveum.midpoint.audit.api.AuditService;
import com.evolveum.midpoint.repo.sql.helpers.modify.Ignore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import static com.evolveum.midpoint.repo.sql.data.audit.RAuditReferenceValue.TABLE_NAME;

import java.util.Objects;
import javax.persistence.*;
import jakarta.persistence.*;

import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString;
import com.evolveum.midpoint.repo.sql.helpers.modify.Ignore;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import static com.evolveum.midpoint.repo.sql.data.audit.RObjectDeltaOperation.COLUMN_RECORD_ID;

import java.util.Objects;
import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.ForeignKey;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import static com.evolveum.midpoint.repo.sql.data.audit.RTargetResourceOid.COLUMN_RECORD_ID;

import java.util.Objects;
import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.ForeignKey;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import java.util.HashSet;
import java.util.Set;
import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.DynamicUpdate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.*;
import jakarta.persistence.*;
import javax.xml.datatype.XMLGregorianCalendar;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
import org.hibernate.annotations.Persister;
import org.hibernate.annotations.Type;

import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
import com.evolveum.midpoint.repo.sql.data.common.container.RAccessCertificationCase;
Expand All @@ -25,6 +26,7 @@
import com.evolveum.midpoint.repo.sql.data.common.enums.RAccessCertificationCampaignState;
import com.evolveum.midpoint.repo.sql.query.definition.JaxbName;
import com.evolveum.midpoint.repo.sql.query.definition.NeverNull;
import com.evolveum.midpoint.repo.sql.type.XMLGregorianCalendarType;
import com.evolveum.midpoint.repo.sql.util.DtoTranslationException;
import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult;
import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister;
Expand Down Expand Up @@ -103,12 +105,14 @@ public String getHandlerUri() {

@JaxbName(localPart = "startTimestamp")
@Column(name = "startTimestamp")
@Type(XMLGregorianCalendarType.class)
public XMLGregorianCalendar getStart() {
return start;
}

@JaxbName(localPart = "endTimestamp")
@Column(name = "endTimestamp")
@Type(XMLGregorianCalendarType.class)
public XMLGregorianCalendar getEnd() {
return end;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,20 @@
*/
package com.evolveum.midpoint.repo.sql.data.common;

import javax.persistence.*;
import jakarta.persistence.*;
import javax.xml.datatype.XMLGregorianCalendar;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
import org.hibernate.annotations.Persister;
import org.hibernate.annotations.Type;

import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference;
import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString;
import com.evolveum.midpoint.repo.sql.query.definition.JaxbName;
import com.evolveum.midpoint.repo.sql.query.definition.NeverNull;
import com.evolveum.midpoint.repo.sql.type.XMLGregorianCalendarType;
import com.evolveum.midpoint.repo.sql.util.DtoTranslationException;
import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult;
import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister;
Expand Down Expand Up @@ -74,10 +76,12 @@ public REmbeddedReference getOwnerRefDefinition() {
return ownerRefDefinition;
}

@Type(XMLGregorianCalendarType.class)
public XMLGregorianCalendar getLastCampaignStartedTimestamp() {
return lastCampaignStartedTimestamp;
}

@Type(XMLGregorianCalendarType.class)
public XMLGregorianCalendar getLastCampaignClosedTimestamp() {
return lastCampaignClosedTimestamp;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
package com.evolveum.midpoint.repo.sql.data.common;

import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,22 @@

import java.util.HashSet;
import java.util.Set;
import javax.persistence.*;
import jakarta.persistence.*;
import javax.xml.datatype.XMLGregorianCalendar;

import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
import org.hibernate.annotations.Persister;
import org.hibernate.annotations.Type;

import com.evolveum.midpoint.repo.sql.data.RepositoryContext;
import com.evolveum.midpoint.repo.sql.data.common.container.RCaseWorkItem;
import com.evolveum.midpoint.repo.sql.data.common.embedded.REmbeddedReference;
import com.evolveum.midpoint.repo.sql.data.common.embedded.RPolyString;
import com.evolveum.midpoint.repo.sql.query.definition.JaxbName;
import com.evolveum.midpoint.repo.sql.query.definition.NeverNull;
import com.evolveum.midpoint.repo.sql.type.XMLGregorianCalendarType;
import com.evolveum.midpoint.repo.sql.util.DtoTranslationException;
import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult;
import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister;
Expand Down Expand Up @@ -114,6 +116,7 @@ public void setRequestorRef(REmbeddedReference requestorRef) {
this.requestorRef = requestorRef;
}

@Type(XMLGregorianCalendarType.class)
public XMLGregorianCalendar getCloseTimestamp() {
return closeTimestamp;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.evolveum.midpoint.repo.sql.data.common;

import java.util.Set;
import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.Cascade;
import org.hibernate.annotations.DynamicUpdate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
package com.evolveum.midpoint.repo.sql.data.common;

import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
package com.evolveum.midpoint.repo.sql.data.common;

import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

import java.util.HashSet;
import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Table;
import javax.persistence.*;
import jakarta.persistence.Entity;
import jakarta.persistence.Index;
import jakarta.persistence.Table;
import jakarta.persistence.*;
import javax.xml.datatype.XMLGregorianCalendar;

import org.hibernate.annotations.ForeignKey;
Expand All @@ -23,6 +23,7 @@
import com.evolveum.midpoint.repo.sql.data.common.other.RReferenceType;
import com.evolveum.midpoint.repo.sql.query.definition.JaxbName;
import com.evolveum.midpoint.repo.sql.query.definition.JaxbPath;
import com.evolveum.midpoint.repo.sql.type.XMLGregorianCalendarType;
import com.evolveum.midpoint.repo.sql.util.DtoTranslationException;
import com.evolveum.midpoint.repo.sql.util.IdGeneratorResult;
import com.evolveum.midpoint.repo.sql.util.MidPointJoinedPersister;
Expand Down Expand Up @@ -122,12 +123,14 @@ public String getTimezone() {
return timezone;
}

@Type(XMLGregorianCalendarType.class)
@JaxbPath(itemPath = { @JaxbName(localPart = "credentials"), @JaxbName(localPart = "password"),
@JaxbName(localPart = "metadata"), @JaxbName(localPart = "createTimestamp") })
public XMLGregorianCalendar getPasswordCreateTimestamp() {
return passwordCreateTimestamp;
}

@Type(XMLGregorianCalendarType.class)
@JaxbPath(itemPath = { @JaxbName(localPart = "credentials"), @JaxbName(localPart = "password"),
@JaxbName(localPart = "metadata"), @JaxbName(localPart = "modifyTimestamp") })
public XMLGregorianCalendar getPasswordModifyTimestamp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.evolveum.midpoint.repo.sql.data.common;

import java.io.Serializable;
import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
package com.evolveum.midpoint.repo.sql.data.common;

import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
package com.evolveum.midpoint.repo.sql.data.common;

import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
package com.evolveum.midpoint.repo.sql.data.common;

import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

import com.evolveum.midpoint.repo.sql.helpers.modify.Ignore;

import javax.persistence.Entity;
import javax.persistence.Id;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import java.util.Objects;

@Entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
package com.evolveum.midpoint.repo.sql.data.common;

import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
package com.evolveum.midpoint.repo.sql.data.common;

import javax.persistence.*;
import jakarta.persistence.*;

import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.ForeignKey;
Expand Down

0 comments on commit f6a3abb

Please sign in to comment.