Merge pull request #18 from philterd/17-remove-lucene

Removing Lucene for changes in philterd/phileas#176.
philterd · Dec 26, 2024 · 82aaecc · 82aaecc
2 parents d274b12 + 2e86865
commit 82aaecc
Show file tree

Hide file tree

Showing 46 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile.philter b/Dockerfile.philter
@@ -5,12 +5,10 @@ ARG PHILTER_VERSION
 RUN apt-get update && apt-get -y install openjdk-17-jre
 
 RUN mkdir -p /opt/philter/ssl \
-    && mkdir -p /opt/philter/indexes \
     && mkdir -p /opt/philter/policies
 
 COPY ./README.md /opt/philter/
 COPY ./LICENSE.txt /opt/philter/
-COPY ./distribution/indexes /opt/philter/indexes/
 COPY ./distribution/policies /opt/philter/policies/
 COPY ./distribution/philter.properties /opt/philter/
 

diff --git a/distribution/indexes/cities/_0.cfe b/distribution/indexes/cities/_0.cfe
diff --git a/distribution/indexes/cities/_0.cfs b/distribution/indexes/cities/_0.cfs
diff --git a/distribution/indexes/cities/_0.si b/distribution/indexes/cities/_0.si
diff --git a/distribution/indexes/cities/segments_2 b/distribution/indexes/cities/segments_2
diff --git a/distribution/indexes/cities/write.lock b/distribution/indexes/cities/write.lock
diff --git a/distribution/indexes/counties/_0.cfe b/distribution/indexes/counties/_0.cfe
diff --git a/distribution/indexes/counties/_0.cfs b/distribution/indexes/counties/_0.cfs
diff --git a/distribution/indexes/counties/_0.si b/distribution/indexes/counties/_0.si
diff --git a/distribution/indexes/counties/segments_1 b/distribution/indexes/counties/segments_1
diff --git a/distribution/indexes/counties/segments_2 b/distribution/indexes/counties/segments_2
diff --git a/distribution/indexes/counties/write.lock b/distribution/indexes/counties/write.lock
diff --git a/distribution/indexes/hospital-abbreviations/_0.cfe b/distribution/indexes/hospital-abbreviations/_0.cfe
diff --git a/distribution/indexes/hospital-abbreviations/_0.cfs b/distribution/indexes/hospital-abbreviations/_0.cfs
diff --git a/distribution/indexes/hospital-abbreviations/_0.si b/distribution/indexes/hospital-abbreviations/_0.si
diff --git a/distribution/indexes/hospital-abbreviations/segments_1 b/distribution/indexes/hospital-abbreviations/segments_1
diff --git a/distribution/indexes/hospital-abbreviations/segments_2 b/distribution/indexes/hospital-abbreviations/segments_2
diff --git a/distribution/indexes/hospital-abbreviations/write.lock b/distribution/indexes/hospital-abbreviations/write.lock
diff --git a/distribution/indexes/hospitals/_0.cfe b/distribution/indexes/hospitals/_0.cfe
diff --git a/distribution/indexes/hospitals/_0.cfs b/distribution/indexes/hospitals/_0.cfs
diff --git a/distribution/indexes/hospitals/_0.si b/distribution/indexes/hospitals/_0.si
diff --git a/distribution/indexes/hospitals/segments_2 b/distribution/indexes/hospitals/segments_2
diff --git a/distribution/indexes/hospitals/write.lock b/distribution/indexes/hospitals/write.lock
diff --git a/distribution/indexes/names/_0.cfe b/distribution/indexes/names/_0.cfe
diff --git a/distribution/indexes/names/_0.cfs b/distribution/indexes/names/_0.cfs
diff --git a/distribution/indexes/names/_0.si b/distribution/indexes/names/_0.si
diff --git a/distribution/indexes/names/segments_2 b/distribution/indexes/names/segments_2
diff --git a/distribution/indexes/names/write.lock b/distribution/indexes/names/write.lock
diff --git a/distribution/indexes/states/_0.cfe b/distribution/indexes/states/_0.cfe
diff --git a/distribution/indexes/states/_0.cfs b/distribution/indexes/states/_0.cfs
diff --git a/distribution/indexes/states/_0.si b/distribution/indexes/states/_0.si
diff --git a/distribution/indexes/states/segments_1 b/distribution/indexes/states/segments_1
diff --git a/distribution/indexes/states/segments_2 b/distribution/indexes/states/segments_2
diff --git a/distribution/indexes/states/write.lock b/distribution/indexes/states/write.lock
diff --git a/distribution/indexes/surnames/_2.fdt b/distribution/indexes/surnames/_2.fdt
diff --git a/distribution/indexes/surnames/_2.fdx b/distribution/indexes/surnames/_2.fdx
diff --git a/distribution/indexes/surnames/_2.fnm b/distribution/indexes/surnames/_2.fnm
diff --git a/distribution/indexes/surnames/_2.si b/distribution/indexes/surnames/_2.si
diff --git a/distribution/indexes/surnames/_2_Lucene50_0.doc b/distribution/indexes/surnames/_2_Lucene50_0.doc
diff --git a/distribution/indexes/surnames/_2_Lucene50_0.tim b/distribution/indexes/surnames/_2_Lucene50_0.tim
diff --git a/distribution/indexes/surnames/_2_Lucene50_0.tip b/distribution/indexes/surnames/_2_Lucene50_0.tip
diff --git a/distribution/indexes/surnames/segments_2 b/distribution/indexes/surnames/segments_2
diff --git a/distribution/indexes/surnames/write.lock b/distribution/indexes/surnames/write.lock
diff --git a/philter-api/src/main/java/ai/philterd/philter/api/controllers/ExplainApiController.java b/philter-api/src/main/java/ai/philterd/philter/api/controllers/ExplainApiController.java
@@ -52,7 +52,7 @@ public ExplainApiController(FilterService filterService, Gson gson) {
 			final FilterResponse response = filterService.filter(policies, context, documentId, body, MimeType.TEXT_PLAIN);
 
 		return ResponseEntity.status(HttpStatus.OK)
-				.header("x-document-id", response.documentId())
+				.header("x-document-id", response.getDocumentId())
 				.contentType(MediaType.APPLICATION_JSON)
 				.body(gson.toJson(response));
 

diff --git a/philter-api/src/main/java/ai/philterd/philter/api/controllers/FilterApiController.java b/philter-api/src/main/java/ai/philterd/philter/api/controllers/FilterApiController.java
@@ -95,8 +95,8 @@ public FilterApiController(FilterService filterService) {
 		final FilterResponse response = filterService.filter(policies, context, documentId, body, MimeType.TEXT_PLAIN);
 
 		return ResponseEntity.status(HttpStatus.OK)
-				.header("x-document-id", response.documentId())
-				.body(response.filteredText());
+				.header("x-document-id", response.getDocumentId())
+				.body(response.getFilteredText());
 
 	}
 

diff --git a/pom.xml b/pom.xml
@@ -93,10 +93,12 @@
         <junit.version>4.13.2</junit.version>
         <micrometer.version>1.13.3</micrometer.version>
         <mockito.version>1.10.19</mockito.version>
-        <phileas.version>2.9.1</phileas.version>
+        <phileas.version>2.10.0-SNAPSHOT</phileas.version>
         <philter.sdk.version>1.4.0</philter.sdk.version>
         <spring.boot.version>3.3.1</spring.boot.version>
         <spring.version>6.1.10</spring.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
     </properties>
     <build>
         <pluginManagement>