Skip to content

Commit

Permalink
split entity manager
Browse files Browse the repository at this point in the history
  • Loading branch information
easybest committed Dec 3, 2022
1 parent 8f401b1 commit 33648c7
Show file tree
Hide file tree
Showing 7 changed files with 118 additions and 64 deletions.
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 6 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
14 changes: 8 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* Copyright 2019-2022 the original author or authors.
*
* 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
*
* https://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 io.easybest.mybatis.autoconfigure;

import java.util.List;

import javax.sql.DataSource;

import org.mybatis.spring.SqlSessionTemplate;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.domain.EntityScanPackages;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

import io.easybest.mybatis.mapping.DefaultEntityManager;
import io.easybest.mybatis.mapping.EntityManager;
import io.easybest.mybatis.mapping.NamingStrategy;
import io.easybest.mybatis.repository.MybatisRepository;
import io.easybest.mybatis.repository.config.MybatisRepositoryConfigExtension;
import io.easybest.mybatis.repository.support.MybatisRepositoryFactoryBean;

/**
* .
*
* @author Jarvis Song
*/
@Configuration(proxyBeanMethods = false)
@ConditionalOnBean(DataSource.class)
@ConditionalOnClass(MybatisRepository.class)
@ConditionalOnMissingBean({ MybatisRepositoryFactoryBean.class, MybatisRepositoryConfigExtension.class })
@ConditionalOnProperty(prefix = SpringDataMybatisProperties.PREFIX, name = "enabled", havingValue = "true",
matchIfMissing = true)
@EnableConfigurationProperties(SpringDataMybatisProperties.class)
public class MybatisEntityManagerAutoConfiguration {

private final SpringDataMybatisProperties properties;

public MybatisEntityManagerAutoConfiguration(SpringDataMybatisProperties properties) {
this.properties = properties;
}

@Bean
@ConditionalOnMissingBean
public EntityManager entityManager(BeanFactory beanFactory, SqlSessionTemplate sqlSessionTemplate) {

DefaultEntityManager entityManager = new DefaultEntityManager(sqlSessionTemplate);

if (null != this.properties.getEntityPackages()) {
entityManager.setEntityPackages(this.properties.getEntityPackages());
}
else {
List<String> packageNames = EntityScanPackages.get(beanFactory).getPackageNames();
if (packageNames.isEmpty() && AutoConfigurationPackages.has(beanFactory)) {
packageNames = AutoConfigurationPackages.get(beanFactory);
}
if (!packageNames.isEmpty()) {
entityManager.setEntityPackages(packageNames.toArray(new String[0]));
}
}

if (null != this.properties.getNamingStrategyType()) {

switch (this.properties.getNamingStrategyType()) {
case UNDERSCORE:
entityManager.setNamingStrategy(NamingStrategy.UNDERSCORE);
break;
case AS_IS:
entityManager.setNamingStrategy(NamingStrategy.AS_IS);
break;
}
}

if (null != this.properties.getUniformTablePrefix()) {
entityManager.setUniformTablePrefix(this.properties.getUniformTablePrefix());
}

return entityManager;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,29 +16,18 @@

package io.easybest.mybatis.autoconfigure;

import java.util.List;

import javax.sql.DataSource;

import org.mybatis.spring.SqlSessionTemplate;
import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.boot.autoconfigure.AutoConfigurationPackages;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.domain.EntityScanPackages;
import org.springframework.boot.autoconfigure.task.TaskExecutionAutoConfiguration;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;

import io.easybest.mybatis.mapping.DefaultEntityManager;
import io.easybest.mybatis.mapping.EntityManager;
import io.easybest.mybatis.mapping.NamingStrategy;
import io.easybest.mybatis.repository.MybatisRepository;
import io.easybest.mybatis.repository.config.MybatisRepositoryConfigExtension;
import io.easybest.mybatis.repository.support.MybatisRepositoryFactoryBean;
Expand All @@ -54,53 +43,9 @@
@ConditionalOnMissingBean({ MybatisRepositoryFactoryBean.class, MybatisRepositoryConfigExtension.class })
@ConditionalOnProperty(prefix = SpringDataMybatisProperties.PREFIX, name = "enabled", havingValue = "true",
matchIfMissing = true)
@EnableConfigurationProperties(SpringDataMybatisProperties.class)
@Import(MybatisRepositoriesRegistrar.class)
@AutoConfigureAfter({ MybatisAutoConfiguration.class, TaskExecutionAutoConfiguration.class })
@AutoConfigureAfter({ MybatisAutoConfiguration.class, TaskExecutionAutoConfiguration.class,
MybatisEntityManagerAutoConfiguration.class })
public class MybatisRepositoriesAutoConfiguration {

private final SpringDataMybatisProperties properties;

public MybatisRepositoriesAutoConfiguration(SpringDataMybatisProperties properties) {
this.properties = properties;
}

@Bean
@ConditionalOnMissingBean
public EntityManager entityManager(BeanFactory beanFactory, SqlSessionTemplate sqlSessionTemplate) {

DefaultEntityManager entityManager = new DefaultEntityManager(sqlSessionTemplate);

if (null != this.properties.getEntityPackages()) {
entityManager.setEntityPackages(this.properties.getEntityPackages());
}
else {
List<String> packageNames = EntityScanPackages.get(beanFactory).getPackageNames();
if (packageNames.isEmpty() && AutoConfigurationPackages.has(beanFactory)) {
packageNames = AutoConfigurationPackages.get(beanFactory);
}
if (!packageNames.isEmpty()) {
entityManager.setEntityPackages(packageNames.toArray(new String[0]));
}
}

if (null != this.properties.getNamingStrategyType()) {

switch (this.properties.getNamingStrategyType()) {
case UNDERSCORE:
entityManager.setNamingStrategy(NamingStrategy.UNDERSCORE);
break;
case AS_IS:
entityManager.setNamingStrategy(NamingStrategy.AS_IS);
break;
}
}

if (null != this.properties.getUniformTablePrefix()) {
entityManager.setUniformTablePrefix(this.properties.getUniformTablePrefix());
}

return entityManager;
}

}
1 change: 1 addition & 0 deletions starter/src/main/resources/META-INF/spring.factories
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.easybest.mybatis.autoconfigure.MybatisEntityManagerAutoConfiguration,\
io.easybest.mybatis.autoconfigure.MybatisRepositoriesAutoConfiguration

0 comments on commit 33648c7

Please sign in to comment.