migrate translation services API

Author: yoadsn

.classpath

@@ -12,7 +12,7 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>

README.md

@@ -1,6 +1,6 @@
-#Tongues - Translation plugin for Bukkit MC server
+#Tongues - Translation plugin for Bukkit/Spigot MC server
 
-Tongues implements real time translation support for messages between players and extends the basic chat services to include other useful features. Currently only the Bing translation API as the translation service.
+Tongues implements real time translation support for messages between players and extends the basic chat services to include other useful features. Currently uses the Azure cognitive services text translation API.
 
 This is quite a stable version, any issues or feature requests are welcome!
 
@@ -158,6 +158,9 @@ The config.yml file can configure the following for chat logging:
 
 ##Latest Changes
 
+Since 1.5:
+- Migrated translation services to the new Azure cognitive text translation API. This is a beaking change and the comfiguration must change to include a valid subscription key for the new translation services.
+
 Since 1.4:
 - Groups administration commands partially implemented (missing list, save, reload commands)
 

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>org.gamesforpeace</groupId>
 	<artifactId>TonguesPlugin</artifactId>
-	<version>1.4</version>
+	<version>1.5</version>
 	<packaging>jar</packaging>
 
 	<name>TonguesPlugin</name>
@@ -33,10 +33,9 @@
 			<version>1.7.9-R0.2</version>
 		</dependency>
 		<dependency>
-			<groupId>com.memetix</groupId>
-			<artifactId>microsoft-translator-java-api</artifactId>
-			<version>0.6.2</version>
-			<type>jar</type>
+  			<groupId>io.github.firemaples</groupId>
+  			<artifactId>microsoft-translator-java-api</artifactId>
+  			<version>0.8.3</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
@@ -71,7 +70,7 @@
 					<minimizeJar>true</minimizeJar>
 					<artifactSet>
 						<includes>
-							<include>com.memetix:microsoft-translator-java-api</include>
+							<include>io.github.firemaples:microsoft-translator-java-api</include>
 							<include>com.google.code.gson:gson</include>
 							<include>com.logentries:logentries-appender</include>
 						</includes>
@@ -86,8 +85,8 @@
 						<configuration>
 							<relocations>
 								<relocation>
-									<pattern>com.memetix</pattern>
-									<shadedPattern>org.gamesforpeace.memetix</shadedPattern>
+									<pattern>io.github.firemaples</pattern>
+									<shadedPattern>org.gamesforpeace.firemaples</shadedPattern>
 								</relocation>
 								<relocation>
 									<pattern>com.google.code.gson</pattern>

src/main/java/org/gamesforpeace/tongues/TonguesPlugin.java

@@ -43,7 +43,7 @@ public void onEnable(){
 		saveDefaultConfig();
 
 		//getLogger().fine("Using Bing Translation authentication values -> ClientID:" + getConfig().getString("bingTranslation.clientID") + " SecretKey:" + getConfig().getString("bingTranslation.secretKey"));
-		Translator translator = new BingTranslator(getConfig().getString("bingTranslation.clientID"), getConfig().getString("bingTranslation.secretKey"));
+		Translator translator = new BingTranslator(getConfig().getString("bingTranslation.subscriptionKey"));
 
 		langStore = new ConcurrentPlayerLanguageStore(translator.getSupportedLanguages(),  translator.getDefaultLanguage());
 

src/main/java/org/gamesforpeace/tongues/translation/BingTranslator.java

@@ -5,21 +5,19 @@
 
 import org.apache.commons.lang.Validate;
 
-import com.memetix.mst.language.Language;
-import com.memetix.mst.translate.Translate;
+import io.github.firemaples.language.Language;
+import io.github.firemaples.translate.Translate;
 
 public class BingTranslator implements Translator{
 
 	private final HashSet<String> supportedLanguages;
 
-	public BingTranslator(String clientID, String secretKey) {
+	public BingTranslator(String subscriptionKey) {
 
-		Validate.notEmpty(clientID);
-		Validate.notEmpty(secretKey);
+		Validate.notEmpty(subscriptionKey);
 
 		// Setup the translator service.
-		Translate.setClientId(clientID);
-		Translate.setClientSecret(secretKey);
+		Translate.setSubscriptionKey(subscriptionKey);
 
 		// Populate supported languages list
 		supportedLanguages = new HashSet<String>();

src/main/resources/config.yml

@@ -1,6 +1,5 @@
 bingTranslation:
-  clientID: replace_with_your_client_id
-  secretKey: replace_with_your_secret_key
+  subscriptionKey: replace_with_your_client_id
 chatLogging:
   file:
     enabled: true