Skip to content

Dropped support of old-qualifier #869

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 2 commits into from
Dec 4, 2024
Merged

Dropped support of old-qualifier #869

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
800e00d
Dropped support of old-qualifier
artem-v Dec 4, 2024
bee031e
Dropped support of old-qualifier
artem-v Dec 4, 2024
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
4 changes: 0 additions & 4 deletions services-api/src/main/java/io/scalecube/services/ServiceReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ public String qualifier() {
return qualifier;
}

public String oldQualifier() {
return Qualifier.DELIMITER + qualifier();
}

public String endpointId() {
return endpointId;
}
Expand Down
4 changes: 0 additions & 4 deletions services-api/src/main/java/io/scalecube/services/methods/MethodInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ public String qualifier() {
return qualifier;
}

public String oldQualifier() {
return Qualifier.DELIMITER + qualifier();
}

public Type parameterizedReturnType() {
return parameterizedReturnType;
}
Expand Down
4 changes: 2 additions & 2 deletions services-gateway/src/test/java/io/scalecube/services/gateway/SecuredService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ public interface SecuredService {
@RequestType(String.class)
Mono<String> createSession(ServiceMessage request);

@Secured
@ServiceMethod
@RequestType(String.class)
@Secured
Mono<String> requestOne(String req);

@Secured
@ServiceMethod
@RequestType(Integer.class)
@Secured
Flux<String> requestN(Integer req);
}
2 changes: 1 addition & 1 deletion ...teway/src/test/java/io/scalecube/services/gateway/websocket/WebsocketGatewayAuthTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ void securedMethodAuthenticatedReqStream() {

private static ServiceMessage createSessionRequest(String username) {
return ServiceMessage.builder()
.qualifier("/" + SecuredService.NAMESPACE + "/createSession")
.qualifier(SecuredService.NAMESPACE + "/createSession")
.data(username)
.build();
}
Expand Down
32 changes: 10 additions & 22 deletions services/src/main/java/io/scalecube/services/registry/ServiceRegistryImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,7 @@ public boolean registerService(ServiceEndpoint serviceEndpoint) {
boolean success = serviceEndpoints.putIfAbsent(serviceEndpoint.id(), serviceEndpoint) == null;
if (success) {
LOGGER.log(Level.DEBUG, "ServiceEndpoint registered: {0}", serviceEndpoint);
serviceEndpoint
.serviceReferences()
.forEach(
sr -> {
populateServiceReferences(sr.qualifier(), sr);
populateServiceReferences(sr.oldQualifier(), sr);
});
serviceEndpoint.serviceReferences().forEach(this::populateServiceReferences);
}
return success;
}
Expand All @@ -93,13 +87,9 @@ public ServiceEndpoint unregisterService(String endpointId) {
serviceReferencesByQualifier.values().stream()
.flatMap(Collection::stream)
.filter(sr -> sr.endpointId().equals(endpointId))
.collect(Collectors.toList());
.toList();

serviceReferencesOfEndpoint.forEach(
sr -> {
computeServiceReferences(sr.qualifier(), sr);
computeServiceReferences(sr.oldQualifier(), sr);
});
serviceReferencesOfEndpoint.forEach(this::cleanServiceReferences);
}
return serviceEndpoint;
}
Expand Down Expand Up @@ -158,13 +148,11 @@ public void registerService(ServiceInfo serviceInfo) {
serviceInfo.level());

methodInvokers.put(methodInfo.qualifier(), methodInvoker);
methodInvokers.put(methodInfo.oldQualifier(), methodInvoker);
}));
}

private void checkMethodInvokerDoesntExist(MethodInfo methodInfo) {
if (methodInvokers.containsKey(methodInfo.qualifier())
|| methodInvokers.containsKey(methodInfo.oldQualifier())) {
if (methodInvokers.containsKey(methodInfo.qualifier())) {
LOGGER.log(Level.ERROR, "MethodInvoker already exists, methodInfo: {0}", methodInfo);
throw new IllegalStateException("MethodInvoker already exists");
}
Expand All @@ -180,20 +168,20 @@ public List<ServiceInfo> listServices() {
return serviceInfos;
}

private void populateServiceReferences(String qualifier, ServiceReference serviceReference) {
private void populateServiceReferences(ServiceReference sr) {
serviceReferencesByQualifier
.computeIfAbsent(qualifier, key -> new CopyOnWriteArrayList<>())
.add(serviceReference);
.computeIfAbsent(sr.qualifier(), key -> new CopyOnWriteArrayList<>())
.add(sr);
}

private void computeServiceReferences(String qualifier, ServiceReference serviceReference) {
private void cleanServiceReferences(ServiceReference sr) {
serviceReferencesByQualifier.compute(
qualifier,
sr.qualifier(),
(key, list) -> {
if (list == null || list.isEmpty()) {
return null;
}
list.remove(serviceReference);
list.remove(sr);
return !list.isEmpty() ? list : null;
});
}
Expand Down
Loading