@@ -544,7 +544,7 @@ public void testFreeFormObjects() {
544
544
codegen .setOpenAPI (openAPI );
545
545
CodegenModel cm1 = codegen .fromModel ("MapTest1" , test1 );
546
546
Assert .assertEquals (cm1 .getDataType (), "Map" );
547
- Assert .assertEquals (cm1 .getParent (), "HashMap<String, oas_any_type_not_mapped >" );
547
+ Assert .assertEquals (cm1 .getParent (), "HashMap<String, Object >" );
548
548
Assert .assertEquals (cm1 .getClassname (), "MapTest1" );
549
549
550
550
Schema test2 = openAPI .getComponents ().getSchemas ().get ("MapTest2" );
@@ -683,29 +683,29 @@ public void testAnyType() {
683
683
684
684
final CodegenProperty property1 = cm1 .allVars .get (0 );
685
685
Assert .assertEquals (property1 .baseName , "any_value" );
686
- Assert .assertEquals (property1 .dataType , "oas_any_type_not_mapped " );
686
+ Assert .assertEquals (property1 .dataType , "Object " );
687
687
Assert .assertTrue (property1 .hasMore );
688
- Assert .assertFalse (property1 .isPrimitiveType );
688
+ Assert .assertTrue (property1 .isPrimitiveType );
689
689
Assert .assertFalse (property1 .isContainer );
690
690
Assert .assertFalse (property1 .isFreeFormObject );
691
691
Assert .assertTrue (property1 .isAnyType );
692
692
693
693
final CodegenProperty property2 = cm1 .allVars .get (1 );
694
694
Assert .assertEquals (property2 .baseName , "any_value_with_desc" );
695
- Assert .assertEquals (property2 .dataType , "oas_any_type_not_mapped " );
695
+ Assert .assertEquals (property2 .dataType , "Object " );
696
696
Assert .assertTrue (property2 .hasMore );
697
697
Assert .assertFalse (property2 .required );
698
- Assert .assertFalse (property2 .isPrimitiveType );
698
+ Assert .assertTrue (property2 .isPrimitiveType );
699
699
Assert .assertFalse (property2 .isContainer );
700
700
Assert .assertFalse (property2 .isFreeFormObject );
701
701
Assert .assertTrue (property2 .isAnyType );
702
702
703
703
final CodegenProperty property3 = cm1 .allVars .get (2 );
704
704
Assert .assertEquals (property3 .baseName , "any_value_nullable" );
705
- Assert .assertEquals (property3 .dataType , "oas_any_type_not_mapped " );
705
+ Assert .assertEquals (property3 .dataType , "Object " );
706
706
Assert .assertFalse (property3 .hasMore );
707
707
Assert .assertFalse (property3 .required );
708
- Assert .assertFalse (property3 .isPrimitiveType );
708
+ Assert .assertTrue (property3 .isPrimitiveType );
709
709
Assert .assertFalse (property3 .isContainer );
710
710
Assert .assertFalse (property3 .isFreeFormObject );
711
711
Assert .assertTrue (property3 .isAnyType );
@@ -717,63 +717,63 @@ public void testAnyType() {
717
717
718
718
final CodegenProperty cp1 = cm2 .vars .get (0 );
719
719
Assert .assertEquals (cp1 .baseName , "any_value" );
720
- Assert .assertEquals (cp1 .dataType , "oas_any_type_not_mapped " );
720
+ Assert .assertEquals (cp1 .dataType , "Object " );
721
721
Assert .assertTrue (cp1 .hasMore );
722
722
Assert .assertFalse (cp1 .required );
723
- Assert .assertFalse (cp1 .isPrimitiveType );
723
+ Assert .assertTrue (cp1 .isPrimitiveType );
724
724
Assert .assertFalse (cp1 .isContainer );
725
725
Assert .assertFalse (cp1 .isFreeFormObject );
726
726
Assert .assertTrue (cp1 .isAnyType );
727
727
728
728
final CodegenProperty cp2 = cm2 .vars .get (1 );
729
729
Assert .assertEquals (cp2 .baseName , "any_value_with_desc" );
730
- Assert .assertEquals (cp2 .dataType , "oas_any_type_not_mapped " );
730
+ Assert .assertEquals (cp2 .dataType , "Object " );
731
731
Assert .assertTrue (cp2 .hasMore );
732
732
Assert .assertFalse (cp2 .required );
733
- Assert .assertFalse (cp2 .isPrimitiveType );
733
+ Assert .assertTrue (cp2 .isPrimitiveType );
734
734
Assert .assertFalse (cp2 .isContainer );
735
735
Assert .assertFalse (cp2 .isFreeFormObject );
736
736
Assert .assertTrue (cp2 .isAnyType );
737
737
738
738
final CodegenProperty cp3 = cm2 .vars .get (2 );
739
739
Assert .assertEquals (cp3 .baseName , "any_value_nullable" );
740
- Assert .assertEquals (cp3 .dataType , "oas_any_type_not_mapped " );
740
+ Assert .assertEquals (cp3 .dataType , "Object " );
741
741
Assert .assertTrue (cp3 .hasMore );
742
742
Assert .assertFalse (cp3 .required );
743
- Assert .assertFalse (cp3 .isPrimitiveType );
743
+ Assert .assertTrue (cp3 .isPrimitiveType );
744
744
Assert .assertFalse (cp3 .isContainer );
745
745
Assert .assertFalse (cp3 .isFreeFormObject );
746
746
Assert .assertTrue (cp3 .isAnyType );
747
747
748
748
// map
749
749
final CodegenProperty cp4 = cm2 .vars .get (3 );
750
750
Assert .assertEquals (cp4 .baseName , "map_any_value" );
751
- Assert .assertEquals (cp4 .dataType , "Map<String, oas_any_type_not_mapped >" );
751
+ Assert .assertEquals (cp4 .dataType , "Map<String, Object >" );
752
752
Assert .assertTrue (cp4 .hasMore );
753
753
Assert .assertFalse (cp4 .required );
754
- Assert .assertFalse (cp4 .isPrimitiveType );
754
+ Assert .assertTrue (cp4 .isPrimitiveType );
755
755
Assert .assertTrue (cp4 .isContainer );
756
756
Assert .assertTrue (cp4 .isMapContainer );
757
757
Assert .assertTrue (cp4 .isFreeFormObject );
758
758
Assert .assertFalse (cp4 .isAnyType );
759
759
760
760
final CodegenProperty cp5 = cm2 .vars .get (4 );
761
761
Assert .assertEquals (cp5 .baseName , "map_any_value_with_desc" );
762
- Assert .assertEquals (cp5 .dataType , "Map<String, oas_any_type_not_mapped >" );
762
+ Assert .assertEquals (cp5 .dataType , "Map<String, Object >" );
763
763
Assert .assertTrue (cp5 .hasMore );
764
764
Assert .assertFalse (cp5 .required );
765
- Assert .assertFalse (cp5 .isPrimitiveType );
765
+ Assert .assertTrue (cp5 .isPrimitiveType );
766
766
Assert .assertTrue (cp5 .isContainer );
767
767
Assert .assertTrue (cp5 .isMapContainer );
768
768
Assert .assertTrue (cp5 .isFreeFormObject );
769
769
Assert .assertFalse (cp5 .isAnyType );
770
770
771
771
final CodegenProperty cp6 = cm2 .vars .get (5 );
772
772
Assert .assertEquals (cp6 .baseName , "map_any_value_nullable" );
773
- Assert .assertEquals (cp6 .dataType , "Map<String, oas_any_type_not_mapped >" );
773
+ Assert .assertEquals (cp6 .dataType , "Map<String, Object >" );
774
774
Assert .assertTrue (cp6 .hasMore );
775
775
Assert .assertFalse (cp6 .required );
776
- Assert .assertFalse (cp6 .isPrimitiveType );
776
+ Assert .assertTrue (cp6 .isPrimitiveType );
777
777
Assert .assertTrue (cp6 .isContainer );
778
778
Assert .assertTrue (cp6 .isMapContainer );
779
779
Assert .assertTrue (cp6 .isFreeFormObject );
@@ -782,32 +782,32 @@ public void testAnyType() {
782
782
// array
783
783
final CodegenProperty cp7 = cm2 .vars .get (6 );
784
784
Assert .assertEquals (cp7 .baseName , "array_any_value" );
785
- Assert .assertEquals (cp7 .dataType , "List<oas_any_type_not_mapped >" );
785
+ Assert .assertEquals (cp7 .dataType , "List<Object >" );
786
786
Assert .assertTrue (cp7 .hasMore );
787
787
Assert .assertFalse (cp7 .required );
788
- Assert .assertFalse (cp7 .isPrimitiveType );
788
+ Assert .assertTrue (cp7 .isPrimitiveType );
789
789
Assert .assertTrue (cp7 .isContainer );
790
790
Assert .assertTrue (cp7 .isListContainer );
791
791
Assert .assertFalse (cp7 .isFreeFormObject );
792
792
Assert .assertFalse (cp7 .isAnyType );
793
793
794
794
final CodegenProperty cp8 = cm2 .vars .get (7 );
795
795
Assert .assertEquals (cp8 .baseName , "array_any_value_with_desc" );
796
- Assert .assertEquals (cp8 .dataType , "List<oas_any_type_not_mapped >" );
796
+ Assert .assertEquals (cp8 .dataType , "List<Object >" );
797
797
Assert .assertTrue (cp8 .hasMore );
798
798
Assert .assertFalse (cp8 .required );
799
- Assert .assertFalse (cp8 .isPrimitiveType );
799
+ Assert .assertTrue (cp8 .isPrimitiveType );
800
800
Assert .assertTrue (cp8 .isContainer );
801
801
Assert .assertTrue (cp8 .isListContainer );
802
802
Assert .assertFalse (cp8 .isFreeFormObject );
803
803
Assert .assertFalse (cp8 .isAnyType );
804
804
805
805
final CodegenProperty cp9 = cm2 .vars .get (8 );
806
806
Assert .assertEquals (cp9 .baseName , "array_any_value_nullable" );
807
- Assert .assertEquals (cp9 .dataType , "List<oas_any_type_not_mapped >" );
807
+ Assert .assertEquals (cp9 .dataType , "List<Object >" );
808
808
Assert .assertFalse (cp9 .hasMore );
809
809
Assert .assertFalse (cp9 .required );
810
- Assert .assertFalse (cp9 .isPrimitiveType );
810
+ Assert .assertTrue (cp9 .isPrimitiveType );
811
811
Assert .assertTrue (cp9 .isContainer );
812
812
Assert .assertTrue (cp9 .isListContainer );
813
813
Assert .assertFalse (cp9 .isFreeFormObject );
0 commit comments