Refactoring: remove extra comments, remove spaces etc

application/src/main/data/upgrade/3.4.4/schema_update.sql

@@ -424,7 +424,6 @@ $$;
 
 -- ALARM FUNCTIONS END
 
-
 -- TTL DROP PARTITIONS FUNCTIONS UPDATE START
 
 DROP PROCEDURE IF EXISTS drop_partitions_by_max_ttl(character varying, bigint, bigint);

application/src/main/java/org/thingsboard/server/service/device/DeviceProvisionServiceImpl.java

@@ -89,7 +89,7 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
     private final AuditLogService auditLogService;
     private final PartitionService partitionService;
 
-    public DeviceProvisionServiceImpl(TbQueueProducerProvider producerProvider, TbClusterService clusterService, DeviceDao deviceDao, DeviceProfileDao deviceProfileDao, DeviceProfileService deviceProfileService, DeviceService deviceService, DeviceCredentialsService deviceCredentialsService, AttributesService attributesService, DeviceStateService deviceStateService, AuditLogService auditLogService, PartitionService partitionService) {
+    public DeviceProvisionServiceImpl(TbQueueProducerProvider producerProvider, TbClusterService clusterService, DeviceProfileService deviceProfileService, DeviceService deviceService, DeviceCredentialsService deviceCredentialsService, AttributesService attributesService, AuditLogService auditLogService, PartitionService partitionService) {
         ruleEngineMsgProducer = producerProvider.getRuleEngineMsgProducer();
         this.clusterService = clusterService;
         this.deviceProfileService = deviceProfileService;

application/src/main/resources/thingsboard.yml

@@ -741,7 +741,7 @@ transport:
     # MQTT SSL configuration
     ssl:
       # Enable/disable SSL support
-      enabled: "${MQTT_SSL_ENABLED:true}"
+      enabled: "${MQTT_SSL_ENABLED:false}"
       # MQTT SSL bind address
       bind_address: "${MQTT_SSL_BIND_ADDRESS:0.0.0.0}"
       # MQTT SSL bind port
@@ -755,11 +755,11 @@ transport:
         # PEM server credentials
         pem:
           # Path to the server certificate file (holds server certificate or certificate chain, may include server private key)
-          cert_file: "${MQTT_SSL_PEM_CERT:/home/developer/x509/server.pem}"
+          cert_file: "${MQTT_SSL_PEM_CERT:mqttserver.pem}"
           # Path to the server certificate private key file. Optional by default. Required if the private key is not present in server certificate file;
-          key_file: "${MQTT_SSL_PEM_KEY:/home/developer/x509/server_key.pem}"
+          key_file: "${MQTT_SSL_PEM_KEY:mqttserver_key.pem}"
           # Server certificate private key password (optional)
-          key_password: "${MQTT_SSL_PEM_KEY_PASSWORD:}"
+          key_password: "${MQTT_SSL_PEM_KEY_PASSWORD:server_key_password}"
         # Keystore server credentials
         keystore:
           # Type of the key store (JKS or PKCS12)

dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileCacheKey.java

@@ -29,31 +29,31 @@ public class DeviceProfileCacheKey implements Serializable {
     private final TenantId tenantId;
     private final String name;
     private final DeviceProfileId deviceProfileId;
-    private final String provisionDeviceKey;
     private final boolean defaultProfile;
+    private final String provisionDeviceKey;
 
-    private DeviceProfileCacheKey(TenantId tenantId, String name, DeviceProfileId deviceProfileId, String provisionDeviceKey, boolean defaultProfile) {
+    private DeviceProfileCacheKey(TenantId tenantId, String name, DeviceProfileId deviceProfileId, boolean defaultProfile, String provisionDeviceKey) {
         this.tenantId = tenantId;
         this.name = name;
         this.deviceProfileId = deviceProfileId;
-        this.provisionDeviceKey = provisionDeviceKey;
         this.defaultProfile = defaultProfile;
+        this.provisionDeviceKey = provisionDeviceKey;
     }
 
     public static DeviceProfileCacheKey fromName(TenantId tenantId, String name) {
-        return new DeviceProfileCacheKey(tenantId, name, null, null, false);
+        return new DeviceProfileCacheKey(tenantId, name, null, false, null);
     }
 
     public static DeviceProfileCacheKey fromId(DeviceProfileId id) {
-        return new DeviceProfileCacheKey(null, null, id, null, false);
+        return new DeviceProfileCacheKey(null, null, id, false, null);
     }
 
-    public static DeviceProfileCacheKey fromProvisionDeviceKey(String provisionDeviceKey) {
-        return new DeviceProfileCacheKey(null, null, null, provisionDeviceKey, false);
+    public static DeviceProfileCacheKey defaultProfile(TenantId tenantId) {
+        return new DeviceProfileCacheKey(tenantId, null, null, true, null);
     }
 
-    public static DeviceProfileCacheKey defaultProfile(TenantId tenantId) {
-        return new DeviceProfileCacheKey(tenantId, null, null, null, true);
+    public static DeviceProfileCacheKey fromProvisionDeviceKey(String provisionDeviceKey) {
+        return new DeviceProfileCacheKey(null, null, null, false, provisionDeviceKey);
     }
 
     /**

dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileDao.java

@@ -45,5 +45,4 @@ public interface DeviceProfileDao extends Dao<DeviceProfile>, ExportableEntityDa
     DeviceProfile findByProvisionDeviceKey(String provisionDeviceKey);
 
     DeviceProfile findByName(TenantId tenantId, String profileName);
-
 }

dao/src/main/java/org/thingsboard/server/dao/service/validator/DeviceProfileDataValidator.java

@@ -136,10 +136,6 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
             if (getRootCAFromJavaCacerts(deviceProfile.getProvisionDeviceKey())) {
                 throw new DataValidationException("Device profile certificate cannot be well known root CA!");
             }
-//            DeviceProfile existingDeviceProfileCertificate = deviceProfileDao.findByProvisionDeviceKey(deviceProfile.getProvisionDeviceKey());
-//            if (existingDeviceProfileCertificate != null && !existingDeviceProfileCertificate.getId().equals(deviceProfile.getId())) {
-//                throw new DataValidationException("Device profile with such certificate hash already exists!");
-//            }
         }
         DeviceProfileTransportConfiguration transportConfiguration = deviceProfile.getProfileData().getTransportConfiguration();
         transportConfiguration.validate();
@@ -238,10 +234,6 @@ public class DeviceProfileDataValidator extends AbstractHasOtaPackageValidator<D
             if (getRootCAFromJavaCacerts(deviceProfile.getProvisionDeviceKey())) {
                 throw new DataValidationException("Device profile certificate cannot be well known root CA!");
             }
-//            DeviceProfile existingDeviceProfileWithDeviceKey = deviceProfileDao.findByProvisionDeviceKey(deviceProfile.getProvisionDeviceKey());
-//            if (existingDeviceProfileWithDeviceKey != null && !existingDeviceProfileWithDeviceKey.getId().equals(old.getId())) {
-//                throw new DataValidationException("Device profile with such certificate hash already exists!");
-//            }
         }
         return old;
     }