Skip to content

Commit 6adfbf1

Browse files
committed
remove data-fast
1 parent 2b31922 commit 6adfbf1

20 files changed

+152
-149
lines changed

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/DataFastConfiguration.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
package com.codingapi.springboot.fast;
22

3-
import com.codingapi.springboot.fast.jpa.JPAQuery;
43
import com.codingapi.springboot.fast.manager.EntityManagerInitializer;
54
import com.codingapi.springboot.fast.mapping.MvcMappingRegister;
5+
import com.codingapi.springboot.fast.script.ScriptMappingRegister;
66
import jakarta.persistence.EntityManager;
77
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
88
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
99
import org.springframework.context.annotation.Bean;
1010
import org.springframework.context.annotation.Configuration;
11-
import org.springframework.jdbc.core.JdbcTemplate;
1211
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
1312
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
1413

@@ -19,8 +18,8 @@ public class DataFastConfiguration {
1918

2019
@Bean
2120
@ConditionalOnMissingBean
22-
public MvcMappingRegister mvcMappingRegister(RequestMappingHandlerMapping handlerMapping, JPAQuery JPAQuery, JdbcTemplate jdbcTemplate) {
23-
return new MvcMappingRegister(handlerMapping, JPAQuery, jdbcTemplate);
21+
public MvcMappingRegister mvcMappingRegister(RequestMappingHandlerMapping handlerMapping) {
22+
return new MvcMappingRegister(handlerMapping);
2423
}
2524

2625

@@ -31,4 +30,9 @@ public EntityManagerInitializer entityManagerInitializer(EntityManager entityMan
3130
}
3231

3332

33+
@Bean
34+
public ScriptMappingRegister scriptMappingRegister(MvcMappingRegister mvcMappingRegister) {
35+
return new ScriptMappingRegister(mvcMappingRegister);
36+
}
37+
3438
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.codingapi.springboot.fast.jdbc;
2+
3+
import org.springframework.context.annotation.Bean;
4+
import org.springframework.context.annotation.Configuration;
5+
import org.springframework.jdbc.core.JdbcTemplate;
6+
7+
8+
@Configuration
9+
public class JdbcQueryConfiguration {
10+
11+
@Bean
12+
public JdbcQuery jdbcQuery(JdbcTemplate jdbcTemplate) {
13+
return new JdbcQuery(jdbcTemplate);
14+
}
15+
16+
@Bean
17+
public JdbcQueryContextRegister jdbcQueryContextRegister(JdbcQuery jdbcQuery){
18+
return new JdbcQueryContextRegister(jdbcQuery);
19+
}
20+
21+
22+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.codingapi.springboot.fast.jdbc;
2+
3+
4+
import lombok.Getter;
5+
6+
public class JdbcQueryContext {
7+
8+
@Getter
9+
private static final JdbcQueryContext instance = new JdbcQueryContext();
10+
11+
private JdbcQueryContext() {
12+
13+
}
14+
15+
@Getter
16+
private JdbcQuery jdbcQuery;
17+
18+
void setJdbcQuery(JdbcQuery jdbcQuery) {
19+
this.jdbcQuery = jdbcQuery;
20+
}
21+
22+
23+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.codingapi.springboot.fast.jdbc;
2+
3+
import lombok.AllArgsConstructor;
4+
import org.springframework.beans.factory.InitializingBean;
5+
6+
@AllArgsConstructor
7+
public class JdbcQueryContextRegister implements InitializingBean {
8+
9+
private JdbcQuery jdbcQuery;
10+
11+
@Override
12+
public void afterPropertiesSet() throws Exception {
13+
JdbcQueryContext.getInstance().setJdbcQuery(jdbcQuery);
14+
}
15+
16+
}

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/ISort.java

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

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/SortRepository.java

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

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/DynamicRepository.java renamed to springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/DynamicRepository.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
package com.codingapi.springboot.fast.jpa;
1+
package com.codingapi.springboot.fast.jpa.repository;
22

3+
import com.codingapi.springboot.fast.jpa.JpaQueryContext;
34
import org.springframework.core.ResolvableType;
45
import org.springframework.data.domain.Page;
56
import org.springframework.data.domain.PageRequest;

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/FastRepository.java renamed to springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/FastRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.codingapi.springboot.fast.jpa;
1+
package com.codingapi.springboot.fast.jpa.repository;
22

33
import com.codingapi.springboot.framework.dto.request.PageRequest;
44
import jakarta.persistence.criteria.Order;

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/QueryRequest.java renamed to springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/jpa/repository/QueryRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.codingapi.springboot.fast.jpa;
1+
package com.codingapi.springboot.fast.jpa.repository;
22

33
import com.codingapi.springboot.framework.dto.request.Filter;
44
import com.codingapi.springboot.framework.dto.request.PageRequest;

springboot-starter-data-fast/src/main/java/com/codingapi/springboot/fast/mapping/MvcMappingRegister.java

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
package com.codingapi.springboot.fast.mapping;
22

3-
import com.codingapi.springboot.fast.jpa.JPAQuery;
4-
import com.codingapi.springboot.fast.jdbc.JdbcQuery;
5-
import com.codingapi.springboot.framework.dto.response.Response;
63
import lombok.AllArgsConstructor;
74
import org.springframework.http.MediaType;
8-
import org.springframework.jdbc.core.JdbcTemplate;
95
import org.springframework.web.bind.annotation.RequestMethod;
106
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
117
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
@@ -18,10 +14,6 @@ public class MvcMappingRegister {
1814

1915
private final RequestMappingHandlerMapping handlerMapping;
2016

21-
public MvcMappingRegister(RequestMappingHandlerMapping handlerMapping, JPAQuery JPAQuery, JdbcTemplate jdbcTemplate) {
22-
this.handlerMapping = handlerMapping;
23-
MvcRunningContext.getInstance().init(JPAQuery, new JdbcQuery(jdbcTemplate));
24-
}
2517

2618
/**
2719
* add mvc mapping
@@ -48,6 +40,7 @@ public void addMapping(String url, RequestMethod requestMethod, Object handler,
4840

4941
/**
5042
* remove mvc mapping
43+
*
5144
* @param url mapping url
5245
* @param requestMethod request method
5346
*/
@@ -66,26 +59,4 @@ public void removeMapping(String url, RequestMethod requestMethod) {
6659
}
6760

6861

69-
70-
/**
71-
* test dynamic mapping
72-
* @param scriptMapping dynamic mapping
73-
**/
74-
public void addMapping(ScriptMapping scriptMapping) {
75-
this.addMapping(scriptMapping.getMapping(), scriptMapping.getRequestMethod(),
76-
scriptMapping, scriptMapping.getExecuteMethod());
77-
}
78-
79-
80-
/**
81-
* test dynamic mapping
82-
* @param scriptMapping dynamic mapping
83-
* @return result
84-
*/
85-
public Response test(ScriptMapping scriptMapping) {
86-
return scriptMapping.execute();
87-
}
88-
89-
90-
9162
}

0 commit comments

Comments
 (0)