Mercurial > hg > thermostat-ng > web-gateway

changeset 183:30f6f82f9f6d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove unused code. Reviewed-by: neugens Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-June/023754.html
author Severin Gehwolf <sgehwolf@redhat.com>
date Mon, 19 Jun 2017 17:57:13 +0200
parents dc3cb45b9eb4
children 586afca62e7f
files services/system-cpu/src/main/java/com/redhat/thermostat/service/cpuinfo/mongo/MongoStorageHandler.java services/systems/src/main/java/com/redhat/thermostat/service/systems/mongo/MongoStorageHandler.java
diffstat 2 files changed, 28 insertions(+), 70 deletions(-) [+]
line wrap: on
line diff
--- a/services/system-cpu/src/main/java/com/redhat/thermostat/service/cpuinfo/mongo/MongoStorageHandler.java	Mon Jun 19 17:04:22 2017 +0200
+++ b/services/system-cpu/src/main/java/com/redhat/thermostat/service/cpuinfo/mongo/MongoStorageHandler.java	Mon Jun 19 17:57:13 2017 +0200
@@ -36,6 +36,20 @@
 
 package com.redhat.thermostat.service.cpuinfo.mongo;
 
+import static com.mongodb.client.model.Filters.and;
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Projections.exclude;
+import static com.mongodb.client.model.Projections.excludeId;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.bson.Document;
+import org.bson.conversions.Bson;
+
 import com.mongodb.BasicDBObject;
 import com.mongodb.CursorType;
 import com.mongodb.DBObject;
@@ -45,21 +59,6 @@
 import com.redhat.thermostat.gateway.common.mongodb.filters.MongoRequestFilters;
 import com.redhat.thermostat.gateway.common.mongodb.filters.MongoSortFilters;
 import com.redhat.thermostat.gateway.common.mongodb.response.MongoResponseBuilder;
-import org.bson.Document;
-import org.bson.conversions.Bson;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import static com.mongodb.client.model.Filters.and;
-import static com.mongodb.client.model.Filters.eq;
-import static com.mongodb.client.model.Filters.or;
-import static com.mongodb.client.model.Projections.exclude;
-import static com.mongodb.client.model.Projections.excludeId;
-import static com.mongodb.client.model.Projections.fields;
-import static com.mongodb.client.model.Projections.include;
 
 public class MongoStorageHandler {
 
@@ -148,22 +147,4 @@
 
         collection.updateMany(and(baseQuery, MongoRequestFilters.buildQueriesFilter(queriesList)), fields);
     }
-
-    public void updateTimestamps(MongoCollection<Document> collection, String body, String systemId, Long timeStamp) {
-        final Bson filter;
-        if (body != null && body.length() > 0) {
-            List<String> systems = (List<String>) JSON.parse(body);
-            List<Bson> systemFilters = new ArrayList<>();
-            for (String id : systems) {
-                systemFilters.add(eq(Fields.SYSTEM_ID, id));
-            }
-            filter = or(eq(Fields.SYSTEM_ID, systemId), or(systemFilters));
-        } else {
-            filter = eq(Fields.SYSTEM_ID, systemId);
-        }
-
-        String setDocument = "{ \"$set\" : { \"" + Fields.LAST_UPDATED + "\":" + timeStamp + " } }";
-        final Bson update = Document.parse(setDocument);
-        collection.updateMany(filter, update);
-    }
 }
--- a/services/systems/src/main/java/com/redhat/thermostat/service/systems/mongo/MongoStorageHandler.java	Mon Jun 19 17:04:22 2017 +0200
+++ b/services/systems/src/main/java/com/redhat/thermostat/service/systems/mongo/MongoStorageHandler.java	Mon Jun 19 17:57:13 2017 +0200
@@ -36,8 +36,21 @@
 
 package com.redhat.thermostat.service.systems.mongo;
 
+import static com.mongodb.client.model.Filters.and;
+import static com.mongodb.client.model.Filters.eq;
+import static com.mongodb.client.model.Projections.exclude;
+import static com.mongodb.client.model.Projections.excludeId;
+import static com.mongodb.client.model.Projections.fields;
+import static com.mongodb.client.model.Projections.include;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.bson.Document;
+import org.bson.conversions.Bson;
+
 import com.mongodb.BasicDBObject;
-import com.mongodb.Block;
 import com.mongodb.CursorType;
 import com.mongodb.DBObject;
 import com.mongodb.client.FindIterable;
@@ -46,24 +59,6 @@
 import com.redhat.thermostat.gateway.common.mongodb.filters.MongoRequestFilters;
 import com.redhat.thermostat.gateway.common.mongodb.filters.MongoSortFilters;
 import com.redhat.thermostat.gateway.common.mongodb.response.MongoResponseBuilder;
-import org.bson.Document;
-import org.bson.conversions.Bson;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static com.mongodb.client.model.Filters.and;
-import static com.mongodb.client.model.Filters.eq;
-import static com.mongodb.client.model.Filters.lt;
-import static com.mongodb.client.model.Filters.or;
-import static com.mongodb.client.model.Projections.exclude;
-import static com.mongodb.client.model.Projections.excludeId;
-import static com.mongodb.client.model.Projections.fields;
-import static com.mongodb.client.model.Projections.include;
 
 public class MongoStorageHandler {
 
@@ -152,22 +147,4 @@
 
         collection.updateMany(and(baseQuery, MongoRequestFilters.buildQueriesFilter(queriesList)), fields);
     }
-
-    public void updateTimestamps(MongoCollection<Document> collection, String body, String systemId, Long timeStamp) {
-        final Bson filter;
-        if (body != null && body.length() > 0) {
-            List<String> systems = (List<String>) JSON.parse(body);
-            List<Bson> systemFilters = new ArrayList<>();
-            for (String id : systems) {
-                systemFilters.add(eq(Fields.SYSTEM_ID, id));
-            }
-            filter = or(eq(Fields.SYSTEM_ID, systemId), or(systemFilters));
-        } else {
-            filter = eq(Fields.SYSTEM_ID, systemId);
-        }
-
-        String setDocument = "{ \"$set\" : { \"" + Fields.LAST_UPDATED + "\":" + timeStamp + " } }";
-        final Bson update = Document.parse(setDocument);
-        collection.updateMany(filter, update);
-    }
 }