From c39c6bb88d2c6122cdce91fccde416cb6e361a6d Mon Sep 17 00:00:00 2001
From: Cristian Ferretti <jcferretti2020@gmail.com>
Date: Tue, 5 Nov 2024 19:54:55 -0500
Subject: [PATCH] Reorganize.

---
 Util/function/build.gradle                                     | 1 -
 .../kafka/src/main/java/io/deephaven/kafka/ProtobufImpl.java   | 3 ++-
 extensions/protobuf/build.gradle                               | 1 +
 .../main/java/io/deephaven/protobuf}/ToChunkTypeTransform.java | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename {Util/function/src/main/java/io/deephaven/function => extensions/protobuf/src/main/java/io/deephaven/protobuf}/ToChunkTypeTransform.java (99%)

diff --git a/Util/function/build.gradle b/Util/function/build.gradle
index 4095a825deb..e75bc73114c 100644
--- a/Util/function/build.gradle
+++ b/Util/function/build.gradle
@@ -6,7 +6,6 @@ plugins {
 dependencies {
     api project(':qst-type')
     api project(':engine-query-constants')
-    api project(':engine-time')
 
     compileOnly libs.jetbrains.annotations
 
diff --git a/extensions/kafka/src/main/java/io/deephaven/kafka/ProtobufImpl.java b/extensions/kafka/src/main/java/io/deephaven/kafka/ProtobufImpl.java
index 662683e7052..186469be333 100644
--- a/extensions/kafka/src/main/java/io/deephaven/kafka/ProtobufImpl.java
+++ b/extensions/kafka/src/main/java/io/deephaven/kafka/ProtobufImpl.java
@@ -36,6 +36,7 @@
 import io.deephaven.protobuf.ProtobufFunction;
 import io.deephaven.protobuf.ProtobufFunctions;
 import io.deephaven.protobuf.ProtobufFunctions.Builder;
+import io.deephaven.protobuf.ToChunkTypeTransform;
 import io.deephaven.qst.type.Type;
 import io.deephaven.util.annotations.VisibleForTesting;
 import io.deephaven.util.mutable.MutableInt;
@@ -55,7 +56,7 @@
 /**
  * This layer builds on top of {@link ProtobufDescriptorParser#parse(Descriptor, ProtobufDescriptorParserOptions)} by
  * further transforming the functions according to {@link #withMostAppropriateType(TypedFunction)}, and then further
- * adapting the functions to ensure they work for the expected chunk types {@link ToChunkTypeTransform}. This layer is
+ * adapting the functions to ensure they work for the expected chunk types {@link io.deephaven.protobuf.ToChunkTypeTransform}. This layer is
  * also responsible for managing schema changes; in essence, ensuring that newly
  * {@link ProtobufDescriptorParser#parse(Descriptor, ProtobufDescriptorParserOptions) parsed} {@link Descriptor
  * descriptor} {@link TypedFunction functions} can be adapted into the original function type.
diff --git a/extensions/protobuf/build.gradle b/extensions/protobuf/build.gradle
index 18a7bff22df..96e53642c9d 100644
--- a/extensions/protobuf/build.gradle
+++ b/extensions/protobuf/build.gradle
@@ -9,6 +9,7 @@ dependencies {
     api project(':util-function')
     api libs.protobuf.java
     implementation project(':engine-query-constants')
+    implementation project(':engine-time')
 
     compileOnly project(':util-immutables')
     annotationProcessor libs.immutables.value
diff --git a/Util/function/src/main/java/io/deephaven/function/ToChunkTypeTransform.java b/extensions/protobuf/src/main/java/io/deephaven/protobuf/ToChunkTypeTransform.java
similarity index 99%
rename from Util/function/src/main/java/io/deephaven/function/ToChunkTypeTransform.java
rename to extensions/protobuf/src/main/java/io/deephaven/protobuf/ToChunkTypeTransform.java
index cbcaeeea97c..4a21411fcdc 100644
--- a/Util/function/src/main/java/io/deephaven/function/ToChunkTypeTransform.java
+++ b/extensions/protobuf/src/main/java/io/deephaven/protobuf/ToChunkTypeTransform.java
@@ -1,8 +1,9 @@
 //
 // Copyright (c) 2016-2024 Deephaven Data Labs and Patent Pending
 //
-package io.deephaven.function;
+package io.deephaven.protobuf;
 
+import io.deephaven.function.*;
 import io.deephaven.qst.type.ArrayType;
 import io.deephaven.qst.type.BoxedBooleanType;
 import io.deephaven.qst.type.BoxedByteType;