From da0209de012e335f244f7248ed7d111fbd7a2bdb Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Mon, 7 Dec 2020 10:18:56 +0200
Subject: [PATCH] Remove trademark from Java binding package names

---
 native_client/java/Makefile                               | 2 +-
 native_client/java/app/build.gradle                       | 2 +-
 .../org/mozilla/deepspeech/ExampleInstrumentedTest.java   | 4 ++--
 native_client/java/app/src/main/AndroidManifest.xml       | 2 +-
 .../java/org/mozilla/deepspeech/DeepSpeechActivity.java   | 4 ++--
 .../test/java/org/mozilla/deepspeech/ExampleUnitTest.java | 2 +-
 native_client/java/libdeepspeech/build.gradle             | 4 ++--
 .../deepspeech/libdeepspeech/test/BasicTest.java          | 8 ++++----
 .../java/libdeepspeech/src/main/AndroidManifest.xml       | 2 +-
 .../deepspeech/libdeepspeech/DeepSpeechModel.java         | 2 +-
 .../libdeepspeech/DeepSpeechStreamingState.java           | 2 +-
 .../deepspeech/libdeepspeech_doc/CandidateTranscript.java | 2 +-
 .../libdeepspeech_doc/DeepSpeech_Error_Codes.java         | 2 +-
 .../deepspeech/libdeepspeech_doc/Metadata.java            | 2 +-
 .../{mozilla => }/deepspeech/libdeepspeech_doc/README.rst | 2 +-
 .../deepspeech/libdeepspeech_doc/TokenMetadata.java       | 2 +-
 .../deepspeech/libdeepspeech/ExampleUnitTest.java         | 2 +-
 17 files changed, 23 insertions(+), 23 deletions(-)
 rename native_client/java/libdeepspeech/src/androidTest/java/org/{mozilla => }/deepspeech/libdeepspeech/test/BasicTest.java (95%)
 rename native_client/java/libdeepspeech/src/main/java/org/{mozilla => }/deepspeech/libdeepspeech/DeepSpeechModel.java (99%)
 rename native_client/java/libdeepspeech/src/main/java/org/{mozilla => }/deepspeech/libdeepspeech/DeepSpeechStreamingState.java (85%)
 rename native_client/java/libdeepspeech/src/main/java/org/{mozilla => }/deepspeech/libdeepspeech_doc/CandidateTranscript.java (97%)
 rename native_client/java/libdeepspeech/src/main/java/org/{mozilla => }/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java (98%)
 rename native_client/java/libdeepspeech/src/main/java/org/{mozilla => }/deepspeech/libdeepspeech_doc/Metadata.java (97%)
 rename native_client/java/libdeepspeech/src/main/java/org/{mozilla => }/deepspeech/libdeepspeech_doc/README.rst (51%)
 rename native_client/java/libdeepspeech/src/main/java/org/{mozilla => }/deepspeech/libdeepspeech_doc/TokenMetadata.java (97%)
 rename native_client/java/libdeepspeech/src/test/java/org/{mozilla => }/deepspeech/libdeepspeech/ExampleUnitTest.java (88%)

diff --git a/native_client/java/Makefile b/native_client/java/Makefile
index 191b1013..90493621 100644
--- a/native_client/java/Makefile
+++ b/native_client/java/Makefile
@@ -28,4 +28,4 @@ maven-bundle: apk
 	$(GRADLE) zipMavenArtifacts
 
 bindings: clean ds-swig
-	$(DS_SWIG_ENV) swig -c++ -java -package org.mozilla.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i
+	$(DS_SWIG_ENV) swig -c++ -java -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/ -o jni/deepspeech_wrap.cpp jni/deepspeech.i
diff --git a/native_client/java/app/build.gradle b/native_client/java/app/build.gradle
index c1aed496..3b5b124a 100644
--- a/native_client/java/app/build.gradle
+++ b/native_client/java/app/build.gradle
@@ -4,7 +4,7 @@ android {
     compileSdkVersion 27
 
     defaultConfig {
-        applicationId "org.mozilla.deepspeech"
+        applicationId "org.deepspeech"
         minSdkVersion 21
         targetSdkVersion 27
         versionName androidGitVersion.name()
diff --git a/native_client/java/app/src/androidTest/java/org/mozilla/deepspeech/ExampleInstrumentedTest.java b/native_client/java/app/src/androidTest/java/org/mozilla/deepspeech/ExampleInstrumentedTest.java
index 6c3e7f91..ea6458a1 100644
--- a/native_client/java/app/src/androidTest/java/org/mozilla/deepspeech/ExampleInstrumentedTest.java
+++ b/native_client/java/app/src/androidTest/java/org/mozilla/deepspeech/ExampleInstrumentedTest.java
@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech;
+package org.deepspeech;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("org.mozilla.deepspeech", appContext.getPackageName());
+        assertEquals("org.deepspeech", appContext.getPackageName());
     }
 }
