Merge pull request #5394 from stbischof/open_reporter

bjhargrave · web-flow · commit 141437029e34 · 2022-10-14T11:16:56.000-04:00
open bnd.reporter for external use
diff --git a/biz.aQute.bnd.reporter/bnd.bnd b/biz.aQute.bnd.reporter/bnd.bnd
@@ -28,12 +28,18 @@ jtwig.version: 5.86.1.RELEASE
 	${junit}
 	
 Export-Package: \
-	biz.aQute.bnd.reporter.service.resource.converter,\
+	biz.aQute.bnd.reporter.codesnippet,\
+	biz.aQute.bnd.reporter.codesnippet.dto,\
+	biz.aQute.bnd.reporter.codesnippet.geneimport,\
+	biz.aQute.bnd.reporter.component.dto,\
 	biz.aQute.bnd.reporter.exporter,\
 	biz.aQute.bnd.reporter.generator,\
+	biz.aQute.bnd.reporter.gogo.dto,\
 	biz.aQute.bnd.reporter.manifest.dto,\
-	biz.aQute.bnd.reporter.codesnippet,\
-	biz.aQute.bnd.reporter.codesnippet.dto
+	biz.aQute.bnd.reporter.maven.dto,\
+	biz.aQute.bnd.reporter.plugins.entries.bundle,\
+	biz.aQute.bnd.reporter.plugins.entries.bundle,\
+	biz.aQute.bnd.reporter.service.resource.converter
 
 -conditionalpackage: \
 	aQute.lib.*,\
diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/component/dto/package-info.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/component/dto/package-info.java
@@ -0,0 +1,2 @@
+@org.osgi.annotation.versioning.Version("1.0.0")
+package biz.aQute.bnd.reporter.component.dto;
diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/gogo/dto/package-info.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/gogo/dto/package-info.java
@@ -0,0 +1,2 @@
+@org.osgi.annotation.versioning.Version("1.0.0")
+package biz.aQute.bnd.reporter.gogo.dto;
diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/maven/dto/package-info.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/maven/dto/package-info.java
@@ -0,0 +1,2 @@
+@org.osgi.annotation.versioning.Version("1.0.0")
+package biz.aQute.bnd.reporter.maven.dto;
diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/ComponentsPlugin.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/ComponentsPlugin.java
@@ -81,7 +81,7 @@ public ComponentsPlugin() {
 	}
 
 	@Override
-	public Object extract(final Jar jar, final Locale locale) throws Exception {
+	public List<ComponentDescriptionDTO> extract(final Jar jar, final Locale locale) throws Exception {
 		Objects.requireNonNull(jar, "jar");
 		Objects.requireNonNull(locale, "locale");
 
diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MavenCoordinatePlugin.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MavenCoordinatePlugin.java
@@ -31,7 +31,7 @@ public MavenCoordinatePlugin() {
 	}
 
 	@Override
-	public Object extract(final Jar jar, final Locale locale) {
+	public MavenCoordinatesDTO extract(final Jar jar, final Locale locale) {
 		Objects.requireNonNull(jar, "jar");
 		Objects.requireNonNull(locale, "locale");
 
diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MetatypesPlugin.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/MetatypesPlugin.java
@@ -74,7 +74,7 @@ public MetatypesPlugin() {
 	}
 
 	@Override
-	public Object extract(final Jar jar, final Locale locale) throws Exception {
+	public List<ObjectClassDefinitionDTO> extract(final Jar jar, final Locale locale) throws Exception {
 		Objects.requireNonNull(jar, "jar");
 		Objects.requireNonNull(locale, "locale");
 
diff --git a/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/package-info.java b/biz.aQute.bnd.reporter/src/biz/aQute/bnd/reporter/plugins/entries/bundle/package-info.java
@@ -0,0 +1,2 @@
+@org.osgi.annotation.versioning.Version("1.0.0")
+package biz.aQute.bnd.reporter.plugins.entries.bundle;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@org.osgi.annotation.versioning.Version("1.0.0")`
	`2`	`+package biz.aQute.bnd.reporter.component.dto;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@org.osgi.annotation.versioning.Version("1.0.0")`
	`2`	`+package biz.aQute.bnd.reporter.gogo.dto;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@org.osgi.annotation.versioning.Version("1.0.0")`
	`2`	`+package biz.aQute.bnd.reporter.maven.dto;`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public ComponentsPlugin() {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`@Override`
`84`		`- public Object extract(final Jar jar, final Locale locale) throws Exception {`
	`84`	`+ public List<ComponentDescriptionDTO> extract(final Jar jar, final Locale locale) throws Exception {`
`85`	`85`	`Objects.requireNonNull(jar, "jar");`
`86`	`86`	`Objects.requireNonNull(locale, "locale");`
`87`	`87`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public MavenCoordinatePlugin() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`
`34`		`- public Object extract(final Jar jar, final Locale locale) {`
	`34`	`+ public MavenCoordinatesDTO extract(final Jar jar, final Locale locale) {`
`35`	`35`	`Objects.requireNonNull(jar, "jar");`
`36`	`36`	`Objects.requireNonNull(locale, "locale");`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public MetatypesPlugin() {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@Override`
`77`		`- public Object extract(final Jar jar, final Locale locale) throws Exception {`
	`77`	`+ public List<ObjectClassDefinitionDTO> extract(final Jar jar, final Locale locale) throws Exception {`
`78`	`78`	`Objects.requireNonNull(jar, "jar");`
`79`	`79`	`Objects.requireNonNull(locale, "locale");`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@org.osgi.annotation.versioning.Version("1.0.0")`
	`2`	`+package biz.aQute.bnd.reporter.plugins.entries.bundle;`