Skip to content
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.

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

#1981: Optional OSGi bundle's dependency on sun.misc package #1993

Merged
merged 8 commits into from Oct 25, 2021
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions gson/bnd.bnd
Expand Up @@ -6,6 +6,10 @@ Bundle-ContactAddress: ${project.parent.url}
Bundle-RequiredExecutionEnvironment: JavaSE-1.6, JavaSE-1.7, JavaSE-1.8
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.6))"

# Optional dependency for JDK's sun.misc.Unsafe
# https://bnd.bndtools.org/chapters/920-faq.html#remove-unwanted-imports-
Import-Package: sun.misc;resolution:=optional, *

-removeheaders: Private-Package

-exportcontents:\
Expand Down
3 changes: 3 additions & 0 deletions gson/src/main/java/module-info.java
Expand Up @@ -10,4 +10,7 @@

// Optional dependency on java.sql
requires static java.sql;

// Optional dependency on jdk.unsupported for JDK's sun.misc.Unsafe
requires static jdk.unsupported;
}
59 changes: 59 additions & 0 deletions gson/src/test/java/com/google/gson/regression/OSGiTest.java
@@ -0,0 +1,59 @@
/*
* Copyright (C) 2016 Google Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.gson.regression;

import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.jar.Manifest;

import junit.framework.TestCase;

public class OSGiTest extends TestCase {
public void testComGoogleGsonAnnotationsPackage() throws Exception {
Manifest mf = findManifest("com.google.gson");
String importPkg = mf.getMainAttributes().getValue("Import-Package");
assertNotNull("Import-Package statement is there", importPkg);
assertNotSame("There should be com.google.gson.annotations dependency, but was: " + importPkg, -1, importPkg.indexOf("com.google.gson.annotations"));
JaroslavTulach marked this conversation as resolved.
Show resolved Hide resolved
}
public void testSunMiscImportPackage() throws Exception {
JaroslavTulach marked this conversation as resolved.
Show resolved Hide resolved
Manifest mf = findManifest("com.google.gson");
String importPkg = mf.getMainAttributes().getValue("Import-Package");
assertNotNull("Import-Package statement is there", importPkg);
for (String dep : importPkg.split(",")) {
if (dep.contains("sun.misc")) {
assertNotSame("sun.misc import is optional", -1, dep.indexOf("resolution:=optional"));
JaroslavTulach marked this conversation as resolved.
Show resolved Hide resolved
return;
}
}
fail("There should be sun.misc dependency, but was: " + importPkg);
}

private Manifest findManifest(String pkg) throws IOException {
List<URL> urls = new ArrayList<URL>();
for (URL u : Collections.list(getClass().getClassLoader().getResources("META-INF/MANIFEST.MF"))) {
Manifest mf = new Manifest(u.openStream());
JaroslavTulach marked this conversation as resolved.
Show resolved Hide resolved
if (pkg.equals(mf.getMainAttributes().getValue("Bundle-SymbolicName"))) {
return mf;
}
urls.add(u);
}
fail("Cannot find com.google.gson OSGi bundle manifest among: " + urls);
JaroslavTulach marked this conversation as resolved.
Show resolved Hide resolved
return null;
}
}