Rename JavaTypeDescriptor and SqlTypeDescriptor to JavaType and…

… `SqlType` (#5)

* Rename recipe packages

* Add TypeDescriptorToType

src/main/resources/META-INF/rewrite/hibernate-6.yml

@@ -16,21 +16,22 @@
 
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.java.migrate.hibernate.MigrateToHibernate61
+name: org.openrewrite.hibernate.MigrateToHibernate61
 displayName: Migrate to Hibernate 6.1.x
 description: >
   This recipe will apply changes commonly needed when migrating to Hibernate 6.1.x. The hibernate dependencies will  
   be updated to use the new org.hibernate.orm group ID and the recipe will make changes necessary to use Hibernate
   with Jakarta EE 9.0.
 
 recipeList:
-  - org.openrewrite.java.migrate.hibernate.MigrateToHibernateDependencies61
+  - org.openrewrite.hibernate.MigrateToHibernateDependencies61
+  - org.openrewrite.hibernate.TypeDescriptorToType
   - org.openrewrite.java.migrate.jakarta.JavaxPersistenceToJakartaPersistence
   - org.openrewrite.java.migrate.jakarta.JavaxPersistenceXmlToJakartaPersistenceXml
 
 ---
 type: specs.openrewrite.org/v1beta/recipe
-name: org.openrewrite.java.migrate.hibernate.MigrateToHibernateDependencies61
+name: org.openrewrite.hibernate.MigrateToHibernateDependencies61
 displayName: Migrate Hibernate dependencies to 6.1.x
 description: >
   This recipe will migrate any existing dependencies on Hibernate 5.x to the latest 6.1.x release. This migration will
@@ -379,3 +380,19 @@ recipeList:
   - org.openrewrite.java.dependencies.RemoveDependency:
         groupId: org.hibernate
         artifactId: hibernate-entitymanager
+
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: org.openrewrite.hibernate.TypeDescriptorToType
+displayName: Rename `JavaTypeDescriptor` and `SqlTypeDescriptor` to `JavaType` and `SqlType`
+description: >
+  Rename `JavaTypeDescriptor` and `SqlTypeDescriptor` to `JavaType` and `SqlType` respectively.
+  See https://github.com/hibernate/hibernate-orm/blob/6.0/migration-guide.adoc#type-system
+
+recipeList:
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: org.hibernate.type.descriptor.java.JavaTypeDescriptor
+      newFullyQualifiedTypeName: org.hibernate.type.descriptor.java.JavaType
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: org.hibernate.type.descriptor.sql.SqlTypeDescriptor
+      newFullyQualifiedTypeName: org.hibernate.type.descriptor.sql.SqlType