Rename inner classes

Author: dwalluck

src/main/java/com/github/packageurl/internal/PackageTypeProviders.java

@@ -16,16 +16,16 @@ public final class PackageTypeProviders {
     private PackageTypeProviders() {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class ApkPackageTypeProvider extends LowercaseNamespaceAndNameTypeProvider {}
+    public static class Apk extends LowercaseNamespaceAndNameTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class BitbucketPackageTypeProvider extends LowercaseNamespaceAndNameTypeProvider {}
+    public static class Bitbucket extends LowercaseNamespaceAndNameTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class BitnamiPackageTypeProvider extends LowercaseNamespacePackageTypeProvider {}
+    public static class Bitnami extends LowercaseNamespacePackageTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class CocoapodsPackageTypeProvider implements PackageTypeProvider {
+    public static class Cocoapods implements PackageTypeProvider {
         @Override
         public void validateComponents(
                 @NonNull String type,
@@ -46,10 +46,10 @@ public void validateComponents(
     }
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class ComposerPackageTypeProvider extends LowercaseNamespaceAndNameTypeProvider {}
+    public static class Composer extends LowercaseNamespaceAndNameTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class ConanPackageTypeProvider implements PackageTypeProvider {
+    public static class Conan implements PackageTypeProvider {
         @Override
         public void validateComponents(
                 @NonNull String type,
@@ -70,7 +70,7 @@ public void validateComponents(
     }
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class CpanPackageTypeProvider implements PackageTypeProvider {
+    public static class Cpan implements PackageTypeProvider {
         @Override
         public void validateComponents(
                 @NonNull String type,
@@ -89,7 +89,7 @@ public void validateComponents(
     }
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class CranPackageTypeProvider implements PackageTypeProvider {
+    public static class Cran implements PackageTypeProvider {
         @Override
         public void validateComponents(
                 @NonNull String type,
@@ -106,19 +106,19 @@ public void validateComponents(
     }
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class DebPackageTypeProvider extends LowercaseNamespaceAndNameTypeProvider {}
+    public static class Deb extends LowercaseNamespaceAndNameTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class GenericPackageTypeProvider implements PackageTypeProvider {}
+    public static class Generic implements PackageTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class GithubPackageTypeProvider extends LowercaseNamespaceAndNameTypeProvider {}
+    public static class Github extends LowercaseNamespaceAndNameTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class GolangPackageTypeProvider extends LowercaseNamespacePackageTypeProvider {}
+    public static class Golang extends LowercaseNamespacePackageTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class HackagePackageTypeProvider implements PackageTypeProvider {
+    public static class Hackage implements PackageTypeProvider {
         @Override
         public void validateComponents(
                 @NonNull String type,
@@ -135,16 +135,16 @@ public void validateComponents(
     }
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class HexPackageTypeProvider extends LowercaseNamespaceAndNameTypeProvider {}
+    public static class Hex extends LowercaseNamespaceAndNameTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class HuggingfacePackageTypeProvider extends LowercaseVersionPackageTypeProvider {}
+    public static class Huggingface extends LowercaseVersionPackageTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class LuarocksPackageTypeProvider extends LowercaseVersionPackageTypeProvider {}
+    public static class Luarocks extends LowercaseVersionPackageTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class MavenPackageTypeProvider implements PackageTypeProvider {
+    public static class Maven implements PackageTypeProvider {
         @Override
         public void validateComponents(
                 @NonNull String type,
@@ -161,7 +161,7 @@ public void validateComponents(
     }
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class MlflowPackageTypeProvider implements PackageTypeProvider {
+    public static class Mlflow implements PackageTypeProvider {
         private static @Nullable String normalizeName(@Nullable String name, @Nullable Map<String, String> qualifiers)
                 throws MalformedPackageURLException {
             if (qualifiers != null) {
@@ -215,7 +215,7 @@ public void validateComponents(
     }
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class OciPackageTypeProvider implements PackageTypeProvider {
+    public static class Oci extends LowercaseNameAndVersionPackageTypeProvider {
         @Override
         public void validateComponents(
                 @NonNull String type,
@@ -229,31 +229,13 @@ public void validateComponents(
                 throw new MalformedPackageURLException("a namespace is not allowed for type '" + type + "'");
             }
         }
-
-        @Override
-        public @NonNull PackageURL normalizeComponents(
-                @NonNull String type,
-                @Nullable String namespace,
-                @NonNull String name,
-                @Nullable String version,
-                @Nullable Map<String, String> qualifiers,
-                @Nullable String subpath)
-                throws MalformedPackageURLException {
-            return new PackageURL(
-                    type,
-                    namespace,
-                    StringUtil.toLowerCase(name),
-                    version != null ? StringUtil.toLowerCase(version) : null,
-                    qualifiers,
-                    subpath);
-        }
     }
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class PubPackageTypeProvider extends LowercaseNamePackageTypeProvider {}
+    public static class Pub extends LowercaseNamePackageTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class PypiPackageTypeProvider implements PackageTypeProvider {
+    public static class Pypi implements PackageTypeProvider {
         @Override
         public @NonNull PackageURL normalizeComponents(
                 @NonNull String type,
@@ -269,13 +251,13 @@ public static class PypiPackageTypeProvider implements PackageTypeProvider {
     }
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class QpkgPackageTypeProvider extends LowercaseNamespacePackageTypeProvider {}
+    public static class Qpkg extends LowercaseNamespacePackageTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class RpmPackageTypeProvider extends LowercaseNamespacePackageTypeProvider {}
+    public static class Rpm extends LowercaseNamespacePackageTypeProvider {}
 
     @ServiceProvider(value = PackageTypeProvider.class, resolution = Requirement.Resolution.MANDATORY)
-    public static class SwiftPackageTypeProvider implements PackageTypeProvider {
+    public static class Swift implements PackageTypeProvider {
         @Override
         public void validateComponents(
                 @NonNull String type,

src/main/resources/META-INF/services/com.github.packageurl.spi.PackageTypeProvider

@@ -1,24 +1,24 @@
-com.github.packageurl.internal.PackageTypeProviders$ApkPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$BitbucketPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$BitnamiPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$CocoapodsPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$ComposerPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$ConanPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$CpanPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$CranPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$DebPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$GenericPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$GithubPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$GolangPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$HackagePackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$HexPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$HuggingfacePackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$LuarocksPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$MavenPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$MlflowPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$OciPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$PubPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$PypiPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$QpkgPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$RpmPackageTypeProvider
-com.github.packageurl.internal.PackageTypeProviders$SwiftPackageTypeProvider
+com.github.packageurl.internal.PackageTypeProviders$Apk
+com.github.packageurl.internal.PackageTypeProviders$Bitbucket
+com.github.packageurl.internal.PackageTypeProviders$Bitnami
+com.github.packageurl.internal.PackageTypeProviders$Cocoapods
+com.github.packageurl.internal.PackageTypeProviders$Composer
+com.github.packageurl.internal.PackageTypeProviders$Conan
+com.github.packageurl.internal.PackageTypeProviders$Cpan
+com.github.packageurl.internal.PackageTypeProviders$Cran
+com.github.packageurl.internal.PackageTypeProviders$Deb
+com.github.packageurl.internal.PackageTypeProviders$Generic
+com.github.packageurl.internal.PackageTypeProviders$Github
+com.github.packageurl.internal.PackageTypeProviders$Golang
+com.github.packageurl.internal.PackageTypeProviders$Hackage
+com.github.packageurl.internal.PackageTypeProviders$Hex
+com.github.packageurl.internal.PackageTypeProviders$Huggingface
+com.github.packageurl.internal.PackageTypeProviders$Luarocks
+com.github.packageurl.internal.PackageTypeProviders$Maven
+com.github.packageurl.internal.PackageTypeProviders$Mlflow
+com.github.packageurl.internal.PackageTypeProviders$Oci
+com.github.packageurl.internal.PackageTypeProviders$Pub
+com.github.packageurl.internal.PackageTypeProviders$Pypi
+com.github.packageurl.internal.PackageTypeProviders$Qpkg
+com.github.packageurl.internal.PackageTypeProviders$Rpm
+com.github.packageurl.internal.PackageTypeProviders$Swift