Add back property functions

pom.xml

@@ -45,8 +45,8 @@
     </organization>
 
     <properties>
-        <stardog.major.version>7</stardog.major.version>
-        <stardog.version>${stardog.major.version}.9.1</stardog.version>
+        <stardog.major.version>8</stardog.major.version>
+        <stardog.version>${stardog.major.version}.0.0</stardog.version>
         <junit.version>4.12</junit.version>
         <slf4j.version>1.7.21</slf4j.version>
         <assertj.version>3.15.0</assertj.version>

src/main/java/com/semantalytics/stardog/kibble/webfunctions/CacheClear.java

@@ -5,7 +5,6 @@
 import com.complexible.stardog.plan.filter.functions.AbstractFunction;
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
 import com.google.common.collect.Range;
-import com.stardog.stark.Literal;
 import com.stardog.stark.Value;
 
 import java.net.MalformedURLException;

src/main/java/com/semantalytics/stardog/kibble/webfunctions/CacheLoad.java

@@ -5,7 +5,6 @@
 import com.complexible.stardog.plan.filter.functions.AbstractFunction;
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
 import com.google.common.collect.Range;
-import com.stardog.stark.Literal;
 import com.stardog.stark.Value;
 
 import java.net.MalformedURLException;

src/main/java/com/semantalytics/stardog/kibble/webfunctions/CacheRefresh.java

@@ -5,7 +5,6 @@
 import com.complexible.stardog.plan.filter.functions.AbstractFunction;
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
 import com.google.common.collect.Range;
-import com.stardog.stark.Literal;
 import com.stardog.stark.Value;
 
 import java.net.MalformedURLException;

src/main/java/com/semantalytics/stardog/kibble/webfunctions/Call.java

@@ -1,10 +1,17 @@
 package com.semantalytics.stardog.kibble.webfunctions;
 
-import com.complexible.stardog.plan.filter.*;
+import com.complexible.stardog.plan.filter.AbstractExpression;
+import com.complexible.stardog.plan.filter.Expression;
+import com.complexible.stardog.plan.filter.ExpressionVisitor;
+import com.complexible.stardog.plan.filter.Expressions;
+import com.complexible.stardog.plan.filter.ValueSolution;
 import com.complexible.stardog.plan.filter.expr.ValueOrError;
 import com.complexible.stardog.plan.filter.functions.FunctionRegistry;
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
-import com.stardog.stark.*;
+import com.stardog.stark.BNode;
+import com.stardog.stark.IRI;
+import com.stardog.stark.Literal;
+import com.stardog.stark.Value;
 import com.stardog.stark.query.SelectQueryResult;
 
 import java.io.IOException;

src/main/java/com/semantalytics/stardog/kibble/webfunctions/Compose.java

@@ -1,15 +1,17 @@
 package com.semantalytics.stardog.kibble.webfunctions;
 
-import com.complexible.stardog.plan.filter.*;
+import com.complexible.stardog.plan.filter.AbstractExpression;
+import com.complexible.stardog.plan.filter.EvalUtil;
+import com.complexible.stardog.plan.filter.Expression;
+import com.complexible.stardog.plan.filter.ExpressionVisitor;
+import com.complexible.stardog.plan.filter.ValueSolution;
 import com.complexible.stardog.plan.filter.expr.ValueOrError;
-import com.complexible.stardog.plan.filter.functions.FunctionRegistry;
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
 import com.stardog.stark.*;
-import org.apache.commons.math3.analysis.function.Exp;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static java.util.stream.Collectors.*;
 

src/main/java/com/semantalytics/stardog/kibble/webfunctions/Filter.java

@@ -7,7 +7,6 @@
 import com.complexible.stardog.plan.filter.functions.FunctionRegistry;
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
 import com.google.common.collect.Lists;
-import com.stardog.stark.IRI;
 import com.stardog.stark.Literal;
 import com.stardog.stark.Value;
 
@@ -16,7 +15,6 @@
 import java.util.stream.IntStream;
 
 import static com.complexible.stardog.plan.filter.functions.AbstractFunction.assertArrayLiteral;
