Refactoring to use provision data only from device profile

@@ -29,9 +29,7 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.audit.ActionType;
-import org.thingsboard.server.common.data.device.data.ProvisionDeviceConfiguration;
 import org.thingsboard.server.common.data.device.profile.ProvisionDeviceProfileConfiguration;
 import org.thingsboard.server.common.data.device.profile.ProvisionDeviceProfileConfiguration;
-import org.thingsboard.server.common.data.device.profile.ProvisionRequestValidationStrategy;
 import org.thingsboard.server.common.data.device.profile.ProvisionRequestValidationStrategyType;
 import org.thingsboard.server.common.data.device.profile.ProvisionRequestValidationStrategyType;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantId;

@@ -22,9 +22,7 @@ import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.ByteString;
-import com.google.protobuf.InvalidProtocolBufferException;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringUtils;
 import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.DataConstants;
@@ -32,7 +30,7 @@ import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.TenantProfile;
 import org.thingsboard.server.common.data.device.credentials.BasicMqttCredentials;
 import org.thingsboard.server.common.data.device.credentials.BasicMqttCredentials;
-import org.thingsboard.server.common.data.device.data.ProvisionDeviceConfiguration;
+import org.thingsboard.server.common.data.device.profile.ProvisionDeviceProfileConfiguration;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -63,7 +61,6 @@ import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFro
 import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFromGatewayResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetOrCreateDeviceFromGatewayResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetTenantRoutingInfoRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetTenantRoutingInfoRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetTenantRoutingInfoResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.GetTenantRoutingInfoResponseMsg;
-import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceCredentialsMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.ProvisionDeviceRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.TransportApiRequestMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
 import org.thingsboard.server.gen.transport.TransportProtos.TransportApiResponseMsg;
@@ -284,7 +281,7 @@ public class DefaultTransportApiService implements TransportApiService {
                         requestMsg.getDeviceName(),
                         requestMsg.getDeviceName(),
                         requestMsg.getDeviceType(),
                         requestMsg.getDeviceType(),
                         requestMsg.getX509CertPubKey(),
                         requestMsg.getX509CertPubKey(),
-                        new ProvisionDeviceConfiguration(
+                        new ProvisionDeviceProfileConfiguration(
                                 requestMsg.getProvisionDeviceCredentialsMsg().getProvisionDeviceKey(),
                                 requestMsg.getProvisionDeviceCredentialsMsg().getProvisionDeviceKey(),
                                 requestMsg.getProvisionDeviceCredentialsMsg().getProvisionDeviceSecret())));
                                 requestMsg.getProvisionDeviceCredentialsMsg().getProvisionDeviceSecret())));
         return Futures.transform(provisionResponseFuture, provisionResponse -> {
         return Futures.transform(provisionResponseFuture, provisionResponse -> {

@@ -17,7 +17,7 @@ package org.thingsboard.server.dao.device.provision;
 
 
 import lombok.AllArgsConstructor;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.Data;
-import org.thingsboard.server.common.data.device.data.ProvisionDeviceConfiguration;
+import org.thingsboard.server.common.data.device.profile.ProvisionDeviceProfileConfiguration;
 
 
 @Data
 @Data
 @AllArgsConstructor
 @AllArgsConstructor
@@ -25,5 +25,5 @@ public class ProvisionRequest {
     private String deviceName;
     private String deviceName;
     private String deviceType;
     private String deviceType;
     private String x509CertPubKey;
     private String x509CertPubKey;
-    private ProvisionDeviceConfiguration credentials;
+    private ProvisionDeviceProfileConfiguration credentials;
 }
 }

@@ -28,7 +28,7 @@ import org.thingsboard.server.common.data.DeviceProfileType;
         property = "type")
         property = "type")
 @JsonSubTypes({
 @JsonSubTypes({
         @JsonSubTypes.Type(value = DefaultDeviceConfiguration.class, name = "DEFAULT"),
         @JsonSubTypes.Type(value = DefaultDeviceConfiguration.class, name = "DEFAULT"),
-        @JsonSubTypes.Type(value = ProvisionDeviceConfiguration.class, name = "PROVISION")})
+        @JsonSubTypes.Type(value = DefaultDeviceConfiguration.class, name = "PROVISION")})
 public interface DeviceConfiguration {
 public interface DeviceConfiguration {
 
 
     @JsonIgnore
     @JsonIgnore

-/**
- * Copyright © 2016-2020 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.common.data.device.data;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import org.thingsboard.server.common.data.DeviceProfileType;
-import org.thingsboard.server.common.data.device.profile.DeviceProfileConfiguration;
-import org.thingsboard.server.common.data.device.profile.ProvisionRequestValidationStrategyType;
-
-import java.util.Objects;
-
-@Data
-public class ProvisionDeviceConfiguration implements DeviceConfiguration {
-
-    private String provisionDeviceKey;
-    private String provisionDeviceSecret;
-
-    @Override
-    public DeviceProfileType getType() {
-        return DeviceProfileType.PROVISION;
-    }
-
-    @JsonCreator
-    public ProvisionDeviceConfiguration(@JsonProperty("provisionDeviceKey") String provisionProfileKey, @JsonProperty("provisionDeviceSecret") String provisionProfileSecret) {
-        this.provisionDeviceKey = provisionProfileKey;
-        this.provisionDeviceSecret = provisionProfileSecret;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        ProvisionDeviceConfiguration that = (ProvisionDeviceConfiguration) o;
-        return provisionDeviceKey.equals(that.provisionDeviceKey) &&
-                provisionDeviceSecret.equals(that.provisionDeviceSecret);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(provisionDeviceKey, provisionDeviceSecret);
-    }
-}

@@ -19,8 +19,6 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.Data;
 import org.thingsboard.server.common.data.DeviceProfileType;
 import org.thingsboard.server.common.data.DeviceProfileType;
-import org.thingsboard.server.common.data.device.credentials.BasicMqttCredentials;
-import org.thingsboard.server.common.data.device.data.ProvisionDeviceConfiguration;
 
 
 import java.util.Objects;
 import java.util.Objects;