Skip to content

Commit 4ed660d

Browse files
RaysmondRaysmond
committed
Rename files
1 parent bc8f4ac commit 4ed660d

15 files changed

Lines changed: 96 additions & 78 deletions

File tree

src/main/java/com/raysmond/blog/BlogSetting.java renamed to src/main/java/com/raysmond/blog/AppSetting.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @author Raysmond<jiankunlei@gmail.com>
1111
*/
1212
@Service
13-
public class BlogSetting {
13+
public class AppSetting {
1414

1515
private SettingService settingService;
1616

@@ -25,7 +25,7 @@ public class BlogSetting {
2525
// other setting keys
2626

2727
@Autowired
28-
public BlogSetting(SettingService settingService){
28+
public AppSetting(SettingService settingService){
2929
this.settingService = settingService;
3030
}
3131

‎src/main/java/com/raysmond/blog/Application.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.raysmond.blog;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
6+
// TODO use Spring Boot for running
7+
@SpringBootApplication
8+
public class Application {
9+
10+
public static void main(String[] args) {
11+
SpringApplication.run(Application.class, args);
12+
}
13+
}

‎src/main/java/com/raysmond/blog/BlogApp.java‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/main/java/com/raysmond/blog/Constants.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.raysmond.blog;
2+
3+
/**
4+
* Constants class
5+
*
6+
* @author: Raysmond
7+
*/
8+
public final class Constants {
9+
10+
public static final String MESSAGE_SOURCE = "/i18n/messages";
11+
12+
public static final String VIEWS = "/views/";
13+
14+
public static final String RESOURCES_LOCATION = "/resources/";
15+
16+
public static final String RESOURCES_HANDLER = RESOURCES_LOCATION + "**";
17+
18+
// Default super user email
19+
public static final String SUPER_USER_EMAIL = "admin@admin.com";
20+
21+
// Default super user password
22+
public static final String SUPER_USER_PASS = "admin";
23+
24+
public static final String ABOUT_PAGE_TITLE = "About";
25+
}

‎src/main/java/com/raysmond/blog/admin/controllers/AdminController.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.raysmond.blog.admin.controllers;
22

33
import com.raysmond.blog.forms.SettingsForm;
4-
import com.raysmond.blog.BlogSetting;
4+
import com.raysmond.blog.AppSetting;
55
import com.raysmond.blog.support.web.MessageHelper;
66
import com.raysmond.blog.utils.DTOUtil;
77
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,11 +22,11 @@
2222
//@Secured("ROLE_ADMIN")
2323
public class AdminController {
2424

25-
private BlogSetting blogSetting;
25+
private AppSetting appSetting;
2626

2727
@Autowired
28-
public AdminController( BlogSetting blogSetting){
29-
this.blogSetting = blogSetting;
28+
public AdminController( AppSetting appSetting){
29+
this.appSetting = appSetting;
3030
}
3131

3232
@RequestMapping("")
@@ -36,7 +36,7 @@ public String index(){
3636

3737
@RequestMapping(value = "settings")
3838
public String settings(Model model){
39-
SettingsForm settingsForm = DTOUtil.map(blogSetting, SettingsForm.class);
39+
SettingsForm settingsForm = DTOUtil.map(appSetting, SettingsForm.class);
4040

4141
model.addAttribute("settings", settingsForm);
4242
return "admin/settings";
@@ -47,9 +47,9 @@ public String updateSettings(@Valid SettingsForm settingsForm, Errors errors, Mo
4747
if (errors.hasErrors()){
4848
return "admin/settings";
4949
} else {
50-
blogSetting.setSiteName(settingsForm.getSiteName());
51-
blogSetting.setSiteSlogan(settingsForm.getSiteSlogan());
52-
blogSetting.setPageSize(settingsForm.getPageSize());
50+
appSetting.setSiteName(settingsForm.getSiteName());
51+
appSetting.setSiteSlogan(settingsForm.getSiteSlogan());
52+
appSetting.setPageSize(settingsForm.getPageSize());
5353

5454
MessageHelper.addSuccessAttribute(ra, "Update settings successfully.");
5555

‎src/main/java/com/raysmond/blog/config/ApplicationConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import static org.springframework.context.annotation.ComponentScan.Filter;
44

5-
import com.raysmond.blog.BlogApp;
5+
import com.raysmond.blog.Application;
66
import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
77
import org.springframework.context.annotation.Bean;
88
import org.springframework.context.annotation.ComponentScan;
@@ -12,7 +12,7 @@
1212

1313

1414
@Configuration
15-
@ComponentScan(basePackageClasses = BlogApp.class, excludeFilters = @Filter({Controller.class, Configuration.class}))
15+
@ComponentScan(basePackageClasses = Application.class, excludeFilters = @Filter({Controller.class, Configuration.class}))
1616
class ApplicationConfig {
1717
@Bean
1818
public static PropertyPlaceholderConfigurer propertyPlaceholderConfigurer() {

‎src/main/java/com/raysmond/blog/config/Config.java‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/main/java/com/raysmond/blog/config/JpaConfig.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44

55
import javax.sql.DataSource;
66

7-
import com.raysmond.blog.BlogApp;
7+
import com.raysmond.blog.Application;
88
import com.zaxxer.hikari.HikariConfig;
99
import com.zaxxer.hikari.HikariDataSource;
10-
import org.hibernate.cfg.Environment;
1110
import org.springframework.beans.factory.annotation.Value;
1211
import org.springframework.context.annotation.Bean;
1312
import org.springframework.context.annotation.Configuration;
@@ -21,7 +20,7 @@
2120

2221
@Configuration
2322
@EnableTransactionManagement
24-
@EnableJpaRepositories(basePackageClasses = BlogApp.class)
23+
@EnableJpaRepositories(basePackageClasses = Application.class)
2524
class JpaConfig implements TransactionManagementConfigurer {
2625

2726
@Value("${dataSource.driverClassName}")

‎src/main/java/com/raysmond/blog/config/WebMvcConfig.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
import static org.springframework.context.annotation.ComponentScan.Filter;
44

5-
import com.raysmond.blog.BlogApp;
6-
import com.raysmond.blog.BlogSetting;
5+
import com.raysmond.blog.Application;
6+
import com.raysmond.blog.AppSetting;
7+
import com.raysmond.blog.Constants;
78
import com.raysmond.blog.support.web.ViewHelper;
89
import de.neuland.jade4j.JadeConfiguration;
910
import de.neuland.jade4j.spring.template.SpringTemplateLoader;
@@ -41,14 +42,14 @@
4142
import java.util.List;
4243

4344
@Configuration
44-
@ComponentScan(basePackageClasses = BlogApp.class, includeFilters = @Filter(Controller.class), useDefaultFilters = false)
45+
@ComponentScan(basePackageClasses = Application.class, includeFilters = @Filter(Controller.class), useDefaultFilters = false)
4546
@EnableWebMvc
4647
class WebMvcConfig extends WebMvcConfigurerAdapter {
4748

4849
@Bean(name = "messageSource")
4950
public MessageSource messageSource() {
5051
ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource();
51-
messageSource.setBasename(Config.MESSAGE_SOURCE);
52+
messageSource.setBasename(Constants.MESSAGE_SOURCE);
5253
messageSource.setCacheSeconds(5);
5354
return messageSource;
5455
}
@@ -86,7 +87,7 @@ public ViewResolver jsonViewResolver() {
8687
@Bean
8788
public TemplateResolver htmlTemplateResolver() {
8889
TemplateResolver templateResolver = new ServletContextTemplateResolver();
89-
templateResolver.setPrefix(Config.VIEWS);
90+
templateResolver.setPrefix(Constants.VIEWS);
9091
templateResolver.setSuffix(".html");
9192
templateResolver.setTemplateMode("HTML");
9293
templateResolver.setCacheable(false);
@@ -112,7 +113,7 @@ public ThymeleafViewResolver htmlViewResolver() {
112113
@Bean
113114
public SpringTemplateLoader jadeTemplateLoader() {
114115
SpringTemplateLoader templateLoader = new SpringTemplateLoader();
115-
templateLoader.setBasePath(Config.VIEWS);
116+
templateLoader.setBasePath(Constants.VIEWS);
116117
templateLoader.setEncoding("UTF-8");
117118
templateLoader.setSuffix(".jade");
118119
return templateLoader;
@@ -150,7 +151,7 @@ public HandlerInterceptor requestProcessTimeInterceptor(){
150151
public ViewHelper viewHelper;
151152

152153
@Autowired
153-
public BlogSetting blogSetting;
154+
public AppSetting appSetting;
154155

155156
@Bean
156157
public HandlerInterceptor viewObjectAddingInterceptor() {
@@ -174,7 +175,7 @@ public void postHandle(HttpServletRequest request, HttpServletResponse response,
174175
// add base path of application
175176
view.addObject("basePath", request.getContextPath());
176177
view.addObject("viewHelper", viewHelper);
177-
view.addObject("App", blogSetting);
178+
view.addObject("App", appSetting);
178179
}
179180
}
180181
};
@@ -190,8 +191,8 @@ public Validator getValidator() {
190191
@Override
191192
public void addResourceHandlers(ResourceHandlerRegistry registry) {
192193
registry
193-
.addResourceHandler(Config.RESOURCES_HANDLER)
194-
.addResourceLocations(Config.RESOURCES_LOCATION);
194+
.addResourceHandler(Constants.RESOURCES_HANDLER)
195+
.addResourceLocations(Constants.RESOURCES_LOCATION);
195196
}
196197

197198
@Override

‎src/main/java/com/raysmond/blog/controllers/HomeController.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.raysmond.blog.models.Post;
44
import com.raysmond.blog.models.support.PostType;
55
import com.raysmond.blog.repositories.PostRepository;
6-
import com.raysmond.blog.BlogSetting;
6+
import com.raysmond.blog.AppSetting;
77
import com.raysmond.blog.services.PostService;
88
import org.springframework.beans.factory.annotation.Autowired;
99
import org.springframework.data.domain.Page;
@@ -18,7 +18,7 @@ public class HomeController {
1818
private PostService postService;
1919

2020
@Autowired
21-
private BlogSetting blogSetting;
21+
private AppSetting appSetting;
2222

2323
@Autowired
2424
private PostRepository postRepository;
@@ -31,7 +31,7 @@ public String index(@RequestParam(defaultValue = "1") int page, Model model) {
3131
page = 1;
3232
}
3333

34-
Page<Post> posts = postService.getAllPostsByPage(page - 1, blogSetting.getPageSize());
34+
Page<Post> posts = postService.getAllPostsByPage(page - 1, appSetting.getPageSize());
3535

3636
model.addAttribute("totalPages", posts.getTotalPages());
3737
model.addAttribute("posts", posts);

0 commit comments

Comments
 (0)