Skip to content

Commit 783fd74

Browse files
lvyahui8lvyahui8
committed
fix misspelling
1 parent af8b0a7 commit 783fd74

File tree

11 files changed

+62
-62
lines changed

11 files changed

+62
-62
lines changed

‎spring-boot-data-aggregator-autoconfigure/src/main/java/io/github/lvyahui8/spring/autoconfigure/BeanAggregateAutoConfiguration.java

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private void scanProviders(DataProviderRepository repository) {
9191
}
9292

9393
private void dealProvideMethod(DataProviderRepository repository, Method method) {
94-
DataProvideDefination provider = new DataProvideDefination();
94+
DataProvideDefinition provider = new DataProvideDefinition();
9595
DataProvider beanProvider = AnnotationUtils.findAnnotation(method, DataProvider.class);
9696
String dataId = beanProvider.id();
9797
Assert.isTrue(! StringUtils.isEmpty(dataId),"data id must be not null!");
@@ -103,13 +103,13 @@ private void dealProvideMethod(DataProviderRepository repository, Method method)
103103
provider.setDepends(new ArrayList<>(method.getParameterCount()));
104104
provider.setParams(new ArrayList<>(method.getParameterCount()));
105105
for (Parameter parameter : parameters) {
106-
dealMethodParamter(provider, methodArgs, parameter);
106+
dealMethodParameter(provider, methodArgs, parameter);
107107
}
108108
provider.setMethodArgs(methodArgs);
109109
repository.put(dataId,provider);
110110
}
111111

