Small javadoc fixes
Also, fix test for use of the FrameworkFactory
diff --git a/atomos.tests/atomos.tests.modulepath.service/src/main/java/module-info.java b/atomos.tests/atomos.tests.modulepath.service/src/main/java/module-info.java
index e957526..bdde920 100644
--- a/atomos.tests/atomos.tests.modulepath.service/src/main/java/module-info.java
+++ b/atomos.tests/atomos.tests.modulepath.service/src/main/java/module-info.java
@@ -12,7 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import org.apache.felix.atomos.Atomos;
+import org.osgi.framework.connect.ConnectFrameworkFactory;
module org.apache.felix.atomos.tests.modulepath.service
{
@@ -23,7 +23,7 @@
requires org.apache.felix.scr;
requires osgi.promise;
- uses Atomos;
+ uses ConnectFrameworkFactory;
opens org.apache.felix.atomos.tests.modulepath.service;
diff --git a/atomos.tests/atomos.tests.modulepath.service/src/test/java/org/apache/felix/atomos/tests/modulepath/service/ModulepathLaunchTest.java b/atomos.tests/atomos.tests.modulepath.service/src/test/java/org/apache/felix/atomos/tests/modulepath/service/ModulepathLaunchTest.java
index b011168..fe2dc65 100644
--- a/atomos.tests/atomos.tests.modulepath.service/src/test/java/org/apache/felix/atomos/tests/modulepath/service/ModulepathLaunchTest.java
+++ b/atomos.tests/atomos.tests.modulepath.service/src/test/java/org/apache/felix/atomos/tests/modulepath/service/ModulepathLaunchTest.java
@@ -435,7 +435,7 @@
@Test
void testAddLayerBeforeFrameworkFactory(@TempDir Path storage) throws BundleException
{
- doAddLayerBeforeFramework(storage, true);
+ doAddLayerBeforeFramework(storage, false);
}
void doAddLayerBeforeFramework(Path storage, boolean useAtomosNewFramework)
diff --git a/atomos/src/main/java/org/apache/felix/atomos/AtomosContent.java b/atomos/src/main/java/org/apache/felix/atomos/AtomosContent.java
index 9350898..7da2131 100644
--- a/atomos/src/main/java/org/apache/felix/atomos/AtomosContent.java
+++ b/atomos/src/main/java/org/apache/felix/atomos/AtomosContent.java
@@ -60,7 +60,7 @@
* @param type Class object for the type to which this Atomos content is to be
* adapted.
* @return The object, of the specified type, to which this Atomos content has been
- * adapted or {@code null} if this content cannot be adapted to the
+ * adapted or {@code empty} if this content cannot be adapted to the
* specified type.
*/
<T> Optional<T> adapt(Class<T> type);
diff --git a/atomos/src/main/java/org/apache/felix/atomos/AtomosLayer.java b/atomos/src/main/java/org/apache/felix/atomos/AtomosLayer.java
index d4a9819..0fc64da 100644
--- a/atomos/src/main/java/org/apache/felix/atomos/AtomosLayer.java
+++ b/atomos/src/main/java/org/apache/felix/atomos/AtomosLayer.java
@@ -55,6 +55,7 @@
*/
MANY
}
+
/**
* Adapt this Atomos layer to the specified type. For example,
* if running in a module layer then the layer can be adapted
@@ -63,7 +64,7 @@
* @param type Class object for the type to which this Atomos layer is to be
* adapted.
* @return The object, of the specified type, to which this Atomos layer has been
- * adapted or {@code null} if this layer cannot be adapted to the
+ * adapted or {@code empty} if this layer cannot be adapted to the
* specified type.
*/
<T> Optional<T> adapt(Class<T> type);
