Skip to content

Commit 4733db7

Browse files
authored
Refactor TypedFunction, ObjectProcessor, and ObjectProcessorFunctions (#4992)
* `io.deephaven.functions` renamed to `io.deephaven.function`, moved to `util/function/`, `:util-function` project * `io.deephaven.processor` moved to `engine/processor/`, `:engine-processor` project * `io.deephaven.processor.functions` renamed to `io.deephaven.processor.function`, moved to `engine/processor-function/`, `:engine-processor-function` project
1 parent d0e8786 commit 4733db7

File tree

87 files changed

+314
-643
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+314
-643
lines changed

Util/function/build.gradle

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
plugins {
2+
id 'java-library'
3+
id 'io.deephaven.project.register'
4+
}
5+
6+
dependencies {
7+
api project(':qst-type')
8+
9+
compileOnly depAnnotations
10+
11+
Classpaths.inheritJUnitPlatform(project)
12+
Classpaths.inheritAssertJ(project)
13+
testImplementation 'org.junit.jupiter:junit-jupiter'
14+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
15+
}
16+
17+
test {
18+
useJUnitPlatform()
19+
}

Util/function/gradle.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.deephaven.project.ProjectType=JAVA_PUBLIC

extensions/protobuf/src/main/java/io/deephaven/functions/BooleanFunctions.java Util/function/src/main/java/io/deephaven/function/BooleanFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import org.jetbrains.annotations.NotNull;
77

extensions/protobuf/src/main/java/io/deephaven/functions/ByteFunctions.java Util/function/src/main/java/io/deephaven/function/ByteFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import java.util.Objects;
77
import java.util.function.Function;

extensions/protobuf/src/main/java/io/deephaven/functions/CharFunctions.java Util/function/src/main/java/io/deephaven/function/CharFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import java.util.Objects;
77
import java.util.function.Function;

extensions/protobuf/src/main/java/io/deephaven/functions/DoubleFunctions.java Util/function/src/main/java/io/deephaven/function/DoubleFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import java.util.Objects;
77
import java.util.function.Function;

extensions/protobuf/src/main/java/io/deephaven/functions/FloatFunctions.java Util/function/src/main/java/io/deephaven/function/FloatFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import java.util.Objects;
77
import java.util.function.Function;

extensions/protobuf/src/main/java/io/deephaven/functions/IntFunctions.java Util/function/src/main/java/io/deephaven/function/IntFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import java.util.Objects;
77
import java.util.function.Function;

extensions/protobuf/src/main/java/io/deephaven/functions/LongFunctions.java Util/function/src/main/java/io/deephaven/function/LongFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import java.util.Objects;
77
import java.util.function.Function;

extensions/protobuf/src/main/java/io/deephaven/functions/ObjectFunctions.java Util/function/src/main/java/io/deephaven/function/ObjectFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.CustomType;
77
import io.deephaven.qst.type.GenericType;

extensions/protobuf/src/main/java/io/deephaven/functions/PrimitiveFunctions.java Util/function/src/main/java/io/deephaven/function/PrimitiveFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import java.util.Objects;
44

extensions/protobuf/src/main/java/io/deephaven/functions/ShortFunctions.java Util/function/src/main/java/io/deephaven/function/ShortFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import java.util.Objects;
77
import java.util.function.Function;

extensions/protobuf/src/main/java/io/deephaven/functions/ToBooleanFunction.java Util/function/src/main/java/io/deephaven/function/ToBooleanFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.BooleanType;
77
import io.deephaven.qst.type.Type;

extensions/protobuf/src/main/java/io/deephaven/functions/ToByteFunction.java Util/function/src/main/java/io/deephaven/function/ToByteFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.ByteType;
77
import io.deephaven.qst.type.Type;

extensions/protobuf/src/main/java/io/deephaven/functions/ToCharFunction.java Util/function/src/main/java/io/deephaven/function/ToCharFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.CharType;
77
import io.deephaven.qst.type.Type;

extensions/protobuf/src/main/java/io/deephaven/functions/ToDoubleFunction.java Util/function/src/main/java/io/deephaven/function/ToDoubleFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.DoubleType;
77
import io.deephaven.qst.type.Type;

extensions/protobuf/src/main/java/io/deephaven/functions/ToFloatFunction.java Util/function/src/main/java/io/deephaven/function/ToFloatFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.FloatType;
77
import io.deephaven.qst.type.Type;

extensions/protobuf/src/main/java/io/deephaven/functions/ToIntFunction.java Util/function/src/main/java/io/deephaven/function/ToIntFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.IntType;
77
import io.deephaven.qst.type.Type;

extensions/protobuf/src/main/java/io/deephaven/functions/ToLongFunction.java Util/function/src/main/java/io/deephaven/function/ToLongFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.LongType;
77
import io.deephaven.qst.type.Type;

extensions/protobuf/src/main/java/io/deephaven/functions/ToObjectFunction.java Util/function/src/main/java/io/deephaven/function/ToObjectFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.GenericType;
77

extensions/protobuf/src/main/java/io/deephaven/functions/ToPrimitiveFunction.java Util/function/src/main/java/io/deephaven/function/ToPrimitiveFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.PrimitiveType;
77

extensions/protobuf/src/main/java/io/deephaven/functions/ToShortFunction.java Util/function/src/main/java/io/deephaven/function/ToShortFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.ShortType;
77
import io.deephaven.qst.type.Type;

extensions/protobuf/src/main/java/io/deephaven/functions/TypedFunction.java Util/function/src/main/java/io/deephaven/function/TypedFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.functions;
4+
package io.deephaven.function;
55

66
import io.deephaven.qst.type.Type;
77

extensions/protobuf/src/main/java/io/deephaven/functions/TypedFunctions.java Util/function/src/main/java/io/deephaven/function/TypedFunctions.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import java.util.Objects;
44

extensions/protobuf/src/test/java/io/deephaven/functions/ToBooleanFunctionTest.java Util/function/src/test/java/io/deephaven/function/ToBooleanFunctionTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import org.junit.jupiter.api.Test;
44

55
import java.util.List;
66

7-
import static io.deephaven.functions.ToBooleanFunction.and;
8-
import static io.deephaven.functions.ToBooleanFunction.map;
9-
import static io.deephaven.functions.ToBooleanFunction.not;
10-
import static io.deephaven.functions.ToBooleanFunction.ofFalse;
11-
import static io.deephaven.functions.ToBooleanFunction.ofTrue;
12-
import static io.deephaven.functions.ToBooleanFunction.or;
7+
import static io.deephaven.function.ToBooleanFunction.and;
8+
import static io.deephaven.function.ToBooleanFunction.map;
9+
import static io.deephaven.function.ToBooleanFunction.not;
10+
import static io.deephaven.function.ToBooleanFunction.ofFalse;
11+
import static io.deephaven.function.ToBooleanFunction.ofTrue;
12+
import static io.deephaven.function.ToBooleanFunction.or;
1313
import static org.assertj.core.api.Assertions.assertThat;
1414

1515
public class ToBooleanFunctionTest {

extensions/protobuf/src/test/java/io/deephaven/functions/ToByteFunctionTest.java Util/function/src/test/java/io/deephaven/function/ToByteFunctionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import org.junit.jupiter.api.Test;
44

5-
import static io.deephaven.functions.ToByteFunction.map;
5+
import static io.deephaven.function.ToByteFunction.map;
66
import static org.assertj.core.api.Assertions.assertThat;
77

88
public class ToByteFunctionTest {

extensions/protobuf/src/test/java/io/deephaven/functions/ToCharFunctionTest.java Util/function/src/test/java/io/deephaven/function/ToCharFunctionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import org.junit.jupiter.api.Test;
44

5-
import static io.deephaven.functions.ToCharFunction.map;
5+
import static io.deephaven.function.ToCharFunction.map;
66
import static org.assertj.core.api.Assertions.assertThat;
77

88
public class ToCharFunctionTest {

extensions/protobuf/src/test/java/io/deephaven/functions/ToDoubleFunctionTest.java Util/function/src/test/java/io/deephaven/function/ToDoubleFunctionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import org.junit.jupiter.api.Test;
44

5-
import static io.deephaven.functions.ToDoubleFunction.map;
5+
import static io.deephaven.function.ToDoubleFunction.map;
66
import static org.assertj.core.api.Assertions.assertThat;
77

88
public class ToDoubleFunctionTest {

extensions/protobuf/src/test/java/io/deephaven/functions/ToFloatFunctionTest.java Util/function/src/test/java/io/deephaven/function/ToFloatFunctionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import org.junit.jupiter.api.Test;
44

5-
import static io.deephaven.functions.ToFloatFunction.map;
5+
import static io.deephaven.function.ToFloatFunction.map;
66
import static org.assertj.core.api.Assertions.assertThat;
77

88
public class ToFloatFunctionTest {

extensions/protobuf/src/test/java/io/deephaven/functions/ToIntFunctionTest.java Util/function/src/test/java/io/deephaven/function/ToIntFunctionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import org.junit.jupiter.api.Test;
44

5-
import static io.deephaven.functions.ToIntFunction.map;
5+
import static io.deephaven.function.ToIntFunction.map;
66
import static org.assertj.core.api.Assertions.assertThat;
77

88
public class ToIntFunctionTest {

extensions/protobuf/src/test/java/io/deephaven/functions/ToLongFunctionTest.java Util/function/src/test/java/io/deephaven/function/ToLongFunctionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import org.junit.jupiter.api.Test;
44

5-
import static io.deephaven.functions.ToLongFunction.map;
5+
import static io.deephaven.function.ToLongFunction.map;
66
import static org.assertj.core.api.Assertions.assertThat;
77

88
public class ToLongFunctionTest {

extensions/protobuf/src/test/java/io/deephaven/functions/ToObjectFunctionTest.java Util/function/src/test/java/io/deephaven/function/ToObjectFunctionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import io.deephaven.qst.type.Type;
44
import org.junit.jupiter.api.Test;
55

6-
import static io.deephaven.functions.ToObjectFunction.map;
6+
import static io.deephaven.function.ToObjectFunction.map;
77
import static org.assertj.core.api.Assertions.assertThat;
88

99
public class ToObjectFunctionTest {

extensions/protobuf/src/test/java/io/deephaven/functions/ToShortFunctionTest.java Util/function/src/test/java/io/deephaven/function/ToShortFunctionTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package io.deephaven.functions;
1+
package io.deephaven.function;
22

33
import org.junit.jupiter.api.Test;
44

5-
import static io.deephaven.functions.ToShortFunction.map;
5+
import static io.deephaven.function.ToShortFunction.map;
66
import static org.assertj.core.api.Assertions.assertThat;
77

88
public class ToShortFunctionTest {
File renamed without changes.
File renamed without changes.
+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
plugins {
2+
id 'java-library'
3+
id 'io.deephaven.project.register'
4+
}
5+
6+
7+
dependencies {
8+
api project(':engine-processor')
9+
api project(':util-function')
10+
11+
implementation project(':engine-time')
12+
13+
Classpaths.inheritJUnitPlatform(project)
14+
Classpaths.inheritAssertJ(project)
15+
testImplementation 'org.junit.jupiter:junit-jupiter'
16+
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
17+
}
18+
19+
test {
20+
useJUnitPlatform()
21+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
io.deephaven.project.ProjectType=JAVA_PUBLIC

extensions/kafka/src/main/java/io/deephaven/kafka/ingest/ChunkUtils.java engine/processor-function/src/main/java/io/deephaven/processor/function/ChunkUtils.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.kafka.ingest;
4+
package io.deephaven.processor.function;
55

66
import io.deephaven.chunk.ObjectChunk;
77
import io.deephaven.chunk.WritableBooleanChunk;
@@ -13,18 +13,18 @@
1313
import io.deephaven.chunk.WritableLongChunk;
1414
import io.deephaven.chunk.WritableObjectChunk;
1515
import io.deephaven.chunk.WritableShortChunk;
16-
import io.deephaven.functions.ToByteFunction;
17-
import io.deephaven.functions.ToCharFunction;
18-
import io.deephaven.functions.ToFloatFunction;
19-
import io.deephaven.functions.ToShortFunction;
16+
import io.deephaven.function.ToByteFunction;
17+
import io.deephaven.function.ToCharFunction;
18+
import io.deephaven.function.ToFloatFunction;
19+
import io.deephaven.function.ToShortFunction;
2020

2121
import java.util.function.Function;
2222
import java.util.function.Predicate;
2323
import java.util.function.ToDoubleFunction;
2424
import java.util.function.ToIntFunction;
2525
import java.util.function.ToLongFunction;
2626

27-
public class ChunkUtils {
27+
final class ChunkUtils {
2828

2929
public static <T> void applyInto(
3030
Predicate<? super T> booleanFunction,

extensions/kafka/src/main/java/io/deephaven/processor/functions/ObjectProcessorFunctions.java engine/processor-function/src/main/java/io/deephaven/processor/function/ObjectProcessorFunctions.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
/**
22
* Copyright (c) 2016-2023 Deephaven Data Labs and Patent Pending
33
*/
4-
package io.deephaven.processor.functions;
4+
package io.deephaven.processor.function;
55

66
import io.deephaven.chunk.ObjectChunk;
7-
import io.deephaven.functions.TypedFunction;
7+
import io.deephaven.function.TypedFunction;
88
import io.deephaven.processor.ObjectProcessor;
99

1010
import java.util.List;

0 commit comments

Comments
 (0)