METAGEN-62 Adding support for SortedMap and SortedSet

src/main/java/org/hibernate/jpamodelgen/annotation/MetaAttributeGenerationVisitor.java

@@ -113,7 +113,6 @@ public AnnotationMetaAttribute visitDeclared(DeclaredType declaredType, Element
 		TypeElement returnedElement = (TypeElement) context.getTypeUtils().asElement( declaredType );
 		// WARNING: .toString() is necessary here since Name equals does not compare to String
 		String fqNameOfReturnType = returnedElement.getQualifiedName().toString();
-		// TODO - need to fix METAGEN-62, need to check whether the specified type is a subtype of a collection type
 		String collection = Constants.COLLECTIONS.get( fqNameOfReturnType );
 		String targetEntity = getTargetEntity( element.getAnnotationMirrors() );
 		if ( collection != null ) {

src/main/java/org/hibernate/jpamodelgen/util/Constants.java

@@ -36,6 +36,10 @@ public final class Constants {
 		COLLECTIONS.put( java.util.Set.class.getName(), javax.persistence.metamodel.SetAttribute.class.getName() );
 		COLLECTIONS.put( java.util.List.class.getName(), javax.persistence.metamodel.ListAttribute.class.getName() );
 		COLLECTIONS.put( java.util.Map.class.getName(), javax.persistence.metamodel.MapAttribute.class.getName() );
+
+		// Hibernate also supports the SortedSet and SortedMap interfaces
+		COLLECTIONS.put( java.util.SortedSet.class.getName(), javax.persistence.metamodel.SetAttribute.class.getName() );
+		COLLECTIONS.put( java.util.SortedMap.class.getName(), javax.persistence.metamodel.MapAttribute.class.getName() );
 	}
 
 	public static List<String> BASIC_TYPES = new ArrayList<String>();

src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/Printer.java

@@ -16,6 +16,7 @@
  */
 package org.hibernate.jpamodelgen.test.onetomanysorted;
 
+import java.util.SortedMap;
 import java.util.SortedSet;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -36,6 +37,10 @@ public class Printer {
 	@OneToMany
 	@Sort
 	private SortedSet<PrintJob> printQueue;
+
+	@OneToMany
+	@Sort
+	private SortedMap<String, PrintJob> printedJobs;
 }
 
 

src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/OneToManySortedTest.java → src/test/java/org/hibernate/jpamodelgen/test/onetomanysorted/SortedCollectionTest.java

@@ -14,31 +14,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.hibernate.jpamodelgen.test.onetomanysorted;
 
 import org.testng.annotations.Test;
 
 import org.hibernate.jpamodelgen.test.util.CompilationTest;
+import org.hibernate.jpamodelgen.test.util.TestForIssue;
 
 import static org.hibernate.jpamodelgen.test.util.TestUtil.assertMetamodelClassGeneratedFor;
 import static org.hibernate.jpamodelgen.test.util.TestUtil.assertPresenceOfFieldInMetamodelFor;
 
 /**
- * @author Emmanuel Bernard
+ * @author Hardy Ferentschik
  */
-public class OneToManySortedTest extends CompilationTest {
+public class SortedCollectionTest extends CompilationTest {
 
 	@Test
+	@TestForIssue(jiraKey = "METAGEN-62")
 	public void testGenerics() {
 		assertMetamodelClassGeneratedFor( Printer.class );
 		assertMetamodelClassGeneratedFor( PrintJob.class );
-		assertPresenceOfFieldInMetamodelFor( Printer.class, "printQueue", "There one to many attribute is missing" );
+		assertPresenceOfFieldInMetamodelFor( Printer.class, "printQueue", "There sorted set attribute is missing" );
+		assertPresenceOfFieldInMetamodelFor( Printer.class, "printedJobs", "There sorted map attribute is missing" );
 	}
 
 	@Override
 	protected String getPackageNameOfCurrentTest() {
-		return OneToManySortedTest.class.getPackage().getName();
+		return SortedCollectionTest.class.getPackage().getName();
 	}
 }