Storage updates (#87)

Author: akshaisarma

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.yahoo.bullet</groupId>
     <artifactId>bullet-core</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <packaging>jar</packaging>
     <name>bullet-core</name>
 
@@ -48,8 +48,8 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.10.19</version>
+            <artifactId>mockito-core</artifactId>
+            <version>3.5.7</version>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/com/yahoo/bullet/common/BulletConfig.java

@@ -372,7 +372,7 @@ public Schema getSchema() {
      * should use a {@link Validator} to define the appropriate definitions, casters and defaults to use. You
      * should call this method before you use the config if you set additional settings to ensure that all configurations
      * are valid.
-     *
+     * <p>
      * This class defines a validator for all the fields it knows about. If you subclass it and define your own fields,
      * you should {@link #getValidator()} and add entries and relationships that you need to validate. Make sure
      * to call this method from your override if you wish validate your new definitions.
@@ -428,7 +428,7 @@ private static Object mapifyMetadata(Object metadata) {
 
     @SuppressWarnings("unchecked")
     private static boolean alreadySetMetadata(Object metadata) {
-        if (metadata == null || !(metadata instanceof Map)) {
+        if (!(metadata instanceof Map)) {
             return false;
         }
         try {

src/main/java/com/yahoo/bullet/common/SerializerDeserializer.java

@@ -52,7 +52,7 @@ public static <U extends Serializable> byte[] toBytes(U object) {
             oos.writeObject(object);
             return bos.toByteArray();
         } catch (IOException | RuntimeException e) {
-            log.error("Could not serialize given object", object);
+            log.error("Could not serialize given object {}", object);
             log.error("Exception was: ", e);
         }
         return null;

src/main/java/com/yahoo/bullet/common/Utilities.java

@@ -130,6 +130,23 @@ public static <K, V> Map<K, V> requireNonNull(Map<K, V> map) {
         return map;
     }
 
+    /**
+     * Adds the given mapping to the given {@link Map} if the value is not null.
+     *
+     * @param map The map to check.
+     * @param key The key to add.
+     * @param value The value to add if not null.
+     * @param <K> The type of the map key.
+     * @param <V> The type of the map value.
+     * @return The map.
+     */
+    public static <K, V> Map<K, V> putNotNull(Map<K, V> map, K key, V value) {
+        if (value != null) {
+            map.put(key, value);
+        }
+        return map;
+    }
+
     /**
      * Rounds a double up to the specified number of places.
      *

src/main/java/com/yahoo/bullet/pubsub/PubSub.java

@@ -22,11 +22,15 @@ public abstract class PubSub {
     /**
      * The context determines how the {@link Publisher} and {@link Subscriber} returned by PubSub behave. For example,
      * If the Context is {@link Context#QUERY_SUBMISSION}:
-     *      1. Publishers write to request queue.
-     *      2. Subscribers read from the response queue.
+     * <ol>
+     *   <li>Publishers write to request queue</li>
+     *   <li>Subscribers read from the response queue</li>
+     * </ol>
      * If the Context is {@link Context#QUERY_PROCESSING}:
-     *      1. Publishers write to response queue.
-     *      2. Subscribers read from the request queue.
+     * <ol>
+     *   <li>Publishers write to response queue</li>
+     *   <li>Subscribers read from the request queue</li>
+     * </ol>
      */
     public enum Context {
         QUERY_SUBMISSION,

src/main/java/com/yahoo/bullet/querying/QueryCategorizer.java

@@ -14,9 +14,9 @@
 
 /**
  * This categorizes running queries into whether they are done, closed, have exceeded the rate limits or have new data.
- * Running queries
- * are provided as a {@link Map} of String query IDs to non-null, valid, initialized {@link Querier} objects.
- *
+ * Running queries are provided as a {@link Map} of String query IDs to non-null, valid, initialized {@link Querier}
+ * objects.
+ * <p>
  * Use {@link #categorize(Map)} and {@link #categorize(BulletRecord, Map)}for categorizing queries. The latter
  * categorizes after making the Querier instances {@link Querier#consume(BulletRecord)}.
  */