Refactoring

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

@@ -27,8 +27,9 @@ import org.springframework.util.StringUtils;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.DeviceProfileProvisionType;
 import org.thingsboard.server.common.data.audit.ActionType;
+import org.thingsboard.server.common.data.device.profile.AllowCreateNewDevicesDeviceProfileProvisionConfiguration;
+import org.thingsboard.server.common.data.device.profile.CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.UserId;
@@ -115,11 +116,9 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
             return Futures.immediateFuture(new ProvisionResponse(null, ProvisionResponseStatus.NOT_FOUND));
         }
 
-        DeviceProfile targetProfile = deviceProfileDao.findByProvisionDeviceKeyAndProvisionDeviceSecret(provisionRequestKey, provisionRequestSecret);
+        DeviceProfile targetProfile = deviceProfileDao.findByProvisionDeviceKey(provisionRequestKey);
 
-        if (targetProfile == null ||
+        if (targetProfile == null) {
-                !(targetProfile.getProvisionType() != DeviceProfileProvisionType.ALLOW_CREATE_NEW_DEVICES ||
-                  targetProfile.getProvisionType() != DeviceProfileProvisionType.CHECK_PRE_PROVISIONED_DEVICES)) {
             return Futures.immediateFuture(new ProvisionResponse(null, ProvisionResponseStatus.NOT_FOUND));
         }
 
@@ -127,23 +126,28 @@ public class DeviceProvisionServiceImpl implements DeviceProvisionService {
 
         switch(targetProfile.getProvisionType()) {
             case ALLOW_CREATE_NEW_DEVICES:
-                if (targetDevice != null) {
+                if (((AllowCreateNewDevicesDeviceProfileProvisionConfiguration) targetProfile.getProfileData().getProvisionConfiguration()).getProvisionDeviceSecret().equals(provisionRequestSecret)){
-                    log.warn("[{}] The device is present and could not be provisioned once more!", targetDevice.getName());
+                    if (targetDevice != null) {
-                    notify(targetDevice, provisionRequest, DataConstants.PROVISION_FAILURE, false);
+                        log.warn("[{}] The device is present and could not be provisioned once more!", targetDevice.getName());
-                    return Futures.immediateFuture(new ProvisionResponse(null, ProvisionResponseStatus.FAILURE));
+                        notify(targetDevice, provisionRequest, DataConstants.PROVISION_FAILURE, false);
-                } else {
+                        return Futures.immediateFuture(new ProvisionResponse(null, ProvisionResponseStatus.FAILURE));
-                    return createDevice(provisionRequest, targetProfile);
+                    } else {
+                        return createDevice(provisionRequest, targetProfile);
+                    }
                 }
+                break;
             case CHECK_PRE_PROVISIONED_DEVICES:
-                if (targetDevice != null && targetDevice.getDeviceProfileId().equals(targetProfile.getId())){
+                if (((CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration) targetProfile.getProfileData().getProvisionConfiguration()).getProvisionDeviceSecret().equals(provisionRequestSecret)) {
-                    return processProvision(targetDevice, provisionRequest);
+                    if (targetDevice != null && targetDevice.getDeviceProfileId().equals(targetProfile.getId())) {
-                } else {
+                        return processProvision(targetDevice, provisionRequest);
-                    log.warn("[{}] Failed to find pre provisioned device!", provisionRequest.getDeviceName());
+                    } else {
-                    return Futures.immediateFuture(new ProvisionResponse(null, ProvisionResponseStatus.FAILURE));
+                        log.warn("[{}] Failed to find pre provisioned device!", provisionRequest.getDeviceName());
+                        return Futures.immediateFuture(new ProvisionResponse(null, ProvisionResponseStatus.FAILURE));
+                    }
                 }
-            default:
+                break;
-                throw new RuntimeException("Strategy is not supported - " + targetProfile.getProvisionType().name());
         }
+        return Futures.immediateFuture(new ProvisionResponse(null, ProvisionResponseStatus.NOT_FOUND));
     }
 
     private ListenableFuture<ProvisionResponse> processProvision(Device device, ProvisionRequest provisionRequest) {

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

@@ -38,7 +38,7 @@ public interface DeviceProfileDao extends Dao<DeviceProfile> {
 
     DeviceProfileInfo findDefaultDeviceProfileInfo(TenantId tenantId);
 
-    DeviceProfile findByProvisionDeviceKeyAndProvisionDeviceSecret(String provisionDeviceKey, String provisionDeviceSecret);
+    DeviceProfile findByProvisionDeviceKey(String provisionDeviceKey);
 
     DeviceProfile findByName(TenantId tenantId, String profileName);
 }

dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceProfileRepository.java

@@ -56,10 +56,5 @@ public interface DeviceProfileRepository extends PagingAndSortingRepository<Devi
 
     DeviceProfileEntity findByTenantIdAndName(UUID id, String profileName);
 
-    @Query(value = "SELECT d.* from device_profile d " +
+    DeviceProfileEntity findByProvisionDeviceKey(@Param("provisionDeviceKey") String provisionDeviceKey);
-            "WHERE d.provision_device_key = :provisionDeviceKey " +
-            "AND d.profile_data->'provisionConfiguration'->>'provisionDeviceSecret' = :provisionDeviceSecret",
-            nativeQuery = true)
-    DeviceProfileEntity findByProvisionDeviceKeyAndProvisionDeviceSecret(@Param("provisionDeviceKey") String provisionDeviceKey,
-                                                                         @Param("provisionDeviceSecret") String provisionDeviceSecret);
 }

dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java

@@ -81,8 +81,8 @@ public class JpaDeviceProfileDao extends JpaAbstractSearchTextDao<DeviceProfileE
     }
 
     @Override
-    public DeviceProfile findByProvisionDeviceKeyAndProvisionDeviceSecret(String provisionDeviceKey, String provisionDeviceSecret) {
+    public DeviceProfile findByProvisionDeviceKey(String provisionDeviceKey) {
-        return DaoUtil.getData(deviceProfileRepository.findByProvisionDeviceKeyAndProvisionDeviceSecret(provisionDeviceKey, provisionDeviceSecret));
+        return DaoUtil.getData(deviceProfileRepository.findByProvisionDeviceKey(provisionDeviceKey));
     }
 
     @Override