Follow consistent vo table name convention (#5004)

davidjumani · web-flow · commit 1a7bfa98d8c8 · 2021-06-24T16:46:50.000-03:00
diff --git a/engine/schema/src/main/java/com/cloud/dc/DomainVlanMapVO.java b/engine/schema/src/main/java/com/cloud/dc/DomainVlanMapVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name="domain_vlan_map")
+@Table(name = "domain_vlan_map")
 public class DomainVlanMapVO implements InternalIdentity {
 
     @Id
diff --git a/engine/schema/src/main/java/com/cloud/gpu/HostGpuGroupsVO.java b/engine/schema/src/main/java/com/cloud/gpu/HostGpuGroupsVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name="host_gpu_groups")
+@Table(name = "host_gpu_groups")
 public class HostGpuGroupsVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/gpu/VGPUTypesVO.java b/engine/schema/src/main/java/com/cloud/gpu/VGPUTypesVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name="vgpu_types")
+@Table(name = "vgpu_types")
 public class VGPUTypesVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy=GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/LBHealthCheckPolicyVO.java b/engine/schema/src/main/java/com/cloud/network/LBHealthCheckPolicyVO.java
@@ -29,7 +29,7 @@
 import com.cloud.network.rules.HealthCheckPolicy;
 
 @Entity
-@Table(name = ("load_balancer_healthcheck_policies"))
+@Table(name = "load_balancer_healthcheck_policies")
 @PrimaryKeyJoinColumn(name = "load_balancer_id", referencedColumnName = "id")
 public class LBHealthCheckPolicyVO implements HealthCheckPolicy {
     @Id
diff --git a/engine/schema/src/main/java/com/cloud/network/UserIpv6AddressVO.java b/engine/schema/src/main/java/com/cloud/network/UserIpv6AddressVO.java
@@ -31,7 +31,7 @@
 import com.cloud.utils.db.GenericDao;
 
 @Entity
-@Table(name = ("user_ipv6_address"))
+@Table(name = "user_ipv6_address")
 public class UserIpv6AddressVO implements UserIpv6Address {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/VpnUserVO.java b/engine/schema/src/main/java/com/cloud/network/VpnUserVO.java
@@ -30,7 +30,7 @@
 import com.cloud.utils.db.Encrypt;
 
 @Entity
-@Table(name = ("vpn_users"))
+@Table(name = "vpn_users")
 public class VpnUserVO implements VpnUser {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/as/AutoScalePolicyConditionMapVO.java b/engine/schema/src/main/java/com/cloud/network/as/AutoScalePolicyConditionMapVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("autoscale_policy_condition_map"))
+@Table(name = "autoscale_policy_condition_map")
 public class AutoScalePolicyConditionMapVO implements InternalIdentity {
 
     @Id
diff --git a/engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java b/engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupPolicyMapVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("autoscale_vmgroup_policy_map"))
+@Table(name = "autoscale_vmgroup_policy_map")
 public class AutoScaleVmGroupPolicyMapVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java b/engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupVmMapVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("autoscale_vmgroup_vm_map"))
+@Table(name = "autoscale_vmgroup_vm_map")
 public class AutoScaleVmGroupVmMapVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesCidrsVO.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesCidrsVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("firewall_rules_cidrs"))
+@Table(name = "firewall_rules_cidrs")
 public class FirewallRulesCidrsVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDestCidrsVO.java b/engine/schema/src/main/java/com/cloud/network/dao/FirewallRulesDestCidrsVO.java
