Correct ordering of properties, WSDL ordering is important

Signed-off-by: Stefan Dilk <[email protected]>

pom.xml

@@ -92,12 +92,20 @@
                     <locales>de</locales>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>9</maven.compiler.source>
-        <maven.compiler.target>9</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
     <url>https://dev-vmware.freenet-rz.de/site/vijava</url>
     <developers>

src/main/java/com/vmware/vim25/ApplyProfile.java

@@ -41,17 +41,17 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 
 public class ApplyProfile extends DynamicData {
 
-    private Boolean copyEnableStatus;
     private boolean enabled;
-    private Boolean favorite;
-    private Boolean hidden;
     private ProfilePolicy[] policy;
     private String profileTypeName;
     private String profileVersion;
     private ProfileApplyProfileProperty[] property;
-    private Boolean toBeDeleted;
+    private Boolean favorite;
     private Boolean toBeMerged;
     private Boolean toReplaceWith;
+    private Boolean toBeDeleted;
+    private Boolean copyEnableStatus;
+    private Boolean hidden;
 
     public Boolean getCopyEnableStatus() {
         return copyEnableStatus;

src/main/java/com/vmware/vim25/ClusterComputeResourceDVSSetting.java

@@ -11,9 +11,9 @@
  */
 public class ClusterComputeResourceDVSSetting extends DynamicData {
 
-    private ClusterComputeResourceDVSSettingDVPortgroupToServiceMapping[] dvPortgroupSetting;
     private ManagedObjectReference dvSwitch;
     private String[] pnicDevices;
+    private ClusterComputeResourceDVSSettingDVPortgroupToServiceMapping[] dvPortgroupSetting;
 
     @Override
     public String toString() {

src/main/java/com/vmware/vim25/ClusterComputeResourceDvsProfile.java

@@ -11,10 +11,10 @@
  */
 public class ClusterComputeResourceDvsProfile extends DynamicData {
 
-    private ClusterComputeResourceDvsProfileDVPortgroupSpecToServiceMapping[] dvPortgroupMapping;
     private String dvsName;
     private ManagedObjectReference dvSwitch;
     private String[] pnicDevices;
+    private ClusterComputeResourceDvsProfileDVPortgroupSpecToServiceMapping[] dvPortgroupMapping;
 
     @Override
     public String toString() {

src/main/java/com/vmware/vim25/ClusterComputeResourceDvsProfileDVPortgroupSpecToServiceMapping.java

@@ -6,8 +6,8 @@
  */
 public class ClusterComputeResourceDvsProfileDVPortgroupSpecToServiceMapping extends DynamicData {
 
-    private ManagedObjectReference dvPortgroup;
     private DVPortgroupConfigSpec dvPortgroupSpec;
+    private ManagedObjectReference dvPortgroup;
     private String service;
 
     @Override

src/main/java/com/vmware/vim25/ClusterComputeResourceHCIConfigSpec.java

@@ -12,8 +12,8 @@ public class ClusterComputeResourceHCIConfigSpec extends DynamicData {
 
     private ClusterComputeResourceDvsProfile[] dvsProf;
     private ClusterComputeResourceHostConfigurationProfile hostConfigProfile;
-    private ClusterComputeResourceVCProfile vcProf;
     private SDDCBase vSanConfigSpec;
+    private ClusterComputeResourceVCProfile vcProf;
 
     @Override
     public String toString() {

src/main/java/com/vmware/vim25/ClusterConfigSpecEx.java

@@ -45,19 +45,19 @@ public class ClusterConfigSpecEx extends ComputeResourceConfigSpec {
 
     private ClusterDasConfigInfo dasConfig;
     private ClusterDasVmConfigSpec[] dasVmConfigSpec;
-    private ClusterDpmConfigInfo dpmConfig;
-    private ClusterDpmHostConfigSpec[] dpmHostConfigSpec;
     private ClusterDrsConfigInfo drsConfig;
     private ClusterDrsVmConfigSpec[] drsVmConfigSpec;
-    private ClusterGroupSpec[] groupSpec;
-    private ClusterInfraUpdateHaConfigInfo infraUpdateHaConfig;
-    private Boolean inHciWorkflow;
-    private ClusterOrchestrationInfo orchestration;
-    private ClusterProactiveDrsConfigInfo proactiveDrsConfig;
     private ClusterRuleSpec[] rulesSpec;
+    private ClusterOrchestrationInfo orchestration;
     private ClusterVmOrchestrationSpec[] vmOrchestrationSpec;
+    private ClusterDpmConfigInfo dpmConfig;
+    private ClusterDpmHostConfigSpec[] dpmHostConfigSpec;
     private VsanClusterConfigInfo vsanConfig;
     private VsanHostConfigInfo[] vsanHostConfigSpec;
+    private ClusterGroupSpec[] groupSpec;
+    private ClusterInfraUpdateHaConfigInfo infraUpdateHaConfig;
+    private ClusterProactiveDrsConfigInfo proactiveDrsConfig;
+    private Boolean inHciWorkflow;
 
     @Override
     public String toString() {

src/main/java/com/vmware/vim25/ConfigTarget.java

@@ -41,33 +41,33 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 
 public class ConfigTarget extends DynamicData {
 
-    private Boolean autoVmotion;
-    private Long availablePersistentMemoryReservationMB;
-    private VirtualMachineCdromInfo[] cdRom;
+    private int numCpus;
+    private int numCpuCores;
+    private int numNumaNodes;
+    private Boolean smcPresent;
     private VirtualMachineDatastoreInfo[] datastore;
+    private VirtualMachineNetworkInfo[] network;
+    private OpaqueNetworkTargetInfo[] opaqueNetwork;
     private DistributedVirtualPortgroupInfo[] distributedVirtualPortgroup;
     private DistributedVirtualSwitchInfo[] distributedVirtualSwitch;
+    private VirtualMachineCdromInfo[] cdRom;
+    private VirtualMachineSerialInfo[] serial;
+    private VirtualMachineParallelInfo[] parallel;
+    private VirtualMachineSoundInfo[] sound;
+    private VirtualMachineUsbInfo[] usb;
     private VirtualMachineFloppyInfo[] floppy;
-    private VirtualMachineIdeDiskDeviceInfo[] ideDisk;
     private VirtualMachineLegacyNetworkSwitchInfo[] legacyNetworkInfo;
+    private VirtualMachineScsiPassthroughInfo[] scsiPassthrough;
+    private VirtualMachineScsiDiskDeviceInfo[] scsiDisk;
+    private VirtualMachineIdeDiskDeviceInfo[] ideDisk;
     private int maxMemMBOptimalPerf;
-    private VirtualMachineNetworkInfo[] network;
-    private int numCpuCores;
-    private int numCpus;
-    private int numNumaNodes;
-    private OpaqueNetworkTargetInfo[] opaqueNetwork;
-    private VirtualMachineParallelInfo[] parallel;
-    private VirtualMachinePciPassthroughInfo[] pciPassthrough;
     private ResourcePoolRuntimeInfo resourcePool;
-    private VirtualMachineScsiDiskDeviceInfo[] scsiDisk;
-    private VirtualMachineScsiPassthroughInfo[] scsiPassthrough;
-    private VirtualMachineSerialInfo[] serial;
-    private VirtualMachinePciSharedGpuPassthroughInfo[] sharedGpuPassthroughTypes;
-    private Boolean smcPresent;
-    private VirtualMachineSoundInfo[] sound;
+    private Boolean autoVmotion;
+    private VirtualMachinePciPassthroughInfo[] pciPassthrough;
     private VirtualMachineSriovInfo[] sriov;
-    private VirtualMachineUsbInfo[] usb;
     private VirtualMachineVFlashModuleInfo[] vFlashModule;
+    private VirtualMachinePciSharedGpuPassthroughInfo[] sharedGpuPassthroughTypes;
+    private Long availablePersistentMemoryReservationMB;
 
     @Override
     public String toString() {

src/main/java/com/vmware/vim25/DVSConfigSpec.java

@@ -43,23 +43,23 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 public class DVSConfigSpec extends DynamicData {
 
     private String configVersion;
-    private DVSContactInfo contact;
+    private String name;
+    private Integer numStandalonePorts;
+    private Integer maxPorts;
+    private DVSUplinkPortPolicy uplinkPortPolicy;
+    private ManagedObjectReference[] uplinkPortgroup;
     private DVPortSetting defaultPortConfig;
-    private Integer defaultProxySwitchMaxNumPorts;
-    private String description;
-    private String extensionKey;
     private DistributedVirtualSwitchHostMemberConfigSpec[] host;
+    private String extensionKey;
+    private String description;
+    private DVSPolicy policy;
+    private DistributedVirtualSwitchKeyedOpaqueBlob[] vendorSpecificConfig;
+    private DVSContactInfo contact;
+    private String switchIpAddress;
+    private Integer defaultProxySwitchMaxNumPorts;
     private DvsHostInfrastructureTrafficResource[] infrastructureTrafficResourceConfig;
-    private Integer maxPorts;
-    private String name;
     private DvsHostInfrastructureTrafficResource[] netResourcePoolTrafficResourceConfig;
     private String networkResourceControlVersion;
-    private Integer numStandalonePorts;
-    private DVSPolicy policy;
-    private String switchIpAddress;
-    private ManagedObjectReference[] uplinkPortgroup;
-    private DVSUplinkPortPolicy uplinkPortPolicy;
-    private DistributedVirtualSwitchKeyedOpaqueBlob[] vendorSpecificConfig;
 
     @Override
     public String toString() {

src/main/java/com/vmware/vim25/DVSMacLearningPolicy.java

@@ -9,8 +9,8 @@
  */
 public class DVSMacLearningPolicy extends InheritablePolicy {
 
-    private Boolean allowUnicastFlooding;
     private boolean enabled;
+    private Boolean allowUnicastFlooding;
     private Integer limit;
     private String  limitPolicy;
 

src/main/java/com/vmware/vim25/DVSMacManagementPolicy.java

@@ -10,8 +10,8 @@
 public class DVSMacManagementPolicy extends InheritablePolicy {
 
     private Boolean allowPromiscuous;
-    private Boolean forgedTransmits;
     private Boolean macChanges;
+    private Boolean forgedTransmits;
     private DVSMacLearningPolicy macLearningPolicy;
 
     @Override

src/main/java/com/vmware/vim25/DvsHostInfrastructureTrafficResource.java

@@ -1,16 +1,25 @@
 package com.vmware.vim25;
 
 /**
- * Created by Stefan Dilk {@literal <[email protected]>} on 31.03.2018
+ * This class defines the resource allocation for a host infrastructure traffic class on a physical NIC
  *
  * @author Stefan Dilk <[email protected]>
  * @since 6.0
  */
 public class DvsHostInfrastructureTrafficResource extends DynamicData {
 
-    public DvsHostInfrastructureTrafficResourceAllocation allocationInfo;
-    public String description;
-    public String key;
+    private String key;
+    private String description;
+    private DvsHostInfrastructureTrafficResourceAllocation allocationInfo;
+
+    @Override
+    public String toString() {
+        return "DvsHostInfrastructureTrafficResource{" +
+                "key='" + key + '\'' +
+                ", description='" + description + '\'' +
+                ", allocationInfo=" + allocationInfo +
+                "} " + super.toString();
+    }
 
     public DvsHostInfrastructureTrafficResourceAllocation getAllocationInfo() {
         return allocationInfo;

src/main/java/com/vmware/vim25/DvsHostInfrastructureTrafficResourceAllocation.java

@@ -1,16 +1,25 @@
 package com.vmware.vim25;
 
 /**
- * Created by Stefan Dilk {@literal <[email protected]>} on 31.03.2018
+ * Resource allocation information for a host infrastructure traffic class.
  *
  * @author Stefan Dilk <[email protected]>
  * @since 6.0
  */
 public class DvsHostInfrastructureTrafficResourceAllocation extends DynamicData {
 
-    public Long limit;
-    public Long reservation;
-    public SharesInfo shares;
+    private Long limit;
+    private SharesInfo shares;
+    private Long reservation;
+
+    @Override
+    public String toString() {
+        return "DvsHostInfrastructureTrafficResourceAllocation{" +
+                "limit=" + limit +
+                ", shares=" + shares +
+                ", reservation=" + reservation +
+                "} " + super.toString();
+    }
 
     public long getLimit() {
         return limit;

src/main/java/com/vmware/vim25/DynamicData.java

@@ -29,44 +29,17 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 
 package com.vmware.vim25;
 
-import java.util.Arrays;
-
 /**
  * DynamicData is a builtin object model data object type for manipulating data properties dynamically.
  * The primary usage is as a base class for types that may be extended with subtypes in the future,
  * where new properties should be sent to old clients as a set of dynamic properties.
  *
+ * Currently no properties in WSDL
+ *
  * @author Steve Jin (http://www.doublecloud.org)
  * @version 5.1
  */
 
 public class DynamicData {
 
-    private String dynamicType;
-    private DynamicProperty[] dynamicProperty;
-
-    @Override
-    public String toString() {
-        return "DynamicData{" +
-                "dynamicType='" + dynamicType + '\'' +
-                ", dynamicProperty=" + Arrays.toString(dynamicProperty) +
-                '}';
-    }
-
-    public String getDynamicType() {
-        return dynamicType;
-    }
-
-    public void setDynamicType(final String dynamicType) {
-        this.dynamicType = dynamicType;
-    }
-
-    public DynamicProperty[] getDynamicProperty() {
-        return dynamicProperty;
-    }
-
-    public void setDynamicProperty(final DynamicProperty[] dynamicProperty) {
-        this.dynamicProperty = dynamicProperty;
-    }
-
 }

src/main/java/com/vmware/vim25/DynamicProperty.java

@@ -38,8 +38,8 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 
 public class DynamicProperty {
 
-    public String name;
-    public Object val;
+    private String name;
+    private Object val;
 
     @Override
     public String toString() {

src/main/java/com/vmware/vim25/FolderNewHostSpec.java

@@ -6,8 +6,8 @@
  */
 public class FolderNewHostSpec extends DynamicData {
 
-    private String esxLicense;
     private HostConnectSpec hostCnxSpec;
+    private String esxLicense;
 
     @Override
     public String toString() {

src/main/java/com/vmware/vim25/HostBIOSInfo.java

@@ -40,12 +40,12 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 public class HostBIOSInfo extends DynamicData {
 
     private String biosVersion;
-    private Integer firmwareMajorRelease;
-    private Integer firmwareMinorRelease;
-    private Integer majorRelease;
-    private Integer minorRelease;
     private Calendar releaseDate;
     private String vendor;
+    private Integer majorRelease;
+    private Integer minorRelease;
+    private Integer firmwareMajorRelease;
+    private Integer firmwareMinorRelease;
 
     @Override
     public String toString() {

src/main/java/com/vmware/vim25/HostNumaNode.java

@@ -46,11 +46,11 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
 @SuppressWarnings("all")
 public class HostNumaNode extends DynamicData {
 
+    private byte typeId;
     private short[] cpuID;
     private long memoryRangeBegin;
     private long memoryRangeLength;
     private String[] pciId;
-    private byte typeId;
 
     @Override
     public String toString() {