Merge branch 'master' into dependabot/maven/com.fasterxml.jackson.core-jackson-core-2.20.0

Author: tfmorris

module/scripts/index/commons-importing-controller.js

@@ -1,22 +1,4 @@
-//Internationalization init
-var lang = navigator.language.split("-")[0]
-		|| navigator.userLanguage.split("-")[0];
-var dictionary = "";
-$.ajax({
-	url : "command/core/load-language?",
-	type : "POST",
-	async : false,
-	data : {
-	  module : "commons",
-//		lang : lang
-	},
-	success : function(data) {
-		dictionary = data['dictionary'];
-                lang = data['lang'];
-	}
-});
-$.i18n().load(dictionary, lang);
-// End internationalization
+I18NUtil.init("commons");
 
 Refine.CommonsImportingController = function(createProjectUI) {
   this._createProjectUI = createProjectUI;

module/styles/commons-importing-controller.less

@@ -26,7 +26,6 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-@import-less url("theme.less");
 
 .commons-panel {
   margin-bottom: 2em;
@@ -89,8 +88,8 @@ table.parsing-options-table {
 
 .commons-importing-wizard-header {
   font-size: 1.3em;
-  background: @chrome_primary;
-  padding: @padding_tight;
+  background: var(--chrome-primary);
+  padding: var(--padding-tight);
   }
 
 .commons-importing-parsing-data-panel {
@@ -112,7 +111,7 @@ table.parsing-options-table {
   font-size: 1.3em;
   position: absolute;
   overflow: auto;
-  border-top: 5px solid @chrome_primary;
+  border-top: 5px solid var(--chrome-primary);
   background: white;
-  padding: @padding_looser;
+  padding: var(--padding-looser);
   }

module/styles/theme.less

@@ -4,7 +4,7 @@
 
   <groupId>org.openrefine.extensions</groupId>
   <artifactId>refine-commons-extension</artifactId>
-  <version>0.1.4-SNAPSHOT</version>
+  <version>0.1.5-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>OpenRefine - Commons extension</name>
@@ -20,9 +20,9 @@
   </licenses>
 
   <properties>
-    <openrefine.version>3.9.2</openrefine.version>
-    <jackson.version>2.20.0</jackson.version>
-    <wdtk.version>0.12.1-SNAPSHOT</wdtk.version>
+    <openrefine.version>3.9.5</openrefine.version>
+    <jackson.version>2.18.3</jackson.version>
+    <wdtk.version>0.17.0</wdtk.version>
     <swc-parser-lazy.version>3.1.9</swc-parser-lazy.version>
     <surefire.version>3.5.3</surefire.version>
   </properties>
@@ -36,8 +36,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.14.0</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
           <encoding>UTF-8</encoding>
           <showDeprecation>false</showDeprecation>
         </configuration>
@@ -80,7 +80,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clean-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.5.0</version>
         <configuration>
           <filesets>
             <fileset>
@@ -132,13 +132,13 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openrefine.dependencies.wdtk</groupId>
+      <groupId>org.wikidata.wdtk</groupId>
       <artifactId>wdtk-datamodel</artifactId>
       <version>${wdtk.version}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.openrefine.dependencies.wdtk</groupId>
+      <groupId>org.wikidata.wdtk</groupId>
       <artifactId>wdtk-util</artifactId>
       <version>${wdtk.version}</version>
       <scope>provided</scope>

pom.xml

@@ -43,7 +43,7 @@ public FileFetcher(String apiUrl, String categoryName, boolean subcategories) {
      */
     public void getCallResults(String category) throws IOException {
 
-        OkHttpClient client = new OkHttpClient.Builder().build();
+        OkHttpClient client = HttpClient.getClient();
         urlBase = HttpUrl.parse(apiUrl).newBuilder()
                 .addQueryParameter("action", "query")
                 .addQueryParameter("list", "categorymembers")

src/main/java/org/openrefine/extensions/commons/importer/FileFetcher.java

@@ -0,0 +1,35 @@
+package org.openrefine.extensions.commons.importer;
+
+import java.io.IOException;
+
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+
+public class HttpClient {
+
+    private static final String USER_AGENT = "OpenRefine-Commons-Extension/0.1.* (https://github.com/OpenRefine/CommonsExtension)";
+
+    public static OkHttpClient getClient() {
+        OkHttpClient client = new OkHttpClient.Builder().addInterceptor(new UserAgentInterceptor(USER_AGENT)).build();
+        return client;
+    }
+
+    static class UserAgentInterceptor implements Interceptor {
+
+        private final String userAgent;
+
+        public UserAgentInterceptor(String userAgent) {
+            this.userAgent = userAgent;
+        }
+
+        @Override
+        public Response intercept(Chain chain) throws IOException {
+            return chain.proceed(chain.request().newBuilder()
+                    .header("User-Agent", userAgent)
+                    .build());
+        }
+    }
+    private static OkHttpClient client;
+}

src/main/java/org/openrefine/extensions/commons/importer/HttpClient.java

@@ -60,7 +60,7 @@ public List<List<String>> getRelatedCategories(List <FileRecord> fileRecordOrigi
         while (titlesIndex < fileRecordOriginal.size()) {
             titles += "|" + fileRecordOriginal.get(titlesIndex++).fileName;
         }
-        OkHttpClient client = new OkHttpClient.Builder().build();
+        OkHttpClient client = HttpClient.getClient();
         HttpUrl urlRelatedCategoriesBase = HttpUrl.parse(apiUrl).newBuilder()
                 .addQueryParameter("action", "query")
                 .addQueryParameter("prop", "categories")