Fix NullPointerException when catalogSessionProperties is not configured

Author: imjalpreet

presto-file-session-property-manager/src/test/java/com/facebook/presto/session/file/TestFileSessionPropertyManager.java

@@ -19,12 +19,14 @@
 import com.facebook.presto.session.SessionMatchSpec;
 import com.facebook.presto.spi.session.SessionPropertyConfigurationManager;
 import com.google.common.collect.ImmutableMap;
+import org.testng.annotations.Test;
 
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.Map;
+import java.util.Optional;
 
 import static com.facebook.presto.session.file.FileSessionPropertyManager.CODEC;
 import static org.testng.Assert.assertEquals;
@@ -59,4 +61,60 @@ protected void assertProperties(Map<String, String> defaultProperties, Map<Strin
             assertEquals(manager.getCatalogSessionProperties(CONTEXT), catalogProperties);
         }
     }
+
+    @Test
+    public void testNullSessionProperties()
+            throws IOException
+    {
+        ImmutableMap<String, Map<String, String>> catalogProperties = ImmutableMap.of("CATALOG", ImmutableMap.of("PROPERTY", "VALUE"));
+        SessionMatchSpec spec = new SessionMatchSpec(
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                null,
+                catalogProperties);
+
+        assertProperties(ImmutableMap.of(), ImmutableMap.of(), catalogProperties, spec);
+    }
+
+    @Test
+    public void testNullCatalogSessionProperties()
+            throws IOException
+    {
+        Map<String, String> properties = ImmutableMap.of("PROPERTY1", "VALUE1", "PROPERTY2", "VALUE2");
+        SessionMatchSpec spec = new SessionMatchSpec(
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                properties,
+                null);
+
+        assertProperties(properties, spec);
+    }
+
+    @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "Either sessionProperties or catalogSessionProperties must be provided")
+    public void testNullBothSessionProperties()
+            throws IOException
+    {
+        SessionMatchSpec spec = new SessionMatchSpec(
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                Optional.empty(),
+                null,
+                null);
+
+        assertProperties(ImmutableMap.of(), spec);
+    }
 }

presto-session-property-managers-common/src/main/java/com/facebook/presto/session/SessionMatchSpec.java

@@ -69,9 +69,12 @@ public SessionMatchSpec(
         this.resourceGroupRegex = requireNonNull(resourceGroupRegex, "resourceGroupRegex is null");
         this.clientInfoRegex = requireNonNull(clientInfoRegex, "clientInfoRegex is null");
         this.overrideSessionProperties = requireNonNull(overrideSessionProperties, "overrideSessionProperties is null");
-        requireNonNull(sessionProperties, "sessionProperties is null");
-        this.sessionProperties = ImmutableMap.copyOf(sessionProperties);
-        this.catalogSessionProperties = ImmutableMap.copyOf(catalogSessionProperties);
+
+        checkArgument(sessionProperties != null || catalogSessionProperties != null,
+                "Either sessionProperties or catalogSessionProperties must be provided");
+
+        this.sessionProperties = ImmutableMap.copyOf(Optional.ofNullable(sessionProperties).orElse(ImmutableMap.of()));
+        this.catalogSessionProperties = ImmutableMap.copyOf(Optional.ofNullable(catalogSessionProperties).orElse(ImmutableMap.of()));
     }
 
     public <T> Map<String, T> match(Map<String, T> object, SessionConfigurationContext context)