From 9a72e2be6ac922038522facf69b609cf593e1f4c Mon Sep 17 00:00:00 2001
From: Chad Johnson <chad@seearejay.com>
Date: Fri, 25 Feb 2022 12:33:00 -0700
Subject: [PATCH] Removed defaultAcl configuration. Updated dependencies.
 Updated jar file assembly (file name). Support for per-search-application
 synonyms.

---
 bin/run-synonyms-connector.sh                          |  2 +-
 bin/schema/dictionary-entry-schema.json                |  9 +++++++++
 pom.xml                                                | 10 +++++-----
 .../gcs/connector/synonyms/SynonymsRepository.java     |  4 ++++
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/bin/run-synonyms-connector.sh b/bin/run-synonyms-connector.sh
index 83b153d..58e3572 100755
--- a/bin/run-synonyms-connector.sh
+++ b/bin/run-synonyms-connector.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 java \
-    -cp ./lib/sadasystems-gcs-synonyms-connector-1.0-withlib.jar \
+    -cp ./lib/sadasystems-gcs-synonyms-connector-1.0-jar-with-dependencies.jar \
     com.sadasystems.gcs.connector.synonyms.SynonymsConnector \
     -Dconfig=./properties/synonyms-connector.properties \
     -Djava.util.logging.config.file=./properties/logging.properties
diff --git a/bin/schema/dictionary-entry-schema.json b/bin/schema/dictionary-entry-schema.json
index 30badeb..1f06128 100644
--- a/bin/schema/dictionary-entry-schema.json
+++ b/bin/schema/dictionary-entry-schema.json
@@ -20,6 +20,15 @@
               "operatorName": "not_used"
             }
           }
+        },
+        {
+          "name": "_onlyApplicableForAttachedSearchApplications",
+          "isRepeatable": false,
+          "booleanPropertyOptions": {
+            "operatorOptions": {
+              "operatorName": "not_used"
+            }
+          }
         }
       ]
     }
diff --git a/pom.xml b/pom.xml
index 977fd81..8499897 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,9 +58,9 @@
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>
                     </descriptorRefs>
-                    <finalName>${project.artifactId}-${project.version}-withlib</finalName>
+                    <finalName>${project.artifactId}-${project.version}</finalName>
                     <outputDirectory>${project.basedir}/bin/lib</outputDirectory>
-                    <appendAssemblyId>false</appendAssemblyId>
+                    <appendAssemblyId>true</appendAssemblyId>
                 </configuration>
                 <executions>
                     <execution>
@@ -133,12 +133,12 @@
         <dependency>
             <groupId>com.google.enterprise.cloudsearch</groupId>
             <artifactId>google-cloudsearch-indexing-connector-sdk</artifactId>
-            <version>v1-0.0.3</version>
+            <version>v1-0.0.5</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.6</version>
+            <version>2.11.0</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-csv</artifactId>
-            <version>1.4</version>
+            <version>1.8</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/com/sadasystems/gcs/connector/synonyms/SynonymsRepository.java b/src/main/java/com/sadasystems/gcs/connector/synonyms/SynonymsRepository.java
index 501ef20..243aa5c 100644
--- a/src/main/java/com/sadasystems/gcs/connector/synonyms/SynonymsRepository.java
+++ b/src/main/java/com/sadasystems/gcs/connector/synonyms/SynonymsRepository.java
@@ -41,9 +41,11 @@ public class SynonymsRepository implements Repository {
 
     private static final String SYNONYMS_FILE_PATH = "synonymsFile.path";
     private static final String SYNONYMS_FILE_URL = "synonymsFile.url";
+    public static final String ONLY_APPLICABLE_FOR_ATTACHED_SEARCH_APPLICATIONS = "onlyApplicableForAttachedSearchApplications";
 
     private String synonymsFilePath;
     private String synonymsFileUrl;
+    private boolean onlyApplicableForAttachedSearchApplications;
 
     public SynonymsRepository() {
     }
@@ -54,6 +56,7 @@ public void init(RepositoryContext context) throws RepositoryException {
 
         synonymsFilePath = Configuration.getString(SYNONYMS_FILE_PATH, "").get();
         synonymsFileUrl = Configuration.getString(SYNONYMS_FILE_URL, "").get();
+        onlyApplicableForAttachedSearchApplications = Configuration.getBoolean(ONLY_APPLICABLE_FOR_ATTACHED_SEARCH_APPLICATIONS, false).get();
     }
 
 
@@ -136,6 +139,7 @@ private ApiOperation buildDocument(CSVRecord record) {
         Multimap<String, Object> structuredData = ArrayListMultimap.create();
         structuredData.put("_term", term);
         structuredData.putAll("_synonym", synonyms);
+        structuredData.put("_onlyApplicableForAttachedSearchApplications", onlyApplicableForAttachedSearchApplications);
 
         String itemName = String.format("dictionary/%s", term);