已合并
[refactor]spring-adapter项目包名整改为org.yuanrong开头 #8
lizi创建于 1月26日
[refactor]spring-adapter项目包名整改为org.yuanrong开头 #8
已合并
共 252 个文件变更+750-756
| @@ -14,7 +14,7 @@ | |||
| 14 | # limitations under the License. | 14 | # limitations under the License. |
| 15 | set -e | 15 | set -e |
| 16 | 16 | ||
| 17 | -groupId=com.yuanrong.m2s | 17 | +groupId=org.yuanrong.m2s |
| 18 | version="v0.0.1" | 18 | version="v0.0.1" |
| 19 | 19 | ||
| 20 | readonly USAGE=" | 20 | readonly USAGE=" |
| @@ -5,7 +5,7 @@ | |||
| 5 | <modelVersion>4.0.0</modelVersion> | 5 | <modelVersion>4.0.0</modelVersion> |
| 6 | 6 | ||
| 7 | <parent> | 7 | <parent> |
| 8 | - <groupId>com.yuanrong.m2s</groupId> | 8 | + <groupId>org.yuanrong.m2s</groupId> |
| 9 | <artifactId>microservice-adapter</artifactId> | 9 | <artifactId>microservice-adapter</artifactId> |
| 10 | <version>1.0.0</version> | 10 | <version>1.0.0</version> |
| 11 | </parent> | 11 | </parent> |
| @@ -20,7 +20,7 @@ | |||
| 20 | <scope>compile</scope> | 20 | <scope>compile</scope> |
| 21 | </dependency> | 21 | </dependency> |
| 22 | <dependency> | 22 | <dependency> |
| 23 | - <groupId>com.yuanrong</groupId> | 23 | + <groupId>org.yuanrong</groupId> |
| 24 | <artifactId>faas-function-sdk</artifactId> | 24 | <artifactId>faas-function-sdk</artifactId> |
| 25 | <version>${runtime-sdk-fg.version}</version> | 25 | <version>${runtime-sdk-fg.version}</version> |
| 26 | <scope>compile</scope> | 26 | <scope>compile</scope> |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/annotation/FunctionHandler.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/annotation/FunctionHandler.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.annotation; | 17 | +package org.yuanrong.m2s.annotation; |
| 18 | 18 | ||
| 19 | import java.lang.annotation.ElementType; | 19 | import java.lang.annotation.ElementType; |
| 20 | import java.lang.annotation.Retention; | 20 | import java.lang.annotation.Retention; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/annotation/FunctionService.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/annotation/FunctionService.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.annotation; | 17 | +package org.yuanrong.m2s.annotation; |
| 18 | 18 | ||
| 19 | import java.lang.annotation.ElementType; | 19 | import java.lang.annotation.ElementType; |
| 20 | import java.lang.annotation.Retention; | 20 | import java.lang.annotation.Retention; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/api/SnapshotResourceRefresher.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/api/SnapshotResourceRefresher.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.api; | 17 | +package org.yuanrong.m2s.api; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * The SnapshotResourceRefresher is used to update snapshot resource for Snapshot-Based Cold Start. | 20 | * The SnapshotResourceRefresher is used to update snapshot resource for Snapshot-Based Cold Start. |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/exception/FunctionException.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/exception/FunctionException.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.exception; | 17 | +package org.yuanrong.m2s.exception; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Function Adapter Exception | 20 | * Function Adapter Exception |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/exception/FunctionRuntimeException.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/exception/FunctionRuntimeException.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.exception; | 17 | +package org.yuanrong.m2s.exception; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Function Adapter RuntimeException | 20 | * Function Adapter RuntimeException |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/Headers.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/Headers.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | import java.util.ArrayList; | 19 | import java.util.ArrayList; |
| 20 | import java.util.Collection; | 20 | import java.util.Collection; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/HttpHeader.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/HttpHeader.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | import lombok.Data; | 19 | import lombok.Data; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/ServerlessContext.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/ServerlessContext.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | -import com.services.runtime.Context; | 19 | +import org.yuanrong.services.runtime.Context; |
| 20 | -import com.services.runtime.RuntimeLogger; | 20 | +import org.yuanrong.services.runtime.RuntimeLogger; |
| 21 | 21 | ||
| 22 | import org.slf4j.Logger; | 22 | import org.slf4j.Logger; |
| 23 | import org.slf4j.LoggerFactory; | 23 | import org.slf4j.LoggerFactory; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/ServerlessFunctionContext.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/ServerlessFunctionContext.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | -import com.services.runtime.Context; | 19 | +import org.yuanrong.services.runtime.Context; |
| 20 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 20 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 21 | -import com.yuanrong.m2s.runtime.api.FunctionLogger; | 21 | +import org.yuanrong.m2s.runtime.api.FunctionLogger; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * ServerlessFunctionContext for Serverless Context | 24 | * ServerlessFunctionContext for Serverless Context |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/YrHttpRequest.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/YrHttpRequest.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 19 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 20 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 20 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 21 | -import com.yuanrong.m2s.utils.SecurityUtils; | 21 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 22 | 22 | ||
| 23 | import com.fasterxml.jackson.annotation.JsonIgnore; | 23 | import com.fasterxml.jackson.annotation.JsonIgnore; |
| 24 | import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | 24 | import com.fasterxml.jackson.annotation.JsonIgnoreProperties; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/YrHttpRequestBuilder.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/YrHttpRequestBuilder.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 19 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 20 | -import com.yuanrong.m2s.utils.MediaType; | 20 | +import org.yuanrong.m2s.utils.MediaType; |
| 21 | 21 | ||
| 22 | import java.util.Collection; | 22 | import java.util.Collection; |
| 23 | import java.util.Map; | 23 | import java.util.Map; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/YrHttpRequestType.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/YrHttpRequestType.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * YrHttpRequestType | 20 | * YrHttpRequestType |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/YrHttpResponse.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/YrHttpResponse.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | import com.fasterxml.jackson.annotation.JsonInclude; | 19 | import com.fasterxml.jackson.annotation.JsonInclude; |
| 20 | import com.fasterxml.jackson.annotation.JsonProperty; | 20 | import com.fasterxml.jackson.annotation.JsonProperty; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/mqs/ConsumeStatus.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/mqs/ConsumeStatus.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model.mqs; | 17 | +package org.yuanrong.m2s.model.mqs; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Consume status. | 20 | * Consume status. |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/model/mqs/Message.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/model/mqs/Message.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model.mqs; | 17 | +package org.yuanrong.m2s.model.mqs; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; | 19 | +import org.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; |
| 20 | -import com.yuanrong.m2s.utils.ConvertUtil; | 20 | +import org.yuanrong.m2s.utils.ConvertUtil; |
| 21 | 21 | ||
| 22 | import lombok.Getter; | 22 | import lombok.Getter; |
| 23 | import lombok.Setter; | 23 | import lombok.Setter; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/utils/ConvertUtil.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/utils/ConvertUtil.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | import com.google.gson.Gson; | 19 | import com.google.gson.Gson; |
| 20 | import com.google.gson.GsonBuilder; | 20 | import com.google.gson.GsonBuilder; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/utils/IAMTokenUpdater.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/utils/IAMTokenUpdater.java+3-4
| @@ -13,10 +13,10 @@ | |||
| 13 | * See the License for the specific language governing permissions and | 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | -package com.yuanrong.m2s.utils; | 16 | +package org.yuanrong.m2s.utils; |
| 17 | 17 | ||
| 18 | -import com.services.runtime.Context; | 18 | +import org.yuanrong.services.runtime.Context; |
| 19 | -import com.services.runtime.ContextHolder; | 19 | +import org.yuanrong.services.runtime.ContextHolder; |
| 20 | 20 | ||
| 21 | import org.yuanrong.datasystem.stream.StreamClient; | 21 | import org.yuanrong.datasystem.stream.StreamClient; |
| 22 | 22 | ||
| @@ -24,7 +24,6 @@ import org.apache.commons.lang3.StringUtils; | |||
| 24 | import org.slf4j.Logger; | 24 | import org.slf4j.Logger; |
| 25 | import org.slf4j.LoggerFactory; | 25 | import org.slf4j.LoggerFactory; |
| 26 | 26 | ||
| 27 | -import java.nio.charset.StandardCharsets; | ||
| 28 | import java.util.TimerTask; | 27 | import java.util.TimerTask; |
| 29 | 28 | ||
| 30 | /** | 29 | /** |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/utils/MediaType.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/utils/MediaType.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * An abstraction for a media type. | 20 | * An abstraction for a media type. |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/utils/SecurityUtils.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/utils/SecurityUtils.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * A Security Utils | 20 | * A Security Utils |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/utils/StreamClientWrapper.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/utils/StreamClientWrapper.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | -import com.services.runtime.Context; | 19 | +import org.yuanrong.services.runtime.Context; |
| 20 | -import com.services.runtime.ContextHolder; | 20 | +import org.yuanrong.services.runtime.ContextHolder; |
| 21 | 21 | ||
| 22 | import org.yuanrong.datasystem.ConnectOptions; | 22 | import org.yuanrong.datasystem.ConnectOptions; |
| 23 | import org.yuanrong.datasystem.stream.StreamClient; | 23 | import org.yuanrong.datasystem.stream.StreamClient; |
Rmicroservice-adapter/microservice-adapter-common/src/main/java/com/yuanrong/m2s/utils/StreamUtil.java→microservice-adapter/microservice-adapter-common/src/main/java/org/yuanrong/m2s/utils/StreamUtil.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | import org.yuanrong.datasystem.DataSystemException; | 19 | import org.yuanrong.datasystem.DataSystemException; |
| 20 | import org.yuanrong.datasystem.stream.Consumer; | 20 | import org.yuanrong.datasystem.stream.Consumer; |
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/TestContext.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/TestContext.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s; | 17 | +package org.yuanrong.m2s; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 19 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 20 | -import com.yuanrong.m2s.runtime.api.FunctionLogger; | 20 | +import org.yuanrong.m2s.runtime.api.FunctionLogger; |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * TestContext | 23 | * TestContext |
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/model/HeadersTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/model/HeadersTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/model/HttpHeaderTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/model/HttpHeaderTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | import static org.junit.Assert.*; | 19 | import static org.junit.Assert.*; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/model/Person.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/model/Person.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * TestRequestData | 20 | * TestRequestData |
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/model/YrHttpRequestBuilderTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/model/YrHttpRequestBuilderTest.java+3-3
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.TestContext; | 21 | +import org.yuanrong.m2s.TestContext; |
| 22 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 22 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 23 | 23 | ||
| 24 | import org.junit.Test; | 24 | import org.junit.Test; |
| 25 | 25 | ||
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/model/YrHttpRequestTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/model/YrHttpRequestTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/model/YrHttpResponseTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/model/YrHttpResponseTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model; | 17 | +package org.yuanrong.m2s.model; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/model/mqs/MessageTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/model/mqs/MessageTest.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.model.mqs; | 17 | +package org.yuanrong.m2s.model.mqs; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; | 19 | +import org.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; |
| 20 | -import com.yuanrong.m2s.utils.ConvertUtil; | 20 | +import org.yuanrong.m2s.utils.ConvertUtil; |
| 21 | 21 | ||
| 22 | import org.junit.Assert; | 22 | import org.junit.Assert; |
| 23 | import org.junit.Test; | 23 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/util/SecurityUtilsTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/util/SecurityUtilsTest.java+2-2
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.util; | 17 | +package org.yuanrong.m2s.util; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.utils.SecurityUtils; | 21 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 22 | 22 | ||
| 23 | import org.junit.Test; | 23 | import org.junit.Test; |
| 24 | 24 | ||
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/utils/ComsumerMock.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/utils/ComsumerMock.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | import org.yuanrong.datasystem.DataSystemException; | 19 | import org.yuanrong.datasystem.DataSystemException; |
| 20 | import org.yuanrong.datasystem.stream.Consumer; | 20 | import org.yuanrong.datasystem.stream.Consumer; |
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/utils/ConvertUtilTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/utils/ConvertUtilTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | import com.google.gson.internal.LazilyParsedNumber; | 19 | import com.google.gson.internal.LazilyParsedNumber; |
| 20 | import com.google.gson.reflect.TypeToken; | 20 | import com.google.gson.reflect.TypeToken; |
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/utils/ExceptionConsumerMock.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/utils/ExceptionConsumerMock.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | import org.yuanrong.datasystem.DataSystemException; | 19 | import org.yuanrong.datasystem.DataSystemException; |
| 20 | import org.yuanrong.datasystem.stream.Consumer; | 20 | import org.yuanrong.datasystem.stream.Consumer; |
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/utils/ProducerMock.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/utils/ProducerMock.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | import org.yuanrong.datasystem.DataSystemException; | 19 | import org.yuanrong.datasystem.DataSystemException; |
| 20 | import org.yuanrong.datasystem.stream.Producer; | 20 | import org.yuanrong.datasystem.stream.Producer; |
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/utils/StreamClientWrapperTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/utils/StreamClientWrapperTest.java+4-6
| @@ -14,29 +14,27 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | -import com.services.runtime.Context; | 19 | +import org.yuanrong.services.runtime.Context; |
| 20 | -import com.services.runtime.ContextHolder; | 20 | +import org.yuanrong.services.runtime.ContextHolder; |
| 21 | 21 | ||
| 22 | import org.yuanrong.datasystem.stream.StreamClient; | 22 | import org.yuanrong.datasystem.stream.StreamClient; |
| 23 | 23 | ||
| 24 | import org.junit.Assert; | 24 | import org.junit.Assert; |
| 25 | import org.junit.Test; | 25 | import org.junit.Test; |
| 26 | import org.junit.runner.RunWith; | 26 | import org.junit.runner.RunWith; |
| 27 | -import org.mockito.Mockito; | ||
| 28 | import org.powermock.api.mockito.PowerMockito; | 27 | import org.powermock.api.mockito.PowerMockito; |
| 29 | import org.powermock.core.classloader.annotations.PrepareForTest; | 28 | import org.powermock.core.classloader.annotations.PrepareForTest; |
| 30 | import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; | 29 | import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor; |
| 31 | import org.powermock.modules.junit4.PowerMockRunner; | 30 | import org.powermock.modules.junit4.PowerMockRunner; |
| 32 | 31 | ||
| 33 | import java.lang.reflect.Field; | 32 | import java.lang.reflect.Field; |
| 34 | -import java.nio.charset.StandardCharsets; | ||
| 35 | import java.util.Timer; | 33 | import java.util.Timer; |
| 36 | 34 | ||
| 37 | 35 | ||
| 38 | 36 | ||
| 39 | -@SuppressStaticInitializationFor("com.datasystem.streamcache.StreamClient") | 37 | +@SuppressStaticInitializationFor("org.yuanrong.datasystem.stream.StreamClient") |
| 40 | public class StreamClientWrapperTest { | 38 | public class StreamClientWrapperTest { |
| 41 | 39 | ||
| 42 | public void testGetStreamClient() throws Exception { | 40 | public void testGetStreamClient() throws Exception { |
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/utils/StreamUtilTest.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/utils/StreamUtilTest.java+2-3
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | import org.yuanrong.datasystem.DataSystemException; | 19 | import org.yuanrong.datasystem.DataSystemException; |
| 20 | import org.yuanrong.datasystem.stream.Consumer; | 20 | import org.yuanrong.datasystem.stream.Consumer; |
| @@ -24,7 +24,6 @@ import org.yuanrong.datasystem.stream.StreamClient; | |||
| 24 | import org.junit.Assert; | 24 | import org.junit.Assert; |
| 25 | import org.junit.Test; | 25 | import org.junit.Test; |
| 26 | import org.junit.runner.RunWith; | 26 | import org.junit.runner.RunWith; |
| 27 | -import org.mockito.Mock; | ||
| 28 | import org.mockito.Mockito; | 27 | import org.mockito.Mockito; |
| 29 | import org.powermock.api.mockito.PowerMockito; | 28 | import org.powermock.api.mockito.PowerMockito; |
| 30 | import org.powermock.core.classloader.annotations.PrepareForTest; | 29 | import org.powermock.core.classloader.annotations.PrepareForTest; |
| @@ -37,7 +36,7 @@ import java.util.HashSet; | |||
| 37 | import java.util.List; | 36 | import java.util.List; |
| 38 | import java.util.Set; | 37 | import java.util.Set; |
| 39 | 38 | ||
| 40 | -import static com.yuanrong.m2s.utils.StreamUtil.*; | 39 | +import static org.yuanrong.m2s.utils.StreamUtil.*; |
| 41 | 40 | ||
| 42 | 41 | ||
| 43 | 42 | ||
Rmicroservice-adapter/microservice-adapter-common/src/test/java/com/yuanrong/m2s/utils/TestObject.java→microservice-adapter/microservice-adapter-common/src/test/java/org/yuanrong/m2s/utils/TestObject.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.utils; | 17 | +package org.yuanrong.m2s.utils; |
| 18 | 18 | ||
| 19 | import lombok.Getter; | 19 | import lombok.Getter; |
| 20 | import lombok.Setter; | 20 | import lombok.Setter; |
| @@ -3,7 +3,7 @@ | |||
| 3 | xmlns="http://maven.apache.org/POM/4.0.0" | 3 | xmlns="http://maven.apache.org/POM/4.0.0" |
| 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | <parent> | 5 | <parent> |
| 6 | - <groupId>com.yuanrong.m2s</groupId> | 6 | + <groupId>org.yuanrong.m2s</groupId> |
| 7 | <artifactId>microservice-adapter</artifactId> | 7 | <artifactId>microservice-adapter</artifactId> |
| 8 | <version>1.0.0</version> | 8 | <version>1.0.0</version> |
| 9 | </parent> | 9 | </parent> |
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | <dependencies> | 14 | <dependencies> |
| 15 | <dependency> | 15 | <dependency> |
| 16 | - <groupId>com.yuanrong.m2s</groupId> | 16 | + <groupId>org.yuanrong.m2s</groupId> |
| 17 | <artifactId>microservice-adapter-common</artifactId> | 17 | <artifactId>microservice-adapter-common</artifactId> |
| 18 | <version>${project.version}</version> | 18 | <version>${project.version}</version> |
| 19 | </dependency> | 19 | </dependency> |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/State.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/State.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core; | 17 | +package org.yuanrong.m2s.core; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Application state | 20 | * Application state |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/constants/HttpHeaderConstant.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/constants/HttpHeaderConstant.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.constants; | 17 | +package org.yuanrong.m2s.core.constants; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Constant of http header key or value | 20 | * Constant of http header key or value |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/exception/ConflictingFunctionDefinitionException.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/exception/ConflictingFunctionDefinitionException.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.exception; | 17 | +package org.yuanrong.m2s.core.exception; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * The ConflictingFunctionDefinitionException is thrown | 20 | * The ConflictingFunctionDefinitionException is thrown |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/handler/HandlersChain.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/handler/HandlersChain.java+5-5
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler; | 17 | +package org.yuanrong.m2s.core.handler; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.handler.request.RequestHandler; | 19 | +import org.yuanrong.m2s.core.handler.request.RequestHandler; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 21 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 22 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 23 | 23 | ||
| 24 | import org.apache.commons.lang3.builder.ToStringBuilder; | 24 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 25 | 25 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/handler/request/AbstractRequestHandler.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/handler/request/AbstractRequestHandler.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 19 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * Template Handler. | 24 | * Template Handler. |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/handler/request/ApaterRequestHandler.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/handler/request/ApaterRequestHandler.java+5-5
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 19 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 22 | -import com.yuanrong.m2s.model.YrHttpRequest; | 22 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * Implementation of { RequestHandler}. | 25 | * Implementation of { RequestHandler}. |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/handler/request/AttrRelationRequestHandler.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/handler/request/AttrRelationRequestHandler.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 19 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * Implementation of { RequestHandler}. | 24 | * Implementation of { RequestHandler}. |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/handler/request/FindServletContextRequestHandler.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/handler/request/FindServletContextRequestHandler.java+7-7
| @@ -14,14 +14,14 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 19 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrServletRegistration; | 21 | +import org.yuanrong.m2s.core.servlet.YrServletRegistration; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 22 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 23 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 23 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 24 | -import com.yuanrong.m2s.utils.SecurityUtils; | 24 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 25 | 25 | ||
| 26 | import java.util.Locale; | 26 | import java.util.Locale; |
| 27 | 27 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/handler/request/ParsePathRequestHandler.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/handler/request/ParsePathRequestHandler.java+8-8
| @@ -14,16 +14,16 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 19 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 22 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 22 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 23 | -import com.yuanrong.m2s.model.YrHttpRequest; | 23 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 24 | -import com.yuanrong.m2s.utils.SecurityUtils; | 24 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 25 | 25 | ||
| 26 | -import com.yuanrong.m2s.model.YrHttpRequestType; | 26 | +import org.yuanrong.m2s.model.YrHttpRequestType; |
| 27 | import org.slf4j.Logger; | 27 | import org.slf4j.Logger; |
| 28 | import org.slf4j.LoggerFactory; | 28 | import org.slf4j.LoggerFactory; |
| 29 | 29 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/handler/request/RequestHandler.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/handler/request/RequestHandler.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 19 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * A { RequestHandler} is an object that performs operating tasks | 24 | * A { RequestHandler} is an object that performs operating tasks |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/handler/request/StatusMsgHandler.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/handler/request/StatusMsgHandler.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 19 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 22 | 22 | ||
| 23 | import org.apache.commons.lang3.StringUtils; | 23 | import org.apache.commons.lang3.StringUtils; |
| 24 | 24 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/AbstractRegistration.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/AbstractRegistration.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import java.util.Collections; | 19 | import java.util.Collections; |
| 20 | import java.util.HashSet; | 20 | import java.util.HashSet; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/AsyncListenerWrapper.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/AsyncListenerWrapper.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import lombok.Getter; | 19 | import lombok.Getter; |
| 20 | import lombok.Setter; | 20 | import lombok.Setter; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/DataSystemOutputStream.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/DataSystemOutputStream.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.utils.StreamUtil; | 19 | +import org.yuanrong.m2s.utils.StreamUtil; |
| 20 | 20 | ||
| 21 | import org.yuanrong.datasystem.DataSystemException; | 21 | import org.yuanrong.datasystem.DataSystemException; |
| 22 | import org.yuanrong.datasystem.stream.Producer; | 22 | import org.yuanrong.datasystem.stream.Producer; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/DataTransferEntity.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/DataTransferEntity.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.model.Headers; | 19 | +import org.yuanrong.m2s.model.Headers; |
| 20 | 20 | ||
| 21 | /** | 21 | /** |
| 22 | * struct used to interact with frontend | 22 | * struct used to interact with frontend |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/FilterChainManager.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/FilterChainManager.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import java.util.Map; | 19 | import java.util.Map; |
| 20 | import java.util.Optional; | 20 | import java.util.Optional; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/FilterChainManagerFacade.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/FilterChainManagerFacade.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import javax.servlet.Servlet; | 19 | import javax.servlet.Servlet; |
| 20 | import javax.servlet.http.HttpServletRequest; | 20 | import javax.servlet.http.HttpServletRequest; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/FilterWrapper.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/FilterWrapper.java+6-6
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.util.YrHttpServletConvert; | 19 | +import org.yuanrong.m2s.core.util.YrHttpServletConvert; |
| 20 | -import com.yuanrong.m2s.model.YrHttpRequestType; | 20 | +import org.yuanrong.m2s.model.YrHttpRequestType; |
| 21 | -import com.yuanrong.m2s.utils.SecurityUtils; | 21 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 22 | 22 | ||
| 23 | import lombok.Getter; | 23 | import lombok.Getter; |
| 24 | import lombok.extern.slf4j.Slf4j; | 24 | import lombok.extern.slf4j.Slf4j; |
| @@ -42,12 +42,12 @@ import javax.servlet.http.HttpServletRequest; | |||
| 42 | 42 | ||
| 43 | 43 | ||
| 44 | public class FilterWrapper { | 44 | public class FilterWrapper { |
| 45 | - private static final String FILTER_TYPE = "com.yuanrong.filtertype"; | 45 | + private static final String FILTER_TYPE = "org.yuanrong.filtertype"; |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * Filter Type: Function | 48 | * Filter Type: Function |
| 49 | */ | 49 | */ |
| 50 | - private static final String FILTER_TYPE_FUNCTION = "com.yuanrong.filtertype.function"; | 50 | + private static final String FILTER_TYPE_FUNCTION = "org.yuanrong.filtertype.function"; |
| 51 | 51 | ||
| 52 | private volatile boolean isInitialized = false; | 52 | private volatile boolean isInitialized = false; |
| 53 | 53 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/FiltersServiceRequestHandler.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/FiltersServiceRequestHandler.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.handler.request.AbstractRequestHandler; | 19 | +import org.yuanrong.m2s.core.handler.request.AbstractRequestHandler; |
| 20 | -import com.yuanrong.m2s.core.handler.request.RequestHandler; | 20 | +import org.yuanrong.m2s.core.handler.request.RequestHandler; |
| 21 | 21 | ||
| 22 | import java.io.IOException; | 22 | import java.io.IOException; |
| 23 | 23 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/PropertyChangeConstants.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/PropertyChangeConstants.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * PropertyChangeConstants | 20 | * PropertyChangeConstants |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/ServletExecutionFilter.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/ServletExecutionFilter.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import java.io.IOException; | 19 | import java.io.IOException; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/ServletMapper.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/ServletMapper.java+5-5
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.util.MappingUtil; | 19 | +import org.yuanrong.m2s.core.util.MappingUtil; |
| 20 | -import com.yuanrong.m2s.core.util.PairElement; | 20 | +import org.yuanrong.m2s.core.util.PairElement; |
| 21 | -import com.yuanrong.m2s.model.YrHttpRequest; | 21 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 22 | -import com.yuanrong.m2s.utils.SecurityUtils; | 22 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 23 | 23 | ||
| 24 | import lombok.Getter; | 24 | import lombok.Getter; |
| 25 | 25 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrApplicationMapping.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrApplicationMapping.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import lombok.ToString; | 19 | import lombok.ToString; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrAsyncContext.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrAsyncContext.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import org.slf4j.Logger; | 19 | import org.slf4j.Logger; |
| 20 | import org.slf4j.LoggerFactory; | 20 | import org.slf4j.LoggerFactory; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrFilterChain.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrFilterChain.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import lombok.extern.slf4j.Slf4j; | 19 | import lombok.extern.slf4j.Slf4j; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrFilterConfig.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrFilterConfig.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import java.util.Collections; | 19 | import java.util.Collections; |
| 20 | import java.util.Enumeration; | 20 | import java.util.Enumeration; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrFilterRegistration.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrFilterRegistration.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import lombok.Getter; | 19 | import lombok.Getter; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrHttpServletRequest.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrHttpServletRequest.java+12-12
| @@ -14,18 +14,18 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.constants.HttpHeaderConstant; | 19 | +import org.yuanrong.m2s.core.constants.HttpHeaderConstant; |
| 20 | -import com.yuanrong.m2s.core.servlet.upload.YrServletFileUpload; | 20 | +import org.yuanrong.m2s.core.servlet.upload.YrServletFileUpload; |
| 21 | -import com.yuanrong.m2s.core.util.AutoCloseableUtil; | 21 | +import org.yuanrong.m2s.core.util.AutoCloseableUtil; |
| 22 | -import com.yuanrong.m2s.core.util.Constants; | 22 | +import org.yuanrong.m2s.core.util.Constants; |
| 23 | -import com.yuanrong.m2s.core.util.HttpHeaderParseUtil; | 23 | +import org.yuanrong.m2s.core.util.HttpHeaderParseUtil; |
| 24 | -import com.yuanrong.m2s.core.util.YrHttpServletConvert; | 24 | +import org.yuanrong.m2s.core.util.YrHttpServletConvert; |
| 25 | -import com.yuanrong.m2s.model.Headers; | 25 | +import org.yuanrong.m2s.model.Headers; |
| 26 | -import com.yuanrong.m2s.model.HttpHeader; | 26 | +import org.yuanrong.m2s.model.HttpHeader; |
| 27 | -import com.yuanrong.m2s.model.YrHttpRequest; | 27 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 28 | -import com.yuanrong.m2s.utils.SecurityUtils; | 28 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 29 | 29 | ||
| 30 | import org.apache.commons.fileupload.FileItem; | 30 | import org.apache.commons.fileupload.FileItem; |
| 31 | import org.apache.commons.fileupload.FileItemFactory; | 31 | import org.apache.commons.fileupload.FileItemFactory; |
| @@ -95,7 +95,7 @@ import javax.servlet.http.Part; | |||
| 95 | * 2025-09-01 | 95 | * 2025-09-01 |
| 96 | */ | 96 | */ |
| 97 | public class YrHttpServletRequest implements HttpServletRequest { | 97 | public class YrHttpServletRequest implements HttpServletRequest { |
| 98 | - static final String DISPATCHER_TYPE_ATTRIBUTE = "com.yuanrong.dispatchertype"; | 98 | + static final String DISPATCHER_TYPE_ATTRIBUTE = "org.yuanrong.dispatchertype"; |
| 99 | 99 | ||
| 100 | static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.RFC_1123_DATE_TIME; | 100 | static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.RFC_1123_DATE_TIME; |
| 101 | 101 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrHttpServletResponse.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrHttpServletResponse.java+11-11
| @@ -14,18 +14,18 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.services.runtime.Context; | 19 | +import org.yuanrong.services.runtime.Context; |
| 20 | -import com.services.runtime.ContextHolder; | 20 | +import org.yuanrong.services.runtime.ContextHolder; |
| 21 | -import com.yuanrong.m2s.core.constants.HttpHeaderConstant; | 21 | +import org.yuanrong.m2s.core.constants.HttpHeaderConstant; |
| 22 | -import com.yuanrong.m2s.core.util.AutoCloseableUtil; | 22 | +import org.yuanrong.m2s.core.util.AutoCloseableUtil; |
| 23 | -import com.yuanrong.m2s.core.util.HttpHeaderParseUtil; | 23 | +import org.yuanrong.m2s.core.util.HttpHeaderParseUtil; |
| 24 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 24 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 25 | -import com.yuanrong.m2s.model.Headers; | 25 | +import org.yuanrong.m2s.model.Headers; |
| 26 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 26 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 27 | -import com.yuanrong.m2s.utils.SecurityUtils; | 27 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 28 | -import com.yuanrong.m2s.utils.StreamUtil; | 28 | +import org.yuanrong.m2s.utils.StreamUtil; |
| 29 | 29 | ||
| 30 | import org.yuanrong.datasystem.DataSystemException; | 30 | import org.yuanrong.datasystem.DataSystemException; |
| 31 | import org.yuanrong.datasystem.stream.Producer; | 31 | import org.yuanrong.datasystem.stream.Producer; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrHttpSession.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrHttpSession.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 19 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 20 | 20 | ||
| 21 | import java.time.Instant; | 21 | import java.time.Instant; |
| 22 | import java.util.Collections; | 22 | import java.util.Collections; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrMappingData.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrMappingData.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import lombok.AccessLevel; | 19 | import lombok.AccessLevel; |
| 20 | import lombok.Getter; | 20 | import lombok.Getter; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrRequestDispatcher.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrRequestDispatcher.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.util.AutoCloseableUtil; | 19 | +import org.yuanrong.m2s.core.util.AutoCloseableUtil; |
| 20 | 20 | ||
| 21 | import java.io.IOException; | 21 | import java.io.IOException; |
| 22 | import java.util.Collections; | 22 | import java.util.Collections; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrRequestPart.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrRequestPart.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import org.apache.commons.fileupload.FileItem; | 19 | import org.apache.commons.fileupload.FileItem; |
| 20 | import org.apache.commons.fileupload.ParameterParser; | 20 | import org.apache.commons.fileupload.ParameterParser; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrServletContext.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrServletContext.java+7-7
| @@ -14,14 +14,14 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.State; | 19 | +import org.yuanrong.m2s.core.State; |
| 20 | -import com.yuanrong.m2s.core.util.Constants; | 20 | +import org.yuanrong.m2s.core.util.Constants; |
| 21 | -import com.yuanrong.m2s.core.util.RequestUtil; | 21 | +import org.yuanrong.m2s.core.util.RequestUtil; |
| 22 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 22 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 23 | -import com.yuanrong.m2s.model.YrHttpRequest; | 23 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 24 | -import com.yuanrong.m2s.utils.SecurityUtils; | 24 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 25 | 25 | ||
| 26 | import org.apache.commons.io.FileUtils; | 26 | import org.apache.commons.io.FileUtils; |
| 27 | import org.apache.commons.lang3.builder.ToStringBuilder; | 27 | import org.apache.commons.lang3.builder.ToStringBuilder; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrServletInputStream.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrServletInputStream.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 19 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 20 | -import com.yuanrong.m2s.utils.SecurityUtils; | 20 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 21 | 21 | ||
| 22 | import lombok.Getter; | 22 | import lombok.Getter; |
| 23 | 23 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrServletRegistration.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrServletRegistration.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import lombok.Getter; | 19 | import lombok.Getter; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrSessionCookieConfig.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrSessionCookieConfig.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.util.AppStateChecker; | 19 | +import org.yuanrong.m2s.core.util.AppStateChecker; |
| 20 | 20 | ||
| 21 | import java.util.Locale; | 21 | import java.util.Locale; |
| 22 | 22 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/YrWebContext.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/YrWebContext.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 19 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 20 | -import com.yuanrong.m2s.utils.SecurityUtils; | 20 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 21 | 21 | ||
| 22 | import org.apache.commons.lang3.builder.ToStringBuilder; | 22 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 23 | import org.slf4j.Logger; | 23 | import org.slf4j.Logger; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/servlet/upload/YrServletFileUpload.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/servlet/upload/YrServletFileUpload.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet.upload; | 17 | +package org.yuanrong.m2s.core.servlet.upload; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.constants.HttpHeaderConstant; | 19 | +import org.yuanrong.m2s.core.constants.HttpHeaderConstant; |
| 20 | -import com.yuanrong.m2s.model.Headers; | 20 | +import org.yuanrong.m2s.model.Headers; |
| 21 | -import com.yuanrong.m2s.model.YrHttpRequest; | 21 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 22 | 22 | ||
| 23 | import java.util.Locale; | 23 | import java.util.Locale; |
| 24 | 24 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/AppStateChecker.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/AppStateChecker.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 19 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 20 | 20 | ||
| 21 | import javax.servlet.ServletContext; | 21 | import javax.servlet.ServletContext; |
| 22 | 22 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/AutoCloseableUtil.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/AutoCloseableUtil.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | import org.slf4j.Logger; | 19 | import org.slf4j.Logger; |
| 20 | import org.slf4j.LoggerFactory; | 20 | import org.slf4j.LoggerFactory; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/Constants.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/Constants.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Adapter constants | 20 | * Adapter constants |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/HttpHeaderParseUtil.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/HttpHeaderParseUtil.java+3-3
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | -import static com.yuanrong.m2s.core.constants.HttpHeaderConstant.PATH_PART_SEPARATOR; | 19 | +import static org.yuanrong.m2s.core.constants.HttpHeaderConstant.PATH_PART_SEPARATOR; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.constants.HttpHeaderConstant; | 21 | +import org.yuanrong.m2s.core.constants.HttpHeaderConstant; |
| 22 | 22 | ||
| 23 | import org.apache.commons.lang3.StringUtils; | 23 | import org.apache.commons.lang3.StringUtils; |
| 24 | 24 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/MappingUtil.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/MappingUtil.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * A utility class that provides functions to handle mapping and association. | 20 | * A utility class that provides functions to handle mapping and association. |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/PairElement.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/PairElement.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | import org.apache.commons.lang3.StringUtils; | 19 | import org.apache.commons.lang3.StringUtils; |
| 20 | import org.apache.commons.lang3.builder.ToStringBuilder; | 20 | import org.apache.commons.lang3.builder.ToStringBuilder; |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/RequestUtil.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/RequestUtil.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | import org.apache.commons.lang3.StringUtils; | 19 | import org.apache.commons.lang3.StringUtils; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/SnapshotUtil.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/SnapshotUtil.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * SnapshotUtil | 20 | * SnapshotUtil |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/YrHttpServletConvert.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/YrHttpServletConvert.java+10-10
| @@ -14,15 +14,15 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.constants.HttpHeaderConstant; | 19 | +import org.yuanrong.m2s.core.constants.HttpHeaderConstant; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 21 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 22 | -import com.yuanrong.m2s.model.Headers; | 22 | +import org.yuanrong.m2s.model.Headers; |
| 23 | -import com.yuanrong.m2s.model.YrHttpRequest; | 23 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 24 | -import com.yuanrong.m2s.model.YrHttpRequestType; | 24 | +import org.yuanrong.m2s.model.YrHttpRequestType; |
| 25 | -import com.yuanrong.m2s.model.YrHttpResponse; | 25 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 26 | 26 | ||
| 27 | import java.nio.charset.StandardCharsets; | 27 | import java.nio.charset.StandardCharsets; |
| 28 | import java.util.Arrays; | 28 | import java.util.Arrays; |
| @@ -43,12 +43,12 @@ public class YrHttpServletConvert { | |||
| 43 | /** | 43 | /** |
| 44 | * YR_REQUEST_TYPE constant key | 44 | * YR_REQUEST_TYPE constant key |
| 45 | */ | 45 | */ |
| 46 | - public static final String YR_REQUEST_TYPE = "com.yuanrong.request.type"; | 46 | + public static final String YR_REQUEST_TYPE = "org.yuanrong.request.type"; |
| 47 | 47 | ||
| 48 | /** | 48 | /** |
| 49 | * YR_REQUEST_ID constant key | 49 | * YR_REQUEST_ID constant key |
| 50 | */ | 50 | */ |
| 51 | - public static final String YR_REQUEST_ID = "com.yuanrong.request.id"; | 51 | + public static final String YR_REQUEST_ID = "org.yuanrong.request.id"; |
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * DEFAULT_CONTENT_CHARSET UTF-8 | 54 | * DEFAULT_CONTENT_CHARSET UTF-8 |
Rmicroservice-adapter/microservice-adapter-core/src/main/java/com/yuanrong/m2s/core/util/YuanRongHelper.java→microservice-adapter/microservice-adapter-core/src/main/java/org/yuanrong/m2s/core/util/YuanRongHelper.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.model.ServerlessContext; | 19 | +import org.yuanrong.m2s.model.ServerlessContext; |
| 20 | -import com.yuanrong.m2s.model.ServerlessFunctionContext; | 20 | +import org.yuanrong.m2s.model.ServerlessFunctionContext; |
| 21 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 21 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * YuanRong helper | 24 | * YuanRong helper |
| @@ -1,6 +0,0 @@ | |||
| 1 | -com.yuanrong.m2s.core.handler.request.AttrRelationRequestHandler | ||
| 2 | -com.yuanrong.m2s.core.handler.request.ApaterRequestHandler | ||
| 3 | -com.yuanrong.m2s.core.handler.request.FindServletContextRequestHandler | ||
| 4 | -com.yuanrong.m2s.core.handler.request.ParsePathRequestHandler | ||
| 5 | -com.yuanrong.m2s.core.handler.request.StatusMsgHandler | ||
| 6 | -com.yuanrong.m2s.core.servlet.FiltersServiceRequestHandler | ||
| @@ -0,0 +1,6 @@ | |||
| 1 | +org.yuanrong.m2s.core.handler.request.AttrRelationRequestHandler | ||
| 2 | +org.yuanrong.m2s.core.handler.request.ApaterRequestHandler | ||
| 3 | +org.yuanrong.m2s.core.handler.request.FindServletContextRequestHandler | ||
| 4 | +org.yuanrong.m2s.core.handler.request.ParsePathRequestHandler | ||
| 5 | +org.yuanrong.m2s.core.handler.request.StatusMsgHandler | ||
| 6 | +org.yuanrong.m2s.core.servlet.FiltersServiceRequestHandler | ||
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/handler/HandlersChainTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/handler/HandlersChainTest.java+15-15
| @@ -14,20 +14,20 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler; | 17 | +package org.yuanrong.m2s.core.handler; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.constants.HttpHeaderConstant; | 19 | +import org.yuanrong.m2s.core.constants.HttpHeaderConstant; |
| 20 | -import com.yuanrong.m2s.core.handler.request.HolderHandler; | 20 | +import org.yuanrong.m2s.core.handler.request.HolderHandler; |
| 21 | -import com.yuanrong.m2s.core.handler.request.RequestHandler; | 21 | +import org.yuanrong.m2s.core.handler.request.RequestHandler; |
| 22 | -import com.yuanrong.m2s.core.servlet.FilterChainManager; | 22 | +import org.yuanrong.m2s.core.servlet.FilterChainManager; |
| 23 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 23 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 24 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 24 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 25 | -import com.yuanrong.m2s.core.servlet.YrHttpSession; | 25 | +import org.yuanrong.m2s.core.servlet.YrHttpSession; |
| 26 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 26 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 27 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 27 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 28 | -import com.yuanrong.m2s.core.util.YrHttpServletConvert; | 28 | +import org.yuanrong.m2s.core.util.YrHttpServletConvert; |
| 29 | -import com.yuanrong.m2s.model.YrHttpRequest; | 29 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 30 | -import com.yuanrong.m2s.model.YrHttpRequestType; | 30 | +import org.yuanrong.m2s.model.YrHttpRequestType; |
| 31 | 31 | ||
| 32 | import org.apache.cxf.transport.servlet.CXFServlet; | 32 | import org.apache.cxf.transport.servlet.CXFServlet; |
| 33 | import org.junit.Assert; | 33 | import org.junit.Assert; |
| @@ -64,8 +64,8 @@ public class HandlersChainTest { | |||
| 64 | 64 | ||
| 65 | YrHttpServletRequest request = YrHttpServletConvert.convertHTTPRequestToServletRequest(yrHttpRequest); | 65 | YrHttpServletRequest request = YrHttpServletConvert.convertHTTPRequestToServletRequest(yrHttpRequest); |
| 66 | request.setServletPath(""); | 66 | request.setServletPath(""); |
| 67 | - request.setAttribute("com.yuanrong.dispatchertype", DispatcherType.REQUEST); | 67 | + request.setAttribute("org.yuanrong.dispatchertype", DispatcherType.REQUEST); |
| 68 | - request.setAttribute("com.yuanrong.request.type", YrHttpRequestType.HTTP); | 68 | + request.setAttribute("org.yuanrong.request.type", YrHttpRequestType.HTTP); |
| 69 | YrHttpServletResponse yrHttpServletResponse = new YrHttpServletResponse(request, new CountDownLatch(0)); | 69 | YrHttpServletResponse yrHttpServletResponse = new YrHttpServletResponse(request, new CountDownLatch(0)); |
| 70 | yrHttpServletResponse.setHeader("Content-Language", "zh"); | 70 | yrHttpServletResponse.setHeader("Content-Language", "zh"); |
| 71 | 71 | ||
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/handler/request/FindServletContextRequestHandlerTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/handler/request/FindServletContextRequestHandlerTest.java+7-7
| @@ -14,14 +14,14 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 19 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 22 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 23 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 23 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 24 | -import com.yuanrong.m2s.model.YrHttpRequest; | 24 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 25 | 25 | ||
| 26 | import org.junit.Assert; | 26 | import org.junit.Assert; |
| 27 | import org.junit.Test; | 27 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/handler/request/HolderHandler.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/handler/request/HolderHandler.java+5-5
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 19 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrHttpSession; | 21 | +import org.yuanrong.m2s.core.servlet.YrHttpSession; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 22 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 23 | 23 | ||
| 24 | import javax.servlet.http.Cookie; | 24 | import javax.servlet.http.Cookie; |
| 25 | 25 | ||
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/handler/request/ParsePathRequestHandlerTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/handler/request/ParsePathRequestHandlerTest.java+5-5
| @@ -14,14 +14,14 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 21 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 22 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 23 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 23 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 24 | -import com.yuanrong.m2s.model.YrHttpRequest; | 24 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 25 | 25 | ||
| 26 | import org.junit.Test; | 26 | import org.junit.Test; |
| 27 | import org.springframework.util.LinkedMultiValueMap; | 27 | import org.springframework.util.LinkedMultiValueMap; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/handler/request/StatusMsgHandlerTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/handler/request/StatusMsgHandlerTest.java+4-4
| @@ -14,13 +14,13 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.handler.request; | 17 | +package org.yuanrong.m2s.core.handler.request; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 21 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 22 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 23 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 23 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 24 | 24 | ||
| 25 | import org.junit.Test; | 25 | import org.junit.Test; |
| 26 | import org.junit.runner.RunWith; | 26 | import org.junit.runner.RunWith; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/DataSystemOutputStreamTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/DataSystemOutputStreamTest.java+2-2
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import org.yuanrong.datasystem.DataSystemException; | 19 | import org.yuanrong.datasystem.DataSystemException; |
| 20 | import org.yuanrong.datasystem.stream.Producer; | 20 | import org.yuanrong.datasystem.stream.Producer; |
| 21 | -import com.yuanrong.m2s.utils.StreamUtil; | 21 | +import org.yuanrong.m2s.utils.StreamUtil; |
| 22 | import org.junit.Assert; | 22 | import org.junit.Assert; |
| 23 | import org.junit.Test; | 23 | import org.junit.Test; |
| 24 | import org.junit.runner.RunWith; | 24 | import org.junit.runner.RunWith; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/DataTransferEntityTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/DataTransferEntityTest.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.model.Headers; | 19 | +import org.yuanrong.m2s.model.Headers; |
| 20 | 20 | ||
| 21 | import org.junit.Assert; | 21 | import org.junit.Assert; |
| 22 | import org.junit.Test; | 22 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/FilterChainManagerTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/FilterChainManagerTest.java+2-2
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.model.YrHttpRequest; | 21 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 22 | 22 | ||
| 23 | import org.junit.BeforeClass; | 23 | import org.junit.BeforeClass; |
| 24 | import org.junit.Test; | 24 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/FilterWrapperTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/FilterWrapperTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | import static org.junit.Assert.assertFalse; | 20 | import static org.junit.Assert.assertFalse; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/ServletMapperTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/ServletMapperTest.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.model.YrHttpRequest; | 19 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 20 | 20 | ||
| 21 | import org.apache.cxf.transport.servlet.CXFServlet; | 21 | import org.apache.cxf.transport.servlet.CXFServlet; |
| 22 | import org.junit.Assert; | 22 | import org.junit.Assert; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/TestContext.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/TestContext.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 19 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 20 | -import com.yuanrong.m2s.runtime.api.FunctionLogger; | 20 | +import org.yuanrong.m2s.runtime.api.FunctionLogger; |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * Test Context. | 23 | * Test Context. |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/TestEventListener.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/TestEventListener.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import javax.servlet.ServletContextAttributeEvent; | 19 | import javax.servlet.ServletContextAttributeEvent; |
| 20 | import javax.servlet.ServletContextAttributeListener; | 20 | import javax.servlet.ServletContextAttributeListener; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrApplicationMappingTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrApplicationMappingTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import org.junit.Assert; | 19 | import org.junit.Assert; |
| 20 | import org.junit.Test; | 20 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrAsyncContextTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrAsyncContextTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import static org.junit.Assert.assertEquals; | 19 | import static org.junit.Assert.assertEquals; |
| 20 | import static org.junit.Assert.assertFalse; | 20 | import static org.junit.Assert.assertFalse; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrHttpServletRequestTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrHttpServletRequestTest.java+6-6
| @@ -14,19 +14,19 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import static com.yuanrong.m2s.core.constants.HttpHeaderConstant.HTTP_PROTOCOL; | 19 | +import static org.yuanrong.m2s.core.constants.HttpHeaderConstant.HTTP_PROTOCOL; |
| 20 | import static org.assertj.core.api.Assertions.assertThat; | 20 | import static org.assertj.core.api.Assertions.assertThat; |
| 21 | import static org.assertj.core.api.Assertions.assertThatThrownBy; | 21 | import static org.assertj.core.api.Assertions.assertThatThrownBy; |
| 22 | import static org.mockito.Mockito.mock; | 22 | import static org.mockito.Mockito.mock; |
| 23 | import static org.mockito.Mockito.spy; | 23 | import static org.mockito.Mockito.spy; |
| 24 | import static org.mockito.Mockito.when; | 24 | import static org.mockito.Mockito.when; |
| 25 | 25 | ||
| 26 | -import com.yuanrong.m2s.core.constants.HttpHeaderConstant; | 26 | +import org.yuanrong.m2s.core.constants.HttpHeaderConstant; |
| 27 | -import com.yuanrong.m2s.core.util.YrHttpServletConvert; | 27 | +import org.yuanrong.m2s.core.util.YrHttpServletConvert; |
| 28 | -import com.yuanrong.m2s.model.Headers; | 28 | +import org.yuanrong.m2s.model.Headers; |
| 29 | -import com.yuanrong.m2s.model.YrHttpRequest; | 29 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 30 | 30 | ||
| 31 | import org.apache.catalina.core.ApplicationPart; | 31 | import org.apache.catalina.core.ApplicationPart; |
| 32 | import org.apache.tomcat.util.http.fileupload.FileItem; | 32 | import org.apache.tomcat.util.http.fileupload.FileItem; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrHttpServletResponseTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrHttpServletResponseTest.java+5-5
| @@ -14,15 +14,15 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | import org.yuanrong.datasystem.stream.StreamClient; | 21 | import org.yuanrong.datasystem.stream.StreamClient; |
| 22 | -import com.yuanrong.m2s.model.YrHttpRequest; | 22 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 23 | 23 | ||
| 24 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 24 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 25 | -import com.yuanrong.m2s.utils.StreamUtil; | 25 | +import org.yuanrong.m2s.utils.StreamUtil; |
| 26 | import lombok.SneakyThrows; | 26 | import lombok.SneakyThrows; |
| 27 | 27 | ||
| 28 | import org.junit.Assert; | 28 | import org.junit.Assert; |
| @@ -56,7 +56,7 @@ import javax.servlet.http.Cookie; | |||
| 56 | */ | 56 | */ |
| 57 | 57 | ||
| 58 | 58 | ||
| 59 | -@SuppressStaticInitializationFor("com.datasystem.streamcache.StreamClient") | 59 | +@SuppressStaticInitializationFor("org.yuanrong.datasystem.stream.StreamClient") |
| 60 | public class YrHttpServletResponseTest { | 60 | public class YrHttpServletResponseTest { |
| 61 | private static class MyWriteListener implements WriteListener { | 61 | private static class MyWriteListener implements WriteListener { |
| 62 | 62 | ||
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrHttpSessionTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrHttpSessionTest.java+2-2
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; | 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; |
| 21 | 21 | ||
| 22 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 22 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 23 | 23 | ||
| 24 | import org.junit.Test; | 24 | import org.junit.Test; |
| 25 | import org.mockito.Mockito; | 25 | import org.mockito.Mockito; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrRequestPartTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrRequestPartTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import static org.junit.Assert.assertEquals; | 19 | import static org.junit.Assert.assertEquals; |
| 20 | import static org.junit.Assert.assertNull; | 20 | import static org.junit.Assert.assertNull; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrServletContextTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrServletContextTest.java+6-6
| @@ -14,14 +14,14 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; | 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; |
| 21 | 21 | ||
| 22 | -import com.yuanrong.m2s.core.State; | 22 | +import org.yuanrong.m2s.core.State; |
| 23 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 23 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 24 | -import com.yuanrong.m2s.model.YrHttpRequest; | 24 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 25 | 25 | ||
| 26 | import org.junit.Assert; | 26 | import org.junit.Assert; |
| 27 | import org.junit.Test; | 27 | import org.junit.Test; |
| @@ -157,7 +157,7 @@ public class YrServletContextTest { | |||
| 157 | FilterRegistration.Dynamic repeatReg1 = context.addFilter("AFilter", filter); | 157 | FilterRegistration.Dynamic repeatReg1 = context.addFilter("AFilter", filter); |
| 158 | FilterRegistration.Dynamic reg2 = context.addFilter("BFilter", TestFilter.class); | 158 | FilterRegistration.Dynamic reg2 = context.addFilter("BFilter", TestFilter.class); |
| 159 | FilterRegistration.Dynamic reg3 = context.addFilter("CFilter", | 159 | FilterRegistration.Dynamic reg3 = context.addFilter("CFilter", |
| 160 | - "com.yuanrong.m2s.core.servlet.YrServletContextTest$TestFilter"); | 160 | + "org.yuanrong.m2s.core.servlet.YrServletContextTest$TestFilter"); |
| 161 | 161 | ||
| 162 | FilterRegistration aFilter = context.getFilterRegistration("AFilter"); | 162 | FilterRegistration aFilter = context.getFilterRegistration("AFilter"); |
| 163 | FilterRegistration bFilter = context.getFilterRegistration("BFilter"); | 163 | FilterRegistration bFilter = context.getFilterRegistration("BFilter"); |
| @@ -180,7 +180,7 @@ public class YrServletContextTest { | |||
| 180 | assertThat(reg2).isNull(); | 180 | assertThat(reg2).isNull(); |
| 181 | 181 | ||
| 182 | Assert.assertThrows(IllegalStateException.class, | 182 | Assert.assertThrows(IllegalStateException.class, |
| 183 | - () -> context.addFilter("NFilter", "com.not.TestClass")); | 183 | + () -> context.addFilter("NFilter", "org.not.TestClass")); |
| 184 | } | 184 | } |
| 185 | 185 | ||
| 186 | 186 | ||
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrServletFileUploadTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrServletFileUploadTest.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.model.Headers; | 19 | +import org.yuanrong.m2s.model.Headers; |
| 20 | -import com.yuanrong.m2s.model.YrHttpRequest; | 20 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 21 | 21 | ||
| 22 | import org.apache.commons.io.IOUtils; | 22 | import org.apache.commons.io.IOUtils; |
| 23 | import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder; | 23 | import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrServletInputStreamTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrServletInputStreamTest.java+2-2
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; | 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; |
| 21 | 21 | ||
| 22 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 22 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 23 | 23 | ||
| 24 | import org.junit.Test; | 24 | import org.junit.Test; |
| 25 | 25 | ||
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrServletRegistrationTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrServletRegistrationTest.java+2-2
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; | 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; |
| 21 | 21 | ||
| 22 | -import com.yuanrong.m2s.model.YrHttpRequest; | 22 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 23 | 23 | ||
| 24 | import org.junit.Assert; | 24 | import org.junit.Assert; |
| 25 | import org.junit.Test; | 25 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrSessionCookieConfigTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrSessionCookieConfigTest.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.State; | 19 | +import org.yuanrong.m2s.core.State; |
| 20 | 20 | ||
| 21 | import org.junit.Assert; | 21 | import org.junit.Assert; |
| 22 | import org.junit.Test; | 22 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/servlet/YrWebContextTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/servlet/YrWebContextTest.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.servlet; | 17 | +package org.yuanrong.m2s.core.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 19 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 20 | 20 | ||
| 21 | import org.junit.Assert; | 21 | import org.junit.Assert; |
| 22 | import org.junit.Test; | 22 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/util/AppStateCheckerTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/util/AppStateCheckerTest.java+2-2
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | import static org.junit.Assert.*; | 19 | import static org.junit.Assert.*; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 22 | 22 | ||
| 23 | import org.junit.Test; | 23 | import org.junit.Test; |
| 24 | import org.mockito.Mockito; | 24 | import org.mockito.Mockito; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/util/HttpHeaderParseUtilTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/util/HttpHeaderParseUtilTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | import static org.junit.Assert.assertEquals; | 19 | import static org.junit.Assert.assertEquals; |
| 20 | import static org.junit.Assert.assertFalse; | 20 | import static org.junit.Assert.assertFalse; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/util/MappingUtilTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/util/MappingUtilTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | import org.junit.Assert; | 19 | import org.junit.Assert; |
| 20 | import org.junit.Before; | 20 | import org.junit.Before; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/util/PairElementTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/util/PairElementTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | import org.junit.Assert; | 19 | import org.junit.Assert; |
| 20 | import org.junit.Test; | 20 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/util/SnapshotUtilTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/util/SnapshotUtilTest.java+2-2
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | import static org.junit.Assert.assertEquals; | 19 | import static org.junit.Assert.assertEquals; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.util.SnapshotUtil.Mode; | 21 | +import org.yuanrong.m2s.core.util.SnapshotUtil.Mode; |
| 22 | 22 | ||
| 23 | import org.junit.After; | 23 | import org.junit.After; |
| 24 | import org.junit.Before; | 24 | import org.junit.Before; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/util/YrHttpServletConvertTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/util/YrHttpServletConvertTest.java+7-7
| @@ -14,17 +14,17 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | -import static com.yuanrong.m2s.core.util.YrHttpServletConvert.MAX_REQUEST_BODY; | 19 | +import static org.yuanrong.m2s.core.util.YrHttpServletConvert.MAX_REQUEST_BODY; |
| 20 | import static org.assertj.core.api.Assertions.assertThat; | 20 | import static org.assertj.core.api.Assertions.assertThat; |
| 21 | import static org.assertj.core.api.Assertions.assertThatThrownBy; | 21 | import static org.assertj.core.api.Assertions.assertThatThrownBy; |
| 22 | 22 | ||
| 23 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 23 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 24 | -import com.yuanrong.m2s.model.Headers; | 24 | +import org.yuanrong.m2s.model.Headers; |
| 25 | -import com.yuanrong.m2s.model.YrHttpRequest; | 25 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 26 | -import com.yuanrong.m2s.model.YrHttpRequestType; | 26 | +import org.yuanrong.m2s.model.YrHttpRequestType; |
| 27 | -import com.yuanrong.m2s.model.YrHttpResponse; | 27 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 28 | 28 | ||
| 29 | import org.junit.Test; | 29 | import org.junit.Test; |
| 30 | import org.springframework.http.HttpHeaders; | 30 | import org.springframework.http.HttpHeaders; |
Rmicroservice-adapter/microservice-adapter-core/src/test/java/com/yuanrong/m2s/core/util/YuanRongHelperTest.java→microservice-adapter/microservice-adapter-core/src/test/java/org/yuanrong/m2s/core/util/YuanRongHelperTest.java+4-4
| @@ -14,13 +14,13 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.core.util; | 17 | +package org.yuanrong.m2s.core.util; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.servlet.TestContext; | 21 | +import org.yuanrong.m2s.core.servlet.TestContext; |
| 22 | -import com.yuanrong.m2s.model.ServerlessContext; | 22 | +import org.yuanrong.m2s.model.ServerlessContext; |
| 23 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 23 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 24 | 24 | ||
| 25 | import org.junit.After; | 25 | import org.junit.After; |
| 26 | import org.junit.Test; | 26 | import org.junit.Test; |
| @@ -4,7 +4,7 @@ | |||
| 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | <modelVersion>4.0.0</modelVersion> | 5 | <modelVersion>4.0.0</modelVersion> |
| 6 | <parent> | 6 | <parent> |
| 7 | - <groupId>com.yuanrong.m2s</groupId> | 7 | + <groupId>org.yuanrong.m2s</groupId> |
| 8 | <artifactId>microservice-adapter</artifactId> | 8 | <artifactId>microservice-adapter</artifactId> |
| 9 | <version>1.0.0</version> | 9 | <version>1.0.0</version> |
| 10 | </parent> | 10 | </parent> |
| @@ -18,7 +18,7 @@ | |||
| 18 | </properties> | 18 | </properties> |
| 19 | <dependencies> | 19 | <dependencies> |
| 20 | <dependency> | 20 | <dependency> |
| 21 | - <groupId>com.yuanrong.m2s</groupId> | 21 | + <groupId>org.yuanrong.m2s</groupId> |
| 22 | <artifactId>microservice-adapter-core</artifactId> | 22 | <artifactId>microservice-adapter-core</artifactId> |
| 23 | <version>${project.version}</version> | 23 | <version>${project.version}</version> |
| 24 | </dependency> | 24 | </dependency> |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/DefaultServiceMethodLookup.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/DefaultServiceMethodLookup.java+5-5
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.annotation.FunctionHandler; | 19 | +import org.yuanrong.m2s.annotation.FunctionHandler; |
| 20 | -import com.yuanrong.m2s.annotation.FunctionService; | 20 | +import org.yuanrong.m2s.annotation.FunctionService; |
| 21 | -import com.yuanrong.m2s.core.exception.ConflictingFunctionDefinitionException; | 21 | +import org.yuanrong.m2s.core.exception.ConflictingFunctionDefinitionException; |
| 22 | -import com.yuanrong.m2s.utils.SecurityUtils; | 22 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 23 | 23 | ||
| 24 | import com.fasterxml.jackson.core.JsonProcessingException; | 24 | import com.fasterxml.jackson.core.JsonProcessingException; |
| 25 | import com.fasterxml.jackson.databind.ObjectMapper; | 25 | import com.fasterxml.jackson.databind.ObjectMapper; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/MicroserviceAdapter.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/MicroserviceAdapter.java+17-17
| @@ -14,24 +14,24 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.State; | 19 | +import org.yuanrong.m2s.core.State; |
| 20 | -import com.yuanrong.m2s.core.constants.HttpHeaderConstant; | 20 | +import org.yuanrong.m2s.core.constants.HttpHeaderConstant; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 22 | -import com.yuanrong.m2s.core.util.Constants; | 22 | +import org.yuanrong.m2s.core.util.Constants; |
| 23 | -import com.yuanrong.m2s.core.util.YuanRongHelper; | 23 | +import org.yuanrong.m2s.core.util.YuanRongHelper; |
| 24 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 24 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 25 | -import com.yuanrong.m2s.model.YrHttpRequest; | 25 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 26 | -import com.yuanrong.m2s.model.YrHttpRequestBuilder; | 26 | +import org.yuanrong.m2s.model.YrHttpRequestBuilder; |
| 27 | -import com.yuanrong.m2s.model.YrHttpResponse; | 27 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 28 | -import com.yuanrong.m2s.model.mqs.ConsumeStatus; | 28 | +import org.yuanrong.m2s.model.mqs.ConsumeStatus; |
| 29 | -import com.yuanrong.m2s.model.mqs.Message; | 29 | +import org.yuanrong.m2s.model.mqs.Message; |
| 30 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 30 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 31 | -import com.yuanrong.m2s.springboot2.handler.SpringBootHandler; | 31 | +import org.yuanrong.m2s.springboot2.handler.SpringBootHandler; |
| 32 | -import com.yuanrong.m2s.springboot2.util.Log4jUtils; | 32 | +import org.yuanrong.m2s.springboot2.util.Log4jUtils; |
| 33 | -import com.yuanrong.m2s.utils.MediaType; | 33 | +import org.yuanrong.m2s.utils.MediaType; |
| 34 | -import com.yuanrong.m2s.utils.SecurityUtils; | 34 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 35 | 35 | ||
| 36 | import com.google.gson.Gson; | 36 | import com.google.gson.Gson; |
| 37 | import com.google.gson.JsonObject; | 37 | import com.google.gson.JsonObject; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/ServiceMethodInvoker.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/ServiceMethodInvoker.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 19 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 20 | 20 | ||
| 21 | import com.fasterxml.jackson.core.JsonProcessingException; | 21 | import com.fasterxml.jackson.core.JsonProcessingException; |
| 22 | import com.fasterxml.jackson.databind.ObjectMapper; | 22 | import com.fasterxml.jackson.databind.ObjectMapper; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/ServiceMethodLookup.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/ServiceMethodLookup.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | import java.lang.reflect.Method; | 19 | import java.lang.reflect.Method; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/config/FunctionAutoConfiguration.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/config/FunctionAutoConfiguration.java+3-3
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.config; | 17 | +package org.yuanrong.m2s.springboot2.config; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.springboot2.embedded.ServerlessServerFactoryCustomizer; | 19 | +import org.yuanrong.m2s.springboot2.embedded.ServerlessServerFactoryCustomizer; |
| 20 | 20 | ||
| 21 | import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; | 21 | import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication; |
| 22 | import org.springframework.boot.autoconfigure.web.ServerProperties; | 22 | import org.springframework.boot.autoconfigure.web.ServerProperties; |
| @@ -32,7 +32,7 @@ import org.springframework.context.annotation.Configuration; | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | -@ComponentScan(basePackages = {"com.yuanrong.m2s.springboot2"}) | 35 | +@ComponentScan(basePackages = {"org.yuanrong.m2s.springboot2"}) |
| 36 | 36 | ||
| 37 | public class FunctionAutoConfiguration { | 37 | public class FunctionAutoConfiguration { |
| 38 | /** | 38 | /** |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/config/FunctionServletAutoConfiguration.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/config/FunctionServletAutoConfiguration.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.config; | 17 | +package org.yuanrong.m2s.springboot2.config; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.springboot2.ServiceMethodInvoker; | 19 | +import org.yuanrong.m2s.springboot2.ServiceMethodInvoker; |
| 20 | -import com.yuanrong.m2s.springboot2.servlet.FunctionServlet; | 20 | +import org.yuanrong.m2s.springboot2.servlet.FunctionServlet; |
| 21 | 21 | ||
| 22 | import com.fasterxml.jackson.databind.ObjectMapper; | 22 | import com.fasterxml.jackson.databind.ObjectMapper; |
| 23 | 23 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/config/YrConfigEnvironmentPostProcessor.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/config/YrConfigEnvironmentPostProcessor.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.config; | 17 | +package org.yuanrong.m2s.springboot2.config; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 19 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 20 | 20 | ||
| 21 | import org.apache.commons.io.FileUtils; | 21 | import org.apache.commons.io.FileUtils; |
| 22 | import org.apache.commons.lang3.StringUtils; | 22 | import org.apache.commons.lang3.StringUtils; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/embedded/NettyWebServerWrapper.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/embedded/NettyWebServerWrapper.java+3-3
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import static com.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_NAME; | 19 | +import static org.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_NAME; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 22 | 22 | ||
| 23 | import reactor.netty.http.server.HttpServer; | 23 | import reactor.netty.http.server.HttpServer; |
| 24 | 24 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/embedded/ReactiveServletHelper.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/embedded/ReactiveServletHelper.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import static com.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_INFO; | 19 | +import static org.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_INFO; |
| 20 | 20 | ||
| 21 | import org.springframework.http.server.reactive.ServletHttpHandlerAdapter; | 21 | import org.springframework.http.server.reactive.ServletHttpHandlerAdapter; |
| 22 | 22 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/embedded/ServerlessReactiveServletEmbeddedServerFactory.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/embedded/ServerlessReactiveServletEmbeddedServerFactory.java+3-3
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 19 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 20 | 20 | ||
| 21 | import reactor.netty.http.HttpProtocol; | 21 | import reactor.netty.http.HttpProtocol; |
| 22 | import reactor.netty.http.server.HttpServer; | 22 | import reactor.netty.http.server.HttpServer; |
| @@ -44,7 +44,7 @@ import java.util.List; | |||
| 44 | * 2025-03-24 | 44 | * 2025-03-24 |
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | -@ComponentScan(basePackages = {"com.yuanrong.m2s.core"}) | 47 | +@ComponentScan(basePackages = {"org.yuanrong.m2s.core"}) |
| 48 | public class ServerlessReactiveServletEmbeddedServerFactory extends AbstractReactiveWebServerFactory { | 48 | public class ServerlessReactiveServletEmbeddedServerFactory extends AbstractReactiveWebServerFactory { |
| 49 | /** | 49 | /** |
| 50 | * websocket enabled | 50 | * websocket enabled |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/embedded/ServerlessServerFactoryCustomizer.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/embedded/ServerlessServerFactoryCustomizer.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.springboot2.handler.SpringBootHandler; | 19 | +import org.yuanrong.m2s.springboot2.handler.SpringBootHandler; |
| 20 | 20 | ||
| 21 | import org.springframework.boot.autoconfigure.web.ServerProperties; | 21 | import org.springframework.boot.autoconfigure.web.ServerProperties; |
| 22 | import org.springframework.boot.web.server.WebServerFactoryCustomizer; | 22 | import org.springframework.boot.web.server.WebServerFactoryCustomizer; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/embedded/ServerlessServletEmbeddedServerFactory.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/embedded/ServerlessServletEmbeddedServerFactory.java+4-4
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.State; | 19 | +import org.yuanrong.m2s.core.State; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 20 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 21 | 21 | ||
| 22 | import org.apache.commons.lang3.builder.ToStringBuilder; | 22 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 23 | import org.slf4j.Logger; | 23 | import org.slf4j.Logger; |
| @@ -41,7 +41,7 @@ import javax.servlet.ServletException; | |||
| 41 | * 2021/12/21 | 41 | * 2021/12/21 |
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | -@ComponentScan(basePackages = {"com.yuanrong.m2s.core"}) | 44 | +@ComponentScan(basePackages = {"org.yuanrong.m2s.core"}) |
| 45 | public class ServerlessServletEmbeddedServerFactory extends AbstractServletWebServerFactory | 45 | public class ServerlessServletEmbeddedServerFactory extends AbstractServletWebServerFactory |
| 46 | implements ServletWebServerFactory, WebServerFactory { | 46 | implements ServletWebServerFactory, WebServerFactory { |
| 47 | private static final Logger LOGGER = LoggerFactory.getLogger(ServerlessServletEmbeddedServerFactory.class); | 47 | private static final Logger LOGGER = LoggerFactory.getLogger(ServerlessServletEmbeddedServerFactory.class); |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/embedded/ServletAdapterConfig.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/embedded/ServletAdapterConfig.java+3-3
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 19 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 20 | 20 | ||
| 21 | import java.util.Enumeration; | 21 | import java.util.Enumeration; |
| 22 | 22 | ||
| @@ -30,7 +30,7 @@ import javax.servlet.ServletContext; | |||
| 30 | */ | 30 | */ |
| 31 | public class ServletAdapterConfig implements ServletConfig { | 31 | public class ServletAdapterConfig implements ServletConfig { |
| 32 | static final String SERVLET_NAME | 32 | static final String SERVLET_NAME |
| 33 | - = "com.yuanrong.m2s.springboot2.embedded.ServerlessReactiveEmbeddedServerFactory"; | 33 | + = "org.yuanrong.m2s.springboot2.embedded.ServerlessReactiveEmbeddedServerFactory"; |
| 34 | 34 | ||
| 35 | static final String SERVLET_INFO = "ServerlessReactiveEmbeddedServerFactory"; | 35 | static final String SERVLET_INFO = "ServerlessReactiveEmbeddedServerFactory"; |
| 36 | 36 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/embedded/YrEmbeddedReactiveWebServer.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/embedded/YrEmbeddedReactiveWebServer.java+3-3
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import static com.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_NAME; | 19 | +import static org.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_NAME; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 22 | 22 | ||
| 23 | import org.springframework.boot.web.server.WebServer; | 23 | import org.springframework.boot.web.server.WebServer; |
| 24 | import org.springframework.boot.web.server.WebServerException; | 24 | import org.springframework.boot.web.server.WebServerException; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/embedded/YrEmbeddedWebServer.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/embedded/YrEmbeddedWebServer.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 19 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 20 | 20 | ||
| 21 | import org.apache.commons.lang3.builder.ToStringBuilder; | 21 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 22 | import org.springframework.boot.web.server.WebServer; | 22 | import org.springframework.boot.web.server.WebServer; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/handler/SpringBootHandler.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/handler/SpringBootHandler.java+28-28
| @@ -14,35 +14,35 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.handler; | 17 | +package org.yuanrong.m2s.springboot2.handler; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.api.SnapshotResourceRefresher; | 19 | +import org.yuanrong.m2s.api.SnapshotResourceRefresher; |
| 20 | -import com.yuanrong.m2s.core.handler.HandlersChain; | 20 | +import org.yuanrong.m2s.core.handler.HandlersChain; |
| 21 | -import com.yuanrong.m2s.core.servlet.FilterChainManager; | 21 | +import org.yuanrong.m2s.core.servlet.FilterChainManager; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 22 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 23 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 23 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 24 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 24 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 25 | -import com.yuanrong.m2s.core.servlet.YrServletInputStream; | 25 | +import org.yuanrong.m2s.core.servlet.YrServletInputStream; |
| 26 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 26 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 27 | -import com.yuanrong.m2s.core.util.Constants; | 27 | +import org.yuanrong.m2s.core.util.Constants; |
| 28 | -import com.yuanrong.m2s.core.util.YrHttpServletConvert; | 28 | +import org.yuanrong.m2s.core.util.YrHttpServletConvert; |
| 29 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 29 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 30 | -import com.yuanrong.m2s.model.YrHttpRequest; | 30 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 31 | -import com.yuanrong.m2s.model.YrHttpResponse; | 31 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 32 | -import com.yuanrong.m2s.model.mqs.ConsumeStatus; | 32 | +import org.yuanrong.m2s.model.mqs.ConsumeStatus; |
| 33 | -import com.yuanrong.m2s.model.mqs.Message; | 33 | +import org.yuanrong.m2s.model.mqs.Message; |
| 34 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 34 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 35 | -import com.yuanrong.m2s.springboot2.embedded.NettyWebServerWrapper; | 35 | +import org.yuanrong.m2s.springboot2.embedded.NettyWebServerWrapper; |
| 36 | -import com.yuanrong.m2s.springboot2.embedded.ServerlessReactiveServletEmbeddedServerFactory; | 36 | +import org.yuanrong.m2s.springboot2.embedded.ServerlessReactiveServletEmbeddedServerFactory; |
| 37 | -import com.yuanrong.m2s.springboot2.embedded.ServerlessServletEmbeddedServerFactory; | 37 | +import org.yuanrong.m2s.springboot2.embedded.ServerlessServletEmbeddedServerFactory; |
| 38 | -import com.yuanrong.m2s.springboot2.embedded.YrEmbeddedReactiveWebServer; | 38 | +import org.yuanrong.m2s.springboot2.embedded.YrEmbeddedReactiveWebServer; |
| 39 | -import com.yuanrong.m2s.springboot2.handler.mqs.MqsHandler; | 39 | +import org.yuanrong.m2s.springboot2.handler.mqs.MqsHandler; |
| 40 | -import com.yuanrong.m2s.springboot2.inputstream.DataSystemInputStream; | 40 | +import org.yuanrong.m2s.springboot2.inputstream.DataSystemInputStream; |
| 41 | -import com.yuanrong.m2s.springboot2.servlet.YrContextHolder; | 41 | +import org.yuanrong.m2s.springboot2.servlet.YrContextHolder; |
| 42 | -import com.yuanrong.m2s.springboot2.servlet.YrSpringWebContext; | 42 | +import org.yuanrong.m2s.springboot2.servlet.YrSpringWebContext; |
| 43 | -import com.yuanrong.m2s.springboot2.spring.ServerlessSpringApplicationBuilder; | 43 | +import org.yuanrong.m2s.springboot2.spring.ServerlessSpringApplicationBuilder; |
| 44 | -import com.yuanrong.m2s.utils.SecurityUtils; | 44 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 45 | -import com.yuanrong.m2s.utils.StreamUtil; | 45 | +import org.yuanrong.m2s.utils.StreamUtil; |
| 46 | 46 | ||
| 47 | import org.yuanrong.datasystem.DataSystemException; | 47 | import org.yuanrong.datasystem.DataSystemException; |
| 48 | import org.yuanrong.datasystem.stream.StreamClient; | 48 | import org.yuanrong.datasystem.stream.StreamClient; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/handler/WebServerInitializedEventListener.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/handler/WebServerInitializedEventListener.java+8-8
| @@ -14,15 +14,15 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.handler; | 17 | +package org.yuanrong.m2s.springboot2.handler; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.State; | 19 | +import org.yuanrong.m2s.core.State; |
| 20 | -import com.yuanrong.m2s.core.servlet.FilterChainManager; | 20 | +import org.yuanrong.m2s.core.servlet.FilterChainManager; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 21 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 22 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 23 | -import com.yuanrong.m2s.springboot2.embedded.YrEmbeddedReactiveWebServer; | 23 | +import org.yuanrong.m2s.springboot2.embedded.YrEmbeddedReactiveWebServer; |
| 24 | -import com.yuanrong.m2s.springboot2.embedded.YrEmbeddedWebServer; | 24 | +import org.yuanrong.m2s.springboot2.embedded.YrEmbeddedWebServer; |
| 25 | -import com.yuanrong.m2s.utils.SecurityUtils; | 25 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 26 | 26 | ||
| 27 | import org.slf4j.Logger; | 27 | import org.slf4j.Logger; |
| 28 | import org.slf4j.LoggerFactory; | 28 | import org.slf4j.LoggerFactory; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/handler/mqs/MqsHandler.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/handler/mqs/MqsHandler.java+6-6
| @@ -14,13 +14,13 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.handler.mqs; | 17 | +package org.yuanrong.m2s.springboot2.handler.mqs; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.util.Constants; | 19 | +import org.yuanrong.m2s.core.util.Constants; |
| 20 | -import com.yuanrong.m2s.model.mqs.ConsumeStatus; | 20 | +import org.yuanrong.m2s.model.mqs.ConsumeStatus; |
| 21 | -import com.yuanrong.m2s.model.mqs.Message; | 21 | +import org.yuanrong.m2s.model.mqs.Message; |
| 22 | -import com.yuanrong.m2s.springboot2.servlet.YrContextHolder; | 22 | +import org.yuanrong.m2s.springboot2.servlet.YrContextHolder; |
| 23 | -import com.yuanrong.m2s.utils.ConvertUtil; | 23 | +import org.yuanrong.m2s.utils.ConvertUtil; |
| 24 | 24 | ||
| 25 | import java.lang.reflect.Constructor; | 25 | import java.lang.reflect.Constructor; |
| 26 | import java.lang.reflect.Method; | 26 | import java.lang.reflect.Method; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/handler/request/FunctionServletRequestHandler.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/handler/request/FunctionServletRequestHandler.java+8-8
| @@ -14,16 +14,16 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.handler.request; | 17 | +package org.yuanrong.m2s.springboot2.handler.request; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.handler.request.AbstractRequestHandler; | 19 | +import org.yuanrong.m2s.core.handler.request.AbstractRequestHandler; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 21 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrServletRegistration; | 22 | +import org.yuanrong.m2s.core.servlet.YrServletRegistration; |
| 23 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 23 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 24 | -import com.yuanrong.m2s.springboot2.servlet.FunctionServlet; | 24 | +import org.yuanrong.m2s.springboot2.servlet.FunctionServlet; |
| 25 | 25 | ||
| 26 | -import com.yuanrong.m2s.core.handler.request.FindServletContextRequestHandler; | 26 | +import org.yuanrong.m2s.core.handler.request.FindServletContextRequestHandler; |
| 27 | import org.slf4j.Logger; | 27 | import org.slf4j.Logger; |
| 28 | import org.slf4j.LoggerFactory; | 28 | import org.slf4j.LoggerFactory; |
| 29 | 29 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/inputstream/DataSystemInputStream.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/inputstream/DataSystemInputStream.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.inputstream; | 17 | +package org.yuanrong.m2s.springboot2.inputstream; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 19 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 20 | -import com.yuanrong.m2s.utils.StreamUtil; | 20 | +import org.yuanrong.m2s.utils.StreamUtil; |
| 21 | 21 | ||
| 22 | import org.yuanrong.datasystem.DataSystemException; | 22 | import org.yuanrong.datasystem.DataSystemException; |
| 23 | import org.yuanrong.datasystem.stream.Consumer; | 23 | import org.yuanrong.datasystem.stream.Consumer; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/servlet/FunctionInvokePayload.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/servlet/FunctionInvokePayload.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.servlet; | 17 | +package org.yuanrong.m2s.springboot2.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.springboot2.ServiceMethodInvoker; | 19 | +import org.yuanrong.m2s.springboot2.ServiceMethodInvoker; |
| 20 | 20 | ||
| 21 | import org.apache.commons.lang3.builder.ToStringBuilder; | 21 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 22 | 22 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/servlet/FunctionServlet.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/servlet/FunctionServlet.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.servlet; | 17 | +package org.yuanrong.m2s.springboot2.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.springboot2.ServiceMethodInvoker; | 19 | +import org.yuanrong.m2s.springboot2.ServiceMethodInvoker; |
| 20 | 20 | ||
| 21 | import com.fasterxml.jackson.databind.ObjectMapper; | 21 | import com.fasterxml.jackson.databind.ObjectMapper; |
| 22 | 22 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/servlet/YrContextHolder.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/servlet/YrContextHolder.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.servlet; | 17 | +package org.yuanrong.m2s.springboot2.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.handler.HandlersChain; | 19 | +import org.yuanrong.m2s.core.handler.HandlersChain; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 20 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 21 | 21 | ||
| 22 | import org.apache.commons.lang3.builder.ToStringBuilder; | 22 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 23 | import org.springframework.context.ApplicationContext; | 23 | import org.springframework.context.ApplicationContext; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/servlet/YrSpringWebContext.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/servlet/YrSpringWebContext.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.servlet; | 17 | +package org.yuanrong.m2s.springboot2.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 19 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 20 | 20 | ||
| 21 | import org.springframework.core.env.ConfigurableEnvironment; | 21 | import org.springframework.core.env.ConfigurableEnvironment; |
| 22 | 22 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/spring/ServerlessSpringApplicationBuilder.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/spring/ServerlessSpringApplicationBuilder.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.spring; | 17 | +package org.yuanrong.m2s.springboot2.spring; |
| 18 | 18 | ||
| 19 | import org.slf4j.Logger; | 19 | import org.slf4j.Logger; |
| 20 | import org.slf4j.LoggerFactory; | 20 | import org.slf4j.LoggerFactory; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/spring/SpringApplicationFactory.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/spring/SpringApplicationFactory.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.spring; | 17 | +package org.yuanrong.m2s.springboot2.spring; |
| 18 | 18 | ||
| 19 | import org.springframework.boot.SpringApplication; | 19 | import org.springframework.boot.SpringApplication; |
| 20 | import org.springframework.core.io.ResourceLoader; | 20 | import org.springframework.core.io.ResourceLoader; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/main/java/com/yuanrong/m2s/springboot2/util/Log4jUtils.java→microservice-adapter/microservice-adapter-springboot2/src/main/java/org/yuanrong/m2s/springboot2/util/Log4jUtils.java+3-3
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.util; | 17 | +package org.yuanrong.m2s.springboot2.util; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.utils.SecurityUtils; | 19 | +import org.yuanrong.m2s.utils.SecurityUtils; |
| 20 | 20 | ||
| 21 | import org.apache.logging.log4j.util.PropertiesUtil; | 21 | import org.apache.logging.log4j.util.PropertiesUtil; |
| 22 | import org.slf4j.Logger; | 22 | import org.slf4j.Logger; |
| @@ -42,7 +42,7 @@ public class Log4jUtils { | |||
| 42 | 42 | ||
| 43 | private static final String FG_RUNTIME_LOG4J_LEVEL_PROPERTY = "RUNTIME_LOG_LEVEL"; | 43 | private static final String FG_RUNTIME_LOG4J_LEVEL_PROPERTY = "RUNTIME_LOG_LEVEL"; |
| 44 | 44 | ||
| 45 | - private static final String FG_ADAPTER_CONTEXT_CLASS = "com.yuanrong.m2s.runtime.fg.FunctionGraphContext"; | 45 | + private static final String FG_ADAPTER_CONTEXT_CLASS = "org.yuanrong.m2s.runtime.fg.FunctionGraphContext"; |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * On FunctionGraph, log4j uses the vm parameter log4j2.configurationFile | 48 | * On FunctionGraph, log4j uses the vm parameter log4j2.configurationFile |
| @@ -1 +0,0 @@ | |||
| 1 | -com.yuanrong.m2s.springboot2.handler.request.FunctionServletRequestHandler | ||
Mmicroservice-adapter/microservice-adapter-springboot2/src/main/resources/META-INF/spring.factories+3-3
| @@ -1,4 +1,4 @@ | |||
| 1 | org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ | 1 | org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ |
| 2 | -com.yuanrong.m2s.springboot2.config.FunctionAutoConfiguration,\ | 2 | +org.yuanrong.m2s.springboot2.config.FunctionAutoConfiguration,\ |
| 3 | -com.yuanrong.m2s.springboot2.config.FunctionServletAutoConfiguration | 3 | +org.yuanrong.m2s.springboot2.config.FunctionServletAutoConfiguration |
| 4 | -org.springframework.boot.env.EnvironmentPostProcessor=com.yuanrong.m2s.springboot2.config.YrConfigEnvironmentPostProcessor | 4 | +org.springframework.boot.env.EnvironmentPostProcessor=org.yuanrong.m2s.springboot2.config.YrConfigEnvironmentPostProcessor |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/MicroserviceAdapter4FunctionTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/MicroserviceAdapter4FunctionTest.java+12-12
| @@ -14,21 +14,21 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.util.Constants; | 21 | +import org.yuanrong.m2s.core.util.Constants; |
| 22 | -import com.yuanrong.m2s.model.YrHttpRequest; | 22 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 23 | -import com.yuanrong.m2s.model.YrHttpRequestBuilder; | 23 | +import org.yuanrong.m2s.model.YrHttpRequestBuilder; |
| 24 | -import com.yuanrong.m2s.model.YrHttpResponse; | 24 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 25 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 25 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 26 | -import com.yuanrong.m2s.testapp.InvokeEvent; | 26 | +import org.yuanrong.m2s.testapp.InvokeEvent; |
| 27 | -import com.yuanrong.m2s.testapp.MicroserviceTestCase; | 27 | +import org.yuanrong.m2s.testapp.MicroserviceTestCase; |
| 28 | -import com.yuanrong.m2s.testapp.Person; | 28 | +import org.yuanrong.m2s.testapp.Person; |
| 29 | -import com.yuanrong.m2s.testapp.TestContext; | 29 | +import org.yuanrong.m2s.testapp.TestContext; |
| 30 | -import com.yuanrong.m2s.testapp.cxf.CxfApplication; | 30 | +import org.yuanrong.m2s.testapp.cxf.CxfApplication; |
| 31 | -import com.yuanrong.m2s.testapp.springboot.Application; | 31 | +import org.yuanrong.m2s.testapp.springboot.Application; |
| 32 | 32 | ||
| 33 | import com.fasterxml.jackson.core.JsonProcessingException; | 33 | import com.fasterxml.jackson.core.JsonProcessingException; |
| 34 | import com.fasterxml.jackson.databind.ObjectMapper; | 34 | import com.fasterxml.jackson.databind.ObjectMapper; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/MicroserviceAdapter4HealthCheckTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/MicroserviceAdapter4HealthCheckTest.java+9-9
| @@ -14,16 +14,16 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.State; | 19 | +import org.yuanrong.m2s.core.State; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 20 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 21 | -import com.yuanrong.m2s.core.util.Constants; | 21 | +import org.yuanrong.m2s.core.util.Constants; |
| 22 | -import com.yuanrong.m2s.model.YrHttpRequest; | 22 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 23 | -import com.yuanrong.m2s.model.YrHttpResponse; | 23 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 24 | -import com.yuanrong.m2s.springboot2.handler.SpringBootHandler; | 24 | +import org.yuanrong.m2s.springboot2.handler.SpringBootHandler; |
| 25 | -import com.yuanrong.m2s.springboot2.servlet.YrContextHolder; | 25 | +import org.yuanrong.m2s.springboot2.servlet.YrContextHolder; |
| 26 | -import com.yuanrong.m2s.testapp.cxf.CxfApplication; | 26 | +import org.yuanrong.m2s.testapp.cxf.CxfApplication; |
| 27 | 27 | ||
| 28 | import org.junit.After; | 28 | import org.junit.After; |
| 29 | import org.junit.Assert; | 29 | import org.junit.Assert; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/MicroserviceAdapter4MqsTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/MicroserviceAdapter4MqsTest.java+8-8
| @@ -14,15 +14,15 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.util.Constants; | 19 | +import org.yuanrong.m2s.core.util.Constants; |
| 20 | -import com.yuanrong.m2s.model.mqs.Message; | 20 | +import org.yuanrong.m2s.model.mqs.Message; |
| 21 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 21 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 22 | -import com.yuanrong.m2s.testapp.MicroserviceTestCase; | 22 | +import org.yuanrong.m2s.testapp.MicroserviceTestCase; |
| 23 | -import com.yuanrong.m2s.testapp.TestContext; | 23 | +import org.yuanrong.m2s.testapp.TestContext; |
| 24 | -import com.yuanrong.m2s.testapp.springboot.Application; | 24 | +import org.yuanrong.m2s.testapp.springboot.Application; |
| 25 | -import com.yuanrong.m2s.testapp.springboot.TestListener; | 25 | +import org.yuanrong.m2s.testapp.springboot.TestListener; |
| 26 | 26 | ||
| 27 | import org.junit.After; | 27 | import org.junit.After; |
| 28 | import org.junit.Assert; | 28 | import org.junit.Assert; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/MicroserviceAdapter4ReportCustomMetricsTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/MicroserviceAdapter4ReportCustomMetricsTest.java+9-9
| @@ -14,16 +14,16 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.State; | 19 | +import org.yuanrong.m2s.core.State; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 20 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 21 | -import com.yuanrong.m2s.core.util.Constants; | 21 | +import org.yuanrong.m2s.core.util.Constants; |
| 22 | -import com.yuanrong.m2s.model.YrHttpRequest; | 22 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 23 | -import com.yuanrong.m2s.model.YrHttpResponse; | 23 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 24 | -import com.yuanrong.m2s.springboot2.handler.SpringBootHandler; | 24 | +import org.yuanrong.m2s.springboot2.handler.SpringBootHandler; |
| 25 | -import com.yuanrong.m2s.springboot2.servlet.YrContextHolder; | 25 | +import org.yuanrong.m2s.springboot2.servlet.YrContextHolder; |
| 26 | -import com.yuanrong.m2s.testapp.cxf.CxfApplication; | 26 | +import org.yuanrong.m2s.testapp.cxf.CxfApplication; |
| 27 | import org.junit.Assert; | 27 | import org.junit.Assert; |
| 28 | import org.junit.Before; | 28 | import org.junit.Before; |
| 29 | import org.junit.Test; | 29 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/MicroserviceAdapter4RestTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/MicroserviceAdapter4RestTest.java+10-10
| @@ -14,19 +14,19 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.util.Constants; | 21 | +import org.yuanrong.m2s.core.util.Constants; |
| 22 | -import com.yuanrong.m2s.model.YrHttpRequest; | 22 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 23 | -import com.yuanrong.m2s.model.YrHttpRequestBuilder; | 23 | +import org.yuanrong.m2s.model.YrHttpRequestBuilder; |
| 24 | -import com.yuanrong.m2s.model.YrHttpResponse; | 24 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 25 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 25 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 26 | -import com.yuanrong.m2s.testapp.MicroserviceTestCase; | 26 | +import org.yuanrong.m2s.testapp.MicroserviceTestCase; |
| 27 | -import com.yuanrong.m2s.testapp.TestContext; | 27 | +import org.yuanrong.m2s.testapp.TestContext; |
| 28 | -import com.yuanrong.m2s.testapp.cxf.CxfApplication; | 28 | +import org.yuanrong.m2s.testapp.cxf.CxfApplication; |
| 29 | -import com.yuanrong.m2s.testapp.springboot.Application; | 29 | +import org.yuanrong.m2s.testapp.springboot.Application; |
| 30 | 30 | ||
| 31 | import org.junit.After; | 31 | import org.junit.After; |
| 32 | import org.junit.Test; | 32 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/MicroserviceAdapter4SnapshotTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/MicroserviceAdapter4SnapshotTest.java+8-8
| @@ -14,15 +14,15 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.util.Constants; | 19 | +import org.yuanrong.m2s.core.util.Constants; |
| 20 | -import com.yuanrong.m2s.testapp.ResourceOneRefresher; | 20 | +import org.yuanrong.m2s.testapp.ResourceOneRefresher; |
| 21 | -import com.yuanrong.m2s.testapp.ResourceThreeRefresher; | 21 | +import org.yuanrong.m2s.testapp.ResourceThreeRefresher; |
| 22 | -import com.yuanrong.m2s.testapp.ResourceTwoRefresher; | 22 | +import org.yuanrong.m2s.testapp.ResourceTwoRefresher; |
| 23 | -import com.yuanrong.m2s.testapp.SnapshotTestCase; | 23 | +import org.yuanrong.m2s.testapp.SnapshotTestCase; |
| 24 | -import com.yuanrong.m2s.testapp.cxf.CxfApplication; | 24 | +import org.yuanrong.m2s.testapp.cxf.CxfApplication; |
| 25 | -import com.yuanrong.m2s.testapp.springboot.Application; | 25 | +import org.yuanrong.m2s.testapp.springboot.Application; |
| 26 | 26 | ||
| 27 | import org.assertj.core.api.Assertions; | 27 | import org.assertj.core.api.Assertions; |
| 28 | import org.junit.After; | 28 | import org.junit.After; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/MicroserviceAdapterInitTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/MicroserviceAdapterInitTest.java+4-4
| @@ -14,13 +14,13 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.core.State; | 21 | +import org.yuanrong.m2s.core.State; |
| 22 | -import com.yuanrong.m2s.core.util.Constants; | 22 | +import org.yuanrong.m2s.core.util.Constants; |
| 23 | -import com.yuanrong.m2s.testapp.cxf.CxfApplication; | 23 | +import org.yuanrong.m2s.testapp.cxf.CxfApplication; |
| 24 | 24 | ||
| 25 | import org.junit.After; | 25 | import org.junit.After; |
| 26 | import org.junit.Test; | 26 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/MicroserviceAdapterTestUtil.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/MicroserviceAdapterTestUtil.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2; | 17 | +package org.yuanrong.m2s.springboot2; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.State; | 19 | +import org.yuanrong.m2s.core.State; |
| 20 | import org.powermock.reflect.Whitebox; | 20 | import org.powermock.reflect.Whitebox; |
| 21 | 21 | ||
| 22 | import java.lang.reflect.Field; | 22 | import java.lang.reflect.Field; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/config/FunctionAutoConfigurationTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/config/FunctionAutoConfigurationTest.java+2-2
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.config; | 17 | +package org.yuanrong.m2s.springboot2.config; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.springboot2.embedded.ServerlessServerFactoryCustomizer; | 21 | +import org.yuanrong.m2s.springboot2.embedded.ServerlessServerFactoryCustomizer; |
| 22 | 22 | ||
| 23 | import org.junit.Test; | 23 | import org.junit.Test; |
| 24 | import org.springframework.boot.autoconfigure.web.ServerProperties; | 24 | import org.springframework.boot.autoconfigure.web.ServerProperties; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/config/YrConfigEnvironmentPostProcessorTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/config/YrConfigEnvironmentPostProcessorTest.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.config; | 17 | +package org.yuanrong.m2s.springboot2.config; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 19 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 20 | 20 | ||
| 21 | import org.junit.Assert; | 21 | import org.junit.Assert; |
| 22 | import org.junit.Test; | 22 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/embedded/NettyWebServerWrapperTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/embedded/NettyWebServerWrapperTest.java+3-4
| @@ -14,14 +14,14 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import static com.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_INFO; | 19 | +import static org.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_INFO; |
| 20 | import static org.junit.Assert.assertEquals; | 20 | import static org.junit.Assert.assertEquals; |
| 21 | import static org.mockito.ArgumentMatchers.any; | 21 | import static org.mockito.ArgumentMatchers.any; |
| 22 | import static org.mockito.Mockito.when; | 22 | import static org.mockito.Mockito.when; |
| 23 | 23 | ||
| 24 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 24 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 25 | 25 | ||
| 26 | import io.netty.channel.group.ChannelGroup; | 26 | import io.netty.channel.group.ChannelGroup; |
| 27 | import reactor.netty.http.server.HttpServer; | 27 | import reactor.netty.http.server.HttpServer; |
| @@ -30,7 +30,6 @@ import org.junit.Before; | |||
| 30 | import org.junit.Test; | 30 | import org.junit.Test; |
| 31 | import org.junit.runner.RunWith; | 31 | import org.junit.runner.RunWith; |
| 32 | import org.mockito.Mock; | 32 | import org.mockito.Mock; |
| 33 | -import org.mockito.Mockito; | ||
| 34 | import org.powermock.api.mockito.PowerMockito; | 33 | import org.powermock.api.mockito.PowerMockito; |
| 35 | import org.powermock.core.classloader.annotations.PowerMockIgnore; | 34 | import org.powermock.core.classloader.annotations.PowerMockIgnore; |
| 36 | import org.powermock.core.classloader.annotations.PrepareForTest; | 35 | import org.powermock.core.classloader.annotations.PrepareForTest; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/embedded/ServerlessReactiveServletEmbeddedServerFactoryTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/embedded/ServerlessReactiveServletEmbeddedServerFactoryTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | import org.junit.Assert; | 19 | import org.junit.Assert; |
| 20 | import org.junit.Test; | 20 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/embedded/ServerlessServerFactoryCustomizerTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/embedded/ServerlessServerFactoryCustomizerTest.java+2-2
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; | 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; |
| 21 | 21 | ||
| 22 | -import com.yuanrong.m2s.springboot2.handler.SpringBootHandler; | 22 | +import org.yuanrong.m2s.springboot2.handler.SpringBootHandler; |
| 23 | 23 | ||
| 24 | import org.junit.Before; | 24 | import org.junit.Before; |
| 25 | import org.junit.Test; | 25 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/embedded/ServerlessServletEmbeddedServerFactoryTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/embedded/ServerlessServletEmbeddedServerFactoryTest.java+2-2
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.springboot2.handler.SpringBootHandler; | 21 | +import org.yuanrong.m2s.springboot2.handler.SpringBootHandler; |
| 22 | 22 | ||
| 23 | import org.junit.Before; | 23 | import org.junit.Before; |
| 24 | import org.junit.Test; | 24 | import org.junit.Test; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/embedded/YrEmbeddedReactiveWebServerTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/embedded/YrEmbeddedReactiveWebServerTest.java+3-3
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.embedded; | 17 | +package org.yuanrong.m2s.springboot2.embedded; |
| 18 | 18 | ||
| 19 | -import static com.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_INFO; | 19 | +import static org.yuanrong.m2s.springboot2.embedded.ServletAdapterConfig.SERVLET_INFO; |
| 20 | import static org.junit.Assert.*; | 20 | import static org.junit.Assert.*; |
| 21 | 21 | ||
| 22 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 22 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 23 | 23 | ||
| 24 | import org.junit.Assert; | 24 | import org.junit.Assert; |
| 25 | import org.junit.Before; | 25 | import org.junit.Before; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/handler/ComsumerMock.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/handler/ComsumerMock.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.handler; | 17 | +package org.yuanrong.m2s.springboot2.handler; |
| 18 | 18 | ||
| 19 | import org.yuanrong.datasystem.stream.Consumer; | 19 | import org.yuanrong.datasystem.stream.Consumer; |
| 20 | import org.yuanrong.datasystem.stream.Element; | 20 | import org.yuanrong.datasystem.stream.Element; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/handler/ExceptionConsumerMock.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/handler/ExceptionConsumerMock.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.handler; | 17 | +package org.yuanrong.m2s.springboot2.handler; |
| 18 | 18 | ||
| 19 | import org.yuanrong.datasystem.DataSystemException; | 19 | import org.yuanrong.datasystem.DataSystemException; |
| 20 | import org.yuanrong.datasystem.stream.Consumer; | 20 | import org.yuanrong.datasystem.stream.Consumer; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/handler/RequestHandlerMock.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/handler/RequestHandlerMock.java+5-5
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.handler; | 17 | +package org.yuanrong.m2s.springboot2.handler; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.handler.request.RequestHandler; | 19 | +import org.yuanrong.m2s.core.handler.request.RequestHandler; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 20 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 21 | -import com.yuanrong.m2s.core.servlet.YrHttpServletResponse; | 21 | +import org.yuanrong.m2s.core.servlet.YrHttpServletResponse; |
| 22 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 22 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 23 | import org.springframework.http.HttpHeaders; | 23 | import org.springframework.http.HttpHeaders; |
| 24 | 24 | ||
| 25 | public class RequestHandlerMock implements RequestHandler { | 25 | public class RequestHandlerMock implements RequestHandler { |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/handler/SpringBootHandlerTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/handler/SpringBootHandlerTest.java+20-20
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.handler; | 17 | +package org.yuanrong.m2s.springboot2.handler; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | import static org.assertj.core.api.Assertions.fail; | 20 | import static org.assertj.core.api.Assertions.fail; |
| @@ -22,24 +22,24 @@ import static org.junit.Assert.assertThrows; | |||
| 22 | 22 | ||
| 23 | import org.yuanrong.datasystem.stream.Consumer; | 23 | import org.yuanrong.datasystem.stream.Consumer; |
| 24 | import org.yuanrong.datasystem.stream.StreamClient; | 24 | import org.yuanrong.datasystem.stream.StreamClient; |
| 25 | -import com.yuanrong.m2s.core.handler.HandlersChain; | 25 | +import org.yuanrong.m2s.core.handler.HandlersChain; |
| 26 | -import com.yuanrong.m2s.core.handler.request.RequestHandler; | 26 | +import org.yuanrong.m2s.core.handler.request.RequestHandler; |
| 27 | -import com.yuanrong.m2s.core.servlet.YrHttpServletRequest; | 27 | +import org.yuanrong.m2s.core.servlet.YrHttpServletRequest; |
| 28 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 28 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 29 | -import com.yuanrong.m2s.core.servlet.YrServletRegistration; | 29 | +import org.yuanrong.m2s.core.servlet.YrServletRegistration; |
| 30 | -import com.yuanrong.m2s.core.servlet.YrWebContext; | 30 | +import org.yuanrong.m2s.core.servlet.YrWebContext; |
| 31 | -import com.yuanrong.m2s.core.util.Constants; | 31 | +import org.yuanrong.m2s.core.util.Constants; |
| 32 | -import com.yuanrong.m2s.exception.FunctionRuntimeException; | 32 | +import org.yuanrong.m2s.exception.FunctionRuntimeException; |
| 33 | -import com.yuanrong.m2s.model.Headers; | 33 | +import org.yuanrong.m2s.model.Headers; |
| 34 | -import com.yuanrong.m2s.model.YrHttpRequest; | 34 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 35 | -import com.yuanrong.m2s.model.YrHttpResponse; | 35 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 36 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 36 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 37 | -import com.yuanrong.m2s.runtime.api.FunctionLogger; | 37 | +import org.yuanrong.m2s.runtime.api.FunctionLogger; |
| 38 | -import com.yuanrong.m2s.springboot2.ServiceMethodInvoker; | 38 | +import org.yuanrong.m2s.springboot2.ServiceMethodInvoker; |
| 39 | -import com.yuanrong.m2s.springboot2.embedded.ServerlessServletEmbeddedServerFactory; | 39 | +import org.yuanrong.m2s.springboot2.embedded.ServerlessServletEmbeddedServerFactory; |
| 40 | -import com.yuanrong.m2s.springboot2.servlet.YrContextHolder; | 40 | +import org.yuanrong.m2s.springboot2.servlet.YrContextHolder; |
| 41 | -import com.yuanrong.m2s.springboot2.spring.ServerlessSpringApplicationBuilder; | 41 | +import org.yuanrong.m2s.springboot2.spring.ServerlessSpringApplicationBuilder; |
| 42 | -import com.yuanrong.m2s.utils.StreamUtil; | 42 | +import org.yuanrong.m2s.utils.StreamUtil; |
| 43 | 43 | ||
| 44 | import org.junit.Assert; | 44 | import org.junit.Assert; |
| 45 | import org.junit.Test; | 45 | import org.junit.Test; |
| @@ -85,7 +85,7 @@ import javax.servlet.ServletResponse; | |||
| 85 | 85 | ||
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | -@SuppressStaticInitializationFor("com.datasystem.streamcache.StreamClient") | 88 | +@SuppressStaticInitializationFor("org.yuanrong.datasystem.stream.StreamClient") |
| 89 | public class SpringBootHandlerTest { | 89 | public class SpringBootHandlerTest { |
| 90 | /** | 90 | /** |
| 91 | * TestBootClass | 91 | * TestBootClass |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/inputstream/DataSystemInputStreamTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/inputstream/DataSystemInputStreamTest.java+3-3
| @@ -14,14 +14,14 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.inputstream; | 17 | +package org.yuanrong.m2s.springboot2.inputstream; |
| 18 | 18 | ||
| 19 | import org.yuanrong.datasystem.stream.Consumer; | 19 | import org.yuanrong.datasystem.stream.Consumer; |
| 20 | import org.yuanrong.datasystem.stream.Element; | 20 | import org.yuanrong.datasystem.stream.Element; |
| 21 | import org.yuanrong.datasystem.stream.Producer; | 21 | import org.yuanrong.datasystem.stream.Producer; |
| 22 | import org.yuanrong.datasystem.stream.StreamClient; | 22 | import org.yuanrong.datasystem.stream.StreamClient; |
| 23 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 23 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 24 | -import com.yuanrong.m2s.utils.StreamUtil; | 24 | +import org.yuanrong.m2s.utils.StreamUtil; |
| 25 | import org.junit.Assert; | 25 | import org.junit.Assert; |
| 26 | import org.junit.Test; | 26 | import org.junit.Test; |
| 27 | import org.junit.runner.RunWith; | 27 | import org.junit.runner.RunWith; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/servlet/ServletContextTestAutoConfiguration.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/servlet/ServletContextTestAutoConfiguration.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.servlet; | 17 | +package org.yuanrong.m2s.springboot2.servlet; |
| 18 | 18 | ||
| 19 | import org.springframework.boot.autoconfigure.AutoConfigureAfter; | 19 | import org.springframework.boot.autoconfigure.AutoConfigureAfter; |
| 20 | import org.springframework.boot.autoconfigure.AutoConfigureOrder; | 20 | import org.springframework.boot.autoconfigure.AutoConfigureOrder; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/servlet/YrServletContextTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/servlet/YrServletContextTest.java+10-11
| @@ -14,17 +14,16 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.servlet; | 17 | +package org.yuanrong.m2s.springboot2.servlet; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.core.servlet.YrServletContext; | 19 | +import org.yuanrong.m2s.core.servlet.YrServletContext; |
| 20 | -import com.yuanrong.m2s.core.servlet.YrServletRegistration; | 20 | +import org.yuanrong.m2s.core.servlet.YrServletRegistration; |
| 21 | -import com.yuanrong.m2s.model.Headers; | 21 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 22 | -import com.yuanrong.m2s.model.YrHttpRequest; | 22 | +import org.yuanrong.m2s.model.YrHttpRequestBuilder; |
| 23 | -import com.yuanrong.m2s.model.YrHttpRequestBuilder; | 23 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 24 | -import com.yuanrong.m2s.model.YrHttpResponse; | 24 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 25 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 25 | +import org.yuanrong.m2s.springboot2.MicroserviceAdapter; |
| 26 | -import com.yuanrong.m2s.springboot2.MicroserviceAdapter; | 26 | +import org.yuanrong.m2s.springboot2.embedded.YrEmbeddedWebServer; |
| 27 | -import com.yuanrong.m2s.springboot2.embedded.YrEmbeddedWebServer; | ||
| 28 | 27 | ||
| 29 | import org.junit.Assert; | 28 | import org.junit.Assert; |
| 30 | import org.junit.Before; | 29 | import org.junit.Before; |
| @@ -89,7 +88,7 @@ public class YrServletContextTest implements ApplicationListener<WebServerInitia | |||
| 89 | 88 | ||
| 90 | 89 | ||
| 91 | public void initYrServerlessContext() { | 90 | public void initYrServerlessContext() { |
| 92 | - System.setProperty("spring_start_class", "com.yuanrong.m2s.springboot2.servlet.YrServletContextTest"); | 91 | + System.setProperty("spring_start_class", "org.yuanrong.m2s.springboot2.servlet.YrServletContextTest"); |
| 93 | MicroserviceAdapter.getInstance().initializer(null, true); | 92 | MicroserviceAdapter.getInstance().initializer(null, true); |
| 94 | } | 93 | } |
| 95 | 94 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/springboot2/util/Log4jUtilsTest.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/springboot2/util/Log4jUtilsTest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.springboot2.util; | 17 | +package org.yuanrong.m2s.springboot2.util; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/InvokeEvent.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/InvokeEvent.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp; | 17 | +package org.yuanrong.m2s.testapp; |
| 18 | 18 | ||
| 19 | import java.util.List; | 19 | import java.util.List; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/MicroserviceTestCase.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/MicroserviceTestCase.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp; | 17 | +package org.yuanrong.m2s.testapp; |
| 18 | 18 | ||
| 19 | import org.springframework.http.HttpStatus; | 19 | import org.springframework.http.HttpStatus; |
| 20 | 20 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/Person.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/Person.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp; | 17 | +package org.yuanrong.m2s.testapp; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * TestRequestData | 20 | * TestRequestData |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/ResourceOneRefresher.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/ResourceOneRefresher.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp; | 17 | +package org.yuanrong.m2s.testapp; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.api.SnapshotResourceRefresher; | 19 | +import org.yuanrong.m2s.api.SnapshotResourceRefresher; |
| 20 | 20 | ||
| 21 | import lombok.extern.slf4j.Slf4j; | 21 | import lombok.extern.slf4j.Slf4j; |
| 22 | 22 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/ResourceThreeRefresher.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/ResourceThreeRefresher.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp; | 17 | +package org.yuanrong.m2s.testapp; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.api.SnapshotResourceRefresher; | 19 | +import org.yuanrong.m2s.api.SnapshotResourceRefresher; |
| 20 | 20 | ||
| 21 | import lombok.extern.slf4j.Slf4j; | 21 | import lombok.extern.slf4j.Slf4j; |
| 22 | 22 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/ResourceTwoRefresher.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/ResourceTwoRefresher.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp; | 17 | +package org.yuanrong.m2s.testapp; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.api.SnapshotResourceRefresher; | 19 | +import org.yuanrong.m2s.api.SnapshotResourceRefresher; |
| 20 | 20 | ||
| 21 | import lombok.extern.slf4j.Slf4j; | 21 | import lombok.extern.slf4j.Slf4j; |
| 22 | 22 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/SnapshotTestCase.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/SnapshotTestCase.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp; | 17 | +package org.yuanrong.m2s.testapp; |
| 18 | 18 | ||
| 19 | import java.util.ArrayList; | 19 | import java.util.ArrayList; |
| 20 | import java.util.Collections; | 20 | import java.util.Collections; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/TestContext.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/TestContext.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp; | 17 | +package org.yuanrong.m2s.testapp; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 19 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 20 | -import com.yuanrong.m2s.runtime.api.FunctionLogger; | 20 | +import org.yuanrong.m2s.runtime.api.FunctionLogger; |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * TestContext | 23 | * TestContext |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/cxf/CxfApplication.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/cxf/CxfApplication.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp.cxf; | 17 | +package org.yuanrong.m2s.testapp.cxf; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.testapp.ResourceOneRefresher; | 19 | +import org.yuanrong.m2s.testapp.ResourceOneRefresher; |
| 20 | -import com.yuanrong.m2s.testapp.ResourceThreeRefresher; | 20 | +import org.yuanrong.m2s.testapp.ResourceThreeRefresher; |
| 21 | -import com.yuanrong.m2s.testapp.ResourceTwoRefresher; | 21 | +import org.yuanrong.m2s.testapp.ResourceTwoRefresher; |
| 22 | 22 | ||
| 23 | import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; | 23 | import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; |
| 24 | 24 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/cxf/PersonService.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/cxf/PersonService.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp.cxf; | 17 | +package org.yuanrong.m2s.testapp.cxf; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.annotation.FunctionHandler; | 19 | +import org.yuanrong.m2s.annotation.FunctionHandler; |
| 20 | -import com.yuanrong.m2s.annotation.FunctionService; | 20 | +import org.yuanrong.m2s.annotation.FunctionService; |
| 21 | -import com.yuanrong.m2s.testapp.Person; | 21 | +import org.yuanrong.m2s.testapp.Person; |
| 22 | 22 | ||
| 23 | import org.springframework.stereotype.Service; | 23 | import org.springframework.stereotype.Service; |
| 24 | 24 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/springboot/Application.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/springboot/Application.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp.springboot; | 17 | +package org.yuanrong.m2s.testapp.springboot; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.testapp.ResourceOneRefresher; | 19 | +import org.yuanrong.m2s.testapp.ResourceOneRefresher; |
| 20 | -import com.yuanrong.m2s.testapp.ResourceThreeRefresher; | 20 | +import org.yuanrong.m2s.testapp.ResourceThreeRefresher; |
| 21 | -import com.yuanrong.m2s.testapp.ResourceTwoRefresher; | 21 | +import org.yuanrong.m2s.testapp.ResourceTwoRefresher; |
| 22 | 22 | ||
| 23 | import org.apache.cxf.spring.boot.autoconfigure.CxfAutoConfiguration; | 23 | import org.apache.cxf.spring.boot.autoconfigure.CxfAutoConfiguration; |
| 24 | import org.springframework.boot.autoconfigure.SpringBootApplication; | 24 | import org.springframework.boot.autoconfigure.SpringBootApplication; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/springboot/PersonController.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/springboot/PersonController.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp.springboot; | 17 | +package org.yuanrong.m2s.testapp.springboot; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.annotation.FunctionHandler; | 19 | +import org.yuanrong.m2s.annotation.FunctionHandler; |
| 20 | -import com.yuanrong.m2s.annotation.FunctionService; | 20 | +import org.yuanrong.m2s.annotation.FunctionService; |
| 21 | -import com.yuanrong.m2s.testapp.Person; | 21 | +import org.yuanrong.m2s.testapp.Person; |
| 22 | 22 | ||
| 23 | import org.springframework.web.bind.annotation.GetMapping; | 23 | import org.springframework.web.bind.annotation.GetMapping; |
| 24 | import org.springframework.web.bind.annotation.PathVariable; | 24 | import org.springframework.web.bind.annotation.PathVariable; |
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/java/com/yuanrong/m2s/testapp/springboot/TestListener.java→microservice-adapter/microservice-adapter-springboot2/src/test/java/org/yuanrong/m2s/testapp/springboot/TestListener.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.testapp.springboot; | 17 | +package org.yuanrong.m2s.testapp.springboot; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.model.mqs.ConsumeStatus; | 19 | +import org.yuanrong.m2s.model.mqs.ConsumeStatus; |
| 20 | -import com.yuanrong.m2s.model.mqs.Message; | 20 | +import org.yuanrong.m2s.model.mqs.Message; |
| 21 | 21 | ||
| 22 | import org.springframework.stereotype.Component; | 22 | import org.springframework.stereotype.Component; |
| 23 | 23 | ||
Rmicroservice-adapter/microservice-adapter-springboot2/src/test/resources/com/huawei/yuanrong/m2s/springboot2/config/properties/config.properties→microservice-adapter/microservice-adapter-springboot2/src/test/resources/org/yuanrong/m2s/springboot2/config/properties/config.properties+0-0
文件重命名但无更改。
| @@ -4,7 +4,7 @@ | |||
| 4 | <modelVersion>4.0.0</modelVersion> | 4 | <modelVersion>4.0.0</modelVersion> |
| 5 | 5 | ||
| 6 | <parent> | 6 | <parent> |
| 7 | - <groupId>com.yuanrong.m2s</groupId> | 7 | + <groupId>org.yuanrong.m2s</groupId> |
| 8 | <artifactId>microservice</artifactId> | 8 | <artifactId>microservice</artifactId> |
| 9 | <version>1.0.0</version> | 9 | <version>1.0.0</version> |
| 10 | </parent> | 10 | </parent> |
| @@ -21,7 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | <dependencies> | 22 | <dependencies> |
| 23 | <dependency> | 23 | <dependency> |
| 24 | - <groupId>com.yuanrong.m2s</groupId> | 24 | + <groupId>org.yuanrong.m2s</groupId> |
| 25 | <artifactId>microservice-runtime-api</artifactId> | 25 | <artifactId>microservice-runtime-api</artifactId> |
| 26 | <version>${project.version}</version> | 26 | <version>${project.version}</version> |
| 27 | </dependency> | 27 | </dependency> |
| @@ -4,7 +4,7 @@ | |||
| 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | <parent> | 5 | <parent> |
| 6 | <artifactId>microservice-function</artifactId> | 6 | <artifactId>microservice-function</artifactId> |
| 7 | - <groupId>com.yuanrong.m2s</groupId> | 7 | + <groupId>org.yuanrong.m2s</groupId> |
| 8 | <version>1.0.0</version> | 8 | <version>1.0.0</version> |
| 9 | </parent> | 9 | </parent> |
| 10 | <modelVersion>4.0.0</modelVersion> | 10 | <modelVersion>4.0.0</modelVersion> |
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | <dependencies> | 14 | <dependencies> |
| 15 | <dependency> | 15 | <dependency> |
| 16 | - <groupId>com.yuanrong.m2s</groupId> | 16 | + <groupId>org.yuanrong.m2s</groupId> |
| 17 | <artifactId>microservice-runtime-yuanrong</artifactId> | 17 | <artifactId>microservice-runtime-yuanrong</artifactId> |
| 18 | <version>${project.version}</version> | 18 | <version>${project.version}</version> |
| 19 | </dependency> | 19 | </dependency> |
Rmicroservice-function/microservice-function-yuanrong/src/main/java/com/yuanrong/m2s/function/Handler.java→microservice-function/microservice-function-yuanrong/src/main/java/org/yuanrong/m2s/function/Handler.java+10-10
| @@ -14,17 +14,17 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.function; | 17 | +package org.yuanrong.m2s.function; |
| 18 | 18 | ||
| 19 | -import com.services.runtime.Context; | 19 | +import org.yuanrong.services.runtime.Context; |
| 20 | -import com.yuanrong.m2s.model.YrHttpRequest; | 20 | +import org.yuanrong.m2s.model.YrHttpRequest; |
| 21 | -import com.yuanrong.m2s.model.YrHttpRequestBuilder; | 21 | +import org.yuanrong.m2s.model.YrHttpRequestBuilder; |
| 22 | -import com.yuanrong.m2s.model.YrHttpResponse; | 22 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 23 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 23 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 24 | -import com.yuanrong.m2s.runtime.api.runtime.yuanrong.CanonicalHttpTriggerEvent; | 24 | +import org.yuanrong.m2s.runtime.api.runtime.yuanrong.CanonicalHttpTriggerEvent; |
| 25 | -import com.yuanrong.m2s.runtime.api.runtime.yuanrong.CanonicalHttpTriggerResponse; | 25 | +import org.yuanrong.m2s.runtime.api.runtime.yuanrong.CanonicalHttpTriggerResponse; |
| 26 | -import com.yuanrong.m2s.runtime.yr.YuanRongContext; | 26 | +import org.yuanrong.m2s.runtime.yr.YuanRongContext; |
| 27 | -import com.yuanrong.m2s.springboot2.MicroserviceAdapter; | 27 | +import org.yuanrong.m2s.springboot2.MicroserviceAdapter; |
| 28 | 28 | ||
| 29 | import java.util.HashMap; | 29 | import java.util.HashMap; |
| 30 | 30 | ||
Rmicroservice-function/microservice-function-yuanrong/src/test/java/com/yuanrong/m2s/function/HandlerTest.java→microservice-function/microservice-function-yuanrong/src/test/java/org/yuanrong/m2s/function/HandlerTest.java+5-5
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.function; | 17 | +package org.yuanrong.m2s.function; |
| 18 | 18 | ||
| 19 | -import com.services.runtime.Context; | 19 | +import org.yuanrong.services.runtime.Context; |
| 20 | -import com.yuanrong.m2s.model.YrHttpResponse; | 20 | +import org.yuanrong.m2s.model.YrHttpResponse; |
| 21 | -import com.yuanrong.m2s.runtime.api.runtime.yuanrong.CanonicalHttpTriggerEvent; | 21 | +import org.yuanrong.m2s.runtime.api.runtime.yuanrong.CanonicalHttpTriggerEvent; |
| 22 | -import com.yuanrong.m2s.springboot2.MicroserviceAdapter; | 22 | +import org.yuanrong.m2s.springboot2.MicroserviceAdapter; |
| 23 | 23 | ||
| 24 | import org.junit.Assert; | 24 | import org.junit.Assert; |
| 25 | import org.junit.Test; | 25 | import org.junit.Test; |
| @@ -5,7 +5,7 @@ | |||
| 5 | <modelVersion>4.0.0</modelVersion> | 5 | <modelVersion>4.0.0</modelVersion> |
| 6 | 6 | ||
| 7 | <parent> | 7 | <parent> |
| 8 | - <groupId>com.yuanrong.m2s</groupId> | 8 | + <groupId>org.yuanrong.m2s</groupId> |
| 9 | <artifactId>microservice</artifactId> | 9 | <artifactId>microservice</artifactId> |
| 10 | <version>1.0.0</version> | 10 | <version>1.0.0</version> |
| 11 | </parent> | 11 | </parent> |
| @@ -18,7 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | <dependencies> | 19 | <dependencies> |
| 20 | <dependency> | 20 | <dependency> |
| 21 | - <groupId>com.yuanrong.m2s</groupId> | 21 | + <groupId>org.yuanrong.m2s</groupId> |
| 22 | <artifactId>microservice-adapter-springboot2</artifactId> | 22 | <artifactId>microservice-adapter-springboot2</artifactId> |
| 23 | <version>${project.version}</version> | 23 | <version>${project.version}</version> |
| 24 | </dependency> | 24 | </dependency> |
| @@ -5,7 +5,7 @@ | |||
| 5 | 开发者需要集成microservice-refresh的SDK | 5 | 开发者需要集成microservice-refresh的SDK |
| 6 | ``` | 6 | ``` |
| 7 | <dependency> | 7 | <dependency> |
| 8 | -<groupId>com.yuanrong.m2s</groupId> | 8 | +<groupId>org.yuanrong.m2s</groupId> |
| 9 | <artifactId>microservice-refresh</artifactId> | 9 | <artifactId>microservice-refresh</artifactId> |
| 10 | <version>${version}</version> | 10 | <version>${version}</version> |
| 11 | </dependency> | 11 | </dependency> |
| @@ -4,7 +4,7 @@ | |||
| 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | <parent> | 5 | <parent> |
| 6 | <artifactId>microservice</artifactId> | 6 | <artifactId>microservice</artifactId> |
| 7 | - <groupId>com.yuanrong.m2s</groupId> | 7 | + <groupId>org.yuanrong.m2s</groupId> |
| 8 | <version>1.0.0</version> | 8 | <version>1.0.0</version> |
| 9 | </parent> | 9 | </parent> |
| 10 | <modelVersion>4.0.0</modelVersion> | 10 | <modelVersion>4.0.0</modelVersion> |
| @@ -40,7 +40,7 @@ | |||
| 40 | </exclusions> | 40 | </exclusions> |
| 41 | </dependency> | 41 | </dependency> |
| 42 | <dependency> | 42 | <dependency> |
| 43 | - <groupId>com.yuanrong.m2s</groupId> | 43 | + <groupId>org.yuanrong.m2s</groupId> |
| 44 | <artifactId>microservice-adapter-common</artifactId> | 44 | <artifactId>microservice-adapter-common</artifactId> |
| 45 | <version>${project.version}</version> | 45 | <version>${project.version}</version> |
| 46 | </dependency> | 46 | </dependency> |
Rmicroservice-refresh/src/main/java/com/yuanrong/m2s/servicerefresh/redis/RedisRefresh.java→microservice-refresh/src/main/java/org/yuanrong/m2s/servicerefresh/redis/RedisRefresh.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.servicerefresh.redis; | 17 | +package org.yuanrong.m2s.servicerefresh.redis; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.api.SnapshotResourceRefresher; | 19 | +import org.yuanrong.m2s.api.SnapshotResourceRefresher; |
| 20 | 20 | ||
| 21 | import lombok.extern.slf4j.Slf4j; | 21 | import lombok.extern.slf4j.Slf4j; |
| 22 | import redis.clients.jedis.JedisCluster; | 22 | import redis.clients.jedis.JedisCluster; |
Rmicroservice-refresh/src/main/java/com/yuanrong/m2s/servicerefresh/redis/RedisRefreshConfig.java→microservice-refresh/src/main/java/org/yuanrong/m2s/servicerefresh/redis/RedisRefreshConfig.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.servicerefresh.redis; | 17 | +package org.yuanrong.m2s.servicerefresh.redis; |
| 18 | 18 | ||
| 19 | import org.springframework.context.annotation.Bean; | 19 | import org.springframework.context.annotation.Bean; |
| 20 | import org.springframework.context.annotation.Configuration; | 20 | import org.springframework.context.annotation.Configuration; |
| @@ -1,2 +1,2 @@ | |||
| 1 | org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ | 1 | org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ |
| 2 | - com.yuanrong.m2s.servicerefresh.redis.RedisRefreshConfig | 2 | + org.yuanrong.m2s.servicerefresh.redis.RedisRefreshConfig |
Rmicroservice-refresh/src/test/java/com/yuanrong/m2s/ervicerefresh/redis/RedisRefreshTest.java→microservice-refresh/src/test/java/org/yuanrong/m2s/ervicerefresh/redis/RedisRefreshTest.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.ervicerefresh.redis; | 17 | +package org.yuanrong.m2s.ervicerefresh.redis; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.servicerefresh.redis.RedisRefresh; | 19 | +import org.yuanrong.m2s.servicerefresh.redis.RedisRefresh; |
| 20 | import org.junit.Test; | 20 | import org.junit.Test; |
| 21 | import org.junit.runner.RunWith; | 21 | import org.junit.runner.RunWith; |
| 22 | import org.mockito.Mockito; | 22 | import org.mockito.Mockito; |
| @@ -7,6 +7,6 @@ | |||
| 7 | 1. 函数互调实现： | 7 | 1. 函数互调实现： |
| 8 | 8 | ||
| 9 | ``` | 9 | ``` |
| 10 | - binder.api.runtime.com.yuanrong.m2s.FunctionInvokerImpl | 10 | + binder.api.runtime.org.yuanrong.m2s.FunctionInvokerImpl |
| 11 | ``` | 11 | ``` |
| 12 | 12 | ||
| @@ -5,7 +5,7 @@ | |||
| 5 | <modelVersion>4.0.0</modelVersion> | 5 | <modelVersion>4.0.0</modelVersion> |
| 6 | 6 | ||
| 7 | <parent> | 7 | <parent> |
| 8 | - <groupId>com.yuanrong.m2s</groupId> | 8 | + <groupId>org.yuanrong.m2s</groupId> |
| 9 | <artifactId>microservice-runtime</artifactId> | 9 | <artifactId>microservice-runtime</artifactId> |
| 10 | <version>1.0.0</version> | 10 | <version>1.0.0</version> |
| 11 | </parent> | 11 | </parent> |
Rmicroservice-runtime/microservice-runtime-api/src/main/java/com/yuanrong/m2s/runtime/api/FunctionContext.java→microservice-runtime/microservice-runtime-api/src/main/java/org/yuanrong/m2s/runtime/api/FunctionContext.java+2-2
| @@ -14,14 +14,14 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api; | 17 | +package org.yuanrong.m2s.runtime.api; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * The unified function context, it abstracts the runtime context of different function platforms. | 20 | * The unified function context, it abstracts the runtime context of different function platforms. |
| 21 | * It provides a unified interface for the runtime context of different function platforms. | 21 | * It provides a unified interface for the runtime context of different function platforms. |
| 22 | * <p> | 22 | * <p> |
| 23 | * You can use the getOrigin method to obtain the actual context object of FunctionGraph at runtime. | 23 | * You can use the getOrigin method to obtain the actual context object of FunctionGraph at runtime. |
| 24 | - * For example, on FunctionGraph, it is an object of {@link com.services.runtime.Context}. | 24 | + * For example, on FunctionGraph, it is an object of {@link org.yuanrong.services.runtime.Context}. |
| 25 | * | 25 | * |
| 26 | * 2022/9/29 | 26 | * 2022/9/29 |
| 27 | */ | 27 | */ |
Rmicroservice-runtime/microservice-runtime-api/src/main/java/com/yuanrong/m2s/runtime/api/FunctionLogger.java→microservice-runtime/microservice-runtime-api/src/main/java/org/yuanrong/m2s/runtime/api/FunctionLogger.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api; | 17 | +package org.yuanrong.m2s.runtime.api; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * FunctionLogger | 20 | * FunctionLogger |
Rmicroservice-runtime/microservice-runtime-api/src/main/java/com/yuanrong/m2s/runtime/api/binder/FunctionInvokerImpl.java→microservice-runtime/microservice-runtime-api/src/main/java/org/yuanrong/m2s/runtime/api/binder/FunctionInvokerImpl.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api.binder; | 17 | +package org.yuanrong.m2s.runtime.api.binder; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 19 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 20 | -import com.yuanrong.m2s.runtime.api.bridge.FunctionInvoker; | 20 | +import org.yuanrong.m2s.runtime.api.bridge.FunctionInvoker; |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * The fake function call implementation, the class will be removed when built. | 23 | * The fake function call implementation, the class will be removed when built. |
Rmicroservice-runtime/microservice-runtime-api/src/main/java/com/yuanrong/m2s/runtime/api/bridge/FunctionBridge.java→microservice-runtime/microservice-runtime-api/src/main/java/org/yuanrong/m2s/runtime/api/bridge/FunctionBridge.java+5-5
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api.bridge; | 17 | +package org.yuanrong.m2s.runtime.api.bridge; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 19 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 20 | -import com.yuanrong.m2s.runtime.api.binder.FunctionInvokerImpl; | 20 | +import org.yuanrong.m2s.runtime.api.binder.FunctionInvokerImpl; |
| 21 | 21 | ||
| 22 | import org.slf4j.Logger; | 22 | import org.slf4j.Logger; |
| 23 | import org.slf4j.LoggerFactory; | 23 | import org.slf4j.LoggerFactory; |
| @@ -38,9 +38,9 @@ import java.util.Set; | |||
| 38 | public class FunctionBridge<T> { | 38 | public class FunctionBridge<T> { |
| 39 | private static final Logger LOGGER = LoggerFactory.getLogger(FunctionBridge.class); | 39 | private static final Logger LOGGER = LoggerFactory.getLogger(FunctionBridge.class); |
| 40 | 40 | ||
| 41 | - // com.yuanrong.m2s.runtime.api.binder.FunctionInvokerImpl. | 41 | + // org.yuanrong.m2s.runtime.api.binder.FunctionInvokerImpl. |
| 42 | private static final String FUNCTION_INVOKER_IMPL_PATH = | 42 | private static final String FUNCTION_INVOKER_IMPL_PATH = |
| 43 | - "com/yuanrong/m2s/runtime/api/binder/FunctionInvokerImpl.class"; | 43 | + "org/yuanrong/m2s/runtime/api/binder/FunctionInvokerImpl.class"; |
| 44 | 44 | ||
| 45 | static { | 45 | static { |
| 46 | checkMultiImplementation(); | 46 | checkMultiImplementation(); |
Rmicroservice-runtime/microservice-runtime-api/src/main/java/com/yuanrong/m2s/runtime/api/bridge/FunctionInvoker.java→microservice-runtime/microservice-runtime-api/src/main/java/org/yuanrong/m2s/runtime/api/bridge/FunctionInvoker.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api.bridge; | 17 | +package org.yuanrong.m2s.runtime.api.bridge; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 19 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 20 | -import com.yuanrong.m2s.runtime.api.binder.FunctionInvokerImpl; | 20 | +import org.yuanrong.m2s.runtime.api.binder.FunctionInvokerImpl; |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * <p> | 23 | * <p> |
Rmicroservice-runtime/microservice-runtime-api/src/main/java/com/yuanrong/m2s/runtime/api/runtime/APIGTriggerEvent.java→microservice-runtime/microservice-runtime-api/src/main/java/org/yuanrong/m2s/runtime/api/runtime/APIGTriggerEvent.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api.runtime; | 17 | +package org.yuanrong.m2s.runtime.api.runtime; |
| 18 | 18 | ||
| 19 | import org.apache.commons.lang3.builder.ToStringBuilder; | 19 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 20 | 20 | ||
Rmicroservice-runtime/microservice-runtime-api/src/main/java/com/yuanrong/m2s/runtime/api/runtime/APIGTriggerResponse.java→microservice-runtime/microservice-runtime-api/src/main/java/org/yuanrong/m2s/runtime/api/runtime/APIGTriggerResponse.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api.runtime; | 17 | +package org.yuanrong.m2s.runtime.api.runtime; |
| 18 | 18 | ||
| 19 | import org.apache.commons.lang3.builder.ToStringBuilder; | 19 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| 20 | 20 | ||
Rmicroservice-runtime/microservice-runtime-api/src/main/java/com/yuanrong/m2s/runtime/api/runtime/yuanrong/CanonicalHttpTriggerEvent.java→microservice-runtime/microservice-runtime-api/src/main/java/org/yuanrong/m2s/runtime/api/runtime/yuanrong/CanonicalHttpTriggerEvent.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api.runtime.yuanrong; | 17 | +package org.yuanrong.m2s.runtime.api.runtime.yuanrong; |
| 18 | 18 | ||
| 19 | import java.util.HashMap; | 19 | import java.util.HashMap; |
| 20 | import java.util.Map; | 20 | import java.util.Map; |
Rmicroservice-runtime/microservice-runtime-api/src/main/java/com/yuanrong/m2s/runtime/api/runtime/yuanrong/CanonicalHttpTriggerResponse.java→microservice-runtime/microservice-runtime-api/src/main/java/org/yuanrong/m2s/runtime/api/runtime/yuanrong/CanonicalHttpTriggerResponse.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api.runtime.yuanrong; | 17 | +package org.yuanrong.m2s.runtime.api.runtime.yuanrong; |
| 18 | 18 | ||
| 19 | import java.util.HashMap; | 19 | import java.util.HashMap; |
| 20 | import java.util.Map; | 20 | import java.util.Map; |
| @@ -4,7 +4,7 @@ | |||
| 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | <parent> | 5 | <parent> |
| 6 | <artifactId>microservice-runtime</artifactId> | 6 | <artifactId>microservice-runtime</artifactId> |
| 7 | - <groupId>com.yuanrong.m2s</groupId> | 7 | + <groupId>org.yuanrong.m2s</groupId> |
| 8 | <version>1.0.0</version> | 8 | <version>1.0.0</version> |
| 9 | </parent> | 9 | </parent> |
| 10 | <modelVersion>4.0.0</modelVersion> | 10 | <modelVersion>4.0.0</modelVersion> |
| @@ -19,12 +19,12 @@ | |||
| 19 | 19 | ||
| 20 | <dependencies> | 20 | <dependencies> |
| 21 | <dependency> | 21 | <dependency> |
| 22 | - <groupId>com.yuanrong.m2s</groupId> | 22 | + <groupId>org.yuanrong.m2s</groupId> |
| 23 | <artifactId>microservice-runtime-api</artifactId> | 23 | <artifactId>microservice-runtime-api</artifactId> |
| 24 | <version>${project.version}</version> | 24 | <version>${project.version}</version> |
| 25 | </dependency> | 25 | </dependency> |
| 26 | <dependency> | 26 | <dependency> |
| 27 | - <groupId>com.yuanrong</groupId> | 27 | + <groupId>org.yuanrong</groupId> |
| 28 | <artifactId>faas-function-sdk</artifactId> | 28 | <artifactId>faas-function-sdk</artifactId> |
| 29 | <version>${runtime-sdk-fg.version}</version> | 29 | <version>${runtime-sdk-fg.version}</version> |
| 30 | <scope>compile</scope> | 30 | <scope>compile</scope> |
Rmicroservice-runtime/microservice-runtime-yuanrong/src/main/java/com/yuanrong/m2s/runtime/api/binder/FunctionInvokerImpl.java→microservice-runtime/microservice-runtime-yuanrong/src/main/java/org/yuanrong/m2s/runtime/api/binder/FunctionInvokerImpl.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.api.binder; | 17 | +package org.yuanrong.m2s.runtime.api.binder; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 19 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 20 | -import com.yuanrong.m2s.runtime.api.bridge.FunctionInvoker; | 20 | +import org.yuanrong.m2s.runtime.api.bridge.FunctionInvoker; |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * The function call implementation of YuanRong. | 23 | * The function call implementation of YuanRong. |
Rmicroservice-runtime/microservice-runtime-yuanrong/src/main/java/com/yuanrong/m2s/runtime/yr/YuanRongContext.java→microservice-runtime/microservice-runtime-yuanrong/src/main/java/org/yuanrong/m2s/runtime/yr/YuanRongContext.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.runtime.yr; | 17 | +package org.yuanrong.m2s.runtime.yr; |
| 18 | 18 | ||
| 19 | -import com.services.runtime.Context; | 19 | +import org.yuanrong.services.runtime.Context; |
| 20 | -import com.yuanrong.m2s.runtime.api.FunctionContext; | 20 | +import org.yuanrong.m2s.runtime.api.FunctionContext; |
| 21 | -import com.yuanrong.m2s.runtime.api.FunctionLogger; | 21 | +import org.yuanrong.m2s.runtime.api.FunctionLogger; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * FunctionGraphContext | 24 | * FunctionGraphContext |
| @@ -5,7 +5,7 @@ | |||
| 5 | <modelVersion>4.0.0</modelVersion> | 5 | <modelVersion>4.0.0</modelVersion> |
| 6 | 6 | ||
| 7 | <parent> | 7 | <parent> |
| 8 | - <groupId>com.yuanrong.m2s</groupId> | 8 | + <groupId>org.yuanrong.m2s</groupId> |
| 9 | <artifactId>microservice</artifactId> | 9 | <artifactId>microservice</artifactId> |
| 10 | <version>1.0.0</version> | 10 | <version>1.0.0</version> |
| 11 | </parent> | 11 | </parent> |
| @@ -49,7 +49,7 @@ public class Local { | |||
| 49 | 49 | ||
| 50 | ```xml | 50 | ```xml |
| 51 | <dependency> | 51 | <dependency> |
| 52 | - <groupId>com.yuanrong.m2s</groupId> | 52 | + <groupId>org.yuanrong.m2s</groupId> |
| 53 | <artifactId>microservice-sdk-functionclient-starter</artifactId> | 53 | <artifactId>microservice-sdk-functionclient-starter</artifactId> |
| 54 | <version>1.0.0</version> | 54 | <version>1.0.0</version> |
| 55 | </dependency> | 55 | </dependency> |
| @@ -59,7 +59,7 @@ public class Local { | |||
| 59 | 59 | ||
| 60 | ```xml | 60 | ```xml |
| 61 | <dependency> | 61 | <dependency> |
| 62 | - <groupId>com.yuanrong.m2s</groupId> | 62 | + <groupId>org.yuanrong.m2s</groupId> |
| 63 | <artifactId>microservice-sdk-functionclient</artifactId> | 63 | <artifactId>microservice-sdk-functionclient</artifactId> |
| 64 | <version>1.0.0</version> | 64 | <version>1.0.0</version> |
| 65 | </dependency> | 65 | </dependency> |
| @@ -77,7 +77,7 @@ public class Local { | |||
| 77 | // 通过LiveData函数平台API Endpoint、appCode鉴权信息构建FunctionClient | 77 | // 通过LiveData函数平台API Endpoint、appCode鉴权信息构建FunctionClient |
| 78 | FunctionClient functionClient = FunctionClient.newBuilder() | 78 | FunctionClient functionClient = FunctionClient.newBuilder() |
| 79 | .withApiEndpoint("https://apigw-beta.apache.com/api") | 79 | .withApiEndpoint("https://apigw-beta.apache.com/api") |
| 80 | - .withAppCredential(new AppCredential("com.apache.demo", "******")) | 80 | + .withAppCredential(new AppCredential("org.apache.demo", "******")) |
| 81 | .build(); | 81 | .build(); |
| 82 | 82 | ||
| 83 | // 通过指定的Serverless函数（API网关触发器地址，如：/demo）Service、Method、返回值类型，Method实参列表，构建请求对象 | 83 | // 通过指定的Serverless函数（API网关触发器地址，如：/demo）Service、Method、返回值类型，Method实参列表，构建请求对象 |
| @@ -4,7 +4,7 @@ | |||
| 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | <parent> | 5 | <parent> |
| 6 | <artifactId>microservice-sdk</artifactId> | 6 | <artifactId>microservice-sdk</artifactId> |
| 7 | - <groupId>com.yuanrong.m2s</groupId> | 7 | + <groupId>org.yuanrong.m2s</groupId> |
| 8 | <version>1.0.0</version> | 8 | <version>1.0.0</version> |
| 9 | </parent> | 9 | </parent> |
| 10 | <modelVersion>4.0.0</modelVersion> | 10 | <modelVersion>4.0.0</modelVersion> |
| @@ -32,7 +32,7 @@ | |||
| 32 | </exclusions> | 32 | </exclusions> |
| 33 | </dependency> | 33 | </dependency> |
| 34 | <dependency> | 34 | <dependency> |
| 35 | - <groupId>com.yuanrong.m2s</groupId> | 35 | + <groupId>org.yuanrong.m2s</groupId> |
| 36 | <artifactId>microservice-sdk-functionclient</artifactId> | 36 | <artifactId>microservice-sdk-functionclient</artifactId> |
| 37 | <version>${project.version}</version> | 37 | <version>${project.version}</version> |
| 38 | </dependency> | 38 | </dependency> |
Rmicroservice-sdk/microservice-sdk-functionclient-starter/src/main/java/com/yuanrong/m2s/sdk/autoconfigure/FunctionClientAutoConfiguration.java→microservice-sdk/microservice-sdk-functionclient-starter/src/main/java/org/yuanrong/m2s/sdk/autoconfigure/FunctionClientAutoConfiguration.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.autoconfigure; | 17 | +package org.yuanrong.m2s.sdk.autoconfigure; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.sdk.util.JSONUtils; | 19 | +import org.yuanrong.m2s.sdk.util.JSONUtils; |
| 20 | 20 | ||
| 21 | import com.fasterxml.jackson.databind.ObjectMapper; | 21 | import com.fasterxml.jackson.databind.ObjectMapper; |
| 22 | 22 | ||
| @@ -1,2 +1,2 @@ | |||
| 1 | org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ | 1 | org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ |
| 2 | - com.yuanrong.m2s.sdk.autoconfigure.FunctionClientAutoConfiguration | 2 | + org.yuanrong.m2s.sdk.autoconfigure.FunctionClientAutoConfiguration |
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | <parent> | 6 | <parent> |
| 7 | <artifactId>microservice-sdk</artifactId> | 7 | <artifactId>microservice-sdk</artifactId> |
| 8 | - <groupId>com.yuanrong.m2s</groupId> | 8 | + <groupId>org.yuanrong.m2s</groupId> |
| 9 | <version>1.0.0</version> | 9 | <version>1.0.0</version> |
| 10 | </parent> | 10 | </parent> |
| 11 | <modelVersion>4.0.0</modelVersion> | 11 | <modelVersion>4.0.0</modelVersion> |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/FunctionClient.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/FunctionClient.java+5-5
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk; | 17 | +package org.yuanrong.m2s.sdk; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.sdk.core.FunctionRequest; | 19 | +import org.yuanrong.m2s.sdk.core.FunctionRequest; |
| 20 | -import com.yuanrong.m2s.sdk.core.RpcClient; | 20 | +import org.yuanrong.m2s.sdk.core.RpcClient; |
| 21 | -import com.yuanrong.m2s.sdk.util.ContextUtils; | 21 | +import org.yuanrong.m2s.sdk.util.ContextUtils; |
| 22 | -import com.yuanrong.m2s.sdk.util.SecurityUtils; | 22 | +import org.yuanrong.m2s.sdk.util.SecurityUtils; |
| 23 | 23 | ||
| 24 | import org.slf4j.Logger; | 24 | import org.slf4j.Logger; |
| 25 | import org.slf4j.LoggerFactory; | 25 | import org.slf4j.LoggerFactory; |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/FunctionClientBuilder.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/FunctionClientBuilder.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk; | 17 | +package org.yuanrong.m2s.sdk; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.sdk.auth.AppCredential; | 19 | +import org.yuanrong.m2s.sdk.auth.AppCredential; |
| 20 | -import com.yuanrong.m2s.sdk.core.HttpClientImpl; | 20 | +import org.yuanrong.m2s.sdk.core.HttpClientImpl; |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * HttpClientBuilder | 23 | * HttpClientBuilder |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/auth/AppCredential.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/auth/AppCredential.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.auth; | 17 | +package org.yuanrong.m2s.sdk.auth; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * AppCredential | 20 | * AppCredential |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/core/FunctionRequest.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/core/FunctionRequest.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.core; | 17 | +package org.yuanrong.m2s.sdk.core; |
| 18 | 18 | ||
| 19 | import java.util.Arrays; | 19 | import java.util.Arrays; |
| 20 | import java.util.HashMap; | 20 | import java.util.HashMap; |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/core/HttpClientImpl.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/core/HttpClientImpl.java+8-8
| @@ -14,15 +14,15 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.core; | 17 | +package org.yuanrong.m2s.sdk.core; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.sdk.auth.AppCredential; | 19 | +import org.yuanrong.m2s.sdk.auth.AppCredential; |
| 20 | -import com.yuanrong.m2s.sdk.entity.InvokeEvent; | 20 | +import org.yuanrong.m2s.sdk.entity.InvokeEvent; |
| 21 | -import com.yuanrong.m2s.sdk.exception.ClientRequestException; | 21 | +import org.yuanrong.m2s.sdk.exception.ClientRequestException; |
| 22 | -import com.yuanrong.m2s.sdk.exception.SdkException; | 22 | +import org.yuanrong.m2s.sdk.exception.SdkException; |
| 23 | -import com.yuanrong.m2s.sdk.exception.ServerResponseException; | 23 | +import org.yuanrong.m2s.sdk.exception.ServerResponseException; |
| 24 | -import com.yuanrong.m2s.sdk.util.ContextUtils; | 24 | +import org.yuanrong.m2s.sdk.util.ContextUtils; |
| 25 | -import com.yuanrong.m2s.sdk.util.JSONUtils; | 25 | +import org.yuanrong.m2s.sdk.util.JSONUtils; |
| 26 | 26 | ||
| 27 | import org.apache.hc.client5.http.classic.methods.HttpPost; | 27 | import org.apache.hc.client5.http.classic.methods.HttpPost; |
| 28 | import org.apache.hc.client5.http.classic.methods.HttpUriRequest; | 28 | import org.apache.hc.client5.http.classic.methods.HttpUriRequest; |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/core/RpcClient.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/core/RpcClient.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.core; | 17 | +package org.yuanrong.m2s.sdk.core; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * RPC client interface | 20 | * RPC client interface |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/entity/InvokeEvent.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/entity/InvokeEvent.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.entity; | 17 | +package org.yuanrong.m2s.sdk.entity; |
| 18 | 18 | ||
| 19 | import java.util.List; | 19 | import java.util.List; |
| 20 | 20 | ||
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/exception/ClientRequestException.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/exception/ClientRequestException.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.exception; | 17 | +package org.yuanrong.m2s.sdk.exception; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Captures Server based Errors (Return Codes for 4xx) | 20 | * Captures Server based Errors (Return Codes for 4xx) |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/exception/IllegalTraceStateException.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/exception/IllegalTraceStateException.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.exception; | 17 | +package org.yuanrong.m2s.sdk.exception; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Illegal Trace State will throw this Exception | 20 | * Illegal Trace State will throw this Exception |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/exception/SdkException.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/exception/SdkException.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.exception; | 17 | +package org.yuanrong.m2s.sdk.exception; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Base Exception for all SDK Exceptions | 20 | * Base Exception for all SDK Exceptions |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/exception/ServerResponseException.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/exception/ServerResponseException.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.exception; | 17 | +package org.yuanrong.m2s.sdk.exception; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * Captures Server based Errors (Return Codes for 5xx) | 20 | * Captures Server based Errors (Return Codes for 5xx) |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/util/ContextUtils.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/util/ContextUtils.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.util; | 17 | +package org.yuanrong.m2s.sdk.util; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.sdk.exception.IllegalTraceStateException; | 19 | +import org.yuanrong.m2s.sdk.exception.IllegalTraceStateException; |
| 20 | 20 | ||
| 21 | import java.util.Locale; | 21 | import java.util.Locale; |
| 22 | import java.util.UUID; | 22 | import java.util.UUID; |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/util/JSONUtils.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/util/JSONUtils.java+2-2
| @@ -14,9 +14,9 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.util; | 17 | +package org.yuanrong.m2s.sdk.util; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.sdk.exception.SdkException; | 19 | +import org.yuanrong.m2s.sdk.exception.SdkException; |
| 20 | 20 | ||
| 21 | import com.fasterxml.jackson.core.JsonProcessingException; | 21 | import com.fasterxml.jackson.core.JsonProcessingException; |
| 22 | import com.fasterxml.jackson.databind.ObjectMapper; | 22 | import com.fasterxml.jackson.databind.ObjectMapper; |
Rmicroservice-sdk/microservice-sdk-functionclient/src/main/java/com/yuanrong/m2s/sdk/util/SecurityUtils.java→microservice-sdk/microservice-sdk-functionclient/src/main/java/org/yuanrong/m2s/sdk/util/SecurityUtils.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.util; | 17 | +package org.yuanrong.m2s.sdk.util; |
| 18 | 18 | ||
| 19 | /** | 19 | /** |
| 20 | * A Security Utils | 20 | * A Security Utils |
Rmicroservice-sdk/microservice-sdk-functionclient/src/test/java/com/yuanrong/m2s/sdk/FunctionClientTest.java→microservice-sdk/microservice-sdk-functionclient/src/test/java/org/yuanrong/m2s/sdk/FunctionClientTest.java+7-7
| @@ -14,17 +14,17 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk; | 17 | +package org.yuanrong.m2s.sdk; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; | 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; |
| 21 | import static org.junit.Assert.assertTrue; | 21 | import static org.junit.Assert.assertTrue; |
| 22 | 22 | ||
| 23 | -import com.yuanrong.m2s.sdk.auth.AppCredential; | 23 | +import org.yuanrong.m2s.sdk.auth.AppCredential; |
| 24 | -import com.yuanrong.m2s.sdk.core.FunctionRequest; | 24 | +import org.yuanrong.m2s.sdk.core.FunctionRequest; |
| 25 | -import com.yuanrong.m2s.sdk.core.HttpClientImpl; | 25 | +import org.yuanrong.m2s.sdk.core.HttpClientImpl; |
| 26 | -import com.yuanrong.m2s.sdk.exception.ClientRequestException; | 26 | +import org.yuanrong.m2s.sdk.exception.ClientRequestException; |
| 27 | -import com.yuanrong.m2s.sdk.exception.ServerResponseException; | 27 | +import org.yuanrong.m2s.sdk.exception.ServerResponseException; |
| 28 | 28 | ||
| 29 | import org.apache.hc.client5.http.classic.methods.HttpUriRequest; | 29 | import org.apache.hc.client5.http.classic.methods.HttpUriRequest; |
| 30 | import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; | 30 | import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; |
| @@ -93,7 +93,7 @@ public class FunctionClientTest { | |||
| 93 | 93 | ||
| 94 | private static FunctionClient buildFunctionClient() { | 94 | private static FunctionClient buildFunctionClient() { |
| 95 | String endpoint = "https://apigw-beta.apache.com/api"; | 95 | String endpoint = "https://apigw-beta.apache.com/api"; |
| 96 | - String id = "com.apache.demo.app"; | 96 | + String id = "org.apache.demo.app"; |
| 97 | String key = "******"; | 97 | String key = "******"; |
| 98 | AppCredential credential = new AppCredential("", ""); | 98 | AppCredential credential = new AppCredential("", ""); |
| 99 | credential.setId(id); | 99 | credential.setId(id); |
Rmicroservice-sdk/microservice-sdk-functionclient/src/test/java/com/yuanrong/m2s/sdk/util/ContextUtilsTest.java→microservice-sdk/microservice-sdk-functionclient/src/test/java/org/yuanrong/m2s/sdk/util/ContextUtilsTest.java+2-2
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.util; | 17 | +package org.yuanrong.m2s.sdk.util; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | 20 | ||
| 21 | -import com.yuanrong.m2s.sdk.exception.IllegalTraceStateException; | 21 | +import org.yuanrong.m2s.sdk.exception.IllegalTraceStateException; |
| 22 | 22 | ||
| 23 | import org.assertj.core.api.Assertions; | 23 | import org.assertj.core.api.Assertions; |
| 24 | import org.junit.After; | 24 | import org.junit.After; |
Rmicroservice-sdk/microservice-sdk-functionclient/src/test/java/com/yuanrong/m2s/sdk/util/JSONUtilsTest.java→microservice-sdk/microservice-sdk-functionclient/src/test/java/org/yuanrong/m2s/sdk/util/JSONUtilsTest.java+2-2
| @@ -14,12 +14,12 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.util; | 17 | +package org.yuanrong.m2s.sdk.util; |
| 18 | 18 | ||
| 19 | import static org.assertj.core.api.Assertions.assertThat; | 19 | import static org.assertj.core.api.Assertions.assertThat; |
| 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; | 20 | import static org.assertj.core.api.Assertions.assertThatThrownBy; |
| 21 | 21 | ||
| 22 | -import com.yuanrong.m2s.sdk.exception.SdkException; | 22 | +import org.yuanrong.m2s.sdk.exception.SdkException; |
| 23 | 23 | ||
| 24 | import com.fasterxml.jackson.core.JsonProcessingException; | 24 | import com.fasterxml.jackson.core.JsonProcessingException; |
| 25 | import com.fasterxml.jackson.databind.ObjectMapper; | 25 | import com.fasterxml.jackson.databind.ObjectMapper; |
Rmicroservice-sdk/microservice-sdk-functionclient/src/test/java/com/yuanrong/m2s/sdk/util/JsonProcessingTestException.java→microservice-sdk/microservice-sdk-functionclient/src/test/java/org/yuanrong/m2s/sdk/util/JsonProcessingTestException.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.util; | 17 | +package org.yuanrong.m2s.sdk.util; |
| 18 | 18 | ||
| 19 | import com.fasterxml.jackson.core.JsonProcessingException; | 19 | import com.fasterxml.jackson.core.JsonProcessingException; |
| 20 | 20 | ||
Rmicroservice-sdk/microservice-sdk-functionclient/src/test/java/com/yuanrong/m2s/sdk/util/User.java→microservice-sdk/microservice-sdk-functionclient/src/test/java/org/yuanrong/m2s/sdk/util/User.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.util; | 17 | +package org.yuanrong.m2s.sdk.util; |
| 18 | 18 | ||
| 19 | import java.util.Date; | 19 | import java.util.Date; |
| 20 | import java.util.Objects; | 20 | import java.util.Objects; |
| @@ -13,7 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | ```java | 14 | ```java |
| 15 | <dependency> | 15 | <dependency> |
| 16 | -<groupId>com.yuanrong.m2s</groupId> | 16 | +<groupId>org.yuanrong</groupId> |
| 17 | <artifactId>microservice-sdk-spring-processor</artifactId> | 17 | <artifactId>microservice-sdk-spring-processor</artifactId> |
| 18 | <version>1.0.0</version> | 18 | <version>1.0.0</version> |
| 19 | </dependency> | 19 | </dependency> |
| @@ -27,7 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | ### 实现接口 | 28 | ### 实现接口 |
| 29 | 29 | ||
| 30 | -`SDK`中提供了`com.yuanrong.sdk.api.Handler`接口，新建类实现该接口并使用`@FunctionHandler`注解标识即可开始进行业务处理。 | 30 | +`SDK`中提供了`org.yuanrong.sdk.api.Handler`接口，新建类实现该接口并使用`@FunctionHandler`注解标识即可开始进行业务处理。 |
| 31 | 参考代码。 | 31 | 参考代码。 |
| 32 | 32 | ||
| 33 | ```java | 33 | ```java |
| @@ -50,11 +50,11 @@ public class MyHandler implements Handler { | |||
| 50 | 使用了`@FunctionHandler`注解之后默认会生成一个该类名+"Handler"组成的函数入口类，比如在`MyHandler`类上添加该注解 | 50 | 使用了`@FunctionHandler`注解之后默认会生成一个该类名+"Handler"组成的函数入口类，比如在`MyHandler`类上添加该注解 |
| 51 | 则会生成名为`MyHandlerHandler`的入口类，建议起名时结尾不带`Handler` | 51 | 则会生成名为`MyHandlerHandler`的入口类，建议起名时结尾不带`Handler` |
| 52 | ，因为会拼接。该注解支持自定义名字，比如`@FunctionHandler("Custom")` | 52 | ，因为会拼接。该注解支持自定义名字，比如`@FunctionHandler("Custom")` |
| 53 | -就会生成名为`CustomHandler`的入口类。包名暂时都是`com.yuanrong.function`。 | 53 | +就会生成名为`CustomHandler`的入口类。包名暂时都是`org.yuanrong.function`。 |
| 54 | 54 | ||
| 55 | > 生成的类可以在本地查看，相对项目路径为`target/generated-sources/annotations/com/yuanrong/function`。 | 55 | > 生成的类可以在本地查看，相对项目路径为`target/generated-sources/annotations/com/yuanrong/function`。 |
| 56 | 56 | ||
| 57 | ### 部署 | 57 | ### 部署 |
| 58 | 58 | ||
| 59 | -将函数执行入口修改为`com.yuanrong.function.`+`@FunctionHandler`所在类的类名+`Handler`+`.handle`即可。 | 59 | +将函数执行入口修改为`org.yuanrong.function.`+`@FunctionHandler`所在类的类名+`Handler`+`.handle`即可。 |
| 60 | -比如`com.yuanrong.function.CustomHandler.handle`。 | 60 | +比如`org.yuanrong.function.CustomHandler.handle`。 |
| @@ -4,7 +4,7 @@ | |||
| 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | <modelVersion>4.0.0</modelVersion> | 5 | <modelVersion>4.0.0</modelVersion> |
| 6 | <parent> | 6 | <parent> |
| 7 | - <groupId>com.yuanrong.m2s</groupId> | 7 | + <groupId>org.yuanrong.m2s</groupId> |
| 8 | <artifactId>microservice-sdk</artifactId> | 8 | <artifactId>microservice-sdk</artifactId> |
| 9 | <version>1.0.0</version> | 9 | <version>1.0.0</version> |
| 10 | </parent> | 10 | </parent> |
| @@ -18,13 +18,13 @@ | |||
| 18 | </properties> | 18 | </properties> |
| 19 | <dependencies> | 19 | <dependencies> |
| 20 | <dependency> | 20 | <dependency> |
| 21 | - <groupId>com.yuanrong.m2s</groupId> | 21 | + <groupId>org.yuanrong.m2s</groupId> |
| 22 | <artifactId>microservice-runtime-api</artifactId> | 22 | <artifactId>microservice-runtime-api</artifactId> |
| 23 | <version>${project.version}</version> | 23 | <version>${project.version}</version> |
| 24 | <scope>compile</scope> | 24 | <scope>compile</scope> |
| 25 | </dependency> | 25 | </dependency> |
| 26 | <dependency> | 26 | <dependency> |
| 27 | - <groupId>com.yuanrong</groupId> | 27 | + <groupId>org.yuanrong</groupId> |
| 28 | <artifactId>faas-function-sdk</artifactId> | 28 | <artifactId>faas-function-sdk</artifactId> |
| 29 | <version>${runtime-sdk-fg.version}</version> | 29 | <version>${runtime-sdk-fg.version}</version> |
| 30 | <scope>compile</scope> | 30 | <scope>compile</scope> |
Rmicroservice-sdk/microservice-sdk-spring-processor/src/main/java/com/yuanrong/m2s/sdk/api/ConfigResource.java→microservice-sdk/microservice-sdk-spring-processor/src/main/java/org/yuanrong/m2s/sdk/api/ConfigResource.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.api; | 17 | +package org.yuanrong.m2s.sdk.api; |
| 18 | 18 | ||
| 19 | import java.lang.annotation.ElementType; | 19 | import java.lang.annotation.ElementType; |
| 20 | import java.lang.annotation.Retention; | 20 | import java.lang.annotation.Retention; |
Rmicroservice-sdk/microservice-sdk-spring-processor/src/main/java/com/yuanrong/m2s/sdk/api/FunctionHandler.java→microservice-sdk/microservice-sdk-spring-processor/src/main/java/org/yuanrong/m2s/sdk/api/FunctionHandler.java+1-1
| @@ -14,7 +14,7 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.api; | 17 | +package org.yuanrong.m2s.sdk.api; |
| 18 | 18 | ||
| 19 | import org.springframework.stereotype.Component; | 19 | import org.springframework.stereotype.Component; |
| 20 | 20 | ||
Rmicroservice-sdk/microservice-sdk-spring-processor/src/main/java/com/yuanrong/m2s/sdk/api/Handler.java→microservice-sdk/microservice-sdk-spring-processor/src/main/java/org/yuanrong/m2s/sdk/api/Handler.java+4-4
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.api; | 17 | +package org.yuanrong.m2s.sdk.api; |
| 18 | 18 | ||
| 19 | -import com.services.runtime.Context; | 19 | +import org.yuanrong.services.runtime.Context; |
| 20 | -import com.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; | 20 | +import org.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; |
| 21 | -import com.yuanrong.m2s.runtime.api.runtime.APIGTriggerResponse; | 21 | +import org.yuanrong.m2s.runtime.api.runtime.APIGTriggerResponse; |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * Business standard processing entry. | 24 | * Business standard processing entry. |
Rmicroservice-sdk/microservice-sdk-spring-processor/src/main/java/com/yuanrong/m2s/sdk/processor/SpringFunctionProcessor.java→microservice-sdk/microservice-sdk-spring-processor/src/main/java/org/yuanrong/m2s/sdk/processor/SpringFunctionProcessor.java+6-6
| @@ -14,11 +14,11 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.processor; | 17 | +package org.yuanrong.m2s.sdk.processor; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.sdk.api.ConfigResource; | 19 | +import org.yuanrong.m2s.sdk.api.ConfigResource; |
| 20 | -import com.yuanrong.m2s.sdk.api.FunctionHandler; | 20 | +import org.yuanrong.m2s.sdk.api.FunctionHandler; |
| 21 | -import com.yuanrong.m2s.sdk.api.Handler; | 21 | +import org.yuanrong.m2s.sdk.api.Handler; |
| 22 | 22 | ||
| 23 | import java.io.BufferedReader; | 23 | import java.io.BufferedReader; |
| 24 | import java.io.IOException; | 24 | import java.io.IOException; |
| @@ -52,7 +52,7 @@ import javax.tools.JavaFileObject; | |||
| 52 | 52 | ||
| 53 | /** | 53 | /** |
| 54 | * Generate java source file. | 54 | * Generate java source file. |
| 55 | - * <p>Function entry class is 'com.yuanrong.m2s.function.Handler'. | 55 | + * <p>Function entry class is 'org.yuanrong.m2s.function.Handler'. |
| 56 | * <p>If an exception occurs, logs are recorded instead of being thrown. | 56 | * <p>If an exception occurs, logs are recorded instead of being thrown. |
| 57 | * | 57 | * |
| 58 | * 2023/6/20 | 58 | * 2023/6/20 |
| @@ -155,7 +155,7 @@ public class SpringFunctionProcessor extends AbstractProcessor { | |||
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | private void writeFile(String annotationText, String handlerName) throws IOException { | 157 | private void writeFile(String annotationText, String handlerName) throws IOException { |
| 158 | - JavaFileObject filerSourceFile = this.filer.createSourceFile("com.yuanrong.m2s.function." + handlerName); | 158 | + JavaFileObject filerSourceFile = this.filer.createSourceFile("org.yuanrong.m2s.function." + handlerName); |
| 159 | try (Writer writer = filerSourceFile.openWriter()) { | 159 | try (Writer writer = filerSourceFile.openWriter()) { |
| 160 | writer.write(annotationText); | 160 | writer.write(annotationText); |
| 161 | } catch (Exception e) { | 161 | } catch (Exception e) { |
| @@ -1 +1 @@ | |||
| 1 | -com.yuanrong.m2s.sdk.processor.SpringFunctionProcessor | 1 | +org.yuanrong.m2s.sdk.processor.SpringFunctionProcessor |
| @@ -1,9 +1,9 @@ | |||
| 1 | -package com.yuanrong.m2s.function; | 1 | +package org.yuanrong.m2s.function; |
| 2 | 2 | ||
| 3 | -import com.services.runtime.Context; | 3 | +import org.yuanrong.services.runtime.Context; |
| 4 | -import com.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; | 4 | +import org.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; |
| 5 | -import com.yuanrong.m2s.runtime.api.runtime.APIGTriggerResponse; | 5 | +import org.yuanrong.m2s.runtime.api.runtime.APIGTriggerResponse; |
| 6 | -import com.yuanrong.m2s.sdk.api.Handler; | 6 | +import org.yuanrong.m2s.sdk.api.Handler; |
| 7 | ${ImportClasses} | 7 | ${ImportClasses} |
| 8 | 8 | ||
| 9 | import org.springframework.context.ApplicationContext; | 9 | import org.springframework.context.ApplicationContext; |
| @@ -12,7 +12,7 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext | |||
| 12 | public class ${FunctionHandlerName} { | 12 | public class ${FunctionHandlerName} { |
| 13 | private volatile ApplicationContext applicationContext; | 13 | private volatile ApplicationContext applicationContext; |
| 14 | 14 | ||
| 15 | - public ApiGTriggerResponse handle(APIGTriggerEvent event, Context context) { | 15 | + public APIGTriggerResponse handle(APIGTriggerEvent event, Context context) { |
| 16 | this.initializer(context); | 16 | this.initializer(context); |
| 17 | return ((Handler) this.applicationContext.getBean("${FunctionHandlerClassName}")).handle(event, context); | 17 | return ((Handler) this.applicationContext.getBean("${FunctionHandlerClassName}")).handle(event, context); |
| 18 | } | 18 | } |
| @@ -1,9 +1,9 @@ | |||
| 1 | -package com.yuanrong.m2s.function; | 1 | +package org.yuanrong.m2s.function; |
| 2 | 2 | ||
| 3 | -import com.services.runtime.Context; | 3 | +import org.yuanrong.services.runtime.Context; |
| 4 | -import com.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; | 4 | +import org.yuanrong.m2s.runtime.api.runtime.APIGTriggerEvent; |
| 5 | -import com.yuanrong.m2s.runtime.api.runtime.APIGTriggerResponse; | 5 | +import org.yuanrong.m2s.runtime.api.runtime.APIGTriggerResponse; |
| 6 | -import com.yuanrong.m2s.sdk.api.Handler; | 6 | +import org.yuanrong.m2s.sdk.api.Handler; |
| 7 | 7 | ||
| 8 | import org.springframework.context.ApplicationContext; | 8 | import org.springframework.context.ApplicationContext; |
| 9 | import org.springframework.context.support.GenericXmlApplicationContext; | 9 | import org.springframework.context.support.GenericXmlApplicationContext; |
Rmicroservice-sdk/microservice-sdk-spring-processor/src/test/java/com/yuanrong/m2s/sdk/processor/SpringFunctionProcessorTest.java→microservice-sdk/microservice-sdk-spring-processor/src/test/java/org/yuanrong/m2s/sdk/processor/SpringFunctionProcessorTest.java+3-3
| @@ -14,10 +14,10 @@ | |||
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package com.yuanrong.m2s.sdk.processor; | 17 | +package org.yuanrong.m2s.sdk.processor; |
| 18 | 18 | ||
| 19 | -import com.yuanrong.m2s.sdk.api.ConfigResource; | 19 | +import org.yuanrong.m2s.sdk.api.ConfigResource; |
| 20 | -import com.yuanrong.m2s.sdk.api.FunctionHandler; | 20 | +import org.yuanrong.m2s.sdk.api.FunctionHandler; |
| 21 | 21 | ||
| 22 | import org.assertj.core.util.Sets; | 22 | import org.assertj.core.util.Sets; |
| 23 | import org.junit.Assert; | 23 | import org.junit.Assert; |
| @@ -4,7 +4,7 @@ | |||
| 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | <parent> | 5 | <parent> |
| 6 | <artifactId>microservice</artifactId> | 6 | <artifactId>microservice</artifactId> |
| 7 | - <groupId>com.yuanrong.m2s</groupId> | 7 | + <groupId>org.yuanrong.m2s</groupId> |
| 8 | <version>1.0.0</version> | 8 | <version>1.0.0</version> |
| 9 | </parent> | 9 | </parent> |
| 10 | <modelVersion>4.0.0</modelVersion> | 10 | <modelVersion>4.0.0</modelVersion> |
| @@ -4,7 +4,7 @@ | |||
| 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | 4 | xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> |
| 5 | <modelVersion>4.0.0</modelVersion> | 5 | <modelVersion>4.0.0</modelVersion> |
| 6 | 6 | ||
| 7 | - <groupId>com.yuanrong.m2s</groupId> | 7 | + <groupId>org.yuanrong.m2s</groupId> |
| 8 | <artifactId>microservice</artifactId> | 8 | <artifactId>microservice</artifactId> |
| 9 | <version>1.0.0</version> | 9 | <version>1.0.0</version> |
| 10 | <packaging>pom</packaging> | 10 | <packaging>pom</packaging> |