Skip to content

Commit 08d8f9c

Browse files
wangjie-fourthwangjie-fourth
authored
refine (#16)
1 parent b7fa52b commit 08d8f9c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+100
-1357
lines changed

‎capa-bff-domain/pom.xml ‎bff/pom.xml

+69-34
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,65 @@
99
<version>0.0.1-SNAPSHOT</version>
1010
</parent>
1111

12-
<artifactId>capa-bff-domain</artifactId>
12+
<artifactId>bff</artifactId>
13+
<packaging>war</packaging>
1314

1415
<dependencies>
16+
<dependency>
17+
<groupId>org.springframework.boot</groupId>
18+
<artifactId>spring-boot-starter-test</artifactId>
19+
<scope>test</scope>
20+
<exclusions>
21+
<exclusion>
22+
<artifactId>junit-jupiter</artifactId>
23+
<groupId>org.junit.jupiter</groupId>
24+
</exclusion>
25+
<exclusion>
26+
<artifactId>junit-vintage-engine</artifactId>
27+
<groupId>org.junit.vintage</groupId>
28+
</exclusion>
29+
<exclusion>
30+
<artifactId>mockito-junit-jupiter</artifactId>
31+
<groupId>org.mockito</groupId>
32+
</exclusion>
33+
</exclusions>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.google.guava</groupId>
37+
<artifactId>guava</artifactId>
38+
</dependency>
39+
<dependency>
40+
<groupId>com.alibaba</groupId>
41+
<artifactId>fastjson</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.junit.jupiter</groupId>
45+
<artifactId>junit-jupiter-api</artifactId>
46+
<version>5.4.2</version>
47+
<scope>test</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>org.junit.jupiter</groupId>
51+
<artifactId>junit-jupiter-engine</artifactId>
52+
<version>5.4.2</version>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>io.projectreactor</groupId>
57+
<artifactId>reactor-test</artifactId>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>com.github.kevinsawicki</groupId>
62+
<artifactId>http-request</artifactId>
63+
<version>6.0</version>
64+
<scope>test</scope>
65+
</dependency>
66+
<dependency>
67+
<groupId>com.google.code.findbugs</groupId>
68+
<artifactId>findbugs-annotations</artifactId>
69+
<scope>provided</scope>
70+
</dependency>
1571
<dependency>
1672
<groupId>org.springframework.boot</groupId>
1773
<artifactId>spring-boot-starter-web</artifactId>
@@ -20,7 +76,6 @@
2076
<groupId>org.springframework.boot</groupId>
2177
<artifactId>spring-boot-starter-webflux</artifactId>
2278
</dependency>
23-
2479
<dependency>
2580
<groupId>group.rxcloud</groupId>
2681
<artifactId>capa-sdk</artifactId>
@@ -38,37 +93,17 @@
3893
<groupId>org.antlr</groupId>
3994
<artifactId>antlr4</artifactId>
4095
</dependency>
41-
<dependency>
42-
<groupId>com.alibaba</groupId>
43-
<artifactId>fastjson</artifactId>
44-
</dependency>
4596
<dependency>
4697
<groupId>org.junit.jupiter</groupId>
4798
<artifactId>junit-jupiter</artifactId>
4899
<version>5.8.1</version>
49100
<scope>test</scope>
50101
</dependency>
51-
<dependency>
52-
<groupId>io.projectreactor</groupId>
53-
<artifactId>reactor-test</artifactId>
54-
<scope>test</scope>
55-
</dependency>
56-
<!-- https://mvnrepository.com/artifact/com.squareup.okhttp/okhttp -->
57102
<dependency>
58103
<groupId>com.squareup.okhttp</groupId>
59104
<artifactId>okhttp</artifactId>
60105
<version>2.7.5</version>
61106
</dependency>
62-
<dependency>
63-
<groupId>org.springframework.boot</groupId>
64-
<artifactId>spring-boot-starter-test</artifactId>
65-
<scope>test</scope>
66-
</dependency>
67-
<dependency>
68-
<groupId>com.google.code.findbugs</groupId>
69-
<artifactId>findbugs-annotations</artifactId>
70-
<scope>provided</scope>
71-
</dependency>
72107
</dependencies>
73108

74109
<build>
@@ -106,18 +141,18 @@
106141
</execution>
107142
</executions>
108143
</plugin>
109-
<!-- <plugin>-->
110-
<!-- <artifactId>maven-checkstyle-plugin</artifactId>-->
111-
<!-- <executions>-->
112-
<!-- <execution>-->
113-
<!-- <id>verify</id>-->
114-
<!-- <phase>verify</phase>-->
115-
<!-- <goals>-->
116-
<!-- <goal>check</goal>-->
117-
<!-- </goals>-->
118-
<!-- </execution>-->
119-
<!-- </executions>-->
120-
<!-- </plugin>-->
144+
<!-- <plugin>-->
145+
<!-- <artifactId>maven-checkstyle-plugin</artifactId>-->
146+
<!-- <executions>-->
147+
<!-- <execution>-->
148+
<!-- <id>verify</id>-->
149+
<!-- <phase>verify</phase>-->
150+
<!-- <goals>-->
151+
<!-- <goal>check</goal>-->
152+
<!-- </goals>-->
153+
<!-- </execution>-->
154+
<!-- </executions>-->
155+
<!-- </plugin>-->
121156
<plugin>
122157
<groupId>org.jacoco</groupId>
123158
<artifactId>jacoco-maven-plugin</artifactId>

‎capa-bff-domain/spotBugIgnore.xml ‎bff/spotBugIgnore.xml

File renamed without changes.

‎capa-bff-domain/src/main/antlr4/CommonLexerRules.g4 ‎bff/src/main/antlr4/CommonLexerRules.g4

File renamed without changes.

‎capa-bff-domain/src/main/antlr4/CustomerJson.g4 ‎bff/src/main/antlr4/CustomerJson.g4

File renamed without changes.

‎capa-bff-api-http/src/main/java/group/rxcloud/capa/bff/api/http/SpringBootCapaApiApplication.java ‎bff/src/main/java/group/rxcloud/capa/bff/SpringBootCapaApplication.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package group.rxcloud.capa.bff.api.http;
1+
package group.rxcloud.capa.bff;
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,9 +10,9 @@
1010
@SpringBootApplication(
1111
scanBasePackages = {"group.rxcloud.capa.bff"}
1212
)
13-
public class SpringBootCapaApiApplication {
13+
public class SpringBootCapaApplication {
1414

1515
public static void main(String[] args) {
16-
SpringApplication.run(SpringBootCapaApiApplication.class, args);
16+
SpringApplication.run(SpringBootCapaApplication.class, args);
1717
}
1818
}

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/configuration/SpringBeanConfiguration.java ‎bff/src/main/java/group/rxcloud/capa/bff/configuration/SpringBeanConfiguration.java

File renamed without changes.

‎capa-bff-api-http/src/main/java/group/rxcloud/capa/bff/api/http/config/WebInitializer.java ‎bff/src/main/java/group/rxcloud/capa/bff/configuration/WebInitializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package group.rxcloud.capa.bff.api.http.config;
1+
package group.rxcloud.capa.bff.configuration;
22

33
import org.springframework.boot.autoconfigure.SpringBootApplication;
44
import org.springframework.boot.builder.SpringApplicationBuilder;

‎capa-bff-api-http/src/main/java/group/rxcloud/capa/bff/api/http/controller/CapaApiHttpController.java ‎bff/src/main/java/group/rxcloud/capa/bff/controller/CapaApiHttpController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package group.rxcloud.capa.bff.api.http.controller;
1+
package group.rxcloud.capa.bff.controller;
22

33
import com.alibaba.fastjson.JSONObject;
44
import group.rxcloud.capa.bff.domain.CapaContext;

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/domain/CapaContext.java ‎bff/src/main/java/group/rxcloud/capa/bff/domain/CapaContext.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/domain/CheckRequestListener.java ‎bff/src/main/java/group/rxcloud/capa/bff/domain/CheckRequestListener.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/domain/Context.java ‎bff/src/main/java/group/rxcloud/capa/bff/domain/Context.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/domain/DefaultContext.java ‎bff/src/main/java/group/rxcloud/capa/bff/domain/DefaultContext.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/domain/HJsonInvocationRequest.java ‎bff/src/main/java/group/rxcloud/capa/bff/domain/HJsonInvocationRequest.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33

44
import com.alibaba.fastjson.JSONObject;
5+
import group.rxcloud.capa.bff.json.JsonValueMapper;
56
import group.rxcloud.capa.bff.enums.RequestEnum;
67
import lombok.Data;
78
import lombok.EqualsAndHashCode;
89
import java.util.HashMap;
9-
import group.rxcloud.capa.bff.json.*;
1010
import java.util.Map;
1111

1212
/**
@@ -41,8 +41,6 @@ public void replaceParam(String key, Object value) {
4141
this.setData(JsonValueMapper.replaceValuesByParameters(this.getData(), pMap));
4242
}
4343

44-
45-
4644
@Override
4745
public boolean sync() {
4846
return false;

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/domain/HJsonInvocationResponse.java ‎bff/src/main/java/group/rxcloud/capa/bff/domain/HJsonInvocationResponse.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/domain/InvocationRequest.java ‎bff/src/main/java/group/rxcloud/capa/bff/domain/InvocationRequest.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/domain/InvocationResponse.java ‎bff/src/main/java/group/rxcloud/capa/bff/domain/InvocationResponse.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/domain/TaskService.java ‎bff/src/main/java/group/rxcloud/capa/bff/domain/TaskService.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/enums/RequestEnum.java ‎bff/src/main/java/group/rxcloud/capa/bff/enums/RequestEnum.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/exception/IllegalInvocationRequestException.java ‎bff/src/main/java/group/rxcloud/capa/bff/exception/IllegalInvocationRequestException.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/core/graph/DependOnFieldInfo.java ‎bff/src/main/java/group/rxcloud/capa/bff/graph/DependOnFieldInfo.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package group.rxcloud.capa.bff.core.graph;
1+
package group.rxcloud.capa.bff.graph;
22

33
import group.rxcloud.capa.bff.domain.InvocationRequest;
44

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/core/graph/InvocationEdge.java ‎bff/src/main/java/group/rxcloud/capa/bff/graph/InvocationEdge.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package group.rxcloud.capa.bff.core.graph;
1+
package group.rxcloud.capa.bff.graph;
22

33
import group.rxcloud.capa.bff.domain.InvocationRequest;
44

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/inbound/AntlrUtils.java ‎bff/src/main/java/group/rxcloud/capa/bff/inbound/AntlrUtils.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/inbound/HJsonInbound.java ‎bff/src/main/java/group/rxcloud/capa/bff/inbound/HJsonInbound.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import com.alibaba.fastjson.JSON;
44
import group.rxcloud.capa.bff.domain.CapaContext;
5+
import group.rxcloud.capa.bff.domain.HJsonInvocationRequest;
56
import group.rxcloud.capa.bff.hjson.antlr4.CustomerJsonLexer;
67
import group.rxcloud.capa.bff.hjson.antlr4.CustomerJsonParser;
7-
import group.rxcloud.capa.bff.domain.HJsonInvocationRequest;
88
import group.rxcloud.capa.bff.inbound.parse.BffParseListener;
99
import lombok.extern.slf4j.Slf4j;
1010
import org.antlr.v4.runtime.CharStreams;

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/inbound/Inbound.java ‎bff/src/main/java/group/rxcloud/capa/bff/inbound/Inbound.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/inbound/parse/BffParseListener.java ‎bff/src/main/java/group/rxcloud/capa/bff/inbound/parse/BffParseListener.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package group.rxcloud.capa.bff.inbound.parse;
22

33
import com.alibaba.fastjson.JSONObject;
4+
import group.rxcloud.capa.bff.domain.HJsonInvocationRequest;
45
import group.rxcloud.capa.bff.enums.RequestEnum;
6+
import group.rxcloud.capa.bff.inbound.AntlrUtils;
57
import group.rxcloud.capa.bff.hjson.antlr4.CustomerJsonBaseListener;
68
import group.rxcloud.capa.bff.hjson.antlr4.CustomerJsonParser;
7-
import group.rxcloud.capa.bff.domain.HJsonInvocationRequest;
8-
import group.rxcloud.capa.bff.inbound.AntlrUtils;
99
import org.antlr.v4.runtime.RuleContext;
1010
import org.springframework.util.StringUtils;
1111
import java.util.HashMap;

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/invoke/HJsonInvoker.java ‎bff/src/main/java/group/rxcloud/capa/bff/invoke/HJsonInvoker.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import group.rxcloud.capa.bff.domain.Context;
66
import group.rxcloud.capa.bff.domain.HJsonInvocationRequest;
77
import group.rxcloud.capa.bff.domain.HJsonInvocationResponse;
8-
import group.rxcloud.capa.bff.json.*;
8+
import group.rxcloud.capa.bff.json.JsonValueMapper;
99
import group.rxcloud.capa.bff.util.GraphUtil;
1010
import group.rxcloud.capa.bff.util.InnerMethodUtil;
1111
import group.rxcloud.capa.rpc.CapaRpcClient;

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/invoke/Invoke.java ‎bff/src/main/java/group/rxcloud/capa/bff/invoke/Invoke.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/json/JsonValueMapper.java ‎bff/src/main/java/group/rxcloud/capa/bff/json/JsonValueMapper.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/outbound/HJsonOutbound.java ‎bff/src/main/java/group/rxcloud/capa/bff/outbound/HJsonOutbound.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import group.rxcloud.capa.bff.domain.DefaultContext;
77
import group.rxcloud.capa.bff.domain.HJsonInvocationRequest;
88
import group.rxcloud.capa.bff.domain.HJsonInvocationResponse;
9-
import group.rxcloud.capa.bff.json.*;
9+
import group.rxcloud.capa.bff.json.JsonValueMapper;
1010
import lombok.Builder;
1111
import lombok.Data;
1212
import lombok.extern.slf4j.Slf4j;

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/outbound/Outbound.java ‎bff/src/main/java/group/rxcloud/capa/bff/outbound/Outbound.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/process/Processor.java ‎bff/src/main/java/group/rxcloud/capa/bff/process/Processor.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/util/GraphUtil.java ‎bff/src/main/java/group/rxcloud/capa/bff/util/GraphUtil.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/util/InnerInvokeMethod.java ‎bff/src/main/java/group/rxcloud/capa/bff/util/InnerInvokeMethod.java

File renamed without changes.

‎capa-bff-domain/src/main/java/group/rxcloud/capa/bff/util/InnerMethodUtil.java ‎bff/src/main/java/group/rxcloud/capa/bff/util/InnerMethodUtil.java

File renamed without changes.

‎capa-bff-api-http/src/main/resources/application.properties ‎bff/src/main/resources/application.properties

File renamed without changes.

‎capa-bff-api-http/src/test/java/group/rxcloud/capa/bff/api/http/integration/SpringBootCapaApiApplicationTests.java ‎bff/src/test/java/group/rxcloud/capa/bff/integration/SpringBootCapaApplicationTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package group.rxcloud.capa.bff.api.http.integration;
1+
package group.rxcloud.capa.bff.integration;
22

33
import com.alibaba.fastjson.JSON;
44
import com.alibaba.fastjson.JSONArray;
55
import com.alibaba.fastjson.JSONObject;
6-
import group.rxcloud.capa.bff.api.http.controller.CapaApiHttpController;
6+
import group.rxcloud.capa.bff.controller.CapaApiHttpController;
77
import group.rxcloud.capa.bff.json.JsonValueMapper;
88
import org.junit.jupiter.api.Assertions;
99
import org.junit.jupiter.api.Test;
@@ -14,14 +14,14 @@
1414
import java.util.List;
1515

1616
@SpringBootTest
17-
public class SpringBootCapaApiApplicationTests {
17+
public class SpringBootCapaApplicationTests {
1818

1919
@Resource
2020
private CapaApiHttpController capaApiHttpController;
2121

22-
private static List<String> requestStrList = new ArrayList<>();
22+
private static final List<String> requestStrList = new ArrayList<>();
2323

24-
private static List<String> responseStrList = new ArrayList<>();
24+
private static final List<String> responseStrList = new ArrayList<>();
2525

2626
static {
2727
String responseStr = "{\"body\":{\"id\":1},\"errors\":[]}";

‎capa-bff-domain/src/test/java/parse/HJsonInboundTest.java ‎bff/src/test/java/group/rxcloud/capa/bff/parse/HJsonInboundTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package parse;
1+
package group.rxcloud.capa.bff.parse;
22

33
import com.alibaba.fastjson.JSON;
44
import group.rxcloud.capa.bff.domain.CapaContext;

‎capa-bff-domain/src/test/java/utils/GraphUtilTest.java ‎bff/src/test/java/group/rxcloud/capa/bff/utils/GraphUtilTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package utils;
1+
package group.rxcloud.capa.bff.utils;
22

33
import com.google.common.collect.ImmutableMap;
44
import group.rxcloud.capa.bff.domain.HJsonInvocationRequest;

‎capa-bff-domain/src/test/java/utils/HJsonInvocationRequestHelper.java ‎bff/src/test/java/group/rxcloud/capa/bff/utils/HJsonInvocationRequestHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package utils;
1+
package group.rxcloud.capa.bff.utils;
22

33
import com.alibaba.fastjson.JSON;
44
import com.alibaba.fastjson.JSONObject;

‎capa-bff-domain/src/test/java/utils/JsonDataSource.java ‎bff/src/test/java/group/rxcloud/capa/bff/utils/JsonDataSource.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package utils;
1+
package group.rxcloud.capa.bff.utils;
22

33
import com.alibaba.fastjson.JSONObject;
44
import java.io.IOException;

‎capa-bff-domain/src/test/java/utils/JsonValueMapperTest.java ‎bff/src/test/java/group/rxcloud/capa/bff/utils/JsonValueMapperTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package utils;
1+
package group.rxcloud.capa.bff.utils;
22

33
import com.alibaba.fastjson.JSONObject;
44
import group.rxcloud.capa.bff.json.JsonValueMapper;

‎capa-bff-domain/src/test/java/utils/ResourceUtils.java ‎bff/src/test/java/group/rxcloud/capa/bff/utils/ResourceUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package utils;
1+
package group.rxcloud.capa.bff.utils;
22

33
import java.io.ByteArrayOutputStream;
44
import java.io.IOException;

‎capa-bff-api-http/src/test/resources/application.properties ‎bff/src/test/resources/application.properties

File renamed without changes.

‎capa-bff-api-http/src/test/resources/examples.graphql ‎bff/src/test/resources/examples.graphql

File renamed without changes.

‎capa-bff-domain/src/test/resources/hjson/case1.txt ‎bff/src/test/resources/hjson/case1.txt

File renamed without changes.

‎capa-bff-domain/src/test/resources/hjson/case2.txt ‎bff/src/test/resources/hjson/case2.txt

File renamed without changes.

‎capa-bff-domain/src/test/resources/hjson/result1.txt ‎bff/src/test/resources/hjson/result1.txt

File renamed without changes.

‎capa-bff-domain/src/test/resources/hjson/result2.txt ‎bff/src/test/resources/hjson/result2.txt

File renamed without changes.

‎capa-bff-api-http/src/test/resources/schema.graphql ‎bff/src/test/resources/schema.graphql

File renamed without changes.

‎capa-bff-api-http/src/test/resources/validation.graphql ‎bff/src/test/resources/validation.graphql

File renamed without changes.

0 commit comments

Comments
 (0)