Eng 7185 danone aem connector aem cloud sdk compatability

core/pom.xml

@@ -19,16 +19,20 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.adobe.granite.translation.connector</groupId>
-        <artifactId>bootstrap-connector</artifactId>
-        <version>2.0-SNAPSHOT</version>
+        <artifactId>lilt-connector</artifactId>
+        <version>1.0.2</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>bootstrap-connector.core</artifactId>
+    <artifactId>lilt-connector.core</artifactId>
     <packaging>bundle</packaging>
     <name>Bootstrap Translation Connector - Core</name>
     <description>Core bundle for Bootstrap Translation Connector</description>
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
             <plugin>
                 <groupId>org.apache.sling</groupId>
                 <artifactId>maven-sling-plugin</artifactId>
@@ -55,6 +59,10 @@
 
     <dependencies>
         <!-- OSGi Dependencies -->
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>osgi.core</artifactId>
@@ -82,21 +90,31 @@
         </dependency>
         <dependency>
             <groupId>com.adobe.aem</groupId>
-            <artifactId>uber-jar</artifactId>
-            <classifier>apis</classifier>
+            <artifactId>aem-sdk-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.models.api</artifactId>
             <version>1.1.0</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpclient</artifactId>
+        </dependency>
+        <dependency>
+          <groupId>com.google.code.gson</groupId>
+          <artifactId>gson</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.adobe.granite.translation</groupId>
             <artifactId>bootstrap-tms.core</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/../ui.apps/src/main/content/jcr_root/apps/bootstrap-connector/install/bootstrap-tms.core-2.0-SNAPSHOT.jar</systemPath>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

core/repository/com/adobe/granite/translation/bootstrap-tms.core/4.0/bootstrap-tms.core-4.0.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.adobe.granite.translation</groupId>
+  <artifactId>bootstrap-tms.core</artifactId>
+  <version>4.0</version>
+  <description>POM was created from install:install-file</description>
+</project>

core/repository/com/adobe/granite/translation/bootstrap-tms.core/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>com.adobe.granite.translation</groupId>
+  <artifactId>bootstrap-tms.core</artifactId>
+  <versioning>
+    <release>4.0</release>
+    <versions>
+      <version>4.0</version>
+    </versions>
+    <lastUpdated>20200730102223</lastUpdated>
+  </versioning>
+</metadata>

core/src/main/java/com/adobe/granite/translation/connector/bootstrap/core/BootstrapTranslationCloudConfig.java

@@ -15,16 +15,16 @@
 
 public interface BootstrapTranslationCloudConfig {
 
-    public static final String PROPERTY_DUMMY_SERVER_URL = "dummyserverurl";
-    public static final String PROPERTY_DUMMY_CONFIG_ID = "dummyconfigid";
+    public static final String PROPERTY_LILT_SERVER_URL = "liltserverurl";
+    public static final String PROPERTY_LILT_CONFIG_ID = "liltconfigid";
     public static final String PROPERTY_PREVIEW_PATH = "previewPath";
 
-    public static final String RESOURCE_TYPE = "bootstrap-connector/components/bootstrap-connector-cloudconfig";
-    public static final String ROOT_PATH = "/etc/cloudservices/bootstrap-translation";
+    public static final String RESOURCE_TYPE = "cq/translation/components/mt-cloudconfig";
+    public static final String ROOT_PATH = "/etc/cloudservices/lilt-translation";
 
-    String getDummyServerUrl();
+    String getLiltServerUrl();
 
-    String getDummyConfigId();
+    String getLiltConfigId();
 
     String getPreviewPath();
-}
+}

core/src/main/java/com/adobe/granite/translation/connector/bootstrap/core/impl/BootstrapConstants.java

@@ -17,6 +17,9 @@ public class BootstrapConstants {
 
 	/** The Constant EXPORT_FORMAT_XLIFF_2_0. */
 	public static final String EXPORT_FORMAT_XLIFF_2_0 = "xliff_2.0";
+
+	/** The Constant EXPORT JSON  */
+	public static final String EXPORT_FORMAT_JSON = "json";
 
 	/** The Constant PREVIEW_ENABLED. */
 	public static final String PREVIEW_ENABLED = "preview.enabled";

core/src/main/java/com/adobe/granite/translation/connector/bootstrap/core/impl/BootstrapServiceConfiguration.java

@@ -9,7 +9,7 @@
 public @interface BootstrapServiceConfiguration {
 
 	@AttributeDefinition(name = "Bootstrap Translation Factory Name", description = "The Unique ID associated with this Translation Factory Connector")
-	String getTranslationFactory() default "Bootstrap Connector";
+	String getTranslationFactory() default "Lilt Connector";
 
 	@AttributeDefinition(name = "Enable Preview", description="Preview Enabled for Translation Objects")
 	boolean isPreviewEnabled() default false;
@@ -19,7 +19,8 @@
 
 	@AttributeDefinition(name = "Export Format", description = "Number values", options = { @Option(label = "XML", value = BootstrapConstants.EXPORT_FORMAT_XML),
 			@Option(label = "XLIFF 1.2", value = BootstrapConstants.EXPORT_FORMAT_XLIFF_1_2),
-			@Option(label = "XLIFF 2.0", value = BootstrapConstants.EXPORT_FORMAT_XLIFF_2_0)})
+			@Option(label = "XLIFF 2.0", value = BootstrapConstants.EXPORT_FORMAT_XLIFF_2_0),
+			@Option(label = "JSON", value = BootstrapConstants.EXPORT_FORMAT_JSON)})
 	String getExportFormat() default BootstrapConstants.EXPORT_FORMAT_XML;
 
-}
+}

core/src/main/java/com/adobe/granite/translation/connector/bootstrap/core/impl/BootstrapTranslationServiceFactoryImpl.java

