Modified PackageAdmin.getExportedPackage() to return the highest version
as per the spec. This resulted in removing a method from Felix and slightly
cleaning up the ExportedPackageImpl class.
git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@418726 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
index df970d7..0db0a84 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/ExportedPackageImpl.java
@@ -35,7 +35,7 @@
m_felix = felix;
m_exporter = exporter;
m_name = name;
- m_version = version;
+ m_version = (version == null) ? Version.emptyVersion : version;
}
public Bundle getExportingBundle()
@@ -82,14 +82,7 @@
{
if (m_versionString == null)
{
- if (m_version == null)
- {
- m_versionString = "0.0.0";
- }
- else
- {
- m_versionString = m_version.toString();
- }
+ m_versionString = m_version.toString();
}
return m_versionString;
}
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
index e00e845..168e69e 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/Felix.java
@@ -2569,23 +2569,7 @@
}
/**
- * Returns the exported package associated with the specified
- * package name. This is used by the PackageAdmin service
- * implementation.
- *
- * @param name The name of the exported package to find.
- * @return The exported package or null if no matching package was found.
- **/
- protected ExportedPackage getExportedPackage(String name)
- {
- ExportedPackage[] pkgs = getExportedPackages(name);
- // There can be multiple versions of the same package exported,
- // so we will just return the first one.
- return ((pkgs != null) && (pkgs.length != 0)) ? pkgs[0] : null;
- }
-
- /**
- * Returns the exported package associated with the specified
+ * Returns the exported packages associated with the specified
* package name. This is used by the PackageAdmin service
* implementation.
*
diff --git a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
index 7c8d1f3..31d72af 100644
--- a/org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
+++ b/org.apache.felix.framework/src/main/java/org/apache/felix/framework/PackageAdminImpl.java
@@ -102,16 +102,44 @@
return bundles;
}
+ public int getBundleType(Bundle bundle)
+ {
+ return 0;
+ }
+
/**
* Returns the exported package associated with the specified
- * package name.
+ * package name. If there are more than one version of the package
+ * being exported, then the highest version is returned.
*
* @param name the name of the exported package to find.
* @return the exported package or null if no matching package was found.
**/
public ExportedPackage getExportedPackage(String name)
{
- return m_felix.getExportedPackage(name);
+ // Get all versions of the exported package.
+ ExportedPackage[] pkgs = m_felix.getExportedPackages(name);
+ // If there are no versions exported, then return null.
+ if ((pkgs == null) || (pkgs.length == 0))
+ {
+ return null;
+ }
+ // Sort the exported versions.
+ Arrays.sort(pkgs, new Comparator() {
+ public int compare(Object o1, Object o2)
+ {
+ // Reverse arguments to sort in descending order.
+ return ((ExportedPackage) o2).getVersion().compareTo(
+ ((ExportedPackage) o1).getVersion());
+ }
+ });
+ // Return the highest version.
+ return pkgs[0];
+ }
+
+ public ExportedPackage[] getExportedPackages(String name)
+ {
+ return m_felix.getExportedPackages(name);
}
/**
@@ -126,11 +154,6 @@
return m_felix.getExportedPackages(b);
}
- public ExportedPackage[] getExportedPackages(String name)
- {
- return m_felix.getExportedPackages(name);
- }
-
/**
* The OSGi specification states that refreshing packages is
* asynchronous; this method simply notifies the package admin
@@ -234,10 +257,4 @@
// TODO: Implement PackageAdmin.getHosts()
return null;
}
-
- public int getBundleType(Bundle bundle)
- {
- // TODO: Implement PackageAdmin.getBundleType()
- return 0;
- }
}
\ No newline at end of file