chore: refactor based on suggestions

Author: dwalluck

pom.xml

@@ -142,6 +142,9 @@
     <json.version>20250107</json.version>
     <junit-bom.version>5.12.1</junit-bom.version>
     <maven-surefire-junit5-tree-reporter.version>1.4.0</maven-surefire-junit5-tree-reporter.version>
+    <biz.aQute.bnd.annotation.version>7.1.0</biz.aQute.bnd.annotation.version>
+    <jspecify.version>1.0.0</jspecify.version>
+    <org.osgi.annotation.bundle.version>2.0.0</org.osgi.annotation.bundle.version>
   </properties>
 
   <dependencyManagement>
@@ -158,6 +161,12 @@
   </dependencyManagement>
 
   <dependencies>
+    <dependency>
+      <groupId>biz.aQute.bnd</groupId>
+      <artifactId>biz.aQute.bnd.annotation</artifactId>
+      <version>${biz.aQute.bnd.annotation.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>jakarta.validation</groupId>
       <artifactId>jakarta.validation-api</artifactId>
@@ -168,13 +177,13 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.annotation.bundle</artifactId>
-      <version>2.0.0</version>
+      <version>${org.osgi.annotation.bundle.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>
-      <version>1.0.0</version>
+      <version>${jspecify.version}</version>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>

src/main/java/com/github/packageurl/PackageURL.java

@@ -24,7 +24,7 @@
 import static java.util.Objects.requireNonNull;
 
 import com.github.packageurl.internal.StringUtil;
-import com.github.packageurl.type.PackageTypeFactory;
+import com.github.packageurl.internal.PackageTypeFactory;
 import java.io.Serializable;
 import java.net.URI;
 import java.net.URISyntaxException;

…/packageurl/type/PackageTypeFactory.java …kageurl/internal/PackageTypeFactory.javasrc/main/java/com/github/packageurl/type/PackageTypeFactory.java renamed to src/main/java/com/github/packageurl/internal/PackageTypeFactory.java src/main/java/com/github/packageurl/type/PackageTypeFactory.java renamed to src/main/java/com/github/packageurl/internal/PackageTypeFactory.java

@@ -19,11 +19,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-package com.github.packageurl.type;
+package com.github.packageurl.internal;
 
+import aQute.bnd.annotation.spi.ServiceConsumer;
 import com.github.packageurl.MalformedPackageURLException;
 import com.github.packageurl.PackageURL;
-import com.github.packageurl.internal.StringUtil;
+
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
@@ -34,9 +35,13 @@
 import java.util.ServiceLoader;
 import java.util.Set;
 import java.util.TreeMap;
+
+import com.github.packageurl.spi.PackageTypeProvider;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
+import org.osgi.annotation.bundle.Requirement;
 
+@ServiceConsumer(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY, cardinality = Requirement.Cardinality.MULTIPLE)
 public final class PackageTypeFactory implements PackageTypeProvider {
     private static final @NonNull PackageTypeFactory INSTANCE = new PackageTypeFactory();
 
@@ -109,7 +114,7 @@ private static void validateQualifiers(@Nullable Map<String, String> qualifiers)
         }
     }
 
-    static void validateType(@NonNull String type) throws MalformedPackageURLException {
+    public static void validateType(@NonNull String type) throws MalformedPackageURLException {
         if (type.isEmpty()) {
             throw new MalformedPackageURLException("a type is always required");
         }