Skip to content

Commit 147276f

Browse files
zacharywhitleyzacharywhitley
committed
Rename package and clean up imports to play nice with java 11
1 parent 413a95c commit 147276f

File tree

21 files changed

+46
-49
lines changed

21 files changed

+46
-49
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66

77
<groupId>com.semantalytics.stardog</groupId>
8-
<artifactId>wasm</artifactId>
8+
<artifactId>wasmfunctions</artifactId>
99
<version>1.0.0</version>
1010

1111
<developers>

src/main/java/com/semantalytics/stardog/kibble/wasm/CacheClear.java renamed to src/main/java/com/semantalytics/stardog/kibble/webfunctions/CacheClear.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.semantalytics.stardog.kibble.wasm;
1+
package com.semantalytics.stardog.kibble.webfunctions;
22

33
import com.complexible.stardog.plan.filter.ExpressionVisitor;
44
import com.complexible.stardog.plan.filter.expr.ValueOrError;

src/main/java/com/semantalytics/stardog/kibble/wasm/CacheList.java renamed to src/main/java/com/semantalytics/stardog/kibble/webfunctions/CacheList.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.semantalytics.stardog.kibble.wasm;
1+
package com.semantalytics.stardog.kibble.webfunctions;
22

33
import com.complexible.common.rdf.model.ArrayLiteral;
44
import com.complexible.stardog.plan.filter.AbstractExpression;

src/main/java/com/semantalytics/stardog/kibble/wasm/CacheLoad.java renamed to src/main/java/com/semantalytics/stardog/kibble/webfunctions/CacheLoad.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.semantalytics.stardog.kibble.wasm;
1+
package com.semantalytics.stardog.kibble.webfunctions;
22

33
import com.complexible.stardog.plan.filter.ExpressionVisitor;
44
import com.complexible.stardog.plan.filter.expr.ValueOrError;

src/main/java/com/semantalytics/stardog/kibble/wasm/CacheRefresh.java renamed to src/main/java/com/semantalytics/stardog/kibble/webfunctions/CacheRefresh.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.semantalytics.stardog.kibble.wasm;
1+
package com.semantalytics.stardog.kibble.webfunctions;
22

33
import com.complexible.stardog.plan.filter.ExpressionVisitor;
44
import com.complexible.stardog.plan.filter.expr.ValueOrError;

src/main/java/com/semantalytics/stardog/kibble/wasm/Call.java renamed to src/main/java/com/semantalytics/stardog/kibble/webfunctions/Call.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.semantalytics.stardog.kibble.wasm;
1+
package com.semantalytics.stardog.kibble.webfunctions;
22

33
import com.complexible.common.base.Pair;
44
import com.complexible.common.rdf.model.ArrayLiteral;
@@ -18,11 +18,18 @@
1818
import com.stardog.stark.query.io.QueryResultFormats;
1919
import com.stardog.stark.query.io.QueryResultParsers;
2020
import com.stardog.stark.query.io.QueryResultWriters;
21-
import io.github.kawamuray.wasmtime.*;
21+
import io.github.kawamuray.wasmtime.Module;
22+
import io.github.kawamuray.wasmtime.Store;
23+
import io.github.kawamuray.wasmtime.Instance;
24+
import io.github.kawamuray.wasmtime.Func;
25+
import io.github.kawamuray.wasmtime.Val;
26+
import io.github.kawamuray.wasmtime.Engine;
27+
import io.github.kawamuray.wasmtime.WasmFunctions;
28+
import io.github.kawamuray.wasmtime.Linker;
29+
import io.github.kawamuray.wasmtime.Extern;
30+
import io.github.kawamuray.wasmtime.Memory;
2231
import io.github.kawamuray.wasmtime.wasi.WasiCtx;
2332
import org.apache.commons.io.IOUtils;
24-
import org.slf4j.Logger;
25-
import org.slf4j.LoggerFactory;
2633

2734
import java.io.ByteArrayInputStream;
2835
import java.io.ByteArrayOutputStream;
@@ -43,8 +50,6 @@
4350

