dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code review fixes

Browse Source
This commit is contained in:
Volodymyr Babak 2017-06-29 15:55:05 +03:00
parent 611995121b
commit 47361b0166
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractDao.java
View File

@ -18,19 +18,15 @@ package org.thingsboard.server.dao.sql;
import com.datastax.driver.core.utils.UUIDs; import com.datastax.driver.core.utils.UUIDs;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.ListeningExecutorService;
import com.google.common.util.concurrent.MoreExecutors;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.CrudRepository;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.thingsboard.server.dao.Dao; import org.thingsboard.server.dao.Dao;
import org.thingsboard.server.dao.DaoUtil; import org.thingsboard.server.dao.DaoUtil;
import org.thingsboard.server.dao.model.BaseEntity; import org.thingsboard.server.dao.model.BaseEntity;
import org.thingsboard.server.dao.model.SearchTextEntity;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.Executors;
import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW; import static org.springframework.transaction.annotation.Propagation.REQUIRES_NEW;
@ -46,9 +42,7 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
protected abstract CrudRepository<E, UUID> getCrudRepository(); protected abstract CrudRepository<E, UUID> getCrudRepository();
protected boolean isSearchTextDao() { protected void setSearchText(E entity) {}
return false;
}
@Override @Override
@Transactional(propagation = REQUIRES_NEW) @Transactional(propagation = REQUIRES_NEW)
@ -60,9 +54,7 @@ public abstract class JpaAbstractDao<E extends BaseEntity<D>, D>
log.error("Can't create entity for domain object {}", domain, e); log.error("Can't create entity for domain object {}", domain, e);
throw new IllegalArgumentException("Can't create entity for domain object {" + domain + "}", e); throw new IllegalArgumentException("Can't create entity for domain object {" + domain + "}", e);
} }
if (isSearchTextDao()) { setSearchText(entity);
((SearchTextEntity) entity).setSearchText(((SearchTextEntity) entity).getSearchTextSource().toLowerCase());
}
log.debug("Saving entity {}", entity); log.debug("Saving entity {}", entity);
if (entity.getId() == null) { if (entity.getId() == null) {
entity.setId(UUIDs.timeBased()); entity.setId(UUIDs.timeBased());

5
dao/src/main/java/org/thingsboard/server/dao/sql/JpaAbstractSearchTextDao.java
View File

@ -16,6 +16,7 @@
package org.thingsboard.server.dao.sql; package org.thingsboard.server.dao.sql;
import org.thingsboard.server.dao.model.BaseEntity; import org.thingsboard.server.dao.model.BaseEntity;
import org.thingsboard.server.dao.model.SearchTextEntity;
/** /**
* Created by Valerii Sosliuk on 5/6/2017. * Created by Valerii Sosliuk on 5/6/2017.
@ -23,7 +24,7 @@ import org.thingsboard.server.dao.model.BaseEntity;
public abstract class JpaAbstractSearchTextDao <E extends BaseEntity<D>, D> extends JpaAbstractDao<E, D> { public abstract class JpaAbstractSearchTextDao <E extends BaseEntity<D>, D> extends JpaAbstractDao<E, D> {
@Override @Override
protected boolean isSearchTextDao() { protected void setSearchText(E entity) {
return true; ((SearchTextEntity) entity).setSearchText(((SearchTextEntity) entity).getSearchTextSource().toLowerCase());
} }
} }

10
extensions-api/src/main/java/org/thingsboard/server/extensions/api/device/DeviceNameOrTypeUpdateMsg.java
View File

@ -16,21 +16,15 @@
package org.thingsboard.server.extensions.api.device; package org.thingsboard.server.extensions.api.device;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Data;
import lombok.ToString;
import org.thingsboard.server.common.data.id.DeviceId; import org.thingsboard.server.common.data.id.DeviceId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
@ToString @Data
@AllArgsConstructor @AllArgsConstructor
public class DeviceNameOrTypeUpdateMsg implements ToDeviceActorNotificationMsg { public class DeviceNameOrTypeUpdateMsg implements ToDeviceActorNotificationMsg {
@Getter
private final TenantId tenantId; private final TenantId tenantId;
@Getter
private final DeviceId deviceId; private final DeviceId deviceId;
@Getter
private final String deviceName; private final String deviceName;
@Getter
private final String deviceType; private final String deviceType;
} }