Browse Source

Build fix

pull/3811/head
Volodymyr Babak 7 years ago
parent
commit
1f7322c09c
  1. 2
      common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java
  2. 2
      dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
  3. 7
      dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeService.java

2
common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java

@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,

2
dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java

@ -31,6 +31,7 @@ import org.thingsboard.server.common.data.id.EdgeId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.page.PageData; import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink; import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.page.TimePageLink;
import org.thingsboard.server.common.data.relation.EntityRelation; import org.thingsboard.server.common.data.relation.EntityRelation;
import org.thingsboard.server.common.data.relation.RelationTypeGroup; import org.thingsboard.server.common.data.relation.RelationTypeGroup;
import org.thingsboard.server.dao.customer.CustomerDao; import org.thingsboard.server.dao.customer.CustomerDao;
@ -39,6 +40,7 @@ import org.thingsboard.server.dao.entity.AbstractEntityService;
import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.exception.DataValidationException;
import org.thingsboard.server.dao.service.DataValidator; import org.thingsboard.server.dao.service.DataValidator;
import org.thingsboard.server.dao.service.PaginatedRemover; import org.thingsboard.server.dao.service.PaginatedRemover;
import org.thingsboard.server.dao.service.TimePaginatedRemover;
import org.thingsboard.server.dao.service.Validator; import org.thingsboard.server.dao.service.Validator;
import org.thingsboard.server.dao.tenant.TenantDao; import org.thingsboard.server.dao.tenant.TenantDao;

7
dao/src/main/java/org/thingsboard/server/dao/edge/BaseEdgeService.java

@ -20,6 +20,7 @@ import com.google.common.base.Function;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures; 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 lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.Cache; import org.springframework.cache.Cache;
@ -311,7 +312,7 @@ public class BaseEdgeService extends AbstractEntityService implements EdgeServic
} }
} }
return Futures.successfulAsList(futures); return Futures.successfulAsList(futures);
}); }, MoreExecutors.directExecutor());
edges = Futures.transform(edges, new Function<List<Edge>, List<Edge>>() { edges = Futures.transform(edges, new Function<List<Edge>, List<Edge>>() {
@Nullable @Nullable
@ -319,7 +320,7 @@ public class BaseEdgeService extends AbstractEntityService implements EdgeServic
public List<Edge> apply(@Nullable List<Edge> edgeList) { public List<Edge> apply(@Nullable List<Edge> edgeList) {
return edgeList == null ? Collections.emptyList() : edgeList.stream().filter(edge -> query.getEdgeTypes().contains(edge.getType())).collect(Collectors.toList()); return edgeList == null ? Collections.emptyList() : edgeList.stream().filter(edge -> query.getEdgeTypes().contains(edge.getType())).collect(Collectors.toList());
} }
}); }, MoreExecutors.directExecutor());
return edges; return edges;
} }
@ -333,7 +334,7 @@ public class BaseEdgeService extends AbstractEntityService implements EdgeServic
edgeTypes -> { edgeTypes -> {
edgeTypes.sort(Comparator.comparing(EntitySubtype::getType)); edgeTypes.sort(Comparator.comparing(EntitySubtype::getType));
return edgeTypes; return edgeTypes;
}); }, MoreExecutors.directExecutor());
} }
@Override @Override

Loading…
Cancel
Save