Made changes

Author: pdabre12

presto-main-base/src/main/java/com/facebook/presto/metadata/BuiltInFunctionHandle.java

@@ -15,7 +15,6 @@
 
 import com.facebook.presto.common.CatalogSchemaName;
 import com.facebook.presto.common.type.TypeSignature;
-import com.facebook.presto.spi.function.BuiltInFunctionKind;
 import com.facebook.presto.spi.function.FunctionHandle;
 import com.facebook.presto.spi.function.FunctionKind;
 import com.facebook.presto.spi.function.Signature;
@@ -25,7 +24,7 @@
 import java.util.List;
 import java.util.Objects;
 
-import static com.facebook.presto.spi.function.BuiltInFunctionKind.ENGINE;
+import static com.facebook.presto.metadata.BuiltInFunctionKind.ENGINE;
 import static java.util.Objects.requireNonNull;
 
 public class BuiltInFunctionHandle

presto-spi/src/main/java/com/facebook/presto/spi/function/BuiltInFunctionKind.java renamed to presto-main-base/src/main/java/com/facebook/presto/metadata/BuiltInFunctionKind.java

@@ -11,7 +11,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.facebook.presto.spi.function;
+package com.facebook.presto.metadata;
 
 import com.facebook.drift.annotations.ThriftEnum;
 import com.facebook.drift.annotations.ThriftEnumValue;

presto-main-base/src/main/java/com/facebook/presto/metadata/BuiltInPluginFunctionNamespaceManager.java

@@ -43,7 +43,7 @@
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
-import static com.facebook.presto.spi.function.BuiltInFunctionKind.PLUGIN;
+import static com.facebook.presto.metadata.BuiltInFunctionKind.PLUGIN;
 import static com.facebook.presto.spi.function.FunctionImplementationType.SQL;
 import static com.facebook.presto.spi.function.FunctionKind.SCALAR;
 import static com.google.common.base.Preconditions.checkArgument;

presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionAndTypeManager.java

@@ -94,6 +94,7 @@
 import static com.facebook.presto.SystemSessionProperties.isExperimentalFunctionsEnabled;
 import static com.facebook.presto.SystemSessionProperties.isListBuiltInFunctionsOnly;
 import static com.facebook.presto.common.type.TypeSignature.parseTypeSignature;
+import static com.facebook.presto.metadata.BuiltInFunctionKind.PLUGIN;
 import static com.facebook.presto.metadata.BuiltInTypeAndFunctionNamespaceManager.JAVA_BUILTIN_NAMESPACE;
 import static com.facebook.presto.metadata.CastType.toOperatorType;
 import static com.facebook.presto.metadata.FunctionSignatureMatcher.constructFunctionNotFoundErrorMessage;
@@ -103,7 +104,6 @@
 import static com.facebook.presto.spi.StandardErrorCode.FUNCTION_IMPLEMENTATION_MISSING;
 import static com.facebook.presto.spi.StandardErrorCode.FUNCTION_NOT_FOUND;
 import static com.facebook.presto.spi.StandardErrorCode.GENERIC_USER_ERROR;
-import static com.facebook.presto.spi.function.BuiltInFunctionKind.PLUGIN;
 import static com.facebook.presto.spi.function.FunctionKind.SCALAR;
 import static com.facebook.presto.spi.function.SqlFunctionVisibility.EXPERIMENTAL;
 import static com.facebook.presto.spi.function.SqlFunctionVisibility.PUBLIC;

presto-main-base/src/main/java/com/facebook/presto/metadata/FunctionMap.java

@@ -26,6 +26,7 @@
 
 import static com.facebook.presto.spi.function.FunctionKind.AGGREGATE;
 import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
 
 public class FunctionMap
 {
@@ -38,6 +39,8 @@ public FunctionMap()
 
     public FunctionMap(FunctionMap map, Iterable<? extends SqlFunction> functions)
     {
+        requireNonNull(map, "map is null");
+        requireNonNull(functions, "functions is null");
         this.functions = ImmutableListMultimap.<QualifiedObjectName, SqlFunction>builder()
                 .putAll(map.functions)
                 .putAll(Multimaps.index(functions, function -> function.getSignature().getName()))