diff --git a/native_client/java/app/src/main/AndroidManifest.xml b/native_client/java/app/src/main/AndroidManifest.xml
index 0702cc10..668ef13f 100644
--- a/native_client/java/app/src/main/AndroidManifest.xml
+++ b/native_client/java/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.deepspeech">
+    package="org.deepspeech">
 
     <application
         android:allowBackup="true"
diff --git a/native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java b/native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java
index d82de3a1..22a15ba6 100644
--- a/native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java
+++ b/native_client/java/app/src/main/java/org/mozilla/deepspeech/DeepSpeechActivity.java
@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech;
+package org.deepspeech;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
@@ -16,7 +16,7 @@ import java.io.IOException;
 import java.nio.ByteOrder;
 import java.nio.ByteBuffer;
 
-import org.mozilla.deepspeech.libdeepspeech.DeepSpeechModel;
+import org.deepspeech.libdeepspeech.DeepSpeechModel;
 
 public class DeepSpeechActivity extends AppCompatActivity {
 
diff --git a/native_client/java/app/src/test/java/org/mozilla/deepspeech/ExampleUnitTest.java b/native_client/java/app/src/test/java/org/mozilla/deepspeech/ExampleUnitTest.java
index a2bc1c83..a40f0582 100644
--- a/native_client/java/app/src/test/java/org/mozilla/deepspeech/ExampleUnitTest.java
+++ b/native_client/java/app/src/test/java/org/mozilla/deepspeech/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech;
+package org.deepspeech;
 
 import org.junit.Test;
 
diff --git a/native_client/java/libdeepspeech/build.gradle b/native_client/java/libdeepspeech/build.gradle
index ab5bc310..40177a9f 100644
--- a/native_client/java/libdeepspeech/build.gradle
+++ b/native_client/java/libdeepspeech/build.gradle
@@ -46,7 +46,7 @@ android {
 
     // Avoid scanning libdeepspeech_doc
     sourceSets {
-        main.java.srcDirs = [ 'src/main/java/org/mozilla/deepspeech/libdeepspeech/' ]
+        main.java.srcDirs = [ 'src/main/java/org/deepspeech/libdeepspeech/' ]
     }
 }
 
@@ -77,7 +77,7 @@ uploadArchives {
         mavenDeployer {
             pom.packaging  = 'aar'
             pom.name       = 'libdeepspeech'
-            pom.groupId    = 'org.mozilla.deepspeech'
+            pom.groupId    = 'org.deepspeech'
             pom.artifactId = 'libdeepspeech'
             pom.version    = dsVersionString + (project.hasProperty('snapshot') ? '-SNAPSHOT' : '')
 
diff --git a/native_client/java/libdeepspeech/src/androidTest/java/org/mozilla/deepspeech/libdeepspeech/test/BasicTest.java b/native_client/java/libdeepspeech/src/androidTest/java/org/deepspeech/libdeepspeech/test/BasicTest.java
similarity index 95%
rename from native_client/java/libdeepspeech/src/androidTest/java/org/mozilla/deepspeech/libdeepspeech/test/BasicTest.java
rename to native_client/java/libdeepspeech/src/androidTest/java/org/deepspeech/libdeepspeech/test/BasicTest.java
index 9381f1aa..f77236ab 100644
--- a/native_client/java/libdeepspeech/src/androidTest/java/org/mozilla/deepspeech/libdeepspeech/test/BasicTest.java
+++ b/native_client/java/libdeepspeech/src/androidTest/java/org/deepspeech/libdeepspeech/test/BasicTest.java
@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech.test;
+package org.deepspeech.libdeepspeech.test;
 
 import android.content.Context;
 import android.support.test.InstrumentationRegistry;
@@ -11,8 +11,8 @@ import org.junit.runners.MethodSorters;
 
 import static org.junit.Assert.*;
 
-import org.mozilla.deepspeech.libdeepspeech.DeepSpeechModel;
-import org.mozilla.deepspeech.libdeepspeech.CandidateTranscript;
+import org.deepspeech.libdeepspeech.DeepSpeechModel;
+import org.deepspeech.libdeepspeech.CandidateTranscript;
 
 import java.io.RandomAccessFile;
 import java.io.FileNotFoundException;
@@ -54,7 +54,7 @@ public class BasicTest {
         // Context of the app under test.
         Context appContext = InstrumentationRegistry.getTargetContext();
 
-        assertEquals("org.mozilla.deepspeech.libdeepspeech.test", appContext.getPackageName());
+        assertEquals("org.deepspeech.libdeepspeech.test", appContext.getPackageName());
     }
 
     @Test
diff --git a/native_client/java/libdeepspeech/src/main/AndroidManifest.xml b/native_client/java/libdeepspeech/src/main/AndroidManifest.xml
index 478a7b83..060fb7ae 100644
--- a/native_client/java/libdeepspeech/src/main/AndroidManifest.xml
+++ b/native_client/java/libdeepspeech/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.mozilla.deepspeech.libdeepspeech" />
+    package="org.deepspeech.libdeepspeech" />
diff --git a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/DeepSpeechModel.java b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechModel.java
similarity index 99%
rename from native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/DeepSpeechModel.java
rename to native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechModel.java
index ce313d20..5fd85b52 100644
--- a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/DeepSpeechModel.java
+++ b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechModel.java
@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * @brief Exposes a DeepSpeech model in Java
diff --git a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/DeepSpeechStreamingState.java b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechStreamingState.java
similarity index 85%
rename from native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/DeepSpeechStreamingState.java
rename to native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechStreamingState.java
index 9bced254..cd9aafe4 100644
--- a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech/DeepSpeechStreamingState.java
+++ b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech/DeepSpeechStreamingState.java
@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 public final class DeepSpeechStreamingState {
     private SWIGTYPE_p_StreamingState _sp;
diff --git a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/CandidateTranscript.java b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/CandidateTranscript.java
similarity index 97%
rename from native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/CandidateTranscript.java
rename to native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/CandidateTranscript.java
index 72dc0f1f..53a0ef64 100644
--- a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/CandidateTranscript.java
+++ b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/CandidateTranscript.java
@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * A single transcript computed by the model, including a confidence<br>
diff --git a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java
similarity index 98%
rename from native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java
rename to native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java
index 3fad4553..0a05439d 100644
--- a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java
+++ b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/DeepSpeech_Error_Codes.java
@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 public enum DeepSpeech_Error_Codes {
   ERR_OK(0x0000),
diff --git a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/Metadata.java b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/Metadata.java
similarity index 97%
rename from native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/Metadata.java
rename to native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/Metadata.java
index 9ef25e1e..b85fc82e 100644
--- a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/Metadata.java
+++ b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/Metadata.java
@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * An array of CandidateTranscript objects computed by the model.
diff --git a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/README.rst b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/README.rst
similarity index 51%
rename from native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/README.rst
rename to native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/README.rst
index bd89f9b8..0181ab31 100644
--- a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/README.rst
+++ b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/README.rst
@@ -8,4 +8,4 @@ To update, please install SWIG (4.0 at least) and then run from native_client/ja
 
 .. code-block::
 
-   swig -c++ -java -doxygen -package org.mozilla.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i
+   swig -c++ -java -doxygen -package org.deepspeech.libdeepspeech -outdir libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc -o jni/deepspeech_wrap.cpp jni/deepspeech.i
diff --git a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/TokenMetadata.java b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/TokenMetadata.java
similarity index 97%
rename from native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/TokenMetadata.java
rename to native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/TokenMetadata.java
index 6f976f21..45ed9052 100644
--- a/native_client/java/libdeepspeech/src/main/java/org/mozilla/deepspeech/libdeepspeech_doc/TokenMetadata.java
+++ b/native_client/java/libdeepspeech/src/main/java/org/deepspeech/libdeepspeech_doc/TokenMetadata.java
@@ -6,7 +6,7 @@
  * the SWIG interface file instead.
  * ----------------------------------------------------------------------------- */
 
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 /**
  * Stores text of an individual token, along with its timing information
diff --git a/native_client/java/libdeepspeech/src/test/java/org/mozilla/deepspeech/libdeepspeech/ExampleUnitTest.java b/native_client/java/libdeepspeech/src/test/java/org/deepspeech/libdeepspeech/ExampleUnitTest.java
similarity index 88%
rename from native_client/java/libdeepspeech/src/test/java/org/mozilla/deepspeech/libdeepspeech/ExampleUnitTest.java
rename to native_client/java/libdeepspeech/src/test/java/org/deepspeech/libdeepspeech/ExampleUnitTest.java
index 793cbf71..862d6bd0 100644
--- a/native_client/java/libdeepspeech/src/test/java/org/mozilla/deepspeech/libdeepspeech/ExampleUnitTest.java
+++ b/native_client/java/libdeepspeech/src/test/java/org/deepspeech/libdeepspeech/ExampleUnitTest.java
@@ -1,4 +1,4 @@
-package org.mozilla.deepspeech.libdeepspeech;
+package org.deepspeech.libdeepspeech;
 
 import org.junit.Test;