Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fixed tests for mysql, cleaned up configuration, switched to annotations
- Loading branch information
Showing
7 changed files
with
159 additions
and
152 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
107 changes: 107 additions & 0 deletions
107
repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/SqlRepositoryBeanConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| /* | ||
| * Copyright (c) 2010-2018 Evolveum | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.evolveum.midpoint.repo.sql; | ||
|
|
||
| import com.evolveum.midpoint.repo.api.RepositoryServiceFactoryException; | ||
| import com.evolveum.midpoint.repo.sql.util.EntityStateInterceptor; | ||
| import com.evolveum.midpoint.repo.sql.util.MidPointImplicitNamingStrategy; | ||
| import com.evolveum.midpoint.repo.sql.util.MidPointPhysicalNamingStrategy; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.context.annotation.Bean; | ||
| import org.springframework.context.annotation.Configuration; | ||
| import org.springframework.orm.hibernate5.HibernateTransactionManager; | ||
| import org.springframework.orm.hibernate5.LocalSessionFactoryBean; | ||
|
|
||
| import java.util.Properties; | ||
|
|
||
| /** | ||
| * Created by Viliam Repan (lazyman). | ||
| */ | ||
| @Configuration | ||
| public class SqlRepositoryBeanConfig { | ||
|
|
||
| @Autowired | ||
| private SqlRepositoryFactory sqlRepositoryFactory; | ||
|
|
||
| @Bean | ||
| public DataSourceFactory dataSourceFactory() { | ||
| DataSourceFactory df = new DataSourceFactory(); | ||
| df.setConfiguration(sqlRepositoryFactory.getSqlConfiguration()); | ||
|
|
||
| return df; | ||
| } | ||
|
|
||
| @Bean | ||
| public MidPointImplicitNamingStrategy midPointImplicitNamingStrategy() { | ||
| return new MidPointImplicitNamingStrategy(); | ||
| } | ||
|
|
||
| @Bean | ||
| public MidPointPhysicalNamingStrategy midPointPhysicalNamingStrategy() { | ||
| return new MidPointPhysicalNamingStrategy(); | ||
| } | ||
|
|
||
| @Bean | ||
| public EntityStateInterceptor entityStateInterceptor() { | ||
| return new EntityStateInterceptor(); | ||
| } | ||
|
|
||
| @Bean | ||
| public LocalSessionFactoryBean sessionFactory() throws RepositoryServiceFactoryException { | ||
| LocalSessionFactoryBean bean = new LocalSessionFactoryBean(); | ||
|
|
||
| DataSourceFactory dataSourceFactory = dataSourceFactory(); | ||
| SqlRepositoryConfiguration configuration = sqlRepositoryFactory.getSqlConfiguration(); | ||
|
|
||
| bean.setDataSource(dataSourceFactory.createDataSource()); | ||
|
|
||
| Properties hibernateProperties = new Properties(); | ||
| hibernateProperties.setProperty("hibernate.dialect", configuration.getHibernateDialect()); | ||
| 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("hibernate.transaction.coordinator_class", "jdbc"); | ||
| hibernateProperties.setProperty("hibernate.hql.bulk_id_strategy", "org.hibernate.hql.spi.id.inline.InlineIdsOrClauseBulkIdStrategy"); | ||
|
|
||
| bean.setHibernateProperties(hibernateProperties); | ||
| bean.setImplicitNamingStrategy(midPointImplicitNamingStrategy()); | ||
| bean.setPhysicalNamingStrategy(midPointPhysicalNamingStrategy()); | ||
| bean.setAnnotatedPackages("com.evolveum.midpoint.repo.sql.type"); | ||
| bean.setPackagesToScan( | ||
| "com.evolveum.midpoint.repo.sql.data.common", | ||
| "com.evolveum.midpoint.repo.sql.data.common.any", | ||
| "com.evolveum.midpoint.repo.sql.data.common.container", | ||
| "com.evolveum.midpoint.repo.sql.data.common.embedded", | ||
| "com.evolveum.midpoint.repo.sql.data.common.enums", | ||
| "com.evolveum.midpoint.repo.sql.data.common.id", | ||
| "com.evolveum.midpoint.repo.sql.data.common.other", | ||
| "com.evolveum.midpoint.repo.sql.data.common.type", | ||
| "com.evolveum.midpoint.repo.sql.data.audit"); | ||
| bean.setEntityInterceptor(entityStateInterceptor()); | ||
|
|
||
| return bean; | ||
| } | ||
|
|
||
| @Bean | ||
| public HibernateTransactionManager transactionManager() throws RepositoryServiceFactoryException { | ||
| HibernateTransactionManager htm = new HibernateTransactionManager(); | ||
| htm.setSessionFactory(sessionFactory().getObject()); | ||
|
|
||
| return htm; | ||
| } | ||
| } |
55 changes: 0 additions & 55 deletions
55
repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/util/StupidClass.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.