Skip to content

JAV-214 avoid NullPointerException in register task, let it try to register again #90

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 3 commits into from
Jul 24, 2017
Merged

JAV-214 avoid NullPointerException in register task, let it try to register again #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e1baab
Update MicroserviceRegisterTask.java
Jul 18, 2017
b65a98e
Update MicroserviceRegisterTask.java
Jul 21, 2017
712ba1f
Update TestMicroserviceRegisterTask.java
Jul 21, 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
13 changes: 10 additions & 3 deletions ...-registry/src/main/java/io/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ protected boolean doRegister() {
microservice.getServiceName(),
microservice.getVersion());

checkSchemaIdSet();
if(!checkSchemaIdSet()) {
return false;
}
} else {
serviceId = srClient.registerMicroservice(microservice);
if (StringUtils.isEmpty(serviceId)) {
Expand Down Expand Up @@ -87,8 +89,12 @@ protected boolean doRegister() {
return registerSchemas();
}

private void checkSchemaIdSet() {
private boolean checkSchemaIdSet() {
Microservice existMicroservice = srClient.getMicroservice(microservice.getServiceId());
if (existMicroservice == null) {
LOGGER.error("Error to get microservice from service center when check schema set");
return false;
}
Set<String> existSchemas = new HashSet<>(existMicroservice.getSchemas());
Set<String> localSchemas = new HashSet<>(microservice.getSchemas());
schemaIdSetMatch = existSchemas.equals(localSchemas);
Expand All @@ -103,7 +109,7 @@ private void checkSchemaIdSet() {
microservice.getVersion(),
localSchemas,
existSchemas);
return;
return true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shall we return true or false in case the schema mismatches?

Copy link
Author

@ShakespeareLiu ShakespeareLiu Jul 24, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this flag just judges whether get the microservice schema dates successfully, another flag "schemaIdSetMatch" judges whether the schema matches.

}

LOGGER.info(
Expand All @@ -113,6 +119,7 @@ private void checkSchemaIdSet() {
microservice.getServiceName(),
microservice.getVersion(),
localSchemas);
return true;
}

private boolean registerSchemas() {
Expand Down
25 changes: 25 additions & 0 deletions ...istry/src/test/java/io/servicecomb/serviceregistry/task/TestMicroserviceRegisterTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,29 @@ public void testAlreadyRegisteredSchemaIdSetNotMatch(@Mocked ServiceRegistryClie
Assert.assertEquals("serviceId", microservice.getIntance().getServiceId());
Assert.assertEquals(1, taskList.size());
}

@Test
public void testAlreadyRegisteredGetSchemaIdSetFailed(@Mocked ServiceRegistryClient srClient) {
Microservice otherMicroservice = new Microservice();
otherMicroservice.setAppId(microservice.getAppId());
otherMicroservice.setServiceName("ms1");
otherMicroservice.addSchema("s1", "");

new Expectations() {
{
srClient.getMicroserviceId(anyString, anyString, anyString);
result = "serviceId";
srClient.getMicroservice(anyString);
result = null;
}
};

MicroserviceRegisterTask registerTask = new MicroserviceRegisterTask(eventBus, srClient, microservice);
registerTask.run();

Assert.assertEquals(false, registerTask.isRegistered());
Assert.assertEquals(false, registerTask.isSchemaIdSetMatch());
Assert.assertEquals("serviceId", microservice.getServiceId());
Assert.assertEquals(1, taskList.size());
}
}