Skip to content

[KARAF-7437] Improve DOSGi exported interface property parsing #84

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

Open
CMoH wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[KARAF-7437] Improve DOSGi exported interface property parsing #84

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
c8a0a77
[KARAF-7437] Improve DOSGi exported interface property parsing
CMoH May 19, 2022
4047d44
[KARAF-7437] Parse DOSGi exported interface of java.lang.Class type
CMoH Feb 2, 2023
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
1 change: 1 addition & 0 deletions dosgi/src/main/java/org/apache/karaf/cellar/dosgi/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ public abstract class Constants {
public static final String EXPORTED_INTERFACES = "service.exported.interfaces";
public static final String ENDPOINT_FRAMEWORK_UUID = "frameworkUUID";

public static final String[] NO_EXPORTED_INTERFACES = {};
}
48 changes: 40 additions & 8 deletions dosgi/src/main/java/org/apache/karaf/cellar/dosgi/ExportServiceListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.Collection;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
Expand Down Expand Up @@ -111,10 +112,9 @@ public void exportService(ServiceReference serviceReference) {
try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());

String exportedServices = (String) serviceReference.getProperty(Constants.EXPORTED_INTERFACES);
if (exportedServices != null && exportedServices.length() > 0) {
LOGGER.debug("CELLAR DOSGI: registering services {} in the cluster", exportedServices);
String[] interfaces = exportedServices.split(Constants.INTERFACE_SEPARATOR);
String[] interfaces = getExportedInterfaces(serviceReference);
if (interfaces.length > 0) {
LOGGER.debug("CELLAR DOSGI: registering services {} in the cluster", (Object) interfaces);
Object service = bundleContext.getService(serviceReference);

Set<String> exportedInterfaces = getServiceInterfaces(service, interfaces);
Expand Down Expand Up @@ -159,10 +159,9 @@ public void unExportService(ServiceReference serviceReference) {
ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
String exportedServices = (String) serviceReference.getProperty(Constants.EXPORTED_INTERFACES);
if (exportedServices != null && exportedServices.length() > 0) {
LOGGER.debug("CELLAR DOSGI: un-register service {} from the cluster", exportedServices);
String[] interfaces = exportedServices.split(Constants.INTERFACE_SEPARATOR);
String[] interfaces = getExportedInterfaces(serviceReference);
if (interfaces.length > 0) {
LOGGER.debug("CELLAR DOSGI: un-register service {} from the cluster", (Object) interfaces);
Object service = bundleContext.getService(serviceReference);

Set<String> exportedInterfaces = getServiceInterfaces(service, interfaces);
Expand All @@ -188,6 +187,39 @@ public void unExportService(ServiceReference serviceReference) {
}
}


private String[] getExportedInterfaces(ServiceReference serviceReference) {
Object property = serviceReference.getProperty(Constants.EXPORTED_INTERFACES);
if (property != null) {
if (property instanceof String)
return ((String) property).split(Constants.INTERFACE_SEPARATOR);
if (property instanceof String[])
return (String[]) property;
if (property instanceof Class)
return getClassBinaryNames(serviceReference, property);
if (property instanceof Class[])
return getClassBinaryNames(serviceReference, (Object[]) property);
if (property instanceof Collection)
return getClassBinaryNames(serviceReference, ((Collection) property).toArray());
LOGGER.warn("CELLAR DOSGI: Illegal value type of property {} on service reference {}", Constants.EXPORTED_INTERFACES, serviceReference);
}
return Constants.NO_EXPORTED_INTERFACES;
}

private String[] getClassBinaryNames(ServiceReference serviceReference, Object... classes) {
String[] names = new String[classes.length];
for (int i = 0; i < classes.length; ++i) {
Object o = classes[i];
if (o instanceof String)
names[i] = (String) o;
else if (o instanceof Class)
names[i] = ((Class)o).getName();
else
LOGGER.warn("CELLAR DOSGI: Illegal value type of property {} on service reference {}", Constants.EXPORTED_INTERFACES, serviceReference);
}
return names;
}

/**
* Get the interfaces that match the exported service interfaces.
*
Expand Down