You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by du...@apache.org on 2022/07/31 08:39:30 UTC
[rocketmq-schema-registry] 30/37: simplify api
This is an automated email from the ASF dual-hosted git repository.
duhengforever pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/rocketmq-schema-registry.git
commit 880826eadefa21d18a7b96358f78bb92ce9657e5
Merge: 2d6c32a 589284e
Author: wangfan <18...@qq.com>
AuthorDate: Sat Jul 30 19:40:20 2022 +0800
simplify api
.travis.yml | 22 ++
README.md | 22 +-
client/pom.xml | 27 ++
.../client/NormalSchemaRegistryClient.java | 94 ++++++
.../registry/client/SchemaRegistryClient.java | 56 ++++
.../client/exceptions/RestClientException.java | 45 +--
.../schema/registry/client/rest/JacksonMapper.java | 18 +-
.../schema/registry/client/rest/RestService.java | 135 +++++++++
.../schema/registry/client/rest/UrlBuilder.java | 175 ++++++++++++
.../schema/registry/client/util/HttpUtil.java | 102 +++++++
common/pom.xml | 5 +-
.../schema/registry/common/QualifiedName.java | 18 +-
.../registry/common/auth/AccessControlService.java | 2 +-
.../auth/DefaultAccessControlServiceImpl.java | 2 +-
.../registry/common/context/RequestContext.java | 3 +-
.../common/context/RequestContextManager.java | 8 +-
.../common/context/StoragePluginContext.java | 5 -
.../common/context/StorageServiceContext.java | 1 -
.../schema/registry/common/dto/AuditDto.java | 3 +-
.../schema/registry/common/dto/BaseDto.java | 5 -
.../schema/registry/common/dto/FieldDto.java | 2 +-
.../registry/common/dto/SchemaDetailDto.java | 2 -
.../schema/registry/common/dto/SchemaMetaDto.java | 5 +-
.../registry/common/dto/SchemaStorageDto.java | 3 +-
.../schema/registry/common/dto/SubjectDto.java | 1 -
.../registry/common/exception/SchemaException.java | 6 +-
.../common/exception/SchemaExistException.java | 22 +-
.../registry/common/filter/RequestFilter.java | 10 +-
.../schema/registry/common/json/JsonConverter.java | 3 +-
.../registry/common/json/JsonConverterImpl.java | 6 +-
.../schema/registry/common/model/AuditInfo.java | 1 -
.../schema/registry/common/model/Dependency.java | 2 +-
.../schema/registry/common/model/FieldInfo.java | 1 -
.../registry/common/model/SchemaDetailInfo.java | 4 -
.../registry/common/model/SchemaMetaInfo.java | 1 -
.../registry/common/model/SchemaStorageInfo.java | 1 -
.../schema/registry/common/model/SchemaType.java | 2 +-
.../registry/common/properties/AclProperties.java | 6 +-
.../common/properties/ServiceProperties.java | 1 -
.../registry/common/storage/StorageManager.java | 4 +-
.../registry/common/storage/StoragePlugin.java | 2 +-
.../common/storage/StoragePluginManager.java | 2 +-
.../registry/common/storage/StorageService.java | 9 +-
.../common/storage/StorageServiceProxy.java | 17 +-
.../schema/registry/common/utils/CommonUtil.java | 29 +-
.../schema/registry/common/utils/IdGenerator.java | 1 -
.../common/utils/MemoryJavaFileManager.java | 9 +-
.../schema/registry/common/utils/StorageUtil.java | 8 +-
core/.mvn/wrapper/maven-wrapper.jar | Bin 58727 -> 0 bytes
core/.mvn/wrapper/maven-wrapper.properties | 2 -
core/mvnw | 316 ---------------------
core/mvnw.cmd | 188 ------------
core/pom.xml | 5 +-
.../schema/registry/core/CoreApplication.java | 27 +-
.../schema/registry/core/api/RequestProcessor.java | 40 +--
.../registry/core/api/v1/SchemaController.java | 77 ++---
.../registry/core/config/SchemaManagerConfig.java | 2 +-
.../registry/core/config/SchemaServiceConfig.java | 10 +-
.../schema/registry/core/config/SwaggerConfig.java | 16 +-
.../ArtifactoryDependencyServiceImpl.java | 2 -
.../registry/core/dependency/DependencyHelper.java | 2 +-
.../core/dependency/DynamicCompileProvider.java | 7 +-
.../core/dependency/DynamicJarsProvider.java | 23 --
.../core/expection/RequestExceptionHandler.java | 7 +-
.../schema/registry/core/package-info.java | 33 +--
.../registry/core/service/SchemaService.java | 4 +-
.../registry/core/service/SchemaServiceImpl.java | 4 +-
.../schema/registry/core/service/Service.java | 1 -
core/src/main/resources/application.properties | 38 ++-
core/src/main/resources/template.pom | 10 +-
.../schema/registry/core/CoreApplicationTests.java | 5 +-
.../core/controller/HelloControllerTest.java | 17 +-
pom.xml | 170 ++++++++++-
storage-rocketmq/pom.xml | 19 +-
.../registry/storage/rocketmq/RocketmqClient.java | 1 -
.../storage/rocketmq/RocketmqStorageClient.java | 1 -
.../rocketmq/RocketmqStorageClientImpl.java | 2 -
.../storage/rocketmq/RocketmqStorageService.java | 3 +-
.../rocketmq/configs/RocketmqConfigConstants.java | 1 -
.../storage/rocketmq/configs/ServiceConfig.java | 1 -
.../registry/storage/rocketmq/package-info.java | 31 +-
style/copyright/Apache.xml | 24 ++
style/copyright/profiles_settings.xml | 64 +++++
style/rmq_checkstyle.xml | 135 +++++++++
style/rmq_codeStyle.xml | 157 ++++++++++
war/pom.xml | 4 +-
86 files changed, 1468 insertions(+), 889 deletions(-)
diff --cc README.md
index 6a08db8,a125bad..5200e67
--- a/README.md
+++ b/README.md
@@@ -41,11 -51,12 +51,12 @@@ $ nohup sh mqnamesrv
$ nohup sh bin/mqbroker -n localhost:9876 &
```
-#### Edit configuration
+#### Edit configuration (Optional)
* Config storage local cache path
+
```shell
-$ storage.local.cache.path="" >> schema-storage-rocketmq/src/main/resources
+$ echo "storage.local.cache.path=${user.dir}" >> storage-rocketmq/src/main/resources/rocketmq.properties
```
#### Deployment & Running locally
diff --cc common/src/main/java/org/apache/rocketmq/schema/registry/common/json/JsonConverterImpl.java
index c3e3f89,0a4b9fe..ae0bac4
--- a/common/src/main/java/org/apache/rocketmq/schema/registry/common/json/JsonConverterImpl.java
+++ b/common/src/main/java/org/apache/rocketmq/schema/registry/common/json/JsonConverterImpl.java
@@@ -18,9 -18,10 +18,11 @@@
package org.apache.rocketmq.schema.registry.common.json;
import com.fasterxml.jackson.databind.ObjectMapper;
+ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.gson.Gson;
+import com.google.gson.JsonObject;
import java.nio.charset.StandardCharsets;
+ import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.schema.registry.common.exception.SchemaException;
diff --cc common/src/main/java/org/apache/rocketmq/schema/registry/common/model/SchemaDetailInfo.java
index 2f1c820,20f9532..3c6134b
--- a/common/src/main/java/org/apache/rocketmq/schema/registry/common/model/SchemaDetailInfo.java
+++ b/common/src/main/java/org/apache/rocketmq/schema/registry/common/model/SchemaDetailInfo.java
@@@ -17,16 -17,11 +17,12 @@@
package org.apache.rocketmq.schema.registry.common.model;
- import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.List;
import lombok.AllArgsConstructor;
- import lombok.Builder;
import lombok.Data;
- import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
- import org.apache.rocketmq.schema.registry.common.dto.SchemaRecordDto;
import org.apache.rocketmq.schema.registry.common.exception.SchemaException;
@Data
diff --cc core/src/main/java/org/apache/rocketmq/schema/registry/core/api/v1/SchemaController.java
index 01e5501,def77e0..79dbe4e
--- a/core/src/main/java/org/apache/rocketmq/schema/registry/core/api/v1/SchemaController.java
+++ b/core/src/main/java/org/apache/rocketmq/schema/registry/core/api/v1/SchemaController.java
@@@ -14,14 -22,12 +22,16 @@@ import io.swagger.annotations.ApiOperat
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
+ import java.net.HttpURLConnection;
+ import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.apache.rocketmq.schema.registry.common.QualifiedName;
+import org.apache.rocketmq.schema.registry.common.dto.RegisterSchemaRequest;
+import org.apache.rocketmq.schema.registry.common.dto.RegisterSchemaResponse;
import org.apache.rocketmq.schema.registry.common.dto.SchemaDto;
import org.apache.rocketmq.schema.registry.common.dto.SchemaRecordDto;
+import org.apache.rocketmq.schema.registry.common.dto.UpdateSchemaRequest;
+import org.apache.rocketmq.schema.registry.common.dto.UpdateSchemaResponse;
import org.apache.rocketmq.schema.registry.core.api.RequestProcessor;
import org.apache.rocketmq.schema.registry.core.service.SchemaService;
import org.springframework.beans.factory.annotation.Autowired;
diff --cc core/src/main/java/org/apache/rocketmq/schema/registry/core/service/SchemaService.java
index a468595,571f678..b32a2fb
--- a/core/src/main/java/org/apache/rocketmq/schema/registry/core/service/SchemaService.java
+++ b/core/src/main/java/org/apache/rocketmq/schema/registry/core/service/SchemaService.java
@@@ -32,19 -28,19 +32,19 @@@ public interface SchemaService<T extend
* Register the given schema.
*
* @param qualifiedName tenant / name of the schema
- * @param dto register resource information
+ * @param dto register resource information
* @return registered schema object
*/
- T register(QualifiedName qualifiedName, T dto);
+ RegisterSchemaResponse register(QualifiedName qualifiedName, RegisterSchemaRequest dto);
/**
* Register the schema.
*
* @param qualifiedName tenant / name of the schema
- * @param dto update information
+ * @param dto update information
* @return updated schema object
*/
- T update(QualifiedName qualifiedName, T dto);
+ UpdateSchemaResponse update(QualifiedName qualifiedName, UpdateSchemaRequest dto);
/**
* Deletes the schema.
diff --cc core/src/main/resources/application.properties
index 44a196c,ff31443..22c0ae0
--- a/core/src/main/resources/application.properties
+++ b/core/src/main/resources/application.properties
@@@ -1,10 -1,8 +1,8 @@@
-
- spring.profiles.active = dev
- spring.application.name = rocketmq-schema-registry
+ spring.profiles.active=dev
+ spring.application.name=rocketmq-schema-registry
server.port=8080
- logging.file.name = schema-registry/log/app.log
-
- schema.dependency.upload-enabled = false
-logging.file.name=log/app.log
++logging.file.name=schema-registry/log/app.log
+ schema.dependency.upload-enabled=false
#schema.dependency.jdk-path
#schema.dependency.compile-path
#schema.dependency.local-repository-path
diff --cc pom.xml
index e955a22,0025d16..f9c389d
--- a/pom.xml
+++ b/pom.xml
@@@ -11,9 -11,8 +11,8 @@@
<groupId>org.apache.rocketmq</groupId>
<artifactId>rocketmq-schema-registry-all</artifactId>
- <version>0.0.2-SNAPSHOT</version>
+ <version>0.0.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>rocketmq-schema-registry-${project.version}</name>
<description>rocketmq-schema-registry</description>
<modules>