@@ -17,6 +17,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Collections;
 
 import org.osgi.framework.Constants;
 import org.osgi.service.component.annotations.Activate;
@@ -35,7 +36,13 @@
 import com.adobe.granite.translation.api.TranslationServiceFactory;
 import com.adobe.granite.translation.bootstrap.tms.core.BootstrapTmsService;
 import com.adobe.granite.translation.connector.bootstrap.core.BootstrapTranslationCloudConfig;
+import com.adobe.granite.translation.connector.bootstrap.core.impl.config.BootstrapTranslationCloudConfigImpl;
+import com.adobe.granite.translation.connector.bootstrap.core.impl.LiltApiClient;
 import com.adobe.granite.translation.core.TranslationCloudConfigUtil;
+import org.apache.sling.api.resource.ResourceResolverFactory;
+import org.apache.sling.api.resource.Resource;
+import org.apache.sling.api.resource.ResourceResolver;
+import org.apache.sling.api.resource.LoginException;
 
 @Component(service = TranslationServiceFactory.class, immediate = true, configurationPid = "com.adobe.granite.translation.connector.bootstrap.core.impl.BootstrapTranslationServiceFactoryImpl", property = {
 		Constants.SERVICE_DESCRIPTION + "=Configurable settings for the Bootstrap Translation connector",
@@ -61,20 +68,21 @@ public class BootstrapTranslationServiceFactoryImpl implements TranslationServic
 	@Reference
 	CryptoSupport cryptoSupport;
 
+	@Reference
+	private ResourceResolverFactory resolverFactory;
+
 	@Reference
 	BootstrapTmsService bootstrapTmsService;
 
 	private List<TranslationMethod> supportedTranslationMethods;
 
 	private BootstrapServiceConfiguration config;
 
-
 	public BootstrapTranslationServiceFactoryImpl() {
 		log.trace("BootstrapTranslationServiceFactoryImpl.");
 
 		supportedTranslationMethods = new ArrayList<TranslationMethod>();
 		supportedTranslationMethods.add(TranslationMethod.HUMAN_TRANSLATION);
-		supportedTranslationMethods.add(TranslationMethod.MACHINE_TRANSLATION);
 	}
 
 	private static final Logger log = LoggerFactory.getLogger(BootstrapTranslationServiceFactoryImpl.class);
@@ -84,26 +92,41 @@ public TranslationService createTranslationService(TranslationMethod translation
 			throws TranslationException {
 		log.trace("BootstrapTranslationServiceFactoryImpl.createTranslationService");
 
-		BootstrapTranslationCloudConfig bootstrapCloudConfg = (BootstrapTranslationCloudConfig) cloudConfigUtil
-				.getCloudConfigObjectFromPath(BootstrapTranslationCloudConfig.class, cloudConfigPath);
 
-		String dummyConfigId = "";
-		String dummyServerUrl = "";
+		BootstrapTranslationCloudConfig bootstrapCloudConfg = null;
+		LiltApiClient liltApiClient = null;
+
+		String liltConfigId = "";
+		String liltServerUrl = "";
 		String previewPath = "";
 
+    try {
+      Map<String, Object> param = new HashMap<String, Object>();
+      param.put(ResourceResolverFactory.SUBSERVICE, "bootstrap-service");
+      ResourceResolver resourceResolver = resolverFactory.getServiceResourceResolver(param);
+      Resource res = resourceResolver.getResource(cloudConfigPath);
+      bootstrapCloudConfg = (BootstrapTranslationCloudConfig) cloudConfigUtil
+        .getCloudConfigObjectFromPath(res, BootstrapTranslationCloudConfig.class, cloudConfigPath);
+      if (res != null) {
+        bootstrapCloudConfg = new BootstrapTranslationCloudConfigImpl(res);
+      }
+    } catch (LoginException e) {
+      log.error("Error while resolving config resource {}", e);
+    }
+
 		if (bootstrapCloudConfg != null) {
-			dummyConfigId = bootstrapCloudConfg.getDummyConfigId();
-			dummyServerUrl = bootstrapCloudConfg.getDummyServerUrl();
+			liltConfigId = bootstrapCloudConfg.getLiltConfigId();
+			liltServerUrl = bootstrapCloudConfg.getLiltServerUrl();
 			previewPath = bootstrapCloudConfg.getPreviewPath();
-
+			liltApiClient = new LiltApiClient(liltServerUrl, liltConfigId);
 		}
 
 		if (cryptoSupport != null) {
 			try {
-				if (cryptoSupport.isProtected(dummyConfigId)) {
-					dummyConfigId = cryptoSupport.unprotect(dummyConfigId);
+				if (cryptoSupport.isProtected(liltConfigId)) {
+					liltConfigId = cryptoSupport.unprotect(liltConfigId);
 				} else {
-					log.trace("Dummy Config ID is not protected");
+					log.trace("Lilt Config ID is not protected");
 				}
 			} catch (CryptoException e) {
 				log.error("Error while decrypting the client secret {}", e);
@@ -113,8 +136,8 @@ public TranslationService createTranslationService(TranslationMethod translation
 		Map<String, String> availableLanguageMap = new HashMap<String, String>();
 		Map<String, String> availableCategoryMap = new HashMap<String, String>();
 		return new BootstrapTranslationServiceImpl(availableLanguageMap, availableCategoryMap, factoryName,
-				isPreviewEnabled, isPseudoLocalizationDisabled, exportFormat, dummyConfigId, dummyServerUrl,
-				previewPath, translationConfig, bootstrapTmsService);
+				isPreviewEnabled, isPseudoLocalizationDisabled, exportFormat, liltConfigId, liltServerUrl,
+        previewPath, translationConfig, liltApiClient, cloudConfigPath);
 	}
 
 	@Override