@@ -26,7 +26,7 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = ("firewall_rules_dcidrs"))
+@Table(name = "firewall_rules_dcidrs")
 public class FirewallRulesDestCidrsVO implements InternalIdentity{
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/IPAddressVO.java b/engine/schema/src/main/java/com/cloud/network/dao/IPAddressVO.java
@@ -40,7 +40,7 @@
  *
  */
 @Entity
-@Table(name = ("user_ip_address"))
+@Table(name = "user_ip_address")
 public class IPAddressVO implements IpAddress {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java b/engine/schema/src/main/java/com/cloud/network/dao/InlineLoadBalancerNicMapVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("inline_load_balancer_nic_map"))
+@Table(name = "inline_load_balancer_nic_map")
 public class InlineLoadBalancerNicMapVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/LBStickinessPolicyVO.java b/engine/schema/src/main/java/com/cloud/network/dao/LBStickinessPolicyVO.java
@@ -35,7 +35,7 @@
 import com.cloud.utils.Pair;
 
 @Entity
-@Table(name = ("load_balancer_stickiness_policies"))
+@Table(name = "load_balancer_stickiness_policies")
 @PrimaryKeyJoinColumn(name = "load_balancer_id", referencedColumnName = "id")
 public class LBStickinessPolicyVO implements StickinessPolicy {
     @Id
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapVO.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVMMapVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("load_balancer_vm_map"))
+@Table(name = "load_balancer_vm_map")
 public class LoadBalancerVMMapVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVO.java b/engine/schema/src/main/java/com/cloud/network/dao/LoadBalancerVO.java
@@ -35,7 +35,7 @@
  *
  */
 @Entity
-@Table(name = ("load_balancing_rules"))
+@Table(name = "load_balancing_rules")
 @DiscriminatorValue(value = "LoadBalancing")
 @PrimaryKeyJoinColumn(name = "id")
 public class LoadBalancerVO extends FirewallRuleVO implements LoadBalancer {
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetworkRuleConfigVO.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkRuleConfigVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("network_rule_config"))
+@Table(name = "network_rule_config")
 public class NetworkRuleConfigVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnVO.java b/engine/schema/src/main/java/com/cloud/network/dao/RemoteAccessVpnVO.java
@@ -28,7 +28,7 @@
 import java.util.UUID;
 
 @Entity
-@Table(name = ("remote_access_vpn"))
+@Table(name = "remote_access_vpn")
 public class RemoteAccessVpnVO implements RemoteAccessVpn {
     @Column(name = "account_id")
     private long accountId;
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteCustomerGatewayVO.java
@@ -32,7 +32,7 @@
 
 
 @Entity
-@Table(name = ("s2s_customer_gateway"))
+@Table(name = "s2s_customer_gateway")
 public class Site2SiteCustomerGatewayVO implements Site2SiteCustomerGateway {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnConnectionVO.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnConnectionVO.java
@@ -35,7 +35,7 @@
 
 
 @Entity
-@Table(name = ("s2s_vpn_connection"))
+@Table(name = "s2s_vpn_connection")
 public class Site2SiteVpnConnectionVO implements Site2SiteVpnConnection, InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayVO.java b/engine/schema/src/main/java/com/cloud/network/dao/Site2SiteVpnGatewayVO.java
@@ -31,7 +31,7 @@
 
 
 @Entity
-@Table(name = ("s2s_vpn_gateway"))
+@Table(name = "s2s_vpn_gateway")
 public class Site2SiteVpnGatewayVO implements Site2SiteVpnGateway {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/element/OvsProviderVO.java b/engine/schema/src/main/java/com/cloud/network/element/OvsProviderVO.java
@@ -30,7 +30,7 @@
 import com.cloud.utils.db.GenericDao;
 
 @Entity
-@Table(name = ("ovs_providers"))
+@Table(name = "ovs_providers")
 public class OvsProviderVO implements OvsProvider {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/element/VirtualRouterProviderVO.java b/engine/schema/src/main/java/com/cloud/network/element/VirtualRouterProviderVO.java
@@ -32,7 +32,7 @@
 import com.cloud.utils.db.GenericDao;
 
 @Entity
-@Table(name = ("virtual_router_providers"))
+@Table(name = "virtual_router_providers")
 public class VirtualRouterProviderVO implements VirtualRouterProvider {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/rules/PortForwardingRuleVO.java b/engine/schema/src/main/java/com/cloud/network/rules/PortForwardingRuleVO.java
@@ -29,7 +29,7 @@
 import com.cloud.utils.net.Ip;
 
 @Entity
-@Table(name = ("port_forwarding_rules"))
+@Table(name = "port_forwarding_rules")
 @DiscriminatorValue(value = "PortForwarding")
 @PrimaryKeyJoinColumn(name = "id")
 public class PortForwardingRuleVO extends FirewallRuleVO implements PortForwardingRule {
diff --git a/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupRuleVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupRuleVO.java
@@ -26,7 +26,7 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = ("security_group_rule"))
+@Table(name = "security_group_rule")
 public class SecurityGroupRuleVO implements SecurityRule {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupRulesVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupRulesVO.java
@@ -29,7 +29,7 @@
 import com.cloud.utils.db.JoinType;
 
 @Entity
-@Table(name = ("security_group"))
+@Table(name = "security_group")
 @JoinType(type = "left")
 @SecondaryTable(name = "security_group_rule", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "id", referencedColumnName = "security_group_id")})
 public class SecurityGroupRulesVO implements SecurityGroupRules {
diff --git a/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVMMapVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVMMapVO.java
@@ -31,7 +31,7 @@
 import com.cloud.vm.VirtualMachine.State;
 
 @Entity
-@Table(name = ("security_group_vm_map"))
+@Table(name = "security_group_vm_map")
 @SecondaryTables({@SecondaryTable(name = "nics", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "instance_id")}),
     @SecondaryTable(name = "vm_instance", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "id")}),
     @SecondaryTable(name = "security_group", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "security_group_id", referencedColumnName = "id")})})
diff --git a/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVO.java b/engine/schema/src/main/java/com/cloud/network/security/SecurityGroupVO.java
@@ -26,7 +26,7 @@
 import javax.persistence.Table;
 
 @Entity