4451
public class Call extends AbstractExpression implements UserDefinedFunction {
4552

46-
private static final Logger LOGGER = LoggerFactory.getLogger(Call.class);
47-
4853
static LoadingCache<URL, byte[]> loadingCache = CacheBuilder.newBuilder().softValues().build(
4954
new CacheLoader<URL, byte[]>() {
5055
@Override
@@ -53,7 +58,6 @@ public byte[] load(URL url) throws IOException {
5358
}
5459
});
5560

56-
5761
private Store<Void> store = Store.withoutData();
5862
private Module module;
5963

@@ -76,7 +80,6 @@ public Call(final Call call) {
7680
@Override
7781
public ValueOrError evaluate(final ValueSolution valueSolution) {
7882
if (getArgs().size() >= 1) {
79-
//shit java.lang.ClassCastException: com.complexible.stardog.plan.filter.expr.ConstantImpl cannot be cast to com.complexible.stardog.plan.filter.expr.Variable
8083

8184
final ValueOrError[] valueOrErrors = getArgs().stream().map(e -> e.evaluate(valueSolution)).toArray(ValueOrError[]::new);
8285
if (Arrays.stream(valueOrErrors).noneMatch(ValueOrError::isError)) {

src/main/java/com/semantalytics/stardog/kibble/wasm/Doc.java renamed to src/main/java/com/semantalytics/stardog/kibble/webfunctions/Doc.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.semantalytics.stardog.kibble.wasm;
1+
package com.semantalytics.stardog.kibble.webfunctions;
22

33
import com.complexible.common.base.Pair;
44
import com.complexible.common.rdf.model.ArrayLiteral;
@@ -8,8 +8,6 @@
88
import com.complexible.stardog.plan.filter.ValueSolution;
99
import com.complexible.stardog.plan.filter.expr.ValueOrError;
1010
import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
11-
import com.google.common.cache.CacheBuilder;
12-
import com.google.common.cache.CacheLoader;
1311
import com.google.common.cache.LoadingCache;
1412
import com.google.common.collect.Lists;
1513
import com.stardog.stark.Literal;
@@ -22,11 +20,18 @@
2220
import com.stardog.stark.query.io.QueryResultFormats;
2321
import com.stardog.stark.query.io.QueryResultParsers;
2422
import com.stardog.stark.query.io.QueryResultWriters;
25-
import io.github.kawamuray.wasmtime.*;
23+
import io.github.kawamuray.wasmtime.Module;
24+
import io.github.kawamuray.wasmtime.Store;
25+
import io.github.kawamuray.wasmtime.Instance;
26+
import io.github.kawamuray.wasmtime.Func;
27+
import io.github.kawamuray.wasmtime.Val;
28+
import io.github.kawamuray.wasmtime.Engine;
29+
import io.github.kawamuray.wasmtime.WasmFunctions;
30+
import io.github.kawamuray.wasmtime.Linker;
31+
import io.github.kawamuray.wasmtime.Extern;
32+
import io.github.kawamuray.wasmtime.Memory;
2633
import io.github.kawamuray.wasmtime.wasi.WasiCtx;
2734
import org.apache.commons.io.IOUtils;
28-
import org.slf4j.Logger;
29-
import org.slf4j.LoggerFactory;
3035

3136
import java.io.ByteArrayInputStream;
3237
import java.io.ByteArrayOutputStream;
@@ -49,13 +54,10 @@
4954

5055
public class Doc extends AbstractExpression implements UserDefinedFunction {
5156

52-
private static final Logger LOGGER = LoggerFactory.getLogger(Doc.class);
53-
54-
//TODO force clearing cache?? size?
5557
static LoadingCache<URL, byte[]> loadingCache = Call.loadingCache;
5658

5759
private Store<Void> store = Store.withoutData();
58-
private Module module;
60+
private io.github.kawamuray.wasmtime.Module module;
5961

6062
private static final int pluginVersion = 1;
6163

src/main/java/com/semantalytics/stardog/kibble/wasm/PluginVersion.java renamed to src/main/java/com/semantalytics/stardog/kibble/webfunctions/PluginVersion.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
package com.semantalytics.stardog.kibble.wasm;
1+
package com.semantalytics.stardog.kibble.webfunctions;
22

33
import com.complexible.stardog.plan.filter.ExpressionVisitor;
44
import com.complexible.stardog.plan.filter.expr.ValueOrError;
55
import com.complexible.stardog.plan.filter.functions.AbstractFunction;
66
import com.complexible.stardog.plan.filter.functions.UserDefinedFunction;
77
import com.google.common.collect.Range;
8-
import com.stardog.stark.Literal;
98
import com.stardog.stark.Value;
10-
import com.stardog.stark.Values;
11-
12-
import java.net.MalformedURLException;
13-
import java.net.URL;
149

1510
import static com.stardog.stark.Values.*;
1611

src/main/java/com/semantalytics/stardog/kibble/wasm/WasmVocabulary.java renamed to src/main/java/com/semantalytics/stardog/kibble/webfunctions/WasmVocabulary.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.semantalytics.stardog.kibble.wasm;
1+
package com.semantalytics.stardog.kibble.webfunctions;
22

33
import com.stardog.stark.IRI;
44

src/main/java/com/semantalytics/stardog/kibble/wasm/todos.txt renamed to src/main/java/com/semantalytics/stardog/kibble/webfunctions/todos.txt

File renamed without changes.

0 commit comments

Comments
 (0)