Skip to content

[JAV-348]http header extensions support and java.lang.Error cause app… #128

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
merged 4 commits into from
Sep 7, 2017
Merged

[JAV-348]http header extensions support and java.lang.Error cause app… #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a7bd82
[JAV-348]http header extensions support and java.lang.Error cause app…
liubao68 Aug 31, 2017
ea6684b
[JAV-348]http header extensions support and java.lang.Error cause app…
liubao68 Sep 1, 2017
589183d
[JAV-348]java.lang.Error cause app exit
liubao68 Sep 5, 2017
2b81fad
[JAV-348]http header extensions support and java.lang.Error cause app
liubao68 Sep 5, 2017
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
16 changes: 7 additions & 9 deletions core/src/main/java/io/servicecomb/core/definition/schema/ConsumerSchemaFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@

package io.servicecomb.core.definition.schema;

import javax.inject.Inject;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;

import io.servicecomb.core.definition.MicroserviceMeta;
import io.servicecomb.core.definition.SchemaMeta;
import io.servicecomb.core.definition.SchemaUtils;
Expand All @@ -31,6 +24,11 @@
import io.servicecomb.serviceregistry.api.registry.Microservice;
import io.servicecomb.serviceregistry.client.ServiceRegistryClient;
import io.swagger.models.Swagger;
import javax.inject.Inject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;

@Component
public class ConsumerSchemaFactory extends AbstractSchemaFactory<ConsumerSchemaContext> {
Expand Down Expand Up @@ -71,8 +69,8 @@ public MicroserviceMeta getOrCreateMicroserviceMeta(String microserviceName, Str
Microservice microservice =
findMicroservice(microserviceMeta, microserviceVersionRule);
if (microservice == null) {
throw new Error(
String.format("can not get microservice from service center, appId=%s, name=%s",
throw new IllegalStateException(
String.format("Probably invoke a service before it is registered, appId=%s, name=%s",
microserviceMeta.getAppId(),
microserviceName));
}
Expand Down
2 changes: 1 addition & 1 deletion demo/demo-jaxrs/jaxrs-client/src/main/resources/microservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ service_description:
cse:
service:
registry:
address: http://127.0.0.1:9980
address: http://127.0.0.1:30100
handler:
chain:
Consumer:
Expand Down
2 changes: 1 addition & 1 deletion demo/demo-jaxrs/jaxrs-server/src/main/resources/microservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ service_description:
cse:
service:
registry:
address: http://127.0.0.1:9980
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080
highway:
Expand Down
4 changes: 4 additions & 0 deletions demo/demo-pojo/pojo-client/src/main/java/io/servicecomb/demo/pojo/client/BeanRpcTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ public void run() {
e1.printStackTrace();
}
continue;
} catch (Throwable e) {
System.out.println("XXXXXXXXXXXXXXXXXXXXXXXX: teset case error");
e.printStackTrace();
System.exit(0);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion demo/demo-pojo/pojo-client/src/main/resources/microservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ service_description:
cse:
service:
registry:
address: http://127.0.0.1:9980
address: http://127.0.0.1:30100
handler:
chain:
Consumer:
Expand Down
2 changes: 1 addition & 1 deletion demo/demo-pojo/pojo-server/src/main/resources/microservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ service_description:
cse:
service:
registry:
address: http://127.0.0.1:9980
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080
highway:
Expand Down
2 changes: 1 addition & 1 deletion demo/demo-springmvc/springmvc-client/src/main/resources/microservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ service_description:
cse:
service:
registry:
address: http://127.0.0.1:9980
address: http://127.0.0.1:30100
handler:
chain:
Consumer:
Expand Down
2 changes: 1 addition & 1 deletion demo/demo-springmvc/springmvc-server/src/main/resources/microservice.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ service_description:
cse:
service:
registry:
address: http://127.0.0.1:9980
address: http://127.0.0.1:30100
rest:
address: 0.0.0.0:8080?sslEnabled=true
highway:
Expand Down