Remove luceneserver from the package path of the server (#754)

Yelp · Oct 4, 2024 · aedd68b · aedd68b
1 parent 021fbbb
commit aedd68b
Show file tree

Hide file tree

Showing 422 changed files with 1,500 additions and 1,551 deletions.
diff --git a/...eneserver/analysis/AnalysisComponent.java → ...ch/server/analysis/AnalysisComponent.java b/...eneserver/analysis/AnalysisComponent.java → ...ch/server/analysis/AnalysisComponent.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.analysis;
+package com.yelp.nrtsearch.server.analysis;
 
 import com.yelp.nrtsearch.server.config.LuceneServerConfiguration;
 

diff --git a/...ceneserver/analysis/AnalysisProvider.java → ...rch/server/analysis/AnalysisProvider.java b/...ceneserver/analysis/AnalysisProvider.java → ...rch/server/analysis/AnalysisProvider.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.analysis;
+package com.yelp.nrtsearch.server.analysis;
 
 /**
  * Interface for creating object from the given analysis properties. Currently only passes the name

diff --git a/...uceneserver/analysis/AnalyzerCreator.java → ...arch/server/analysis/AnalyzerCreator.java b/...uceneserver/analysis/AnalyzerCreator.java → ...arch/server/analysis/AnalyzerCreator.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.analysis;
+package com.yelp.nrtsearch.server.analysis;
 
 import com.yelp.nrtsearch.server.config.LuceneServerConfiguration;
 import com.yelp.nrtsearch.server.grpc.ConditionalTokenFilter;

diff --git a/.../analysis/MappingV2CharFilterFactory.java → .../analysis/MappingV2CharFilterFactory.java b/.../analysis/MappingV2CharFilterFactory.java → .../analysis/MappingV2CharFilterFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.analysis;
+package com.yelp.nrtsearch.server.analysis;
 
 import java.io.Reader;
 import java.util.Arrays;

diff --git a/...rver/analysis/NrtsearchSynonymParser.java → ...rver/analysis/NrtsearchSynonymParser.java b/...rver/analysis/NrtsearchSynonymParser.java → ...rver/analysis/NrtsearchSynonymParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.analysis;
+package com.yelp.nrtsearch.server.analysis;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...er/analysis/PosIncGapAnalyzerWrapper.java → ...er/analysis/PosIncGapAnalyzerWrapper.java b/...er/analysis/PosIncGapAnalyzerWrapper.java → ...er/analysis/PosIncGapAnalyzerWrapper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.analysis;
+package com.yelp.nrtsearch.server.analysis;
 
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.AnalyzerWrapper;

diff --git a/...analysis/SynonymV2GraphFilterFactory.java → ...analysis/SynonymV2GraphFilterFactory.java b/...analysis/SynonymV2GraphFilterFactory.java → ...analysis/SynonymV2GraphFilterFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.analysis;
+package com.yelp.nrtsearch.server.analysis;
 
 import java.io.IOException;
 import java.io.StringReader;

diff --git a/...erver/luceneserver/codec/ServerCodec.java → ...p/nrtsearch/server/codec/ServerCodec.java b/...erver/luceneserver/codec/ServerCodec.java → ...p/nrtsearch/server/codec/ServerCodec.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.codec;
+package com.yelp.nrtsearch.server.codec;
 
-import com.yelp.nrtsearch.server.luceneserver.field.FieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.IndexableFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.VectorFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
-import com.yelp.nrtsearch.server.luceneserver.index.IndexStateManager;
+import com.yelp.nrtsearch.server.field.FieldDef;
+import com.yelp.nrtsearch.server.field.IndexableFieldDef;
+import com.yelp.nrtsearch.server.field.VectorFieldDef;
+import com.yelp.nrtsearch.server.index.IndexState;
+import com.yelp.nrtsearch.server.index.IndexStateManager;
 import org.apache.lucene.codecs.Codec;
 import org.apache.lucene.codecs.DocValuesFormat;
 import org.apache.lucene.codecs.KnnVectorsFormat;

diff --git a/...concurrent/ThreadPoolExecutorFactory.java → ...concurrent/ThreadPoolExecutorFactory.java b/...concurrent/ThreadPoolExecutorFactory.java → ...concurrent/ThreadPoolExecutorFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.concurrent;
+package com.yelp.nrtsearch.server.concurrent;
 
 import com.yelp.nrtsearch.server.config.ThreadPoolConfiguration;
 import com.yelp.nrtsearch.server.monitoring.ThreadPoolCollector;

diff --git a/src/main/java/com/yelp/nrtsearch/server/config/LuceneServerConfiguration.java b/src/main/java/com/yelp/nrtsearch/server/config/LuceneServerConfiguration.java
@@ -19,8 +19,8 @@
 import com.google.protobuf.util.JsonFormat;
 import com.yelp.nrtsearch.server.grpc.IndexLiveSettings;
 import com.yelp.nrtsearch.server.grpc.ReplicationServerClient;
-import com.yelp.nrtsearch.server.luceneserver.warming.WarmerConfig;
 import com.yelp.nrtsearch.server.utils.JsonUtils;
+import com.yelp.nrtsearch.server.warming.WarmerConfig;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Path;

diff --git a/src/main/java/com/yelp/nrtsearch/server/config/ThreadPoolConfiguration.java b/src/main/java/com/yelp/nrtsearch/server/config/ThreadPoolConfiguration.java
@@ -16,7 +16,7 @@
 package com.yelp.nrtsearch.server.config;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.yelp.nrtsearch.server.luceneserver.concurrent.ThreadPoolExecutorFactory;
+import com.yelp.nrtsearch.server.concurrent.ThreadPoolExecutorFactory;
 import com.yelp.nrtsearch.server.utils.JsonUtils;
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ustom/request/CustomRequestProcessor.java → ...ustom/request/CustomRequestProcessor.java b/...ustom/request/CustomRequestProcessor.java → ...ustom/request/CustomRequestProcessor.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.custom.request;
+package com.yelp.nrtsearch.server.custom.request;
 
 import com.yelp.nrtsearch.server.config.LuceneServerConfiguration;
 import com.yelp.nrtsearch.server.grpc.CustomRequest;

diff --git a/...stom/request/DuplicateRouteException.java → ...stom/request/DuplicateRouteException.java b/...stom/request/DuplicateRouteException.java → ...stom/request/DuplicateRouteException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.custom.request;
+package com.yelp.nrtsearch.server.custom.request;
 
 import java.text.MessageFormat;
 

diff --git a/...ustom/request/RouteNotFoundException.java → ...ustom/request/RouteNotFoundException.java b/...ustom/request/RouteNotFoundException.java → ...ustom/request/RouteNotFoundException.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.custom.request;
+package com.yelp.nrtsearch.server.custom.request;
 
 import java.text.MessageFormat;
 

diff --git a/...neserver/doc/DefaultSharedDocContext.java → ...h/server/doc/DefaultSharedDocContext.java b/...neserver/doc/DefaultSharedDocContext.java → ...h/server/doc/DefaultSharedDocContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.doc;
+package com.yelp.nrtsearch.server.doc;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...ch/server/luceneserver/doc/DocLookup.java → .../yelp/nrtsearch/server/doc/DocLookup.java b/...ch/server/luceneserver/doc/DocLookup.java → .../yelp/nrtsearch/server/doc/DocLookup.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.doc;
+package com.yelp.nrtsearch.server.doc;
 
-import com.yelp.nrtsearch.server.luceneserver.field.FieldDef;
+import com.yelp.nrtsearch.server.field.FieldDef;
 import java.util.function.Function;
 import org.apache.lucene.index.LeafReaderContext;
 

diff --git a/...ver/luceneserver/doc/LoadedDocValues.java → ...nrtsearch/server/doc/LoadedDocValues.java b/...ver/luceneserver/doc/LoadedDocValues.java → ...nrtsearch/server/doc/LoadedDocValues.java
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.doc;
+package com.yelp.nrtsearch.server.doc;
 
 import static org.apache.lucene.util.ArrayUtil.oversize;
 
 import com.google.protobuf.ByteString;
 import com.google.protobuf.ListValue;
 import com.google.protobuf.Struct;
 import com.google.type.LatLng;
+import com.yelp.nrtsearch.server.geo.GeoPoint;
 import com.yelp.nrtsearch.server.grpc.SearchResponse;
 import com.yelp.nrtsearch.server.grpc.SearchResponse.Hit.FieldValue;
 import com.yelp.nrtsearch.server.grpc.SearchResponse.Hit.FieldValue.Vector;
 import com.yelp.nrtsearch.server.grpc.SearchResponse.Hit.FieldValue.Vector.Builder;
-import com.yelp.nrtsearch.server.luceneserver.geo.GeoPoint;
-import com.yelp.nrtsearch.server.luceneserver.vector.ByteVectorType;
-import com.yelp.nrtsearch.server.luceneserver.vector.FloatVectorType;
+import com.yelp.nrtsearch.server.vector.ByteVectorType;
+import com.yelp.nrtsearch.server.vector.FloatVectorType;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.FloatBuffer;

diff --git a/...er/luceneserver/doc/SegmentDocLookup.java → ...rtsearch/server/doc/SegmentDocLookup.java b/...er/luceneserver/doc/SegmentDocLookup.java → ...rtsearch/server/doc/SegmentDocLookup.java
@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.doc;
+package com.yelp.nrtsearch.server.doc;
 
-import com.yelp.nrtsearch.server.luceneserver.field.FieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.IndexableFieldDef;
+import com.yelp.nrtsearch.server.field.FieldDef;
+import com.yelp.nrtsearch.server.field.IndexableFieldDef;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.HashMap;

diff --git a/...er/luceneserver/doc/SharedDocContext.java → ...rtsearch/server/doc/SharedDocContext.java b/...er/luceneserver/doc/SharedDocContext.java → ...rtsearch/server/doc/SharedDocContext.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.doc;
+package com.yelp.nrtsearch.server.doc;
 
 import java.util.Map;
 

diff --git a/...luceneserver/facet/DrillSidewaysImpl.java → ...earch/server/facet/DrillSidewaysImpl.java b/...luceneserver/facet/DrillSidewaysImpl.java → ...earch/server/facet/DrillSidewaysImpl.java
@@ -13,25 +13,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.facet;
+package com.yelp.nrtsearch.server.facet;
 
 import com.google.protobuf.ProtocolStringList;
+import com.yelp.nrtsearch.server.doc.LoadedDocValues;
+import com.yelp.nrtsearch.server.field.DoubleFieldDef;
+import com.yelp.nrtsearch.server.field.FieldDef;
+import com.yelp.nrtsearch.server.field.FloatFieldDef;
+import com.yelp.nrtsearch.server.field.IndexableFieldDef;
+import com.yelp.nrtsearch.server.field.IntFieldDef;
+import com.yelp.nrtsearch.server.field.LongFieldDef;
+import com.yelp.nrtsearch.server.field.RuntimeFieldDef;
+import com.yelp.nrtsearch.server.field.VirtualFieldDef;
 import com.yelp.nrtsearch.server.grpc.Facet;
 import com.yelp.nrtsearch.server.grpc.NumericRangeType;
 import com.yelp.nrtsearch.server.grpc.SearchResponse.Diagnostics;
-import com.yelp.nrtsearch.server.luceneserver.doc.LoadedDocValues;
-import com.yelp.nrtsearch.server.luceneserver.field.DoubleFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.FieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.FloatFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.IndexableFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.IntFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.LongFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.RuntimeFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.VirtualFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
-import com.yelp.nrtsearch.server.luceneserver.index.ShardState;
-import com.yelp.nrtsearch.server.luceneserver.script.FacetScript;
-import com.yelp.nrtsearch.server.luceneserver.script.ScriptService;
+import com.yelp.nrtsearch.server.index.IndexState;
+import com.yelp.nrtsearch.server.index.ShardState;
+import com.yelp.nrtsearch.server.script.FacetScript;
+import com.yelp.nrtsearch.server.script.ScriptService;
 import com.yelp.nrtsearch.server.utils.ScriptParamsUtils;
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...rver/luceneserver/facet/FacetTopDocs.java → .../nrtsearch/server/facet/FacetTopDocs.java b/...rver/luceneserver/facet/FacetTopDocs.java → .../nrtsearch/server/facet/FacetTopDocs.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.facet;
+package com.yelp.nrtsearch.server.facet;
 
+import com.yelp.nrtsearch.server.doc.LoadedDocValues;
+import com.yelp.nrtsearch.server.field.FieldDef;
+import com.yelp.nrtsearch.server.field.IndexableFieldDef;
 import com.yelp.nrtsearch.server.grpc.Facet;
 import com.yelp.nrtsearch.server.grpc.FacetResult;
 import com.yelp.nrtsearch.server.grpc.SearchResponse.Diagnostics;
-import com.yelp.nrtsearch.server.luceneserver.doc.LoadedDocValues;
-import com.yelp.nrtsearch.server.luceneserver.field.FieldDef;
-import com.yelp.nrtsearch.server.luceneserver.field.IndexableFieldDef;
-import com.yelp.nrtsearch.server.luceneserver.index.IndexState;
+import com.yelp.nrtsearch.server.index.IndexState;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...server/facet/FilteredSSDVFacetCounts.java → ...server/facet/FilteredSSDVFacetCounts.java b/...server/facet/FilteredSSDVFacetCounts.java → ...server/facet/FilteredSSDVFacetCounts.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.facet;
+package com.yelp.nrtsearch.server.facet;
 
 import java.io.IOException;
 import java.util.Arrays;

diff --git a/...rver/luceneserver/field/AtomFieldDef.java → .../nrtsearch/server/field/AtomFieldDef.java b/...rver/luceneserver/field/AtomFieldDef.java → .../nrtsearch/server/field/AtomFieldDef.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.field;
+package com.yelp.nrtsearch.server.field;
 
-import static com.yelp.nrtsearch.server.luceneserver.analysis.AnalyzerCreator.hasAnalyzer;
+import static com.yelp.nrtsearch.server.analysis.AnalyzerCreator.hasAnalyzer;
 
+import com.yelp.nrtsearch.server.field.properties.Sortable;
 import com.yelp.nrtsearch.server.grpc.Field;
 import com.yelp.nrtsearch.server.grpc.SortType;
-import com.yelp.nrtsearch.server.luceneserver.field.properties.Sortable;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.core.KeywordAnalyzer;
 import org.apache.lucene.document.FieldType;

diff --git a/...eneserver/field/BindingValuesSources.java → ...ch/server/field/BindingValuesSources.java b/...eneserver/field/BindingValuesSources.java → ...ch/server/field/BindingValuesSources.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.field;
+package com.yelp.nrtsearch.server.field;
 
 import java.io.IOException;
 import java.util.Objects;

diff --git a/...r/luceneserver/field/BooleanFieldDef.java → ...tsearch/server/field/BooleanFieldDef.java b/...r/luceneserver/field/BooleanFieldDef.java → ...tsearch/server/field/BooleanFieldDef.java
@@ -13,16 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.field;
+package com.yelp.nrtsearch.server.field;
 
-import static com.yelp.nrtsearch.server.luceneserver.analysis.AnalyzerCreator.hasAnalyzer;
+import static com.yelp.nrtsearch.server.analysis.AnalyzerCreator.hasAnalyzer;
 
+import com.yelp.nrtsearch.server.doc.LoadedDocValues;
+import com.yelp.nrtsearch.server.field.properties.TermQueryable;
 import com.yelp.nrtsearch.server.grpc.FacetType;
 import com.yelp.nrtsearch.server.grpc.Field;
 import com.yelp.nrtsearch.server.grpc.SearchResponse;
 import com.yelp.nrtsearch.server.grpc.TermInSetQuery;
-import com.yelp.nrtsearch.server.luceneserver.doc.LoadedDocValues;
-import com.yelp.nrtsearch.server.luceneserver.field.properties.TermQueryable;
 import java.io.IOException;
 import java.util.List;
 import org.apache.lucene.document.*;

diff --git a/...eserver/field/ContextSuggestFieldDef.java → .../server/field/ContextSuggestFieldDef.java b/...eserver/field/ContextSuggestFieldDef.java → .../server/field/ContextSuggestFieldDef.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.field;
+package com.yelp.nrtsearch.server.field;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.yelp.nrtsearch.server.analysis.AnalyzerCreator;
 import com.yelp.nrtsearch.server.grpc.Field;
-import com.yelp.nrtsearch.server.luceneserver.analysis.AnalyzerCreator;
-import com.yelp.nrtsearch.server.luceneserver.suggest.ContextSuggestFieldData;
+import com.yelp.nrtsearch.server.suggest.ContextSuggestFieldData;
 import java.util.List;
 import java.util.Optional;
 import org.apache.lucene.analysis.Analyzer;

diff --git a/.../luceneserver/field/DateTimeFieldDef.java → ...search/server/field/DateTimeFieldDef.java b/.../luceneserver/field/DateTimeFieldDef.java → ...search/server/field/DateTimeFieldDef.java
@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.field;
+package com.yelp.nrtsearch.server.field;
 
-import static com.yelp.nrtsearch.server.luceneserver.analysis.AnalyzerCreator.hasAnalyzer;
+import static com.yelp.nrtsearch.server.analysis.AnalyzerCreator.hasAnalyzer;
 
+import com.yelp.nrtsearch.server.doc.LoadedDocValues;
+import com.yelp.nrtsearch.server.field.properties.RangeQueryable;
+import com.yelp.nrtsearch.server.field.properties.Sortable;
 import com.yelp.nrtsearch.server.grpc.*;
 import com.yelp.nrtsearch.server.grpc.Field;
-import com.yelp.nrtsearch.server.luceneserver.doc.LoadedDocValues;
-import com.yelp.nrtsearch.server.luceneserver.field.properties.RangeQueryable;
-import com.yelp.nrtsearch.server.luceneserver.field.properties.Sortable;
 import java.io.IOException;
 import java.time.Instant;
 import java.time.LocalDateTime;

diff --git a/...er/luceneserver/field/DoubleFieldDef.java → ...rtsearch/server/field/DoubleFieldDef.java b/...er/luceneserver/field/DoubleFieldDef.java → ...rtsearch/server/field/DoubleFieldDef.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.field;
+package com.yelp.nrtsearch.server.field;
 
+import com.yelp.nrtsearch.server.doc.LoadedDocValues;
 import com.yelp.nrtsearch.server.grpc.Field;
 import com.yelp.nrtsearch.server.grpc.RangeQuery;
 import com.yelp.nrtsearch.server.grpc.SearchResponse;
-import com.yelp.nrtsearch.server.luceneserver.doc.LoadedDocValues;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.LongToDoubleFunction;

diff --git a/...h/server/luceneserver/field/FieldDef.java → ...yelp/nrtsearch/server/field/FieldDef.java b/...h/server/luceneserver/field/FieldDef.java → ...yelp/nrtsearch/server/field/FieldDef.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.field;
+package com.yelp.nrtsearch.server.field;
 
 import java.io.Closeable;
 

diff --git a/.../luceneserver/field/FieldDefBindings.java → ...search/server/field/FieldDefBindings.java b/.../luceneserver/field/FieldDefBindings.java → ...search/server/field/FieldDefBindings.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.yelp.nrtsearch.server.luceneserver.field;
+package com.yelp.nrtsearch.server.field;
 
-import com.yelp.nrtsearch.server.luceneserver.field.properties.Bindable;
+import com.yelp.nrtsearch.server.field.properties.Bindable;
 import java.util.function.Function;
 import org.apache.lucene.expressions.Bindings;
 import org.apache.lucene.expressions.js.VariableContext;