Merge pull request #111 from devicehive/hotfix

Hotfix #107, #109

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.devicehive</groupId>
     <artifactId>devicehive-server</artifactId>
     <packaging>${packaging.type}</packaging>
-    <version>2.0.7</version>
+    <version>2.0.8</version>
     <name>DeviceHive Java Server</name>
 
     <properties>

src/main/java/com/devicehive/messages/subscriptions/SubscriptionManager.java

@@ -6,12 +6,9 @@
 @Component
 public class SubscriptionManager {
 
-    private final CommandSubscriptionStorage commandSubscriptionStorage
-        = new CommandSubscriptionStorage();
-    private final CommandUpdateSubscriptionStorage commandUpdateSubscriptionStorage =
-        new CommandUpdateSubscriptionStorage();
-    private final NotificationSubscriptionStorage notificationSubscriptionStorage =
-        new NotificationSubscriptionStorage();
+    private final CommandSubscriptionStorage commandSubscriptionStorage = new CommandSubscriptionStorage();
+    private final CommandUpdateSubscriptionStorage commandUpdateSubscriptionStorage = new CommandUpdateSubscriptionStorage();
+    private final NotificationSubscriptionStorage notificationSubscriptionStorage = new NotificationSubscriptionStorage();
 
     public CommandSubscriptionStorage getCommandSubscriptionStorage() {
         return commandSubscriptionStorage;

src/main/java/com/devicehive/resource/impl/DeviceCommandResourceImpl.java

@@ -109,6 +109,8 @@ private void getOrWaitForCommands(HivePrincipal principal, final String devices,
         if (timestamp != null) {
             list = commandService.find(deviceGuids, commandNames, timestamp, null, Constants.DEFAULT_TAKE, false, principal);
         }
+        // polling expects only commands after timestamp to be returned
+        list.removeIf(c -> !c.getTimestamp().after(timestamp));
 
         if (!list.isEmpty()) {
             Response response;

src/main/java/com/devicehive/resource/impl/DeviceNotificationResourceImpl.java

@@ -167,6 +167,9 @@ private void getOrWaitForNotifications(final HivePrincipal principal, final Stri
                     DEFAULT_TAKE, principal);
         }
 
+        // polling expects only notifications after timestamp to be returned
+        list.removeIf(n -> !n.getTimestamp().after(timestamp));
+
         if (!list.isEmpty()) {
             Response response;
             if (isMany) {

src/main/java/com/devicehive/service/DeviceService.java

@@ -402,7 +402,13 @@ public List<Device> getList(String name,
     @Transactional(propagation = Propagation.SUPPORTS)
     //TODO: need to remove it
     public long getAllowedDevicesCount(HivePrincipal principal, List<String> guids) {
-        return getDeviceList(guids, principal).size();
+        final CriteriaBuilder cb = genericDAO.criteriaBuilder();
+        final CriteriaQuery<Device> criteria = cb.createQuery(Device.class);
+        final Root<Device> from = criteria.from(Device.class);
+        final Predicate[] predicates = CriteriaHelper.deviceListPredicates(cb, from, guids, Optional.ofNullable(principal));
+        criteria.where(predicates);
+        final TypedQuery<Device> query = genericDAO.createQuery(criteria);
+        return query.getResultList().size();
     }
 
     @Transactional

src/main/java/com/devicehive/websockets/HiveWebsocketSessionState.java

@@ -27,8 +27,7 @@ public class HiveWebsocketSessionState {
     private final Set<UUID> commandSubscriptions = Collections.newSetFromMap(new ConcurrentHashMap<>());
     private final Set<UUID> commandUpdateSubscriptions = Collections.newSetFromMap(new ConcurrentHashMap<>());
     private final Lock commandSubscriptionsLock = new ReentrantLock(true);
-    private final Set<UUID> notificationSubscriptions =
-        Collections.newSetFromMap(new ConcurrentHashMap<>());
+    private final Set<UUID> notificationSubscriptions = Collections.newSetFromMap(new ConcurrentHashMap<>());
     private final Lock notificationSubscriptionsLock = new ReentrantLock(true);
     private final Lock commandUpdateSubscriptionsLock = new ReentrantLock(true);
     private final ConcurrentMap<Set<String>, Set<UUID>> oldFormatCommandSubscriptions = Maps.newConcurrentMap();