Browse Source

Refactoring according to comments from @YevhenBondarenko

pull/3518/head
zbeacon 6 years ago
parent
commit
950907d398
  1. 6
      common/dao-api/src/main/java/org/thingsboard/server/dao/device/provision/ProvisionResponse.java
  2. 4
      common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
  3. 3
      common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java
  4. 1
      dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileDao.java
  5. 1
      dao/src/main/java/org/thingsboard/server/dao/sql/device/JpaDeviceProfileDao.java

6
common/dao-api/src/main/java/org/thingsboard/server/dao/device/provision/ProvisionResponse.java

@ -15,13 +15,11 @@
*/
package org.thingsboard.server.dao.device.provision;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.thingsboard.server.common.data.security.DeviceCredentials;
@Data
@AllArgsConstructor
public class ProvisionResponse {
private DeviceCredentials deviceCredentials;
private ProvisionResponseStatus responseStatus;
private final DeviceCredentials deviceCredentials;
private final ProvisionResponseStatus responseStatus;
}

4
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java

@ -167,10 +167,6 @@ public class MqttTransportHandler extends ChannelInboundHandlerAdapter implement
case PINGREQ:
ctx.writeAndFlush(new MqttMessage(new MqttFixedHeader(PINGRESP, false, AT_MOST_ONCE, false, 0)));
break;
// case SUBSCRIBE:
// deviceSessionCtx.setDeviceInfo(TransportDeviceInfo);
// processSubscribe(ctx, (MqttSubscribeMessage) msg);
// break;
case DISCONNECT:
ctx.close();
break;

3
common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/adaptor/JsonConverter.java

@ -417,8 +417,7 @@ public class JsonConverter {
if (toGateway) {
result.addProperty("id", requestId);
}
result.addProperty("deviceId", new DeviceId(
new UUID(payload.getDeviceCredentials().getDeviceIdMSB(), payload.getDeviceCredentials().getDeviceIdLSB())).toString());
result.addProperty("deviceId", new UUID(payload.getDeviceCredentials().getDeviceIdMSB(), payload.getDeviceCredentials().getDeviceIdLSB()).toString());
result.addProperty("credentialsType", payload.getDeviceCredentials().getCredentialsType().name());
result.addProperty("credentialsId", payload.getDeviceCredentials().getCredentialsId());
result.addProperty("credentialsValue",

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

@ -22,7 +22,6 @@ import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.dao.Dao;
import java.util.Optional;
import java.util.UUID;
public interface DeviceProfileDao extends Dao<DeviceProfile> {

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

@ -29,7 +29,6 @@ import org.thingsboard.server.dao.model.sql.DeviceProfileEntity;
import org.thingsboard.server.dao.sql.JpaAbstractSearchTextDao;
import java.util.Objects;
import java.util.Optional;
import java.util.UUID;
@Component

Loading…
Cancel
Save