-import static com.complexible.stardog.plan.filter.functions.AbstractFunction.assertLiteral;
 import static java.util.stream.Collectors.toList;
 
 public final class Filter extends AbstractExpression implements UserDefinedFunction {

src/main/java/com/semantalytics/stardog/kibble/webfunctions/Get.java

@@ -10,7 +10,6 @@
 import com.stardog.stark.impl.IntegerLiteral;
 import com.stardog.stark.impl.StringLiteral;
 import org.apache.commons.io.IOUtils;
-import org.apache.james.mime4j.util.MimeUtil;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

src/main/java/com/semantalytics/stardog/kibble/webfunctions/Map.java

@@ -7,15 +7,12 @@
 import com.complexible.stardog.plan.filter.functions.FunctionRegistry;
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
 import com.google.common.collect.Lists;
-import com.stardog.stark.IRI;
-import com.stardog.stark.Literal;
 import com.stardog.stark.Value;
 
 import java.util.Arrays;
 import java.util.List;
 
 import static com.complexible.stardog.plan.filter.functions.AbstractFunction.assertArrayLiteral;
-import static com.complexible.stardog.plan.filter.functions.AbstractFunction.assertLiteral;
 import static java.util.stream.Collectors.toList;
 
 public final class Map extends AbstractExpression implements UserDefinedFunction {

src/main/java/com/semantalytics/stardog/kibble/webfunctions/Memoize.java

@@ -4,10 +4,8 @@
 import com.complexible.stardog.plan.filter.expr.ValueOrError;
 import com.complexible.stardog.plan.filter.functions.FunctionRegistry;
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
-import com.google.api.client.util.Lists;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import com.stardog.stark.IRI;
 import com.stardog.stark.Literal;
 import com.stardog.stark.Value;
 
@@ -17,7 +15,6 @@
 import java.util.stream.Stream;
 
 import static com.complexible.stardog.plan.filter.functions.AbstractFunction.assertIntegerLiteral;
-import static com.complexible.stardog.plan.filter.functions.AbstractFunction.assertLiteral;
 import static java.util.stream.Collectors.toList;
 
 public final class Memoize extends AbstractExpression implements UserDefinedFunction {

src/main/java/com/semantalytics/stardog/kibble/webfunctions/Partial.java

@@ -6,7 +6,6 @@
 import com.complexible.stardog.plan.filter.ValueSolution;
 import com.complexible.stardog.plan.filter.expr.ValueOrError;
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
-import com.google.common.collect.Lists;
 import com.stardog.stark.BNode;
 import com.stardog.stark.Value;
 import com.stardog.stark.Values;

src/main/java/com/semantalytics/stardog/kibble/webfunctions/PluginVersion.java

@@ -6,13 +6,6 @@
 import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
 import com.stardog.stark.Value;
 
-import java.io.File;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.security.CodeSource;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
 import static com.stardog.stark.Values.*;
 
 public class PluginVersion extends AbstractFunction implements UserDefinedFunction {

src/main/java/com/semantalytics/stardog/kibble/webfunctions/PluginVersions.java

@@ -12,9 +12,7 @@
 import com.vdurmont.semver4j.Semver;
 
 import java.util.List;
-import java.util.Optional;
 import java.util.ServiceLoader;
-import java.util.stream.Collectors;
 
 public class PluginVersions extends AbstractExpression implements UserDefinedFunction {
 

src/main/java/com/semantalytics/stardog/kibble/webfunctions/Reduce.java

@@ -12,7 +12,6 @@
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Stream;
 
 import static com.complexible.stardog.plan.filter.functions.AbstractFunction.assertArrayLiteral;
 import static com.complexible.stardog.plan.filter.functions.AbstractFunction.assertLiteral;

src/main/java/com/semantalytics/stardog/kibble/webfunctions/StardogWasmInstance.java

@@ -6,12 +6,10 @@
 import com.complexible.stardog.index.statistics.Accuracy;
 import com.complexible.stardog.index.statistics.Cardinality;
 import com.complexible.stardog.plan.PlanException;
-import com.complexible.stardog.plan.QueryTerm;
 import com.complexible.stardog.plan.filter.expr.ValueOrError;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import com.google.common.cache.RemovalListener;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Streams;
 import com.stardog.stark.Literal;
@@ -25,7 +23,16 @@
 import com.stardog.stark.query.io.QueryResultFormats;
 import com.stardog.stark.query.io.QueryResultParsers;
 import com.stardog.stark.query.io.QueryResultWriters;
-import io.github.kawamuray.wasmtime.*;
+import io.github.kawamuray.wasmtime.Engine;
+import io.github.kawamuray.wasmtime.Extern;
+import io.github.kawamuray.wasmtime.Func;
+import io.github.kawamuray.wasmtime.Instance;
+import io.github.kawamuray.wasmtime.Linker;
+import io.github.kawamuray.wasmtime.Memory;
+import io.github.kawamuray.wasmtime.Module;
+import io.github.kawamuray.wasmtime.Store;
+import io.github.kawamuray.wasmtime.Val;
+import io.github.kawamuray.wasmtime.WasmFunctions;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 
@@ -82,9 +89,10 @@ private static byte[] getWasm(final URL wasmUrl) throws IOException {
         conn.setReadTimeout(240000);
         conn.connect();
 
-        final ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        IOUtils.copy(conn.getInputStream(), baos);
-        return baos.toByteArray();
+        try(final ByteArrayOutputStream baos = new ByteArrayOutputStream()) {
+            IOUtils.copy(conn.getInputStream(), baos);
+            return baos.toByteArray();
+        }
     }
 
     private Store<Void> store = Store.withoutData();

src/main/java/com/semantalytics/stardog/kibble/webfunctions/WebFunctionService.java

@@ -10,8 +10,12 @@
 import com.stardog.stark.Value;
 import com.stardog.stark.Values;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
 
 import static java.util.stream.Collectors.toList;
 

src/main/java/com/semantalytics/stardog/kibble/webfunctions/WebFunctionServiceModule.java

@@ -1,7 +1,6 @@
 package com.semantalytics.stardog.kibble.webfunctions;
 
 import com.complexible.stardog.AbstractStardogModule;
-import com.complexible.stardog.metadata.MetaProperties;
 import com.complexible.stardog.plan.eval.service.Service;
 import com.google.inject.Singleton;
 import com.google.inject.multibindings.Multibinder;

src/main/java/com/semantalytics/stardog/kibble/webfunctions/WebFunctionServiceOperator.java

@@ -1,34 +1,22 @@
 package com.semantalytics.stardog.kibble.webfunctions;
 
-import com.complexible.common.base.Pair;
 import com.complexible.common.rdf.model.ArrayLiteral;
-import com.complexible.stardog.StardogException;
-import com.complexible.stardog.plan.PlanNode;
 import com.complexible.stardog.plan.QueryTerm;
 import com.complexible.stardog.plan.SortType;
 import com.complexible.stardog.plan.eval.ExecutionContext;
 import com.complexible.stardog.plan.eval.operator.*;
 import com.complexible.stardog.plan.eval.operator.impl.AbstractOperator;
 import com.complexible.stardog.plan.eval.operator.impl.Solutions;
 import com.complexible.stardog.plan.filter.expr.ValueOrError;
-import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterators;
 import com.google.common.collect.Sets;
 import com.stardog.stark.Literal;
 import com.stardog.stark.Value;
 import com.stardog.stark.query.BindingSet;
 import com.stardog.stark.query.SelectQueryResult;
-import io.github.kawamuray.wasmtime.Func;
-import io.github.kawamuray.wasmtime.Instance;
-import io.github.kawamuray.wasmtime.Val;
-import org.apache.jena.rdfconnection.SparqlQueryConnection;
 
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
 import java.util.*;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 

src/main/java/com/semantalytics/stardog/kibble/webfunctions/WebFunctionServiceQuery.java

@@ -11,7 +11,6 @@
 import com.complexible.stardog.plan.eval.service.ServiceQuery;
 import com.complexible.stardog.plan.filter.expr.Constant;
 import com.complexible.stardog.plan.filter.expr.ValueOrError;
-import com.google.api.client.util.Lists;
 import com.google.common.base.Objects;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableSet;
@@ -21,13 +20,10 @@
 import com.stardog.stark.query.io.QueryResultFormats;
 
 import java.net.MalformedURLException;
-import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.function.UnaryOperator;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
 
 import static com.stardog.stark.Values.iri;
 import static java.util.stream.Collectors.*;