Skip to content

Commit b6611f3

Browse files
committed
dbTools feature:
some clean comment code
1 parent ff7d42c commit b6611f3

3 files changed

Lines changed: 27 additions & 24 deletions

File tree

src/main/java/ir/bigz/springbootreal/configuration/DataSourceConfiguration.java

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ public class DataSourceConfiguration {
2626

2727
@Bean
2828
@ConfigurationProperties(prefix = "demo.datasource")
29-
public DataSourceProperties dataSourceProperties(){
29+
public DataSourceProperties dataSourceProperties() {
3030
return new DataSourceProperties();
3131
}
3232

3333

3434
@Bean
35-
public DataSource dataSource(){
35+
public DataSource dataSource() {
3636
DataSourceProperties dataSourceProperties = dataSourceProperties();
3737
// final HikariDataSource dataSource = new HikariDataSource();
3838
// dataSource.setDriverClassName(dataSourceProperties.getDriverClassName());
@@ -42,31 +42,30 @@ public DataSource dataSource(){
4242
// dataSource.setConnectionTimeout(Integer.parseInt(env.getProperty("spring.datasource.hikari.connectionTimeout")));
4343
// dataSource.setMaximumPoolSize(Integer.parseInt(env.getProperty("spring.datasource.hikari.maximumPoolSize")));
4444
// return dataSource;
45-
return connectionPoolDataSource(DataSourceBuilder.create()
46-
.driverClassName(dataSourceProperties.getDriverClassName())
47-
.url(dataSourceProperties.getUrl())
48-
.username(dataSourceProperties.getUsername())
49-
.password(dataSourceProperties.getPassword())
50-
.build());
45+
return connectionPoolDataSource(DataSourceBuilder.create()
46+
.driverClassName(dataSourceProperties.getDriverClassName())
47+
.url(dataSourceProperties.getUrl())
48+
.username(dataSourceProperties.getUsername())
49+
.password(dataSourceProperties.getPassword())
50+
.build());
5151
}
5252

53-
protected HikariConfig hikariConfig(
54-
DataSource dataSource) {
55-
HikariConfig hikariConfig = new HikariConfig();
56-
int cpuCores = Runtime.getRuntime().availableProcessors();
57-
hikariConfig.setMaximumPoolSize(cpuCores * 4);
58-
hikariConfig.setDataSource(dataSource);
59-
// hikariConfig.setAutoCommit(false);
60-
return hikariConfig;
61-
}
53+
protected HikariConfig hikariConfig(DataSource dataSource) {
54+
HikariConfig hikariConfig = new HikariConfig();
55+
int cpuCores = Runtime.getRuntime().availableProcessors();
56+
hikariConfig.setMaximumPoolSize(cpuCores * 4);
57+
hikariConfig.setDataSource(dataSource);
58+
hikariConfig.setAutoCommit(false);
59+
return hikariConfig;
60+
}
6261

63-
protected HikariDataSource connectionPoolDataSource(
64-
DataSource dataSource) {
65-
return new HikariDataSource(hikariConfig(dataSource));
66-
}
62+
protected HikariDataSource connectionPoolDataSource(
63+
DataSource dataSource) {
64+
return new HikariDataSource(hikariConfig(dataSource));
65+
}
6766

6867
@Bean
69-
public LocalContainerEntityManagerFactoryBean entityManagerFactory(){
68+
public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
7069
LocalContainerEntityManagerFactoryBean factory = new LocalContainerEntityManagerFactoryBean();
7170
factory.setDataSource(dataSource());
7271
factory.setPackagesToScan(new String[]{"ir.bigz.springbootreal.dao"});
@@ -81,7 +80,7 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory(){
8180
}
8281

8382
@Bean
84-
public PlatformTransactionManager transactionManager(){
83+
public PlatformTransactionManager transactionManager() {
8584
EntityManagerFactory factory = entityManagerFactory().getObject();
8685
return new JpaTransactionManager(factory);
8786
}

src/main/java/ir/bigz/springbootreal/controller/SampleController.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public SampleController(UserService userService) {
2626
}
2727

2828
@GetMapping(path = "/user/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
29+
@ResponseStatus(HttpStatus.OK)
2930
public ResponseEntity<?> getUserById(@PathVariable("id") long id) {
3031
UserModel userModel = userService.getUser(id);
3132
return ResponseEntity.ok(userModel);
@@ -47,6 +48,7 @@ public ResponseEntity<?> updateUser(@RequestBody UserModel userModel, @PathVaria
4748

4849

4950
@PostMapping(path = "/user/delete/{id}", produces = MediaType.APPLICATION_JSON_VALUE)
51+
@ResponseStatus(HttpStatus.ACCEPTED)
5052
public ResponseEntity<?> deleteUser(@PathVariable("id") long userId) {
5153
String result = userService.deleteUser(userId);
5254
if(result.equals("Success")){
@@ -56,12 +58,14 @@ public ResponseEntity<?> deleteUser(@PathVariable("id") long userId) {
5658
}
5759

5860
@GetMapping(path = "/user/all", produces = MediaType.APPLICATION_JSON_VALUE)
61+
@ResponseStatus(HttpStatus.OK)
5962
public ResponseEntity<?> getAllUser() {
6063
List<UserModel> result = userService.getAll();
6164
return ResponseEntity.ok(result);
6265
}
6366

6467
@GetMapping(path = "/user/search", produces = MediaType.APPLICATION_JSON_VALUE)
68+
@ResponseStatus(HttpStatus.OK)
6569
public ResponseEntity<?> getUserWithSearch(@RequestBody UserSearchDto userSearchDto,
6670
@RequestParam(name = "sortorder", defaultValue = "id") String sortOrder,
6771
@RequestParam(name = "direction", defaultValue = "desc", required = false) String direction,
@@ -73,6 +77,7 @@ public ResponseEntity<?> getUserWithSearch(@RequestBody UserSearchDto userSearch
7377

7478

7579
@GetMapping(path = "/user/all/pagerquest", produces = MediaType.APPLICATION_JSON_VALUE)
80+
@ResponseStatus(HttpStatus.OK)
7681
public ResponseEntity<?> getAllUserPage(@RequestParam(name = "sortorder", required = false) String sortOrder,
7782
@RequestParam(name = "direction") String sortDirection,
7883
@RequestParam(name = "pagenumber") Integer pageNumber,

src/main/resources/application-dev.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ demo.datasource.driver-class-name=org.postgresql.Driver
66
demo.datasource.url=jdbc:postgresql://localhost:5432/myapp
77
demo.datasource.username=postgres
88
demo.datasource.password=postgres
9-
#demo.datasource.max-connection-size=5
109

1110
################### Hibernate Configuration ##########################
1211
demo.jpa.hibernate.ddl-auto=update

0 commit comments

Comments
 (0)