Fixing merge conflict.

philterd · Dec 13, 2024 · 5f7f645 · 5f7f645
2 parents 59727ed + d274b12
commit 5f7f645
Show file tree

Hide file tree

Showing 22 changed files with 236 additions and 10 deletions.
diff --git a/philter-api/pom.xml b/philter-api/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>ai.philterd</groupId>
 		<artifactId>philter</artifactId>
-		<version>3.0.0</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>philter-api</artifactId>
 	<name>philter-api</name>

diff --git a/philter-api/src/main/java/ai/philterd/philter/api/controllers/AbstractController.java b/philter-api/src/main/java/ai/philterd/philter/api/controllers/AbstractController.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.api.controllers;
 
 import org.apache.logging.log4j.LogManager;

diff --git a/philter-api/src/main/java/ai/philterd/philter/api/controllers/AlertingApiController.java b/philter-api/src/main/java/ai/philterd/philter/api/controllers/AlertingApiController.java
@@ -1,18 +1,34 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.api.controllers;
 
 import ai.philterd.phileas.model.exceptions.api.BadRequestException;
 import ai.philterd.phileas.model.objects.Alert;
 import ai.philterd.phileas.model.services.FilterService;
-import ai.philterd.philter.api.controllers.AbstractController;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.io.IOException;
 import java.util.List;
 
 @Controller

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
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.api.controllers;
 
 import ai.philterd.phileas.model.enums.MimeType;

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
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.api.controllers;
 
 import ai.philterd.phileas.model.enums.MimeType;

diff --git a/philter-api/src/main/java/ai/philterd/philter/api/controllers/PoliciesApiController.java b/philter-api/src/main/java/ai/philterd/philter/api/controllers/PoliciesApiController.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.api.controllers;
 
 import ai.philterd.phileas.model.exceptions.api.BadRequestException;

diff --git a/philter-api/src/main/java/ai/philterd/philter/api/controllers/StatusApiController.java b/philter-api/src/main/java/ai/philterd/philter/api/controllers/StatusApiController.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.api.controllers;
 
 import ai.philterd.phileas.model.configuration.PhileasConfiguration;

diff --git a/philter-api/src/main/java/ai/philterd/philter/api/exceptions/RestApiExceptions.java b/philter-api/src/main/java/ai/philterd/philter/api/exceptions/RestApiExceptions.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.api.exceptions;
 
 import ai.philterd.phileas.model.exceptions.InvalidPolicyException;

diff --git a/philter-api/src/main/java/ai/philterd/philter/api/model/ResponseSpan.java b/philter-api/src/main/java/ai/philterd/philter/api/model/ResponseSpan.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.api.model;
 
 import ai.philterd.phileas.model.objects.Span;

diff --git a/philter-api/src/main/java/ai/philterd/philter/api/security/X509Authenticator.java b/philter-api/src/main/java/ai/philterd/philter/api/security/X509Authenticator.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.api.security;
 
 import ai.philterd.philter.api.controllers.PoliciesApiController;

diff --git a/philter-app/pom.xml b/philter-app/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>ai.philterd</groupId>
 		<artifactId>philter</artifactId>
-		<version>3.0.0</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>philter-app</artifactId>
 	<packaging>jar</packaging>

diff --git a/philter-app/src/main/java/ai/philterd/philter/PhilterApplication.java b/philter-app/src/main/java/ai/philterd/philter/PhilterApplication.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter;
 
 import ai.philterd.phileas.model.configuration.PhileasConfiguration;

diff --git a/philter-configuration/pom.xml b/philter-configuration/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>philter</artifactId>
     <groupId>ai.philterd</groupId>
-    <version>3.0.0</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>philter-configuration</artifactId>
   <name>philter-configuration</name>

diff --git a/philter-configuration/src/main/java/ai/philterd/philter/PhilterConfiguration.java b/philter-configuration/src/main/java/ai/philterd/philter/PhilterConfiguration.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter;
 
 import java.io.FileReader;

diff --git a/philter-metrics/pom.xml b/philter-metrics/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>philter</artifactId>
     <groupId>ai.philterd</groupId>
-    <version>3.0.0</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>philter-metrics</artifactId>
   <name>philter-metrics</name>

diff --git a/philter-services/pom.xml b/philter-services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>philter</artifactId>
     <groupId>ai.philterd</groupId>
-    <version>3.0.0</version>
+    <version>3.1.0-SNAPSHOT</version>
   </parent>
   <artifactId>philter-services</artifactId>
   <name>philter-services</name>

diff --git a/philter-services/src/main/java/ai/philterd/philter/services/PhilterService.java b/philter-services/src/main/java/ai/philterd/philter/services/PhilterService.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.services;
 
 import ai.philterd.phileas.metrics.PhilterMetricsService;

diff --git a/philter-ui/pom.xml b/philter-ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>ai.philterd</groupId>
 		<artifactId>philter</artifactId>
-		<version>3.0.0</version>
+		<version>3.1.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>philter-ui</artifactId>
 	<name>philter-ui</name>

diff --git a/philter-ui/src/main/java/ai/philterd/philter/ui/PhilterUiApplication.java b/philter-ui/src/main/java/ai/philterd/philter/ui/PhilterUiApplication.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.ui;
 
 import ai.philterd.philter.PhilterClient;

diff --git a/philter-ui/src/main/java/ai/philterd/philter/ui/controllers/PhilterUiController.java b/philter-ui/src/main/java/ai/philterd/philter/ui/controllers/PhilterUiController.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.ui.controllers;
 
 import ai.philterd.philter.PhilterClient;

diff --git a/philter-ui/src/main/java/ai/philterd/philter/ui/domain/Policy.java b/philter-ui/src/main/java/ai/philterd/philter/ui/domain/Policy.java
@@ -1,3 +1,18 @@
+/*
+ *     Copyright 2024 Philterd, LLC @ https://www.philterd.ai
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package ai.philterd.philter.ui.domain;
 
 public class Policy {

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <artifactId>philter</artifactId>
     <groupId>ai.philterd</groupId>
     <packaging>pom</packaging>
-    <version>3.0.0</version>
+    <version>3.1.0-SNAPSHOT</version>
     <name>philter</name>
     <url>https://www.philterd.ai</url>
     <description>Philter identifies and removes sensitive information in natural language text.</description>