Skip to content

[SCB-1348[WIP][WEAK] change SchemaLoader to SwaggerLoader #1263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liubao68 merged 2 commits into from
Jul 8, 2019
Merged

[SCB-1348[WIP][WEAK] change SchemaLoader to SwaggerLoader #1263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a96f98a
[SCB-1348[WIP][WEAK] change SchemaLoader to SwaggerLoader
Jul 6, 2019
9472662
[SCB-1348[WIP][WEAK] delete SchemaLoader
Jul 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 0 additions & 81 deletions core/src/main/java/org/apache/servicecomb/core/definition/loader/DynamicSchemaLoader.java
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions core/src/main/java/org/apache/servicecomb/core/definition/loader/SchemaListener.java
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions core/src/main/java/org/apache/servicecomb/core/definition/loader/SchemaListenerManager.java
View file
Open in desktop

This file was deleted.

133 changes: 0 additions & 133 deletions core/src/main/java/org/apache/servicecomb/core/definition/loader/SchemaLoader.java
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions service-registry/src/main/java/org/apache/servicecomb/serviceregistry/RegistryUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ private RegistryUtils() {
}

public static void init() {
if (serviceRegistry != null) {
return;
}

MicroserviceConfigLoader loader = ConfigUtil.getMicroserviceConfigLoader();
MicroserviceDefinition microserviceDefinition = new MicroserviceDefinition(loader.getConfigModels());
serviceRegistry =
Expand Down
7 changes: 6 additions & 1 deletion ...main/java/org/apache/servicecomb/serviceregistry/consumer/StaticMicroserviceVersions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
import org.apache.servicecomb.serviceregistry.api.response.FindInstancesResponse;
import org.apache.servicecomb.serviceregistry.client.http.MicroserviceInstances;
import org.apache.servicecomb.serviceregistry.version.Version;
import org.apache.servicecomb.swagger.SwaggerUtils;

import io.swagger.models.Swagger;

public class StaticMicroserviceVersions extends MicroserviceVersions {
private Class<?> schemaIntfCls;
Expand All @@ -40,7 +43,9 @@ public StaticMicroserviceVersions(AppManager appManager, String appId, String mi
public StaticMicroserviceVersions init(Class<?> schemaIntfCls, String version,
List<MicroserviceInstance> addedInstances) {
this.schemaIntfCls = schemaIntfCls;
this.appManager.getServiceRegistry().getSwaggerLoader().registerSwagger(appId, shortName, shortName, schemaIntfCls);
Swagger swagger = this.appManager.getServiceRegistry().getSwaggerLoader()
.registerSwagger(appId, shortName, shortName, schemaIntfCls);
microservice.addSchema(shortName, SwaggerUtils.swaggerToString(swagger));

createMicroservice(version);

Expand Down
3 changes: 2 additions & 1 deletion ...src/main/java/org/apache/servicecomb/serviceregistry/registry/ServiceRegistryFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.servicecomb.serviceregistry.registry;

import org.apache.servicecomb.config.archaius.sources.MicroserviceConfigLoader;
import org.apache.servicecomb.foundation.common.event.SimpleEventBus;
import org.apache.servicecomb.serviceregistry.ServiceRegistry;
import org.apache.servicecomb.serviceregistry.client.LocalServiceRegistryClientImpl;
import org.apache.servicecomb.serviceregistry.config.ServiceRegistryConfig;
Expand Down Expand Up @@ -62,7 +63,7 @@ public static ServiceRegistry createLocal() {
}

public static ServiceRegistry createLocal(String localFile) {
EventBus eventBus = new EventBus();
EventBus eventBus = new SimpleEventBus();
ServiceRegistryConfig serviceRegistryConfig = ServiceRegistryConfig.INSTANCE;
MicroserviceConfigLoader loader = new MicroserviceConfigLoader();
loader.loadAndSort();
Expand Down
Loading