Fix inheritance and polymorphism

Anggakhalifah · Aug 9, 2022 · 3d70680 · 3d70680
1 parent 0cfeb65
commit 3d70680
Show file tree

Hide file tree

Showing 37 changed files with 33,106 additions and 11,029 deletions.
diff --git a/27.0.json b/27.0.json
diff --git a/27.0.yml b/27.0.yml
diff --git a/29.0.json b/29.0.json
diff --git a/29.0.yml b/29.0.yml
diff --git a/30.0.json b/30.0.json
diff --git a/30.0.yml b/30.0.yml
diff --git a/31.0.json b/31.0.json
diff --git a/31.0.yml b/31.0.yml
diff --git a/32.0.json b/32.0.json
diff --git a/32.0.yml b/32.0.yml
diff --git a/33.0.json b/33.0.json
diff --git a/33.0.yml b/33.0.yml
diff --git a/34.0.json b/34.0.json
diff --git a/34.0.yml b/34.0.yml
diff --git a/35.0.json b/35.0.json
diff --git a/35.0.yml b/35.0.yml
diff --git a/35.2.json b/35.2.json
diff --git a/35.2.yml b/35.2.yml
diff --git a/36.0.json b/36.0.json
diff --git a/36.0.yml b/36.0.yml
diff --git a/36.1.json b/36.1.json
diff --git a/36.1.yml b/36.1.yml
diff --git a/36.2.json b/36.2.json
diff --git a/36.2.yml b/36.2.yml
diff --git a/36.3.json b/36.3.json
diff --git a/36.3.yml b/36.3.yml
diff --git a/README.md b/README.md
@@ -99,7 +99,7 @@ diff -U20 --color=always \
 To fix the issue [Unable to compile Java openapi client#3](https://github.com/ccouzens/vcloud-rest-openapi/issues/3), run [patch_java_openapi_client.sed](./patch_java_openapi_client.sed) as a temporary workaround
 
 ```bash
-find <output directory>/ -type f \( -name "*.java" -o -name "*.md" \) -exec sed -ri -f patch_java_openapi_client.sed {} \;
+find <output directory> -regex '.*\(Type\|Value\|AllOf\|Test\)\.java' -exec grep -H '_type\|typeTest' {} \; -exec sed -ri -f patch_java_openapi_client.sed {} \;
 ```
 
 ## Status

diff --git a/patch_java_openapi_client.sed b/patch_java_openapi_client.sed
@@ -1,24 +1,41 @@
 {
-    0,/(Vcloud)?(Metadata|QueryResult)(Typed|String|Number|Boolean|DateTime|LicensingReport|LicensingReportSample|LicensingManagedServer|LicensingVirtualMachine|AdminEventCBM|ToCloudTunnel|FromCloudTunnel|SiteOrgAssociation|Org|OrgVdc|Media|VAppTemplate|VApp|VM|OrgNetwork|AdminOrgNetwork|VAppNetwork|Catalog|AdminVdc|VMWProviderVdc|Network|Group|User|StrandedUser|Role|AllocatedExternalAddress|Event|ResourcePool|Datastore|NetworkPool|Portgroup|DvSwitch|Cell|VirtualCenter|Host|AdminVApp|Right|AdminVM|AdminAllocatedExternalAddress|VAppOrgNetworkRelation|OrgVdcResourcePoolRelation|ProviderVdcResourcePoolRelation|DatastoreProviderVdcRelation|AdminUser|AdminGroup|AdminVAppNetwork|AdminCatalog|AdminCatalogItem|CatalogItem|AdminMedia|AdminVAppTemplate|AdminShadowVM|Task|AdminTask|BlockingTask|Disk|VmDiskRelation|AdminDisk|AdminVmDiskRelation|Condition|AdminEvent|StrandedItem|AdminService|Service|ServiceLink|StorageProfile|OrgVdcStorageProfile|AdminOrgVdcStorageProfile|ProviderVdcStorageProfile|ApiFilter|AdminApiDefinition|ApiDefinition|AdminFileDescriptor|FileDescriptor|ResourceClassAction|AclRule|ResourceClass|ServiceResource|EdgeGateway|OrgVdcNetwork|VAppOrgVdcNetworkRelation|ExternalLocalization|ResourcePoolVM|VmGroupVms|VmGroups|AdminRole|NsxTManager|AdminOrgVdcTemplate|OrgVdcTemplate|GatewayUplinks|Site|SiteAssociation|OrgAssociation)?(RecordType|Value)(\.JSON_PROPERTY_)(TYPE)/s//\1\2\3\4\5_\6/;
-    0,/(Objects\.equals\(this\.)(type, )(vcloud)?([Qq]ueryResult|[Mm]etadata)(Typed|String|Number|Boolean|DateTime|LicensingReport|LicensingReportSample|LicensingManagedServer|LicensingVirtualMachine|AdminEventCBM|ToCloudTunnel|FromCloudTunnel|SiteOrgAssociation|Org|OrgVdc|Media|VAppTemplate|VApp|VM|OrgNetwork|AdminOrgNetwork|VAppNetwork|Catalog|AdminVdc|VMWProviderVdc|Network|Group|User|StrandedUser|Role|AllocatedExternalAddress|Event|ResourcePool|Datastore|NetworkPool|Portgroup|DvSwitch|Cell|VirtualCenter|Host|AdminVApp|Right|AdminVM|AdminAllocatedExternalAddress|VAppOrgNetworkRelation|OrgVdcResourcePoolRelation|ProviderVdcResourcePoolRelation|DatastoreProviderVdcRelation|AdminUser|AdminGroup|AdminVAppNetwork|AdminCatalog|AdminCatalogItem|CatalogItem|AdminMedia|AdminVAppTemplate|AdminShadowVM|Task|AdminTask|BlockingTask|Disk|VmDiskRelation|AdminDisk|AdminVmDiskRelation|Condition|AdminEvent|StrandedItem|AdminService|Service|ServiceLink|StorageProfile|OrgVdcStorageProfile|AdminOrgVdcStorageProfile|ProviderVdcStorageProfile|ApiFilter|AdminApiDefinition|ApiDefinition|AdminFileDescriptor|FileDescriptor|ResourceClassAction|AclRule|ResourceClass|ServiceResource|EdgeGateway|OrgVdcNetwork|VAppOrgVdcNetworkRelation|ExternalLocalization|ResourcePoolVM|VmGroupVms|VmGroups|AdminRole|NsxTManager|AdminOrgVdcTemplate|OrgVdcTemplate|GatewayUplinks|Site|SiteAssociation|OrgAssociation)?(Value|RecordType)\.(type\))/s//\1_\2\3\4\5\6._\7/;
-
-    /class (Vcloud)?(Metadata|QueryResult)(Typed|String|Number|Boolean|DateTime|LicensingReport|LicensingReportSample|LicensingManagedServer|LicensingVirtualMachine|AdminEventCBM|ToCloudTunnel|FromCloudTunnel|SiteOrgAssociation|Org|OrgVdc|Media|VAppTemplate|VApp|VM|OrgNetwork|AdminOrgNetwork|VAppNetwork|Catalog|AdminVdc|VMWProviderVdc|Network|Group|User|StrandedUser|Role|AllocatedExternalAddress|Event|ResourcePool|Datastore|NetworkPool|Portgroup|DvSwitch|Cell|VirtualCenter|Host|AdminVApp|Right|AdminVM|AdminAllocatedExternalAddress|VAppOrgNetworkRelation|OrgVdcResourcePoolRelation|ProviderVdcResourcePoolRelation|DatastoreProviderVdcRelation|AdminUser|AdminGroup|AdminVAppNetwork|AdminCatalog|AdminCatalogItem|CatalogItem|AdminMedia|AdminVAppTemplate|AdminShadowVM|Task|AdminTask|BlockingTask|Disk|VmDiskRelation|AdminDisk|AdminVmDiskRelation|Condition|AdminEvent|StrandedItem|AdminService|Service|ServiceLink|StorageProfile|OrgVdcStorageProfile|AdminOrgVdcStorageProfile|ProviderVdcStorageProfile|ApiFilter|AdminApiDefinition|ApiDefinition|AdminFileDescriptor|FileDescriptor|ResourceClassAction|AclRule|ResourceClass|ServiceResource|EdgeGateway|OrgVdcNetwork|VAppOrgVdcNetworkRelation|ExternalLocalization|ResourcePoolVM|VmGroupVms|VmGroups|AdminRole|NsxTManager|AdminOrgVdcTemplate|OrgVdcTemplate|GatewayUplinks|Site|SiteAssociation|OrgAssociation)?(RecordType|Value) \{/,$ {
-        s/(JSON_PROPERTY_)(TYPE = "_type")/\1_\2/;
-        s/(private|protected)( TypeEnum )(type)/\1\2_\3/;
-
-        /sb\.append\("class (Vcloud)?(Metadata|QueryResult)(Typed|String|Number|Boolean|DateTime|LicensingReport|LicensingReportSample|LicensingManagedServer|LicensingVirtualMachine|AdminEventCBM|ToCloudTunnel|FromCloudTunnel|SiteOrgAssociation|Org|OrgVdc|Media|VAppTemplate|VApp|VM|OrgNetwork|AdminOrgNetwork|VAppNetwork|Catalog|AdminVdc|VMWProviderVdc|Network|Group|User|StrandedUser|Role|AllocatedExternalAddress|Event|ResourcePool|Datastore|NetworkPool|Portgroup|DvSwitch|Cell|VirtualCenter|Host|AdminVApp|Right|AdminVM|AdminAllocatedExternalAddress|VAppOrgNetworkRelation|OrgVdcResourcePoolRelation|ProviderVdcResourcePoolRelation|DatastoreProviderVdcRelation|AdminUser|AdminGroup|AdminVAppNetwork|AdminCatalog|AdminCatalogItem|CatalogItem|AdminMedia|AdminVAppTemplate|AdminShadowVM|Task|AdminTask|BlockingTask|Disk|VmDiskRelation|AdminDisk|AdminVmDiskRelation|Condition|AdminEvent|StrandedItem|AdminService|Service|ServiceLink|StorageProfile|OrgVdcStorageProfile|AdminOrgVdcStorageProfile|ProviderVdcStorageProfile|ApiFilter|AdminApiDefinition|ApiDefinition|AdminFileDescriptor|FileDescriptor|ResourceClassAction|AclRule|ResourceClass|ServiceResource|EdgeGateway|OrgVdcNetwork|VAppOrgVdcNetworkRelation|ExternalLocalization|ResourcePoolVM|VmGroupVms|VmGroups|AdminRole|NsxTManager|AdminOrgVdcTemplate|OrgVdcTemplate|GatewayUplinks|Site|SiteAssociation|OrgAssociation)?(Value|RecordType) \{/,/return sb\.toString\(\)/ {
-            0,/(type)/s//_\1/g;
+    0,/typeTest/!{0,/typeTest/s/type/_&/};
+    /JSON_PROPERTY_TYPE = "_type"/,+1 {
+        s/type/_&/i;
+    };
+    0,/(\.JSON_PROPERTY_)(TYPE,?)$/s//\1_\2/;
+    0,/Objects\.equals\(this\.type,/ {
+        /Objects\.equals\(this\.type,/s/type/_&/g;
+    };
+    0,/\.append\(toIndentedString\(type\)\)/ {
+        /\.append\(toIndentedString\(type\)\)/s/type/_&/g;
+    };
+    /Objects\.hash/s/type[,\)]/_&/;
+    0,/type\([a-zA-Z]+ type\) \{/ {
+        /type\([a-zA-Z]+ type\) \{/ {
+            N;N;
+            s/type/_&/;
+            s/\.(type)/\._\1/;
         }
-
-        /type\(TypeEnum type\)/,/setType\(TypeEnum type\)/ {
-            N;
-            s/(JSON_PROPERTY_)(TYPE)/\1_\2/g;
-            s/(get)(Type)/\1_\2/;
-            s/(return )(type)/\1_\2/;
-            s/(set)(Type)/\1_\2/;
-            s/(type = type)/_\1/;
-        }
-
-        /return Objects\.hash\(/s/(type)/_\1/;
-    }
-} 
+    };
+    0,/\(JSON_PROPERTY_TYPE\)/ {
+        /\(JSON_PROPERTY_TYPE\)/ {
+                N;N;N;N;N;
+                s/type/_&/i;
+                s/type = type/_&/;
+                s/(return )(type)/\1_\2/;
+                s/getType/get_Type/;
+                s/setType/set_Type/;
+            }
+     };
+     0,/\(JSON_PROPERTY_TYPE\)/ {
+        /\(JSON_PROPERTY_TYPE\)/ {
+                N;N;N;N;N;
+                s/type/_&/i;
+                s/type = type/_&/;
+                s/(return )(type)/\1_\2/;
+                s/getType/get_Type/;
+                s/setType/set_Type/;
+            }
+     };
+}
diff --git a/transformer/src/main.rs b/transformer/src/main.rs
@@ -7,10 +7,7 @@ extern crate lazy_static;
 
 use indexmap::IndexMap;
 use openapiv3::{Components, OpenAPI, ReferenceOr, SecurityScheme, Tag};
-use schema_tweaks::{
-    metadata_superclass::metadata_superclass, query_parameters::query_parameters,
-    query_superclass::query_superclass, stub_ovf::stub_ovf,
-};
+use schema_tweaks::{query_parameters::query_parameters, stub_ovf::stub_ovf};
 use std::{collections::BTreeMap, io::Read};
 mod info;
 mod parsers;
@@ -43,8 +40,8 @@ fn main() -> Result<()> {
     let content_type_mapping =
         schemas::schemas(&mut schemas, &mut zip).context("Unable to make content type mappings")?;
     stub_ovf(&mut schemas);
-    metadata_superclass(&mut schemas);
-    query_superclass(&mut schemas);
+    //metadata_superclass(&mut schemas);
+    //query_superclass(&mut schemas);
 
     let content_element_mapping: BTreeMap<String, String> = types::types(&mut zip)
         .context("unable to collect types")?