-@Table(name = ("security_group"))
+@Table(name = "security_group")
 public class SecurityGroupVO implements SecurityGroup {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/com/cloud/vm/InstanceGroupVMMapVO.java b/engine/schema/src/main/java/com/cloud/vm/InstanceGroupVMMapVO.java
@@ -29,7 +29,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("instance_group_vm_map"))
+@Table(name = "instance_group_vm_map")
 @SecondaryTables({@SecondaryTable(name = "user_vm", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "instance_id", referencedColumnName = "id")}),
     @SecondaryTable(name = "instance_group", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "group_id", referencedColumnName = "id")})})
 public class InstanceGroupVMMapVO implements InternalIdentity {
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java
@@ -26,7 +26,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("affinity_group_vm_map"))
+@Table(name = "affinity_group_vm_map")
 public class AffinityGroupVMMapVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupVO.java b/engine/schema/src/main/java/org/apache/cloudstack/affinity/AffinityGroupVO.java
@@ -30,7 +30,7 @@
 import org.apache.cloudstack.acl.ControlledEntity;
 
 @Entity
-@Table(name = ("affinity_group"))
+@Table(name = "affinity_group")
 public class AffinityGroupVO implements AffinityGroup {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/lb/ApplicationLoadBalancerRuleVO.java b/engine/schema/src/main/java/org/apache/cloudstack/lb/ApplicationLoadBalancerRuleVO.java
@@ -37,7 +37,7 @@
  *
  */
 @Entity
-@Table(name = ("load_balancing_rules"))
+@Table(name = "load_balancing_rules")
 @DiscriminatorValue(value = "LoadBalancing")
 @PrimaryKeyJoinColumn(name = "id")
 public class ApplicationLoadBalancerRuleVO extends FirewallRuleVO implements ApplicationLoadBalancerRule {
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java b/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerLbRuleMapVO.java
@@ -27,7 +27,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("global_load_balancer_lb_rule_map"))
+@Table(name = "global_load_balancer_lb_rule_map")
 public class GlobalLoadBalancerLbRuleMapVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java b/engine/schema/src/main/java/org/apache/cloudstack/region/gslb/GlobalLoadBalancerRuleVO.java
@@ -31,7 +31,7 @@
 import com.cloud.region.ha.GlobalLoadBalancerRule;
 
 @Entity
-@Table(name = ("global_load_balancing_rules"))
+@Table(name = "global_load_balancing_rules")
 public class GlobalLoadBalancerRuleVO implements GlobalLoadBalancerRule {
 
     @Id
diff --git a/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/ElasticLbVmMapVO.java b/plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/ElasticLbVmMapVO.java
@@ -33,7 +33,7 @@
 import com.cloud.utils.net.Ip;
 
 @Entity
-@Table(name = ("elastic_lb_vm_map"))
+@Table(name = "elastic_lb_vm_map")
 @SecondaryTables({@SecondaryTable(name = "user_ip_address", pkJoinColumns = {@PrimaryKeyJoinColumn(name = "ip_addr_id", referencedColumnName = "id")})})
 public class ElasticLbVmMapVO implements InternalIdentity {
     @Id
diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/NetScalerServicePackageVO.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/NetScalerServicePackageVO.java
@@ -34,7 +34,7 @@
  * By using the service package, CloudStack can choose the kind of NetScaler offering it wants to use.
  */
 @Entity
-@Table(name = " netscaler_servicepackages")
+@Table(name = "netscaler_servicepackages")
 public class NetScalerServicePackageVO implements InternalIdentity {
 
 
diff --git a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelInterfaceVO.java
@@ -27,7 +27,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("ovs_tunnel_interface"))
+@Table(name = "ovs_tunnel_interface")
 public class OvsTunnelInterfaceVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java b/plugins/network-elements/ovs/src/main/java/com/cloud/network/ovs/dao/OvsTunnelNetworkVO.java
@@ -27,7 +27,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name = ("ovs_tunnel_network"))
+@Table(name = "ovs_tunnel_network")
 public class OvsTunnelNetworkVO implements InternalIdentity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/server/src/main/java/com/cloud/api/query/vo/AsyncJobJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/AsyncJobJoinVO.java
@@ -31,7 +31,7 @@
 import com.cloud.utils.db.GenericDao;
 
 @Entity
-@Table(name="async_job_view")
+@Table(name = "async_job_view")
 public class AsyncJobJoinVO extends BaseViewVO implements ControlledViewEntity { //InternalIdentity, Identity {
     @Id
     @Column(name = "id")
diff --git a/server/src/main/java/com/cloud/api/query/vo/DomainJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/DomainJoinVO.java
@@ -31,7 +31,7 @@
 import org.apache.cloudstack.api.InternalIdentity;
 
 @Entity
-@Table(name="domain_view")
+@Table(name = "domain_view")
 public class DomainJoinVO extends BaseViewVO implements InternalIdentity, Identity {
 
     @Id