112-
private void dealMethodParamter(DataProvideDefination provideDefination, List<MethodArg> methodArgs, Parameter parameter) {
112+
private void dealMethodParameter(DataProvideDefinition provideDefinition, List<MethodArg> methodArgs, Parameter parameter) {
113113
DataConsumer dataConsumer = AnnotationUtils.findAnnotation(parameter, DataConsumer.class);
114114
InvokeParameter invokeParameter = AnnotationUtils.findAnnotation(parameter,InvokeParameter.class);
115115
Assert.isTrue(dataConsumer != null || invokeParameter != null,
@@ -118,23 +118,23 @@ private void dealMethodParamter(DataProvideDefination provideDefination, List<Me
118118
if(dataConsumer != null) {
119119
String dataId = dataConsumer.id();
120120
Assert.isTrue(! StringUtils.isEmpty(dataId),"data id must be not null!");
121-
methodArg.setAnnotionKey(dataId);
122-
methodArg.setDenpendType(DenpendType.OTHER_MODEL);
123-
DataConsumeDefination dataConsumeDefination = new DataConsumeDefination();
124-
dataConsumeDefination.setClazz(parameter.getType());
125-
dataConsumeDefination.setId(dataId);
121+
methodArg.setAnnotationKey(dataId);
122+
methodArg.setDependType(DependType.OTHER_MODEL);
123+
DataConsumeDefinition dataConsumeDefinition = new DataConsumeDefinition();
124+
dataConsumeDefinition.setClazz(parameter.getType());
125+
dataConsumeDefinition.setId(dataId);
126126
if(! dataConsumer.exceptionProcessingMethod().equals(ExceptionProcessingMethod.BY_DEFAULT)) {
127-
dataConsumeDefination.setIgnoreException(
127+
dataConsumeDefinition.setIgnoreException(
128128
dataConsumer.exceptionProcessingMethod().equals(ExceptionProcessingMethod.IGNORE)
129129
);
130130
}
131-
provideDefination.getDepends().add(dataConsumeDefination);
131+
provideDefinition.getDepends().add(dataConsumeDefinition);
132132
} else {
133-
methodArg.setAnnotionKey(invokeParameter.value());
134-
methodArg.setDenpendType(DenpendType.INVOKE_PARAM);
135-
InvokeParameterDefination parameterDefination = new InvokeParameterDefination();
136-
parameterDefination.setKey(invokeParameter.value());
137-
provideDefination.getParams().add(parameterDefination);
133+
methodArg.setAnnotationKey(invokeParameter.value());
134+
methodArg.setDependType(DependType.INVOKE_PARAM);
135+
InvokeParameterDefinition parameterDefinition = new InvokeParameterDefinition();
136+
parameterDefinition.setKey(invokeParameter.value());
137+
provideDefinition.getParams().add(parameterDefinition);
138138
}
139139
methodArg.setParameter(parameter);
140140
methodArgs.add(methodArg);

‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/DataConsumeDefination.java renamed to ‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/DataConsumeDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* @since 2019/6/2 22:13
88
*/
99
@Data
10-
public class DataConsumeDefination {
10+
public class DataConsumeDefinition {
1111
private String id;
1212
private Class<?> clazz;
1313
private Boolean ignoreException;

‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/DataProvideDefination.java

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

‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/DataProvideDefinition.java

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package io.github.lvyahui8.spring.aggregate.model;
2+
3+
import lombok.Data;
4+
5+
import java.lang.reflect.Method;
6+
import java.util.List;
7+
8+
/**
9+
* @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
10+
* @since 2019/6/2 21:30
11+
*/
12+
@Data
13+
public class DataProvideDefinition {
14+
private String id;
15+
private Method method;
16+
private Long timeout;
17+
private List<DataConsumeDefinition> depends;
18+
private List<InvokeParameterDefinition> params;
19+
private List<MethodArg> methodArgs;
20+
}

‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/DenpendType.java renamed to ‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/DependType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
55
* @since 2019/6/3 22:44
66
*/
7-
public enum DenpendType {
7+
public enum DependType {
88
INVOKE_PARAM,
99
OTHER_MODEL
1010
}

‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/InvokeParameterDefination.java renamed to ‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/InvokeParameterDefinition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
* @since 2019/6/2 22:14
88
*/
99
@Data
10-
public class InvokeParameterDefination {
10+
public class InvokeParameterDefinition {
1111
private String key;
1212
}

‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/model/MethodArg.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
@Data
1212
public class MethodArg {
13-
private String annotionKey;
14-
private DenpendType denpendType;
15-
private Parameter parameter;
13+
private String annotationKey;
14+
private DependType dependType;
15+
private Parameter parameter;
1616
}

‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/repository/DataProviderRepository.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package io.github.lvyahui8.spring.aggregate.repository;
22

3-
import io.github.lvyahui8.spring.aggregate.model.DataProvideDefination;
4-
import io.github.lvyahui8.spring.aggregate.model.DataProvideDefination;
3+
import io.github.lvyahui8.spring.aggregate.model.DataProvideDefinition;
54

65
/**
76
* @author lvyahui (lvyahui8@gmail.com,lvyahui8@126.com)
87
* @since 2019/6/2 21:26
98
*/
109
public interface DataProviderRepository {
11-
void put(String id, DataProvideDefination dataProvideDefination);
10+
void put(String id, DataProvideDefinition dataProvideDefinition);
1211

13-
DataProvideDefination get(String id);
12+
DataProvideDefinition get(String id);
1413

1514
boolean contains(String id);
1615
}

‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/repository/impl/DataProviderRepositoryImpl.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.github.lvyahui8.spring.aggregate.repository.impl;
22

3-
import io.github.lvyahui8.spring.aggregate.model.DataProvideDefination;
3+
import io.github.lvyahui8.spring.aggregate.model.DataProvideDefinition;
44
import io.github.lvyahui8.spring.aggregate.repository.DataProviderRepository;
55
import org.springframework.util.Assert;
66

@@ -12,16 +12,16 @@
1212
*/
1313
public class DataProviderRepositoryImpl implements DataProviderRepository {
1414

15-
private ConcurrentHashMap<String,DataProvideDefination> providerMap = new ConcurrentHashMap<>();
15+
private ConcurrentHashMap<String,DataProvideDefinition> providerMap = new ConcurrentHashMap<>();
1616

1717
@Override
18-
public void put(String id, DataProvideDefination dataProvideDefination) {
19-
Assert.isTrue(! providerMap.containsKey(id),"data provider exisit! id: " + id);
20-
providerMap.put(id, dataProvideDefination);
18+
public void put(String id, DataProvideDefinition dataProvideDefinition) {
19+
Assert.isTrue(! providerMap.containsKey(id),"data provider exist! id: " + id);
20+
providerMap.put(id, dataProvideDefinition);
2121
}
2222

2323
@Override
24-
public DataProvideDefination get(String id) {
24+
public DataProvideDefinition get(String id) {
2525
return providerMap.get(id);
2626
}
2727

‎spring-boot-data-aggregator-core/src/main/java/io/github/lvyahui8/spring/aggregate/service/impl/DataBeanAggregateQueryServiceImpl.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ public DataBeanAggregateQueryServiceImpl(DataProviderRepository repository) {
4040
@Override
4141
public <T> T get(String id, Map<String, Object> invokeParams, Class<T> resultType,final Map<InvokeSignature,Object> queryCache)
4242
throws InterruptedException, InvocationTargetException, IllegalAccessException {
43-
Assert.isTrue(repository.contains(id),"id not exisit");
43+
Assert.isTrue(repository.contains(id),"id not exist");
4444
long startTime = System.currentTimeMillis();
45-
DataProvideDefination provider = repository.get(id);
45+
DataProvideDefinition provider = repository.get(id);
4646
Map<String,Object> dependObjectMap = new HashMap<>(provider.getDepends().size());
4747
if(provider.getDepends() != null && ! provider.getDepends().isEmpty()) {
4848
CountDownLatch stopDownLatch = new CountDownLatch(provider.getDepends().size());
4949
Map<String,Future<?>> futureMap = new HashMap<>(provider.getDepends().size());
50-
Map<String,DataConsumeDefination> consumeDefinationMap = new HashMap<>(provider.getDepends().size());
51-
for (DataConsumeDefination depend : provider.getDepends()) {
52-
consumeDefinationMap.put(depend.getId(),depend);
50+
Map<String,DataConsumeDefinition> consumeDefinitionMap = new HashMap<>(provider.getDepends().size());
51+
for (DataConsumeDefinition depend : provider.getDepends()) {
52+
consumeDefinitionMap.put(depend.getId(),depend);
5353
Future<?> future = executorService.submit(() -> {
5454
try {
5555
Object o = get(depend.getId(), invokeParams, depend.getClazz(),queryCache);
@@ -65,11 +65,11 @@ public <T> T get(String id, Map<String, Object> invokeParams, Class<T> resultTyp
6565
for (Map.Entry<String,Future<?>> item : futureMap.entrySet()) {
6666
Future<?> future = item.getValue();
6767
Object value = null;
68-
DataConsumeDefination consumeDefination = consumeDefinationMap.get(item.getKey());
68+
DataConsumeDefinition consumeDefinition = consumeDefinitionMap.get(item.getKey());
6969
try {
7070
value = future.get();
7171
} catch (ExecutionException e) {
72-
if (consumeDefination.getIgnoreException() != null ? ! consumeDefination.getIgnoreException()
72+
if (consumeDefinition.getIgnoreException() != null ? ! consumeDefinition.getIgnoreException()
7373
: ! runtimeSettings.isIgnoreException()) {
7474
throwException(e);
7575
}
@@ -82,10 +82,10 @@ public <T> T get(String id, Map<String, Object> invokeParams, Class<T> resultTyp
8282
Object [] args = new Object[provider.getMethod().getParameterCount()];
8383
for (int i = 0 ; i < provider.getMethodArgs().size(); i ++) {
8484
MethodArg methodArg = provider.getMethodArgs().get(i);
85-
if (methodArg.getDenpendType().equals(DenpendType.OTHER_MODEL)) {
86-
args[i] = dependObjectMap.get(methodArg.getAnnotionKey());
85+
if (methodArg.getDependType().equals(DependType.OTHER_MODEL)) {
86+
args[i] = dependObjectMap.get(methodArg.getAnnotationKey());
8787
} else {
88-
args[i] = invokeParams.get(methodArg.getAnnotionKey());
88+
args[i] = invokeParams.get(methodArg.getAnnotationKey());
8989
}
9090
if (args[i] != null && ! methodArg.getParameter().getType().isAssignableFrom(args[i].getClass())) {
9191
throw new IllegalArgumentException("param type not match, param:"
@@ -125,7 +125,7 @@ private void throwException(ExecutionException e) throws InterruptedException,
125125
}
126126
}
127127

128-
private void logging(String id, long startTime, DataProvideDefination provider) {
128+
private void logging(String id, long startTime, DataProvideDefinition provider) {
129129
if (runtimeSettings.isEnableLogging() && log.isInfoEnabled()) {
130130
log.info("query id: {}, " +
131131
"costTime: {}ms, " +

0 commit comments

Comments
 (0)