Skip to content
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
12 changes: 6 additions & 6 deletions src/main/java/egovframework/example/config/EgovConfigAspect.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
public class EgovConfigAspect {

@Bean
public EgovSampleExcepHndlr egovHandler() {
EgovSampleExcepHndlr egovHandler() {
return new EgovSampleExcepHndlr();
}

@Bean
public EgovSampleOthersExcepHndlr otherHandler() {
EgovSampleOthersExcepHndlr otherHandler() {
return new EgovSampleOthersExcepHndlr();
}

@Bean
public DefaultExceptionHandleManager defaultExceptionHandleManager(AntPathMatcher antPathMatcher, EgovSampleExcepHndlr egovHandler) {
DefaultExceptionHandleManager defaultExceptionHandleManager(AntPathMatcher antPathMatcher, EgovSampleExcepHndlr egovHandler) {
DefaultExceptionHandleManager defaultExceptionHandleManager = new DefaultExceptionHandleManager();
defaultExceptionHandleManager.setReqExpMatcher(antPathMatcher);
defaultExceptionHandleManager.setPatterns(new String[]{"**service.impl.*"});
Expand All @@ -38,7 +38,7 @@ public DefaultExceptionHandleManager defaultExceptionHandleManager(AntPathMatche
}

@Bean
public DefaultExceptionHandleManager otherExceptionHandleManager(AntPathMatcher antPathMatcher, EgovSampleOthersExcepHndlr othersExcepHndlr) {
DefaultExceptionHandleManager otherExceptionHandleManager(AntPathMatcher antPathMatcher, EgovSampleOthersExcepHndlr othersExcepHndlr) {
DefaultExceptionHandleManager defaultExceptionHandleManager = new DefaultExceptionHandleManager();
defaultExceptionHandleManager.setReqExpMatcher(antPathMatcher);
defaultExceptionHandleManager.setPatterns(new String[]{"**service.impl.*"});
Expand All @@ -47,7 +47,7 @@ public DefaultExceptionHandleManager otherExceptionHandleManager(AntPathMatcher
}

@Bean
public ExceptionTransfer exceptionTransfer(
ExceptionTransfer exceptionTransfer(
@Qualifier("defaultExceptionHandleManager") DefaultExceptionHandleManager defaultExceptionHandleManager,
@Qualifier("otherExceptionHandleManager") DefaultExceptionHandleManager otherExceptionHandleManager) {
ExceptionTransfer exceptionTransfer = new ExceptionTransfer();
Expand All @@ -58,7 +58,7 @@ public ExceptionTransfer exceptionTransfer(
}

@Bean
public EgovAopExceptionTransfer aopExceptionTransfer(ExceptionTransfer exceptionTransfer) {
EgovAopExceptionTransfer aopExceptionTransfer(ExceptionTransfer exceptionTransfer) {
EgovAopExceptionTransfer egovAopExceptionTransfer = new EgovAopExceptionTransfer();
egovAopExceptionTransfer.setExceptionTransfer(exceptionTransfer);
return egovAopExceptionTransfer;
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/egovframework/example/config/EgovConfigCommon.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
public class EgovConfigCommon {

@Bean
public AntPathMatcher antPathMatcher() {
AntPathMatcher antPathMatcher() {
return new AntPathMatcher();
}

@Bean
public DefaultTraceHandler defaultTraceHandler() {
DefaultTraceHandler defaultTraceHandler() {
return new DefaultTraceHandler();
}

@Bean
public ReloadableResourceBundleMessageSource messageSource() {
ReloadableResourceBundleMessageSource messageSource() {
ReloadableResourceBundleMessageSource reloadableResourceBundleMessageSource = new ReloadableResourceBundleMessageSource();
reloadableResourceBundleMessageSource.setBasenames(
"classpath:/egovframework/message/message-common",
Expand All @@ -37,12 +37,12 @@ public ReloadableResourceBundleMessageSource messageSource() {
}

@Bean
public MessageSourceAccessor messageSourceAccessor() {
MessageSourceAccessor messageSourceAccessor() {
return new MessageSourceAccessor(this.messageSource());
}

@Bean
public DefaultTraceHandleManager traceHandlerService() {
DefaultTraceHandleManager traceHandlerService() {
DefaultTraceHandleManager defaultTraceHandleManager = new DefaultTraceHandleManager();
defaultTraceHandleManager.setReqExpMatcher(antPathMatcher());
defaultTraceHandleManager.setPatterns(new String[]{"*"});
Expand All @@ -51,7 +51,7 @@ public DefaultTraceHandleManager traceHandlerService() {
}

@Bean
public LeaveaTrace leaveaTrace() {
LeaveaTrace leaveaTrace() {
LeaveaTrace leaveaTrace = new LeaveaTrace();
leaveaTrace.setTraceHandlerServices(new TraceHandlerService[]{traceHandlerService()});
return leaveaTrace;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public class EgovConfigDatasource {

@Bean(name="dataSource")
public DataSource dataSource() {
DataSource dataSource() {
EmbeddedDatabaseBuilder builder = new EmbeddedDatabaseBuilder();
return builder.setType(EmbeddedDatabaseType.HSQL).addScript("classpath:/db/sampledb.sql").build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
public class EgovConfigIdGeneration {

@Bean
public EgovIdGnrStrategyImpl mixPrefixSample() {
EgovIdGnrStrategyImpl mixPrefixSample() {
EgovIdGnrStrategyImpl egovIdGnrStrategyImpl = new EgovIdGnrStrategyImpl();
egovIdGnrStrategyImpl.setPrefix("SAMPLE-");
egovIdGnrStrategyImpl.setCipers(5);
Expand All @@ -21,7 +21,7 @@ public EgovIdGnrStrategyImpl mixPrefixSample() {
}

@Bean(destroyMethod="destroy")
public EgovTableIdGnrServiceImpl egovIdGnrService(@Qualifier("dataSource") DataSource dataSource) {
EgovTableIdGnrServiceImpl egovIdGnrService(@Qualifier("dataSource") DataSource dataSource) {
EgovTableIdGnrServiceImpl egovTableIdGnrServiceImpl = new EgovTableIdGnrServiceImpl();
egovTableIdGnrServiceImpl.setDataSource(dataSource);
egovTableIdGnrServiceImpl.setStrategy(mixPrefixSample());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
public class EgovConfigMapper {

@Bean(name = "sqlSession") // DAO 방식을 활용할 경우 EgovAbstractMapper 가 찾는 Bean Name
public SqlSessionFactoryBean sqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws IOException {
SqlSessionFactoryBean sqlSessionFactory(@Qualifier("dataSource") DataSource dataSource) throws IOException {
PathMatchingResourcePatternResolver pmrpr = new PathMatchingResourcePatternResolver();
SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean();
sqlSessionFactoryBean.setDataSource(dataSource);
Expand All @@ -28,7 +28,7 @@ public SqlSessionFactoryBean sqlSessionFactory(@Qualifier("dataSource") DataSour
}

@Bean(name = "sqlSessionTemplate") // 혼동 방지를 위한 명시적 Bean Name 을 표기
public SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) {
SqlSessionTemplate sqlSession(SqlSessionFactory sqlSessionFactory) {
return new SqlSessionTemplate(sqlSessionFactory);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public class EgovConfigProperties {

@Bean(destroyMethod="destroy")
public EgovPropertyServiceImpl propertiesService() {
EgovPropertyServiceImpl propertiesService() {
Map<String, String> properties = new HashMap<>();
properties.put("pageUnit", "10");
properties.put("pageSize", "10");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
public class EgovConfigTransaction {

@Bean(name="txManager")
public DataSourceTransactionManager txManager(@Qualifier("dataSource") DataSource dataSource) {
DataSourceTransactionManager txManager(@Qualifier("dataSource") DataSource dataSource) {
DataSourceTransactionManager dataSourceTransactionManager = new DataSourceTransactionManager();
dataSourceTransactionManager.setDataSource(dataSource);
return dataSourceTransactionManager;
}

@Bean
public TransactionInterceptor txAdvice(DataSourceTransactionManager txManager) {
TransactionInterceptor txAdvice(DataSourceTransactionManager txManager) {
RuleBasedTransactionAttribute txAttribute = new RuleBasedTransactionAttribute();
txAttribute.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRED);
txAttribute.setRollbackRules(Collections.singletonList(new RollbackRuleAttribute(Exception.class)));
Expand All @@ -49,7 +49,7 @@ public TransactionInterceptor txAdvice(DataSourceTransactionManager txManager) {
}

@Bean
public Advisor txAdvisor(@Qualifier("txManager") DataSourceTransactionManager txManager) {
Advisor txAdvisor(@Qualifier("txManager") DataSourceTransactionManager txManager) {
AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut();
pointcut.setExpression("execution(* egovframework.example.sample..impl.*Impl.*(..))");
return new DefaultPointcutAdvisor(pointcut, txAdvice(txManager));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public class EgovConfigValidation {

@Bean
public Validator getValidator(@Qualifier("messageSource") MessageSource messageSource) {
Validator getValidator(@Qualifier("messageSource") MessageSource messageSource) {
LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
localValidatorFactoryBean.setValidationMessageSource(messageSource);
return localValidatorFactoryBean;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/egovframework/example/config/EgovConfigWeb.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void setApplicationContext(final ApplicationContext applicationContext) {
}

@Bean
public SpringResourceTemplateResolver templateResolver() {
SpringResourceTemplateResolver templateResolver() {
SpringResourceTemplateResolver templateResolver = new SpringResourceTemplateResolver();
templateResolver.setApplicationContext(this.applicationContext);
templateResolver.setPrefix("classpath:/templates/thymeleaf/");
Expand All @@ -54,7 +54,7 @@ public SpringResourceTemplateResolver templateResolver() {
}

@Bean
public SpringTemplateEngine templateEngine(EgovKrdsPaginationRenderer egovKrdsPaginationRenderer) {
SpringTemplateEngine templateEngine(EgovKrdsPaginationRenderer egovKrdsPaginationRenderer) {
SpringTemplateEngine templateEngine = new SpringTemplateEngine();
templateEngine.setTemplateResolver(templateResolver());
templateEngine.setEnableSpringELCompiler(true);
Expand All @@ -64,7 +64,7 @@ public SpringTemplateEngine templateEngine(EgovKrdsPaginationRenderer egovKrdsPa
}

@Bean
public ThymeleafViewResolver thymeleafViewResolver(EgovKrdsPaginationRenderer egovKrdsPaginationRenderer) {
ThymeleafViewResolver thymeleafViewResolver(EgovKrdsPaginationRenderer egovKrdsPaginationRenderer) {
ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
viewResolver.setCharacterEncoding("UTF-8");
viewResolver.setTemplateEngine(templateEngine(egovKrdsPaginationRenderer));
Expand All @@ -89,12 +89,12 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
}

@Bean
public SessionLocaleResolver localeResolver() {
SessionLocaleResolver localeResolver() {
return new SessionLocaleResolver();
}

@Bean
public LocaleChangeInterceptor localeChangeInterceptor() {
LocaleChangeInterceptor localeChangeInterceptor() {
LocaleChangeInterceptor interceptor = new LocaleChangeInterceptor();
interceptor.setParamName("language");
return interceptor;
Expand Down