{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6229", "base_commit": "fe25b5d7db3347f1a29a8cc483ad9b2cf1eec5f9", "patch": "diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml\nindex 59375016a..2ed919c1b 100644\n--- a/extensions/gdata/pom.xml\n+++ b/extensions/gdata/pom.xml\n@@ -84,7 +84,7 @@\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-drive</artifactId>\n-      <version>v3-rev20231120-2.0.0</version>\n+      <version>v3-rev20231128-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.google.apis</groupId>\ndiff --git a/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java b/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java\nindex 353d3a3f5..a54c8eaf8 100644\n--- a/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java\n+++ b/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java\n@@ -22,7 +22,7 @@ public class FileNameScrutinizer extends EditScrutinizer {\n     // see https://commons.wikimedia.org/wiki/Commons:File_naming\n     public static final int maxFileNameBytes = 240;\n     public static final Pattern forbiddenFileNameChars = Pattern.compile(\n-            \".*([^ %!\\\"$&'()*,\\\\-./\\\\d:;=?@\\\\p{L}\\\\p{Mc}\\\\\\\\^_`~\\\\x80-\\\\xFF+]|%[0-9A-Fa-f]{2}|&[A-Za-z0-9\\\\x80-\\\\xff]+;|&#[0-9]+;|&#x[0-9A-Fa-f]+;).*\");\n+            \".*([^ %!\\\"$&'()*,\\\\-./\\\\d:;=?@\\\\p{L}\\\\p{M}\\\\p{N}\\\\\\\\^_`~\\\\x80-\\\\xFF+]|%[0-9A-Fa-f]{2}|&[A-Za-z0-9\\\\x80-\\\\xff]+;|&#[0-9]+;|&#x[0-9A-Fa-f]+;).*\");\n \n     public static final String duplicateFileNamesInBatchType = \"duplicate-file-names-in-batch\";\n     public static final String fileNamesAlreadyExistOnWikiType = \"file-names-already-exist-on-wiki\";\n@@ -98,7 +98,7 @@ public class FileNameScrutinizer extends EditScrutinizer {\n             // Invalid characters\n             Matcher matcher = forbiddenFileNameChars.matcher(fileName);\n             if (matcher.matches()) {\n-                QAWarning issue = new QAWarning(invalidCharactersInFileNameType, null, QAWarning.Severity.CRITICAL,\n+                QAWarning issue = new QAWarning(invalidCharactersInFileNameType, null, QAWarning.Severity.IMPORTANT,\n                         1);\n                 issue.setProperty(\"example_filename\", fileName);\n                 issue.setProperty(\"invalid_character\", matcher.group(1));\ndiff --git a/refine b/refine\nindex 58cdda042..08c9208d4 100755\n--- a/refine\n+++ b/refine\n@@ -42,17 +42,18 @@ Options\n     --jmx                         Enable JMX monitoring.\n \n Actions\n+    run                           Run OpenRefine [default].\n     build                         Build OpenRefine.\n     clean                         Clean compiled classes.\n-    dist <version>                Make all distributions.\n+    test                          Run all tests.\n     extensions_test               Run the extensions tests.\n-    linux_dist <version>          Make Linux binary distribution.\n-    mac_dist <version>            Make MacOSX binary distribution.\n-    run                           Run OpenRefine [default].\n     server_test                   Run the server tests.\n-    test                          Run all tests.\n-    e2e_tests                      Run the e2e tests.\n+    e2e_tests                     Run the e2e tests.\n+    lint                          Reformat the source code according to OpenRefine's conventions.\n+    mac_dist <version>            Make MacOS binary distribution.\n     windows_dist <version>        Make Windows binary distribution.\n+    linux_dist <version>          Make Linux binary distribution.\n+    dist <version>                Make all distributions.\n EOF\n exit 1\n }\n@@ -244,6 +245,13 @@ do_mvn() {\n \n # ----------------------------------------------------------------------------------------------\n \n+lint() {\n+    mvn_prepare\n+    \"$MVN\" formatter:format impsort:sort\n+}\n+\n+# ----------------------------------------------------------------------------------------------\n+\n dist() {\n     get_version $1\n     build_prepare\n@@ -720,12 +728,13 @@ case \"$ACTION\" in\n   clean) do_mvn clean;;\n   test) test $1;;\n   tests) test $1;;\n-  e2e_tests) e2e_tests;;    \n+  e2e_tests) e2e_tests;;\n   server_test) server_test $1;;  \n   server_tests) server_test $1;;  \n   extensions_test) extensions_test $1;;\n   extensions_tests) extensions_test $1;;\n   run) run;;\n+  lint) lint;;\n   mac_dist) mac_dist $1;;\n   windows_dist) windows_dist $1;;\n   linux_dist) linux_dist $1;;\ndiff --git a/refine.bat b/refine.bat\nindex ef9361f6f..3e6768dfd 100644\n--- a/refine.bat\n+++ b/refine.bat\n@@ -48,6 +48,7 @@ echo     extensions_test         Run the extensions tests.\n echo     run                     Run OpenRefine.\n echo     server_test             Run the server tests.\n echo     test                    Run all the tests.\n+echo     lint                    Reformat the source code according to OpenRefine's conventions.\n goto :eof\n \n \n@@ -190,6 +191,7 @@ if \"\"%ACTION%\"\" == \"\"build\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"server_test\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"extensions_test\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"test\"\" goto doMvn\n+if \"\"%ACTION%\"\" == \"\"lint\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"clean\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"run\"\" goto doRun\n if \"\"%ACTION%\"\" == \"\"\"\" goto doRun\n@@ -270,6 +272,12 @@ set MVN_ACTION=compile test-compile dependency:build-classpath\n if \"\"%ACTION%\"\" == \"\"test\"\" set MVN_ACTION=test dependency:build-classpath\n if \"\"%ACTION%\"\" == \"\"server_test\"\" set MVN_ACTION=test -f main\n if \"\"%ACTION%\"\" == \"\"extensions_test\"\" set MVN_ACTION=test -f extensions\n+if \"\"%ACTION%\"\" == \"\"lint\"\" (\n+    set MVN_ACTION=formatter:format impsort:sort\n+    rem Skip the call to process-resources as it's not needed for this action\n+    goto :mvnCall\n+)\n call \"%MVN%\" process-resources\n+:mvnCall\n call \"%MVN%\" %MVN_ACTION%\n goto :eof\n", "test_patch": "diff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java\nindex abb1da6c4..5ced94b25 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java\n@@ -78,6 +78,16 @@ public class FileNameScrutinizerTest extends ScrutinizerTest {\n         assertNoWarningRaised();\n     }\n \n+    @Test\n+    public void testValidCharactersInFilenameNonAscii() {\n+        MediaInfoEdit edit = new MediaInfoEditBuilder(TestingData.newMidA)\n+                .addFileName(\"সমাচার দর্পণ - ৮ অক্টোবর ১৮৩৬.pdf\")\n+                .build();\n+\n+        scrutinize(edit);\n+        assertNoWarningRaised();\n+    }\n+\n     @Test()\n     public void testInvalidCharactersInFilenameTab() throws IOException, MediaWikiApiErrorException {\n         MediaInfoEdit edit = new MediaInfoEditBuilder(TestingData.newMidA)\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "This helps developers reformat their code according to our standards.\r\n\r\nCloses #6166.\r\n\r\nNot tested on Windows yet.\r\n", "PR_Title": "Add 'lint' option to refine(.bat) scripts", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6229_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6229, "issue_title": "Add 'lint' option to refine(.bat) scripts", "issue_body": "This helps developers reformat their code according to our standards.\r\n\r\nCloses #6166.\r\n\r\nNot tested on Windows yet.\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-5935", "base_commit": "82f649972268620de9d7fd912a695bb09692712a", "patch": "diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml\ndeleted file mode 100644\nindex 9780ee044..000000000\n--- a/.github/workflows/codeql.yml\n+++ /dev/null\n@@ -1,66 +0,0 @@\n-# For most projects, this workflow file will not need changing; you simply need\n-# to commit it to your repository.\n-#\n-# You may wish to alter this file to override the set of languages analyzed,\n-# or to provide custom queries or build logic.\n-#\n-# ******** NOTE ********\n-# We have attempted to detect the languages in your repository. Please check\n-# the `language` matrix defined below to confirm you have the correct set of\n-# supported CodeQL languages.\n-#\n-name: \"CodeQL\"\n-\n-on:\n-  push:\n-    branches: [ \"master\" ]\n-  pull_request:\n-    # The branches below must be a subset of the branches above\n-    branches: [ \"master\" ]\n-  schedule:\n-    - cron: '27 23 * * 6'\n-\n-jobs:\n-  analyze:\n-    name: Analyze\n-    runs-on: ubuntu-latest\n-    permissions:\n-      actions: read\n-      contents: read\n-      security-events: write\n-\n-    strategy:\n-      fail-fast: false\n-      matrix:\n-        language: [ 'java', 'javascript' ]\n-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]\n-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support\n-\n-    steps:\n-    - name: Checkout repository\n-      uses: actions/checkout@v3\n-\n-    # Initializes the CodeQL tools for scanning.\n-    - name: Initialize CodeQL\n-      uses: github/codeql-action/init@v2\n-      with:\n-        languages: ${{ matrix.language }}\n-        # If you wish to specify custom queries, you can do so here or in a config file.\n-        # By default, queries listed here will override any specified in a config file.\n-        # Prefix the list here with \"+\" to use these queries and those in the config file.\n-\n-        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs\n-        # queries: security-extended,security-and-quality\n-\n-    # ℹ️ Command-line programs to run using the OS shell.\n-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun\n-\n-    - name: Build\n-      run: |\n-        echo \"Run, Build Application using script\"\n-        ./refine build\n-\n-    - name: Perform CodeQL Analysis\n-      uses: github/codeql-action/analyze@v2\n-      with:\n-        category: \"/language:${{matrix.language}}\"\ndiff --git a/.github/workflows/codeql_java.yml b/.github/workflows/codeql_java.yml\nnew file mode 100644\nindex 000000000..752453665\n--- /dev/null\n+++ b/.github/workflows/codeql_java.yml\n@@ -0,0 +1,38 @@\n+name: \"CodeQL Java\"\n+\n+on:\n+  push:\n+    branches: [ \"master\" ]\n+    paths:\n+      - '**/*.java' # Only trigger the workflow if Java files have changed\n+  pull_request:\n+    branches: [ \"master\" ]\n+    paths:\n+      - '**/*.java'\n+\n+jobs:\n+  analyze:\n+    name: Analyze Java\n+    runs-on: ubuntu-latest\n+    permissions:\n+      actions: read\n+      contents: read\n+      security-events: write\n+\n+    steps:\n+      - name: Checkout repository\n+        uses: actions/checkout@v3\n+\n+      - name: Initialize CodeQL\n+        uses: github/codeql-action/init@v2\n+        with:\n+          languages: 'java'\n+\n+      - name: Build\n+        run: |\n+          ./refine build\n+\n+      - name: Perform CodeQL Analysis\n+        uses: github/codeql-action/analyze@v2\n+        with:\n+          category: \"/language:java\"\ndiff --git a/.github/workflows/codeql_javascript.yml b/.github/workflows/codeql_javascript.yml\nnew file mode 100644\nindex 000000000..644924576\n--- /dev/null\n+++ b/.github/workflows/codeql_javascript.yml\n@@ -0,0 +1,38 @@\n+name: \"CodeQL JavaScript\"\n+\n+on:\n+  push:\n+    branches: [ \"master\" ]\n+    paths:\n+      - '**/*.js' # Only trigger the workflow if JavaScript files have changed\n+  pull_request:\n+    branches: [ \"master\" ]\n+    paths:\n+      - '**/*.js'\n+\n+jobs:\n+  analyze:\n+    name: Analyze JavaScript\n+    runs-on: ubuntu-latest\n+    permissions:\n+      actions: read\n+      contents: read\n+      security-events: write\n+\n+    steps:\n+      - name: Checkout repository\n+        uses: actions/checkout@v3\n+\n+      - name: Initialize CodeQL\n+        uses: github/codeql-action/init@v2\n+        with:\n+          languages: 'javascript'\n+\n+      - name: Build\n+        run: |\n+          ./refine build\n+\n+      - name: Perform CodeQL Analysis\n+        uses: github/codeql-action/analyze@v2\n+        with:\n+          category: \"/language:javascript\"\ndiff --git a/.github/workflows/pull_request_server.yml b/.github/workflows/pull_request_server.yml\nindex 78ce4a7ff..3d5bd96b4 100644\n--- a/.github/workflows/pull_request_server.yml\n+++ b/.github/workflows/pull_request_server.yml\n@@ -47,7 +47,7 @@ jobs:\n   linux_server_tests:\n     strategy:\n       matrix:\n-        java: [ 11, 17 ]\n+        java: [ 11, 20 ]\n \n     runs-on: ubuntu-latest\n \n@@ -122,11 +122,11 @@ jobs:\n     steps:\n       - uses: actions/checkout@v3\n \n-      - name: Set up Java 17\n+      - name: Set up Java 20\n         uses: actions/setup-java@v3\n         with:\n           distribution: 'temurin'\n-          java-version: 17\n+          java-version: 20\n           cache: 'maven'\n \n       - name: Check Java linting\ndiff --git a/README.md b/README.md\nindex 6b7f2a921..570405b06 100644\n--- a/README.md\n+++ b/README.md\n@@ -33,7 +33,7 @@ If you have cloned this repository to your computer, you can run OpenRefine with\n * `./refine` on Mac OS and Linux\n * `refine.bat` on Windows\n \n-This requires [JDK 11](https://adoptium.net/), [Apache Maven](https://maven.apache.org/) and [NPM](https://www.npmjs.com/).\n+This requires [JDK 11](https://adoptium.net/) or newer, [Apache Maven](https://maven.apache.org/) and [NPM](https://www.npmjs.com/) 16 or newer.\n \n ## Documentation\n \ndiff --git a/benchmark/pom.xml b/benchmark/pom.xml\nindex 1419fcb65..c9f3cd13d 100644\n--- a/benchmark/pom.xml\n+++ b/benchmark/pom.xml\n@@ -121,7 +121,7 @@\n       <plugins>\n         <plugin>\n           <artifactId>maven-clean-plugin</artifactId>\n-          <version>3.2.0</version>\n+          <version>3.3.1</version>\n         </plugin>\n         <plugin>\n           <artifactId>maven-install-plugin</artifactId>\ndiff --git a/extensions/database/module/langs/translation-es.json b/extensions/database/module/langs/translation-es.json\nindex 0967ef424..fb253b914 100644\n--- a/extensions/database/module/langs/translation-es.json\n+++ b/extensions/database/module/langs/translation-es.json\n@@ -1,1 +1,64 @@\n-{}\n+{\n+    \"database-source/databaseHostPlaceholder\": \"Introduzca el dominio o la IP del servidor de base de datos\",\n+    \"database-parsing/preview-button\": \"Actualizar&nbsp;Vista previa\",\n+    \"database-source/databasePortLabel\": \"Puerto\",\n+    \"database-parsing/ignore-first\": \"ignorar primero\",\n+    \"database-import/title\": \"Servidores de base de datos\",\n+    \"database-import/creating\": \"Creando proyecto…\",\n+    \"database-import/importer-name\": \"Base de datos\",\n+    \"database-import/preparing\": \"Preparando el resultado …\",\n+    \"database-import/checking\": \"Validando consulta…\",\n+    \"database-source/alert-user\": \"Debe especificar un usuario para la de base de datos\",\n+    \"database-source/alert-port\": \"Debe especificar un puerto para la base de datos\",\n+    \"database-source/alert-host\": \"Debe especificar un host de base de datos\",\n+    \"database-source/alert-password\": \"Tienes que especificar una contraseña de base de datos\",\n+    \"database-source/alert-connection-name\": \"Debe especificar un nombre de conexión\",\n+    \"database-source/alert-invalid-query-keyword\": \"La consulta no puede contener palabras clave de manipulación de datos:\",\n+    \"database-source/alert-initial-database\": \"Debe especificar una base de datos inicial\",\n+    \"database-source/alert-query\": \"Debe especificar una consulta válida\",\n+    \"database-source/databaseFileNameLabel\": \"Archivo de base de datos\",\n+    \"database-source/connectionNamePlaceholder\": \"Introducir un Nombre de Conexión nuevo\",\n+    \"database-source/alert-invalid-query-select\": \"La consulta debe comenzar con la palabra clave SELECT\",\n+    \"database-source/form-validation-failure\": \"¡Nuevo formulario de conexión inválido!\",\n+    \"database-source/connectionNameLabel\": \"Nombre\",\n+    \"database-source/databaseTypeLabel\": \"Tipo\",\n+    \"database-source/alert-connection-edit\": \"Conexión editada\",\n+    \"database-source/databaseNameLabel\": \"Nombre de la base de datos\",\n+    \"database-source/databaseTestButton\": \"Prueba\",\n+    \"database-source/databaseConnectButton\": \"Conectar\",\n+    \"database-source/databaseUserLabel\": \"Usuario\",\n+    \"database-source/databasePasswordLabel\": \"Contraseña\",\n+    \"database-source/databaseHostLabel\": \"Host\",\n+    \"database-source/databaseSchemaLabel\": \"Esquema\",\n+    \"database-source/databaseUserPlaceholder\": \"Ingrese el usuario de la base de datos\",\n+    \"database-source/databasePortPlaceholder\": \"Introduzca el puerto de la base de datos, por ejemplo 3306\",\n+    \"database-source/databaseSchemaPlaceholder\": \"Ingrese el esquema inicial de la base de datos\",\n+    \"database-source/databasePasswordPlaceholder\": \"Ingrese la contraseña de la base de datos\",\n+    \"database-source/databaseNamePlaceholder\": \"Ingrese el nombre de la base de datos\",\n+    \"database-source/databaseFileNamePlaceholder\": \"Ingrese la ruta completa al archivo de la base de datos\",\n+    \"database-source/connectionNameDefaultValue\": \"Nombre_de_Conexión_Nueva\",\n+    \"database-source/databaseSaveButton\": \"Guardar\",\n+    \"database-source/new-connection-legend\": \"Nuevo Editor de Conexión\",\n+    \"database-source/newConnectionButtonDiv\": \"Nueva conexión\",\n+    \"database-parsing/start-over\": \"&laquo; Comenzar de nuevo\",\n+    \"database-parsing/conf-pars\": \"Configurar opciones de parsing\",\n+    \"database-source/savedConnectionSpan\": \"Conexiones guardadas\",\n+    \"database-parsing/proj-name\": \"Nombre del&nbsp;proyecto\",\n+    \"database-parsing/create-proj\": \"Crear Proyecto &raquo;\",\n+    \"database-parsing/option\": \"Opciones\",\n+    \"database-parsing/parse-next\": \"Analizar siguiente\",\n+    \"database-parsing/disable-auto-preview\": \"Deshabilitar vista previa automática\",\n+    \"database-parsing/worksheet\": \"Hojas de cálculo\",\n+    \"database-parsing/updating-preview\": \"Actualizando vista previa…\",\n+    \"database-parsing/ignore\": \"linea(s) al inicio del archivo\",\n+    \"database-parsing/discard-next\": \"Descartar el Inicial\",\n+    \"database-parsing/parse\": \"línea(s) como encabezados de columna\",\n+    \"database-parsing/store-cell\": \"Guardar las celdas en blanco como nulos\",\n+    \"database-parsing/discard\": \"Fila(s) de datos\",\n+    \"database-parsing/limit\": \"Fila(s) de datos\",\n+    \"database-parsing/store-row\": \"Almacenar filas vacías\",\n+    \"database-source/alert-conn-name-invalid-character\": \"Error al introducir el nombre de la conexión: Carácter ilegal en la entrada. Sólo se permite [a-zA-Z0-9._-]\",\n+    \"database-source/alert-db-host-invalid-character\": \"Error de host de base de datos: Carácter ilegal en la entrada. Sólo se permiten caracteres alfanuméricos\",\n+    \"database-source/alert-db-user-invalid-character\": \"Error en usuario de base de datos: Carácter ilegal en la entrada. Sólo se permiten caracteres alfanuméricos\",\n+    \"database-source/alert-db-port-invalid-character\": \"Error en el puerto de base de datos: Carácter ilegal en la entrada. Sólo se permiten valores numéricos.\"\n+}\ndiff --git a/extensions/wikibase/module/langs/translation-en.json b/extensions/wikibase/module/langs/translation-en.json\nindex 96eed2976..74ff926b8 100644\n--- a/extensions/wikibase/module/langs/translation-en.json\n+++ b/extensions/wikibase/module/langs/translation-en.json\n@@ -34,9 +34,8 @@\n     \"wikibase-addition/version-error\": \"Manifest version $1 is not supported. OpenRefine supports manifest versions 1.x and 2.x only.\",\n     \"wikibase-schema/dialog-header\": \"Align to Wikibase\",\n     \"wikibase-schema/target-wikibase-instance\": \"Target Wikibase instance:\",\n-    \"wikibase-schema/dialog-explanation\": \"The schema below specifies how your tabular data will be transformed into <a href=\\\"$1\\\">$2</a> edits.\",\n     \"wikibase-schema/start-from-an-existing-schema\": \"Start from an existing schema:\",\n-    \"wikibase-schema/save-new-schema\": \"Save new...\",\n+    \"wikibase-schema/save-new-schema\": \"Save schema changes\",\n     \"wikibase-schema/preview-explanation\": \"This tab shows the first edits (out of $1) that will be made once you upload the changes to <a href=\\\"$2\\\" target=\\\"_blank\\\">$3</a>. You can use facets to inspect the edits on particular items.\",\n     \"wikibase-schema/schema-tab-header\": \"Schema\",\n     \"wikibase-schema/warnings-tab-header\": \"Issues\",\n@@ -336,7 +335,7 @@\n     \"wikibase-save-schema-dialog/dialog-header\": \"Save schema\",\n     \"wikibase-save-schema-dialog/schema-name\": \"New schema name\",\n     \"wikibase-save-schema-dialog/existing-schema-label\": \"Or select an existing schema to override\",\n-    \"wikibase-save-schema-dialog/select-schema\": \"Select schema...\",\n+    \"wikibase-save-schema-dialog/select-schema\": \"Select...\",\n     \"wikibase-save-schema-dialog/save\": \"Save\",\n     \"wikibase-save-schema-dialog/empty-name\": \"Please provide a name for the schema.\",\n     \"wikibase-save-schema-dialog/manage-schemas\": \"Manage schemas…\",\ndiff --git a/extensions/wikibase/module/langs/translation-es.json b/extensions/wikibase/module/langs/translation-es.json\nindex 705e7c4e8..d1eb2871d 100644\n--- a/extensions/wikibase/module/langs/translation-es.json\n+++ b/extensions/wikibase/module/langs/translation-es.json\n@@ -234,5 +234,31 @@\n     \"wikibase-schema/mediainfo-wikitext-override\": \"Wikitext (anular):\",\n     \"wikibase-schema/mediainfo-wikitext-no-override\": \"Wikitexto (no anular):\",\n     \"wikibase-addition/manifest-paste-input\": \"JSON del manifiesto\",\n-    \"wikibase-addition/manifest-url-input\": \"URL del manifiesto\"\n+    \"wikibase-addition/manifest-url-input\": \"URL del manifiesto\",\n+    \"warnings-messages/invalid-item-subject/title\": \"Identificadores de asunto no válidos para la edición de un elemento\",\n+    \"wikibase-schema/add-caption\": \"añadir leyenda\",\n+    \"wikibase-schema/add-mediainfo-button\": \"Agregar medios\",\n+    \"wikibase-schema/some-value\": \"Algún valor\",\n+    \"wikibase-schema/no-value\": \"Ningún valor\",\n+    \"wikibase-schema/caption-if-new\": \"Leyenda (no anular)\",\n+    \"wikibase-schema/input-placeholder-for-wikibase-mediainfo\": \"Escriba el nombre de archivo o arrastre la columna reconciliada\",\n+    \"wikibase-schema/override-wikitext\": \"anular el wikitexto existente\",\n+    \"wikibase-schema/caption-override\": \"Leyenda (anular si está presente)\",\n+    \"wikibase-schema/input-placeholder-for-wikibase-item\": \"Escriba elemento o arrastre la columna reconciliada\",\n+    \"wikibase-schema/input-placeholder-for-wikibase-property\": \"Escriba la propiedad o arrastre la columna reconciliada\",\n+    \"wikibase-schema/input-placeholder-for-wikibase-lexeme\": \"escriba el lexema o arrastre la columna conciliada\",\n+    \"wikibase-schema/input-placeholder-for-wikibase-form\": \"Escriba el formulario o arrastre la columna conciliada\",\n+    \"wikibase-schema/entity-or-reconciled-column\": \"Escriba la entidad o arrastre la columna reconciliada aquí\",\n+    \"wikibase-schema/file-name-placeholder\": \"Nombre del archivo en la wiki\",\n+    \"wikibase-schema/wikitext-placeholder\": \"Wiki markup asociado al archivo\",\n+    \"wikibase-schema/invalid-schema-warning\": \"Su esquema está incompleto:\",\n+    \"wikibase-schema/file-path-placeholder\": \"Ruta absoluta o URL del archivo multimedia a cargar\",\n+    \"wikibase-schema/incompatible-site-iri-reconciled-column\": \"Esta columna se concilia con el espacio identificador $1, pero esta entrada requiere una columna conciliada con $2.\",\n+    \"warnings-messages/invalid-item-subject/body\": \"Los identificadores de entidad como <span class=\\\"wb-issue-preformat\\\">{ejemplo}</span> no pueden utilizarse como asunto para editar un elemento. El asunto debe ser un Qid.\",\n+    \"warnings-messages/invalid-mediainfo-subject/title\": \"Identificadores de asunto no válidos para la edición de un archivo multimedia\",\n+    \"warnings-messages/invalid-mediainfo-subject/body\": \"Los identificadores de entidad como <span class=\\\"wb-issue-preformat\\\">{example}</span> no se pueden usar como asunto para editar un archivo multimedia. El asunto debe ser un Qid.\",\n+    \"warnings-messages/invalid-entity-id-format/title\": \"Identificadores de entidad no válidos\",\n+    \"wikibase-schema/caption\": \"Leyenda\",\n+    \"wikibase-schema/empty-captions\": \"no se agregaron subtítulos\",\n+    \"wikibase-schema/configure-statement\": \"Configuración\"\n }\ndiff --git a/extensions/wikibase/module/scripts/schema-alignment-tab.html b/extensions/wikibase/module/scripts/schema-alignment-tab.html\nindex 3f2d7f8a4..b5b56dc14 100644\n--- a/extensions/wikibase/module/scripts/schema-alignment-tab.html\n+++ b/extensions/wikibase/module/scripts/schema-alignment-tab.html\n@@ -1,24 +1,27 @@\n <div id=\"schema-alignment-tab\">\n     <div bind=\"schemaHeader\">\n-        <p class=\"panel-explanation\"><label bind=\"targetWikibaseLabel\" for=\"wikibase-instance-selector\"></label> <select bind=\"wikibaseSelect\" name=\"wikibase-instance-selector\" id=\"wikibase-instance-selector\"></select></p>\n-        <p class=\"panel-explanation\" bind=\"dialogExplanation\"></p>\n-        <div class=\"panel-explanation\">\n-          <label bind=\"templateLabel\" for=\"wikibase-template-select\"></label>\n-          <select bind=\"templateSelect\" name=\"wikibase-template-select\" id=\"wikibase-template-select\"></select>\n-          <button bind=\"saveNewTemplateButton\" class=\"button button-primary\"></button>\n+        <div class=\"schema-alignment-tab-content\">\n+            <p class=\"panel-explanation\"><label bind=\"targetWikibaseLabel\" for=\"wikibase-instance-selector\"></label> <select bind=\"wikibaseSelect\" name=\"wikibase-instance-selector\" id=\"wikibase-instance-selector\"></select></p>\n+            <div class=\"panel-explanation float-apart\">\n+                <div>\n+                    <label bind=\"templateLabel\" for=\"wikibase-template-select\"></label>\n+                    <select bind=\"templateSelect\" name=\"wikibase-template-select\" id=\"wikibase-template-select\"></select>\n+                </div>\n+                <button bind=\"saveNewTemplateButton\" class=\"button button-primary\"></button>\n+            </div>\n         </div>\n         <div style=\"clear: right\"></div>\n         <div class=\"schema-alignment-dialog-columns-area\" bind=\"columnsArea\">\n         </div>\n     </div>\n-    <div class=\"schema-alignment-dialog-canvas\" bind=\"canvas\">\n-        <div class=\"schema-alignment-dialog-entity-edits-area\" bind=\"entityEditsArea\">\n-                <div id=\"schema-alignment-entity-edits-container\" bind=\"entityEditsContainer\">\n-                </div>\n-                <div id=\"schema-alignment-entity-add-buttons\" bind=\"entityAddButtons\">\n-                <div class=\"schema-alignment-save-buttons\">\n-                    <div class=\"schema-alignment-save\"><button class=\"button button-primary\" bind=\"saveButton\"></button></div>\n-                    <div class=\"schema-alignment-discard\"><button class=\"button button-primary\" bind=\"discardButton\"></button></div>\n+    <div class=\"schema-alignment-dialog-canvas schema-alignment-tab-content\" bind=\"canvas\">\n+        <div bind=\"entityEditsArea\">\n+            <div id=\"schema-alignment-entity-edits-container\" bind=\"entityEditsContainer\"></div>\n+            <div class=\"float-apart schema-alignment-footer\">\n+                <div id=\"schema-alignment-entity-add-buttons\" bind=\"entityAddButtons\"></div>\n+                <div>\n+                    <button class=\"button button-primary\" bind=\"saveButton\"></button>\n+                    <button class=\"button button-primary\" bind=\"discardButton\"></button>\n                 </div>\n             </div>\n         </div>\ndiff --git a/extensions/wikibase/module/scripts/schema-alignment.js b/extensions/wikibase/module/scripts/schema-alignment.js\nindex 6c8bfc84b..2f640ff3a 100644\n--- a/extensions/wikibase/module/scripts/schema-alignment.js\n+++ b/extensions/wikibase/module/scripts/schema-alignment.js\n@@ -120,9 +120,6 @@ SchemaAlignment._rerenderTabs = function() {\n   var schemaTab = $(DOM.loadHTML(\"wikidata\", \"scripts/schema-alignment-tab.html\")).appendTo(this._schemaPanel);\n   var schemaElmts = this._schemaElmts = DOM.bind(schemaTab);\n   schemaElmts.targetWikibaseLabel.text($.i18n('wikibase-schema/target-wikibase-instance'));\n-  schemaElmts.dialogExplanation.html($.i18n('wikibase-schema/dialog-explanation',\n-      WikibaseManager.getSelectedWikibaseMainPage(),\n-      WikibaseManager.getSelectedWikibaseName()));\n   let editableEntityTypes = WikibaseManager.getSelectedWikibaseEditableEntityTypes();\n   for (let entityType of editableEntityTypes) {\n     let addButton = $('<div></div>').addClass(\"wbs-toolbar\");\ndiff --git a/extensions/wikibase/module/styles/schema-alignment.css b/extensions/wikibase/module/styles/schema-alignment.css\nindex daea05d24..2b57f7205 100644\n--- a/extensions/wikibase/module/styles/schema-alignment.css\n+++ b/extensions/wikibase/module/styles/schema-alignment.css\n@@ -21,6 +21,10 @@\n   overflow: hidden;\n }\n \n+.schema-alignment-tab-content {\n+  max-width: 70em;\n+}\n+\n .main-view-panel-tab-header {\n   margin-top: 9px;\n   margin-left: 7px;\n@@ -48,10 +52,6 @@\n   overflow-y: auto;\n }\n \n-.schema-alignment-dialog-entity-edits-area {\n-  max-width: 70em;\n-}\n-\n .schema-alignment-dialog-statements-area {\n   padding: 10px;\n   max-width: 900px;\n@@ -66,45 +66,25 @@\n   margin: 1em;\n }\n \n-.schema-alignment-save-buttons{\n-  display:flex; \n-  flex-direction: row; \n-  float: right; \n-  padding: 12px;\n+.float-apart {\n+  display: flex;\n+  justify-content: space-between;\n }\n \n-.schema-alignment-save {\n-  padding-right: 10px; \n-}\n-\n-#schema-alignment-entity-add-buttons .wbs-toolbar{\n-  float: left;\n-  padding: 1em;  \n-}\n-\n-.schema-alignment-save button:disabled {\n-  color: gray;\n+.schema-alignment-footer {\n+  padding: 1em;\n }\n \n-.schema-alignment-save button {\n-  font-weight: normal;\n-  width: 100%;\n-}\n-\n-.schema-alignment-discard button:disabled {\n-  color: gray;\n-}\n-\n-.schema-alignment-discard button {\n-  font-weight: normal;\n-  width: 100%;\n+.schema-alignment-footer button:disabled {\n+  color: grey;\n+  cursor: not-allowed;\n }\n \n .schema-alignment-dialog-columns-area {\n   border: 1px solid #bcf;\n   border-left: 0;\n   border-right: 0;\n-  padding: 5px;\n+  padding: 5px 1em;\n   max-height: 100px;\n   overflow-y: auto;\n }\ndiff --git a/main/resources/com/google/refine/grel/ControlEvalError_es.properties b/main/resources/com/google/refine/grel/ControlEvalError_es.properties\nindex 8b1378917..e69de29bb 100644\n--- a/main/resources/com/google/refine/grel/ControlEvalError_es.properties\n+++ b/main/resources/com/google/refine/grel/ControlEvalError_es.properties\n@@ -1,1 +0,0 @@\n-\ndiff --git a/main/src/com/google/refine/util/PatternSyntaxExceptionParser.java b/main/src/com/google/refine/util/PatternSyntaxExceptionParser.java\nindex 325bc3aa6..062d082ba 100644\n--- a/main/src/com/google/refine/util/PatternSyntaxExceptionParser.java\n+++ b/main/src/com/google/refine/util/PatternSyntaxExceptionParser.java\n@@ -80,6 +80,7 @@ public class PatternSyntaxExceptionParser {\n                 msg = \"The regular expression has a '*','+' or '?' in the wrong place.\";\n                 break;\n             case \"Unexpected internal error\":\n+            case \"Unescaped trailing backslash\":\n                 msg = \"The regular expression has a backslash '\\\\' at the end.\";\n                 break;\n             case \"Unclosed counted closure\":\ndiff --git a/main/webapp/modules/core/scripts/project.js b/main/webapp/modules/core/scripts/project.js\nindex 421be1c45..b22e95bb4 100644\n--- a/main/webapp/modules/core/scripts/project.js\n+++ b/main/webapp/modules/core/scripts/project.js\n@@ -194,55 +194,45 @@ Refine.setTitle = function(status) {\n };\n \n Refine.reinitializeProjectData = function(f, fError) {\n-  $.getJSON(\n-    \"command/core/get-project-metadata?\" + $.param({ project: theProject.id }), null,\n-    function(data) {\n-      if (data.status == \"error\") {\n-        alert(data.message);\n-        if (fError) {\n-          fError();\n-        }\n-      } else {\n-        theProject.metadata = data;\n-        $.getJSON(\n-          \"command/core/get-models?\" + $.param({ project: theProject.id }), null,\n-          function(data) {\n-            if (data.status == \"error\") {\n-              alert(data.message);\n-              if (fError) {\n-                fError();\n-              }\n-            } else {\n-              for (var n in data) {\n-                if (data.hasOwnProperty(n)) {\n-                  theProject[n] = data[n];\n-                }\n-              }\n-              $.post(\n-                \"command/core/get-all-preferences\", null,\n-                function(preferences) {\n-                  if (preferences.status == \"error\") {\n-                    alert(preferences.message);\n-                    if (fError) {\n-                      fError();\n-                    }\n-                  } else {\n-                    if (preferences != null) {\n-                      thePreferences = preferences;\n-                    }\n-                    f();\n-                  }\n-                },\n-                'json'\n-              );\n-            }\n-          },\n-          'json'\n-        );\n+  function handleError(status, message, fError) {\n+    if (status === \"error\") {\n+      alert(message);\n+      if (fError) {\n+        fError();\n       }\n-    },\n-    'json'\n-  );\n+      return true;\n+    }\n+    return false;\n+  }\n+\n+  $.when(\n+    $.getJSON(\"command/core/get-project-metadata?\" + $.param({ project: theProject.id }), null),\n+    $.getJSON(\"command/core/get-models?\" + $.param({ project: theProject.id }), null),\n+    $.getJSON(\"command/core/get-all-preferences\", null),\n+  ).done(function(metadata, models, preferences) {\n+    metadata = metadata[0], models = models[0], preferences = preferences[0];\n+    if (\n+      handleError(metadata.status, metadata.message, fError) ||\n+      handleError(models.status, models.message, fError) ||\n+      handleError(preferences.status, preferences.message, fError)\n+    ) {\n+      return;\n+    }\n+\n+    theProject.metadata = metadata;\n+\n+    for (var n in models) {\n+      if (models.hasOwnProperty(n)) {\n+        theProject[n] = models[n];\n+      }\n+    }\n+\n+    if (preferences) {\n+      thePreferences = preferences;\n+    }\n+\n+    f();\n+  });\n };\n \n Refine.getPreference = function(key, defaultValue) {\ndiff --git a/main/webapp/modules/core/scripts/util/url.js b/main/webapp/modules/core/scripts/util/url.js\nindex cf1bb34c6..f437977e0 100644\n--- a/main/webapp/modules/core/scripts/util/url.js\n+++ b/main/webapp/modules/core/scripts/util/url.js\n@@ -37,6 +37,7 @@ var URLUtil = {\n     \"chrome\":1,\n     \"file\":1,\n     \"ftp\":1,\n+    \"geo\":0,\n     \"http\":1,\n     \"https\":1,\n     \"imap\":1,\ndiff --git a/main/webapp/package-lock.json b/main/webapp/package-lock.json\nindex 7e0886a55..824f48858 100644\n--- a/main/webapp/package-lock.json\n+++ b/main/webapp/package-lock.json\n@@ -17,7 +17,12 @@\n         \"tablesorter\": \"2.31.3\",\n         \"underscore\": \"1.13.6\"\n       },\n-      \"devDependencies\": {}\n+      \"devDependencies\": {},\n+      \"engines\": {\n+        \"node\": \">=14.0.0\",\n+        \"npm\": \">=8.11.0\",\n+        \"yarn\": \">=1.22.15\"\n+      }\n     },\n     \"node_modules/@wikimedia/jquery.i18n\": {\n       \"version\": \"1.0.9\",\ndiff --git a/main/webapp/package.json b/main/webapp/package.json\nindex f8589d8d0..52f8ccdc4 100644\n--- a/main/webapp/package.json\n+++ b/main/webapp/package.json\n@@ -1,4 +1,9 @@\n {\n+  \"engines\": {\n+    \"node\": \">=14.0.0\",\n+    \"npm\":  \">=8.11.0\",\n+    \"yarn\": \">=1.22.15\"\n+  },\n   \"scripts\": {\n     \"postinstall\": \"node copy-dependencies.js\"\n   },\ndiff --git a/pom.xml b/pom.xml\nindex 38137875e..e45bbf23e 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -64,7 +64,7 @@\n \n   <properties>\n     <java.minversion>11</java.minversion>\n-    <java.maxversion>17</java.maxversion>\n+    <java.maxversion>20</java.maxversion>\n     <jee.path>/</jee.path>\n     <jee.port>3333</jee.port>\n     <refine.data>/tmp/refine</refine.data>\n@@ -88,7 +88,7 @@\n     <commons-validator.version>1.7</commons-validator.version>\n     <org-jvnet-localizer.version>1.31</org-jvnet-localizer.version>\n     <!-- v1.15 of commons-codec is needed for Jena 3.14+ - copied from org.apache.jena:jena:pom -->\n-    <commons-codec.version>1.15</commons-codec.version>\n+    <commons-codec.version>1.16.0</commons-codec.version>\n     <commons-compress.version>1.23.0</commons-compress.version>\n     <velocity.version>1.5</velocity.version>\n     <marc4j.version>2.9.5</marc4j.version>\n@@ -108,7 +108,7 @@\n     <httpmime.version>4.5.14</httpmime.version>\n     <owasp-encoder.version>1.2.3</owasp-encoder.version>\n     <jasypt.version>1.9.3</jasypt.version>\n-    <mockito.version>5.3.1</mockito.version>\n+    <mockito.version>5.4.0</mockito.version>\n \n     <!-- plugin versions -->\n     <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>\n@@ -120,7 +120,7 @@\n     <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>\n     <surefire.version>3.1.2</surefire.version>\n     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>\n-    <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>\n+    <maven-clean-plugin.version>3.3.1</maven-clean-plugin.version>\n     <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>\n     <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>\n     <license-plugin.version>2.0.0</license-plugin.version>\ndiff --git a/refine.bat b/refine.bat\nindex 1b649f74e..ef9361f6f 100644\n--- a/refine.bat\n+++ b/refine.bat\n@@ -159,14 +159,6 @@ set REFINE_WEBAPP=main\\webapp\n :gotWebApp\n set OPTS=%OPTS% -Drefine.webapp=%REFINE_WEBAPP%\n \n-for /f \"tokens=2 delims==\" %%i in ('wmic OS get FreePhysicalMemory /Value') do set /a freeRam=%%i/1024\n-echo -------------------------------------------------------------------------------------------------\n-echo You have %freeRam%M of free memory.\n-echo Your current configuration is set to use %REFINE_MEMORY% of memory.\n-echo OpenRefine can run better when given more memory. Read our FAQ on how to allocate more memory here:\n-echo https://openrefine.org/docs/manual/installing\\#increasing-memory-allocation\n-echo -------------------------------------------------------------------------------------------------\n-\n if not \"%REFINE_CLASSES_DIR%\" == \"\" goto gotClassesDir\n set REFINE_CLASSES_DIR=server\\classes\n :gotClassesDir\n@@ -205,6 +197,15 @@ if \"\"%ACTION%\"\" == \"\"\"\" goto doRun\n   exit /B 1\n \n :doRun\n+\n+for /f \"tokens=2 delims==\" %%i in ('wmic OS get FreePhysicalMemory /Value') do set /a freeRam=%%i/1024\n+echo -------------------------------------------------------------------------------------------------\n+echo You have %freeRam%M of free memory.\n+echo Your current configuration is set to use %REFINE_MEMORY% of memory.\n+echo OpenRefine can run better when given more memory. Read our FAQ on how to allocate more memory here:\n+echo https://openrefine.org/docs/manual/installing\\#increasing-memory-allocation\n+echo -------------------------------------------------------------------------------------------------\n+\n rem --- Checking Java Version  ------------------------------------------\n set JAVA=\"%JAVA_HOME%\\bin\\java.exe\"\n \n", "test_patch": "diff --git a/.github/workflows/pull_request_e2e.yml b/.github/workflows/pull_request_e2e.yml\nindex aa942512a..3ef38c771 100644\n--- a/.github/workflows/pull_request_e2e.yml\n+++ b/.github/workflows/pull_request_e2e.yml\n@@ -45,11 +45,11 @@ jobs:\n           echo \"CYPRESS_RECORD_KEY=$(echo YzE3ZDU4OGItZTBkOC00ZjJmLTg4NjYtNzJmNmFmYmRhNGQxCg== | base64 -d)\" >> $GITHUB_ENV\n           echo \"CYPRESS_PROJECT_ID=s5du3k\" >> $GITHUB_ENV\n \n-      - name: Set up Java 11\n+      - name: Set up Java 17\n         uses: actions/setup-java@v3\n         with:\n           distribution: 'temurin'\n-          java-version: 11\n+          java-version: 17\n           cache: 'maven'\n \n       - name: Build OpenRefine\ndiff --git a/main/tests/cypress/cypress/support/commands.js b/main/tests/cypress/cypress/support/commands.js\nindex ec51f1bd4..f20915c01 100644\n--- a/main/tests/cypress/cypress/support/commands.js\n+++ b/main/tests/cypress/cypress/support/commands.js\n@@ -9,7 +9,6 @@\n // ***********************************************\n \n import 'cypress-file-upload';\n-import 'cypress-wait-until';\n \n // /**\n //  * Reconcile a column\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex 6c5022386..f54223ad5 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -5,25 +5,25 @@\n     \"license\": \"BSD-3-Clause\",\n     \"author\": \"OpenRefine\",\n     \"private\": true,\n+    \"engines\": {\n+        \"node\": \">=14.0.0\",\n+        \"npm\":  \">=8.11.0\",\n+        \"yarn\": \">=1.22.15\"\n+    },\n     \"scripts\": {\n         \"test\": \"cypress run --browser electron --headless --quiet\",\n         \"fix-lint\": \"prettier --write . && eslint --fix .\",\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"12.14.0\",\n-        \"cypress-file-upload\": \"^5.0.8\",\n-        \"cypress-wait-until\": \"^1.7.2\",\n-        \"dotenv\": \"^16.3.0\",\n-        \"fs-extra\": \"^11.1.1\",\n-        \"uniqid\": \"^5.4.0\"\n+        \"cypress\": \"12.16.0\",\n+        \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.42.0\",\n+        \"eslint\": \"^8.43.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^8.8.0\",\n         \"eslint-plugin-cypress\": \"^2.13.3\",\n-        \"jsdoc\": \"^4.0.2\",\n         \"prettier\": \"2.8.8\"\n     }\n }\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex b8ff44d3a..067aadd14 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -2,11 +2,6 @@\n # yarn lockfile v1\n \n \n-\"@babel/parser@^7.20.15\":\n-  version \"7.21.0\"\n-  resolved \"https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.0.tgz#cc09288743b867763cb927ba101ccdf0b600b7e4\"\n-  integrity sha512-ONjtg4renj14A9pj3iA5T5+r5Eijxbr2eNIkMBTC74occDSsRZUpe8vowmowAjFR1imWlkD8eEmjYXiREZpGZg==\n-\n \"@cypress/request@^2.88.10\":\n   version \"2.88.10\"\n   resolved \"https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce\"\n@@ -66,10 +61,10 @@\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@8.42.0\":\n-  version \"8.42.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.42.0.tgz#484a1d638de2911e6f5a30c12f49c7e4a3270fb6\"\n-  integrity sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==\n+\"@eslint/js@8.43.0\":\n+  version \"8.43.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.43.0.tgz#559ca3d9ddbd6bf907ad524320a0d14b85586af0\"\n+  integrity sha512-s2UHCoiXfxMvmfzqoN+vrQ84ahUSYde9qNO1MdxmoEhyHWsfmwOpFlwYV+ePJEVc7gFnATGUi376WowX1N7tFg==\n \n \"@humanwhocodes/config-array@^0.11.10\":\n   version \"0.11.10\"\n@@ -90,13 +85,6 @@\n   resolved \"https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45\"\n   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==\n \n-\"@jsdoc/salty@^0.2.1\":\n-  version \"0.2.1\"\n-  resolved \"https://registry.yarnpkg.com/@jsdoc/salty/-/salty-0.2.1.tgz#815c487c859eca81ad3dfea540f830e1ff9d3392\"\n-  integrity sha512-JXwylDNSHa549N9uceDYu8D4GMXwSo3H8CCPYEQqxhhHpxD28+lRl2b3bS/caaPj5w1YD3SWtrficJNTnUjGpg==\n-  dependencies:\n-    lodash \"^4.17.21\"\n-\n \"@nodelib/fs.scandir@2.1.5\":\n   version \"2.1.5\"\n   resolved \"https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5\"\n@@ -123,24 +111,6 @@\n   resolved \"https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz\"\n   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==\n \n-\"@types/linkify-it@*\":\n-  version \"3.0.2\"\n-  resolved \"https://registry.yarnpkg.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9\"\n-  integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==\n-\n-\"@types/markdown-it@^12.2.3\":\n-  version \"12.2.3\"\n-  resolved \"https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51\"\n-  integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ==\n-  dependencies:\n-    \"@types/linkify-it\" \"*\"\n-    \"@types/mdurl\" \"*\"\n-\n-\"@types/mdurl@*\":\n-  version \"1.0.2\"\n-  resolved \"https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9\"\n-  integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==\n-\n \"@types/node@*\":\n   version \"15.12.4\"\n   resolved \"https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26\"\n@@ -343,13 +313,6 @@ caseless@~0.12.0:\n   resolved \"https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz\"\n   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=\n \n-catharsis@^0.9.0:\n-  version \"0.9.0\"\n-  resolved \"https://registry.yarnpkg.com/catharsis/-/catharsis-0.9.0.tgz#40382a168be0e6da308c277d3a2b3eb40c7d2121\"\n-  integrity sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==\n-  dependencies:\n-    lodash \"^4.17.15\"\n-\n chalk@^4.0.0, chalk@^4.1.0:\n   version \"4.1.0\"\n   resolved \"https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz\"\n@@ -460,15 +423,10 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress-wait-until@^1.7.2:\n-  version \"1.7.2\"\n-  resolved \"https://registry.yarnpkg.com/cypress-wait-until/-/cypress-wait-until-1.7.2.tgz#7f534dd5a11c89b65359e7a0210f20d3dfc22107\"\n-  integrity sha512-uZ+M8/MqRcpf+FII/UZrU7g1qYZ4aVlHcgyVopnladyoBrpoaMJ4PKZDrdOJ05H5RHbr7s9Tid635X3E+ZLU/Q==\n-\n-cypress@12.14.0:\n-  version \"12.14.0\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-12.14.0.tgz#37a19b85f5e9d881995e9fee1ddf41b3d3a623dd\"\n-  integrity sha512-HiLIXKXZaIT1RT7sw1sVPt+qKtis3uYNm6KwC4qoYjabwLKaqZlyS/P+uVvvlBNcHIwL/BC6nQZajpbUd7hOgQ==\n+cypress@12.16.0:\n+  version \"12.16.0\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-12.16.0.tgz#d0dcd0725a96497f4c60cf54742242259847924c\"\n+  integrity sha512-mwv1YNe48hm0LVaPgofEhGCtLwNIQEjmj2dJXnAkY1b4n/NE9OtgPph4TyS+tOtYp5CKtRmDvBzWseUXQTjbTg==\n   dependencies:\n     \"@cypress/request\" \"^2.88.10\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n@@ -556,11 +514,6 @@ doctrine@^3.0.0:\n   dependencies:\n     esutils \"^2.0.2\"\n \n-dotenv@^16.3.0:\n-  version \"16.3.0\"\n-  resolved \"https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.0.tgz#1c61ae0a7b6f7b7e2285d50016ebab048f12ec6d\"\n-  integrity sha512-tHB+hmf8MRCkT3VVivGiG8kq9HiGTmQ3FzOKgztfpJQH1IWuZTOvKSJmHNnQPowecAmkCJhLrxdPhOr06LLqIQ==\n-\n ecc-jsbn@~0.1.1:\n   version \"0.1.2\"\n   resolved \"https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz\"\n@@ -588,21 +541,11 @@ enquirer@^2.3.6:\n   dependencies:\n     ansi-colors \"^4.1.1\"\n \n-entities@~2.1.0:\n-  version \"2.1.0\"\n-  resolved \"https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5\"\n-  integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==\n-\n escape-string-regexp@^1.0.5:\n   version \"1.0.5\"\n   resolved \"https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz\"\n   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=\n \n-escape-string-regexp@^2.0.0:\n-  version \"2.0.0\"\n-  resolved \"https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344\"\n-  integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==\n-\n escape-string-regexp@^4.0.0:\n   version \"4.0.0\"\n   resolved \"https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34\"\n@@ -638,15 +581,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:\n   resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994\"\n   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==\n \n-eslint@^8.42.0:\n-  version \"8.42.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.42.0.tgz#7bebdc3a55f9ed7167251fe7259f75219cade291\"\n-  integrity sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==\n+eslint@^8.43.0:\n+  version \"8.43.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.43.0.tgz#3e8c6066a57097adfd9d390b8fc93075f257a094\"\n+  integrity sha512-aaCpf2JqqKesMFGgmRPessmVKjcGXqdlAYLLC3THM8t5nBRZRQ+st5WM/hoJXkdioEXLLbXgclUpM0TXo5HX5Q==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n     \"@eslint-community/regexpp\" \"^4.4.0\"\n     \"@eslint/eslintrc\" \"^2.0.3\"\n-    \"@eslint/js\" \"8.42.0\"\n+    \"@eslint/js\" \"8.43.0\"\n     \"@humanwhocodes/config-array\" \"^0.11.10\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\n@@ -847,15 +790,6 @@ form-data@~2.3.2:\n     combined-stream \"^1.0.6\"\n     mime-types \"^2.1.12\"\n \n-fs-extra@^11.1.1:\n-  version \"11.1.1\"\n-  resolved \"https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d\"\n-  integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==\n-  dependencies:\n-    graceful-fs \"^4.2.0\"\n-    jsonfile \"^6.0.1\"\n-    universalify \"^2.0.0\"\n-\n fs-extra@^9.1.0:\n   version \"9.1.0\"\n   resolved \"https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz\"\n@@ -930,7 +864,7 @@ globals@^13.19.0:\n   dependencies:\n     type-fest \"^0.20.2\"\n \n-graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0:\n+graceful-fs@^4.1.6, graceful-fs@^4.2.0:\n   version \"4.2.6\"\n   resolved \"https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee\"\n   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==\n@@ -1069,39 +1003,11 @@ js-yaml@^4.1.0:\n   dependencies:\n     argparse \"^2.0.1\"\n \n-js2xmlparser@^4.0.2:\n-  version \"4.0.2\"\n-  resolved \"https://registry.yarnpkg.com/js2xmlparser/-/js2xmlparser-4.0.2.tgz#2a1fdf01e90585ef2ae872a01bc169c6a8d5e60a\"\n-  integrity sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==\n-  dependencies:\n-    xmlcreate \"^2.0.4\"\n-\n jsbn@~0.1.0:\n   version \"0.1.1\"\n   resolved \"https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz\"\n   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=\n \n-jsdoc@^4.0.2:\n-  version \"4.0.2\"\n-  resolved \"https://registry.yarnpkg.com/jsdoc/-/jsdoc-4.0.2.tgz#a1273beba964cf433ddf7a70c23fd02c3c60296e\"\n-  integrity sha512-e8cIg2z62InH7azBBi3EsSEqrKx+nUtAS5bBcYTSpZFA+vhNPyhv8PTFZ0WsjOPDj04/dOLlm08EDcQJDqaGQg==\n-  dependencies:\n-    \"@babel/parser\" \"^7.20.15\"\n-    \"@jsdoc/salty\" \"^0.2.1\"\n-    \"@types/markdown-it\" \"^12.2.3\"\n-    bluebird \"^3.7.2\"\n-    catharsis \"^0.9.0\"\n-    escape-string-regexp \"^2.0.0\"\n-    js2xmlparser \"^4.0.2\"\n-    klaw \"^3.0.0\"\n-    markdown-it \"^12.3.2\"\n-    markdown-it-anchor \"^8.4.1\"\n-    marked \"^4.0.10\"\n-    mkdirp \"^1.0.4\"\n-    requizzle \"^0.2.3\"\n-    strip-json-comments \"^3.1.0\"\n-    underscore \"~1.13.2\"\n-\n json-schema-traverse@^0.4.1:\n   version \"0.4.1\"\n   resolved \"https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz\"\n@@ -1141,13 +1047,6 @@ jsprim@^2.0.2:\n     json-schema \"0.4.0\"\n     verror \"1.10.0\"\n \n-klaw@^3.0.0:\n-  version \"3.0.0\"\n-  resolved \"https://registry.yarnpkg.com/klaw/-/klaw-3.0.0.tgz#b11bec9cf2492f06756d6e809ab73a2910259146\"\n-  integrity sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==\n-  dependencies:\n-    graceful-fs \"^4.1.9\"\n-\n lazy-ass@^1.6.0:\n   version \"1.6.0\"\n   resolved \"https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz\"\n@@ -1161,13 +1060,6 @@ levn@^0.4.1:\n     prelude-ls \"^1.2.1\"\n     type-check \"~0.4.0\"\n \n-linkify-it@^3.0.1:\n-  version \"3.0.3\"\n-  resolved \"https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e\"\n-  integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==\n-  dependencies:\n-    uc.micro \"^1.0.1\"\n-\n listr2@^3.8.3:\n   version \"3.10.0\"\n   resolved \"https://registry.yarnpkg.com/listr2/-/listr2-3.10.0.tgz#58105a53ed7fa1430d1b738c6055ef7bb006160f\"\n@@ -1198,7 +1090,7 @@ lodash.once@^4.1.1:\n   resolved \"https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz\"\n   integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=\n \n-lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21:\n+lodash@^4.17.21:\n   version \"4.17.21\"\n   resolved \"https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c\"\n   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==\n@@ -1227,32 +1119,6 @@ lru-cache@^6.0.0:\n   dependencies:\n     yallist \"^4.0.0\"\n \n-markdown-it-anchor@^8.4.1:\n-  version \"8.6.4\"\n-  resolved \"https://registry.yarnpkg.com/markdown-it-anchor/-/markdown-it-anchor-8.6.4.tgz#affb8aa0910a504c114e9fcad53ac3a5b907b0e6\"\n-  integrity sha512-Ul4YVYZNxMJYALpKtu+ZRdrryYt/GlQ5CK+4l1bp/gWXOG2QWElt6AqF3Mih/wfUKdZbNAZVXGR73/n6U/8img==\n-\n-markdown-it@^12.3.2:\n-  version \"12.3.2\"\n-  resolved \"https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90\"\n-  integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==\n-  dependencies:\n-    argparse \"^2.0.1\"\n-    entities \"~2.1.0\"\n-    linkify-it \"^3.0.1\"\n-    mdurl \"^1.0.1\"\n-    uc.micro \"^1.0.5\"\n-\n-marked@^4.0.10:\n-  version \"4.0.18\"\n-  resolved \"https://registry.yarnpkg.com/marked/-/marked-4.0.18.tgz#cd0ac54b2e5610cfb90e8fd46ccaa8292c9ed569\"\n-  integrity sha512-wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw==\n-\n-mdurl@^1.0.1:\n-  version \"1.0.1\"\n-  resolved \"https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e\"\n-  integrity sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=\n-\n merge-stream@^2.0.0:\n   version \"2.0.0\"\n   resolved \"https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz\"\n@@ -1287,11 +1153,6 @@ minimist@^1.2.8:\n   resolved \"https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c\"\n   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==\n \n-mkdirp@^1.0.4:\n-  version \"1.0.4\"\n-  resolved \"https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e\"\n-  integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==\n-\n ms@2.1.2, ms@^2.1.1:\n   version \"2.1.2\"\n   resolved \"https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz\"\n@@ -1453,13 +1314,6 @@ request-progress@^3.0.0:\n   dependencies:\n     throttleit \"^1.0.0\"\n \n-requizzle@^0.2.3:\n-  version \"0.2.3\"\n-  resolved \"https://registry.yarnpkg.com/requizzle/-/requizzle-0.2.3.tgz#4675c90aacafb2c036bd39ba2daa4a1cb777fded\"\n-  integrity sha512-YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ==\n-  dependencies:\n-    lodash \"^4.17.14\"\n-\n resolve-from@^4.0.0:\n   version \"4.0.0\"\n   resolved \"https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz\"\n@@ -1510,9 +1364,9 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:\n   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==\n \n semver@^7.3.2:\n-  version \"7.3.5\"\n-  resolved \"https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7\"\n-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==\n+  version \"7.5.3\"\n+  resolved \"https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e\"\n+  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==\n   dependencies:\n     lru-cache \"^6.0.0\"\n \n@@ -1679,21 +1533,6 @@ type-fest@^0.21.3:\n   resolved \"https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37\"\n   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==\n \n-uc.micro@^1.0.1, uc.micro@^1.0.5:\n-  version \"1.0.6\"\n-  resolved \"https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac\"\n-  integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==\n-\n-underscore@~1.13.2:\n-  version \"1.13.4\"\n-  resolved \"https://registry.yarnpkg.com/underscore/-/underscore-1.13.4.tgz#7886b46bbdf07f768e0052f1828e1dcab40c0dee\"\n-  integrity sha512-BQFnUDuAQ4Yf/cYY5LNrK9NCJFKriaRbD9uR1fTeXnBeoa97W0i41qkZfGO9pSo8I5KzjAcSY2XYtdf0oKd7KQ==\n-\n-uniqid@^5.4.0:\n-  version \"5.4.0\"\n-  resolved \"https://registry.yarnpkg.com/uniqid/-/uniqid-5.4.0.tgz#4e17bfcab66dfe33563411ae0c801f46ef964e66\"\n-  integrity sha512-38JRbJ4Fj94VmnC7G/J/5n5SC7Ab46OM5iNtSstB/ko3l1b5g7ALt4qzHFgGciFkyiRNtDXtLNb+VsxtMSE77A==\n-\n universalify@^1.0.0:\n   version \"1.0.0\"\n   resolved \"https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz\"\n@@ -1765,11 +1604,6 @@ wrappy@1:\n   resolved \"https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz\"\n   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=\n \n-xmlcreate@^2.0.4:\n-  version \"2.0.4\"\n-  resolved \"https://registry.yarnpkg.com/xmlcreate/-/xmlcreate-2.0.4.tgz#0c5ab0f99cdd02a81065fa9cd8f8ae87624889be\"\n-  integrity sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==\n-\n yallist@^4.0.0:\n   version \"4.0.0\"\n   resolved \"https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72\"\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #5346", "PR_Title": "Wikibase: Layout and label changes to schema alignment tab", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-5935_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 5935, "issue_title": "Wikibase: Layout and label changes to schema alignment tab", "issue_body": "Fixes #5346"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6021", "base_commit": "3dabe5130b43d6590faaaf37fae541b655f4e713", "patch": "diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml\nindex 6dc58d714..68c0165b7 100644\n--- a/extensions/gdata/pom.xml\n+++ b/extensions/gdata/pom.xml\n@@ -85,7 +85,7 @@\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-drive</artifactId>\n-      <version>v3-rev20230714-2.0.0</version>\n+      <version>v3-rev20230815-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.google.apis</groupId>\ndiff --git a/main/src/com/google/refine/importers/TextFormatGuesser.java b/main/src/com/google/refine/importers/TextFormatGuesser.java\nindex ca9c6f96b..b9a08a674 100644\n--- a/main/src/com/google/refine/importers/TextFormatGuesser.java\n+++ b/main/src/com/google/refine/importers/TextFormatGuesser.java\n@@ -34,13 +34,13 @@ import java.io.IOException;\n import java.io.InputStream;\n import java.io.InputStreamReader;\n import java.io.UnsupportedEncodingException;\n-import java.util.Arrays;\n \n import org.apache.commons.io.input.BoundedInputStream;\n import org.apache.commons.lang.StringUtils;\n \n import com.google.common.base.CharMatcher;\n import com.google.refine.importing.FormatGuesser;\n+import com.google.refine.importing.ImportingUtilities;\n \n public class TextFormatGuesser implements FormatGuesser {\n \n@@ -51,7 +51,7 @@ public class TextFormatGuesser implements FormatGuesser {\n     @Override\n     public String guess(File file, String encoding, String seedFormat) {\n         try (InputStream fis = new FileInputStream(file)) {\n-            if (isCompressed(file)) {\n+            if (ImportingUtilities.isCompressed(file)) {\n                 return \"binary\";\n             }\n             ;\n@@ -132,19 +132,4 @@ public class TextFormatGuesser implements FormatGuesser {\n         return null;\n     }\n \n-    private boolean isCompressed(File file) throws IOException {\n-        // Check for common compressed file types to protect ourselves from binary data\n-        try (InputStream is = new FileInputStream(file)) {\n-            byte[] magic = new byte[4];\n-            int count = is.read(magic);\n-            if (count == 4 && Arrays.equals(magic, new byte[] { 0x50, 0x4B, 0x03, 0x04 }) || // zip\n-                    Arrays.equals(magic, new byte[] { 0x50, 0x4B, 0x07, 0x08 }) ||\n-                    (magic[0] == 0x1F && magic[1] == (byte) 0x8B) // gzip\n-            ) {\n-                return true;\n-            }\n-        }\n-        return false;\n-    }\n-\n }\ndiff --git a/main/src/com/google/refine/importing/EncodingGuesser.java b/main/src/com/google/refine/importing/EncodingGuesser.java\nindex 605f93c47..797c355f1 100644\n--- a/main/src/com/google/refine/importing/EncodingGuesser.java\n+++ b/main/src/com/google/refine/importing/EncodingGuesser.java\n@@ -1,31 +1,32 @@\n \n package com.google.refine.importing;\n \n-import java.io.BufferedInputStream;\n import java.io.File;\n import java.io.FileInputStream;\n-import java.io.FileNotFoundException;\n import java.io.IOException;\n-import java.io.InputStream;\n import java.util.List;\n \n-import org.apache.commons.lang.StringUtils;\n-import org.mozilla.universalchardet.UniversalDetector;\n import com.fasterxml.jackson.databind.node.ArrayNode;\n import com.fasterxml.jackson.databind.node.ObjectNode;\n+import org.apache.commons.lang.StringUtils;\n+import org.mozilla.universalchardet.UnicodeBOMInputStream;\n+import org.mozilla.universalchardet.UniversalDetector;\n \n import com.google.refine.util.JSONUtilities;\n \n /**\n- * This class tries to find the correct encoding based on the http://site.icu-project.org/ and the icu4j library\n- * http://site.icu-project.org/home/why-use-icu4j.\n+ * This class tries to find the correct encoding based on https://github.com/albfernandez/juniversalchardet which is a\n+ * Java port of Mozilla's universalchardet library\n+ * https://hg.mozilla.org/mozilla-central/file/tip/extensions/universalchardet/\n  * \n  * @author <a href=\"mailto:kontakt@stundzig.de\">Steffen Stundzig</a>\n  */\n public final class EncodingGuesser {\n \n-    public final static void guess(final ImportingJob job)\n-            throws FileNotFoundException, IOException {\n+    public static final String UTF_8_BOM = \"UTF-8-BOM\";\n+\n+    public static void guess(final ImportingJob job)\n+            throws IOException {\n         ObjectNode retrievalRecord = job.getRetrievalRecord();\n         if (retrievalRecord != null) {\n             ArrayNode fileRecords = JSONUtilities.getArray(retrievalRecord, \"files\");\n@@ -38,9 +39,13 @@ public final class EncodingGuesser {\n                     if (StringUtils.isBlank(encoding)) {\n                         String location = JSONUtilities.getString(record, \"location\", null);\n                         if (location != null) {\n-                            try (InputStream is = new BufferedInputStream(\n+                            try (UnicodeBOMInputStream is = new UnicodeBOMInputStream(\n                                     new FileInputStream(new File(job.getRawDataDir(), location)))) {\n                                 String detected = UniversalDetector.detectCharset(is);\n+                                UnicodeBOMInputStream.BOM bom = is.getBOM();\n+                                if (UnicodeBOMInputStream.BOM.UTF_8.equals(bom)) {\n+                                    detected = UTF_8_BOM;\n+                                }\n                                 if (detected != null) {\n                                     JSONUtilities.safePut(record, \"encoding\", detected);\n                                 }\ndiff --git a/main/src/com/google/refine/importing/ImportingUtilities.java b/main/src/com/google/refine/importing/ImportingUtilities.java\nindex 27ff6a5d8..5a2f2d923 100644\n--- a/main/src/com/google/refine/importing/ImportingUtilities.java\n+++ b/main/src/com/google/refine/importing/ImportingUtilities.java\n@@ -33,6 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.importing;\n \n+import static java.nio.charset.StandardCharsets.UTF_8;\n+\n import java.io.File;\n import java.io.FileInputStream;\n import java.io.FileNotFoundException;\n@@ -69,7 +71,6 @@ import javax.servlet.http.HttpServletResponse;\n import org.apache.commons.compress.archivers.tar.TarArchiveEntry;\n import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;\n import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;\n-import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream;\n import org.apache.commons.fileupload.FileItem;\n import org.apache.commons.fileupload.FileUploadException;\n import org.apache.commons.fileupload.ProgressListener;\n@@ -84,6 +85,7 @@ import org.apache.hc.core5.http.ContentType;\n import org.apache.hc.core5.http.HttpEntity;\n import org.apache.hc.core5.http.HttpStatus;\n import org.apache.hc.core5.http.io.HttpClientResponseHandler;\n+import org.mozilla.universalchardet.UnicodeBOMInputStream;\n import org.slf4j.Logger;\n import org.slf4j.LoggerFactory;\n \n@@ -349,7 +351,6 @@ public class ImportingUtilities {\n                         if (httpClient.getResponse(urlString, null, responseHandler) != null) {\n                             archiveCount++;\n                         }\n-                        ;\n                         downloadCount++;\n                     } else {\n                         // Fallback handling for non HTTP connections (only FTP?)\n@@ -435,19 +436,19 @@ public class ImportingUtilities {\n \n         update.totalExpectedSize += length;\n \n-        progress.setProgress(\"Downloading \" + url.toString(),\n+        progress.setProgress(\"Downloading \" + url, // TODO: Localize\n                 calculateProgressPercent(update.totalExpectedSize, update.totalRetrievedSize));\n \n         long actualLength = saveStreamToFile(stream, file, update);\n         JSONUtilities.safePut(fileRecord, \"size\", actualLength);\n         if (actualLength == 0) {\n-            throw new IOException(\"No content found in \" + url.toString());\n+            throw new IOException(\"No content found in \" + url);\n         } else if (length >= 0) {\n             update.totalExpectedSize += (actualLength - length);\n         } else {\n             update.totalExpectedSize += actualLength;\n         }\n-        progress.setProgress(\"Saving \" + url.toString() + \" locally\",\n+        progress.setProgress(\"Saving \" + url + \" locally\", // TODO: Localize\n                 calculateProgressPercent(update.totalExpectedSize, update.totalRetrievedSize));\n         return postProcessRetrievedFile(rawDataDir, file, fileRecord, fileRecords, progress);\n     }\n@@ -528,11 +529,23 @@ public class ImportingUtilities {\n             encoding = commonEncoding;\n         }\n         if (encoding != null) {\n-            try {\n-                return new InputStreamReader(inputStream, encoding);\n-            } catch (UnsupportedEncodingException e) {\n-                // Ignore and fall through\n+\n+            // Special case for UTF-8 with BOM\n+            if (EncodingGuesser.UTF_8_BOM.equals(encoding)) {\n+                try {\n+                    return new InputStreamReader(new UnicodeBOMInputStream(inputStream, true), UTF_8);\n+                } catch (IOException e) {\n+                    throw new RuntimeException(\"Exception from UnicodeBOMInputStream\", e);\n+                }\n+            } else {\n+                try {\n+                    return new InputStreamReader(inputStream, encoding);\n+                } catch (UnsupportedEncodingException e) {\n+                    // This should never happen since they picked from a list of supported encodings\n+                    throw new RuntimeException(\"Unsupported encoding: \" + encoding, e);\n+                }\n             }\n+\n         }\n         return new InputStreamReader(inputStream);\n     }\n@@ -677,7 +690,7 @@ public class ImportingUtilities {\n                     || \"application/x-zip-compressed\".equals(contentType)\n                     || \"application/zip\".equals(contentType)\n                     || \"application/x-compressed\".equals(contentType)\n-                    || \"multipar/x-zip\".equals(contentType)) {\n+                    || \"multipart/x-zip\".equals(contentType)) {\n                 return new ZipInputStream(new FileInputStream(file));\n             } else if (fileName.endsWith(\".kmz\")) {\n                 return new ZipInputStream(new FileInputStream(file));\n@@ -689,13 +702,28 @@ public class ImportingUtilities {\n \n     private static boolean isFileGZipped(File file) {\n         int magic = 0;\n-        try (RandomAccessFile raf = new RandomAccessFile(file, \"r\");) {\n+        try (RandomAccessFile raf = new RandomAccessFile(file, \"r\")) {\n             magic = raf.read() & 0xff | ((raf.read() << 8) & 0xff00);\n         } catch (IOException ignored) {\n         }\n         return magic == GZIPInputStream.GZIP_MAGIC;\n     }\n \n+    public static boolean isCompressed(File file) throws IOException {\n+        // Check for common compressed file types to protect ourselves from binary data\n+        try (InputStream is = new FileInputStream(file)) {\n+            byte[] magic = new byte[4];\n+            int count = is.read(magic);\n+            if (count == 4 && Arrays.equals(magic, new byte[] { 0x50, 0x4B, 0x03, 0x04 }) || // zip\n+                    Arrays.equals(magic, new byte[] { 0x50, 0x4B, 0x07, 0x08 }) ||\n+                    (magic[0] == 0x1F && magic[1] == (byte) 0x8B) // gzip\n+            ) {\n+                return true;\n+            }\n+        }\n+        return false;\n+    }\n+\n     // FIXME: This is wasteful of space and time. We should try to process on the fly\n     static private boolean explodeArchive(\n             File rawDataDir,\n@@ -888,7 +916,7 @@ public class ImportingUtilities {\n                 }\n             }\n \n-            // If nothing matches the best format but we have some files,\n+            // If nothing matches the best format, but we have some files,\n             // then select them all\n             if (fileSelectionIndexes.size() == 0 && count > 0) {\n                 for (int i = 0; i < count; i++) {\ndiff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json\nindex 3faec69f3..4b0df045f 100644\n--- a/main/webapp/modules/core/langs/translation-en.json\n+++ b/main/webapp/modules/core/langs/translation-en.json\n@@ -577,7 +577,7 @@\n     \"core-views/word-facet\": \"Word facet\",\n     \"core-views/add-id-column\": \"Add entity identifiers column…\",\n     \"core-views/add-id-column2\": \"Add a column containing entity identifiers from items\",\n-    \"core-views/add-id-col\": \"Add column containing entity identifiers on $1\",\n+    \"core-views/add-id-col\": \"Add column containing entity identifiers on \\\"$1\\\"\",\n     \"core-views/duplicates-facet\": \"Duplicates facet\",\n     \"core-views/numeric-log-facet\": \"Numeric log facet\",\n     \"core-views/bounded-log-facet\": \"1-bounded numeric log facet\",\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/add-q-column-dialog.html b/main/webapp/modules/core/scripts/views/data-table/add-q-column-dialog.html\nindex 2ba2398c2..2b9dc48ca 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/add-q-column-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/add-q-column-dialog.html\n@@ -5,13 +5,13 @@\n     <div class=\"dialog-body\" bind=\"dialogBody\">\n       <div class=\"grid-layout layout-normal layout-full\"><table cols=\"2\">\n         <tr>\n-          <td width=\"1%\" style=\"white-space: pre;\"><label for=\"columnNameInputId\" bind=\"or_views_newCol\"></label></td>\n-          <td><input bind=\"columnNameInput\" id=\"columnNameInputId\" size=\"40\" /></td>\n+          <td width=\"1%\" style=\"white-space: pre;\"><label for=\"columnNameInputId\" bind=\"or_views_newCol\" ></label></td>\n+          <td><input bind=\"columnNameInput\" id=\"columnNameInputId\" size=\"40\" autofocus/></td>\n         </tr>\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <input type=\"submit\" class=\"button\" bind=\"okButton\"/>\n+      <button type=\"submit\" class=\"button\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js b/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js\nindex 2ebbdd8a6..cb89df347 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js\n@@ -250,7 +250,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n     elmts.cancelButton.text($.i18n('core-buttons/cancel'));\n \n     var level = DialogSystem.showDialog(frame);\n-    var dismiss = function() { DialogSystem.dismissUntil(level - 1); };\n+\n+    elmts.columnNameInput.focus();\n+      var dismiss = function() { DialogSystem.dismissUntil(level - 1); };\n \n     var o = DataTableView.sampleVisibleRows(column);\n     \ndiff --git a/main/webapp/package-lock.json b/main/webapp/package-lock.json\nindex 824f48858..75ca6ca17 100644\n--- a/main/webapp/package-lock.json\n+++ b/main/webapp/package-lock.json\n@@ -9,7 +9,7 @@\n       \"dependencies\": {\n         \"@wikimedia/jquery.i18n\": \"1.0.9\",\n         \"datejs-coolite\": \"1.0.0\",\n-        \"jquery\": \"3.7.0\",\n+        \"jquery\": \"3.7.1\",\n         \"jquery-migrate\": \"3.4.1\",\n         \"js-cookie\": \"3.0.5\",\n         \"moment\": \"2.29.4\",\n@@ -35,9 +35,9 @@\n       \"integrity\": \"sha512-kppYUwn9R2pzsoChLsDlWLtKTwjf5k9Z3fx8CNKjwvhYfpadKIFoL+16dDJvftiXKwT+ixh2PRslZsfzp+1ZVA==\"\n     },\n     \"node_modules/jquery\": {\n-      \"version\": \"3.7.0\",\n-      \"resolved\": \"https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz\",\n-      \"integrity\": \"sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==\"\n+      \"version\": \"3.7.1\",\n+      \"resolved\": \"https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz\",\n+      \"integrity\": \"sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==\"\n     },\n     \"node_modules/jquery-migrate\": {\n       \"version\": \"3.4.1\",\n@@ -94,9 +94,9 @@\n       \"integrity\": \"sha512-kppYUwn9R2pzsoChLsDlWLtKTwjf5k9Z3fx8CNKjwvhYfpadKIFoL+16dDJvftiXKwT+ixh2PRslZsfzp+1ZVA==\"\n     },\n     \"jquery\": {\n-      \"version\": \"3.7.0\",\n-      \"resolved\": \"https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz\",\n-      \"integrity\": \"sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==\"\n+      \"version\": \"3.7.1\",\n+      \"resolved\": \"https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz\",\n+      \"integrity\": \"sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==\"\n     },\n     \"jquery-migrate\": {\n       \"version\": \"3.4.1\",\ndiff --git a/main/webapp/package.json b/main/webapp/package.json\nindex 52f8ccdc4..44211bc1b 100644\n--- a/main/webapp/package.json\n+++ b/main/webapp/package.json\n@@ -12,7 +12,7 @@\n   \"dependencies\": {\n     \"@wikimedia/jquery.i18n\": \"1.0.9\",\n     \"datejs-coolite\": \"1.0.0\",\n-    \"jquery\": \"3.7.0\",\n+    \"jquery\": \"3.7.1\",\n     \"jquery-migrate\": \"3.4.1\",\n     \"js-cookie\": \"3.0.5\",\n     \"moment\": \"2.29.4\",\ndiff --git a/pom.xml b/pom.xml\nindex 4f5ef1c2d..8b60e5d7d 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -108,7 +108,7 @@\n     <httpmime.version>4.5.14</httpmime.version>\n     <owasp-encoder.version>1.2.3</owasp-encoder.version>\n     <jasypt.version>1.9.3</jasypt.version>\n-    <mockito.version>5.4.0</mockito.version>\n+    <mockito.version>5.5.0</mockito.version>\n \n     <!-- plugin versions -->\n     <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>\n", "test_patch": "diff --git a/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/add_entity_identifiers.cy.js b/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/add_entity_identifiers.cy.js\nindex 3686d4876..7f621a966 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/add_entity_identifiers.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/add_entity_identifiers.cy.js\n@@ -20,10 +20,10 @@ describe('Add entity identifiers', () => {\n     // check the dialog, enter a new column name \"id_column\"\n     cy.get('.dialog-container .dialog-header').should(\n       'to.contain',\n-      'Add column containing entity identifiers on species'\n+      'Add column containing entity identifiers on \"species\"'\n     );\n     cy.get('.dialog-container .dialog-body input').type('id_column');\n-    cy.get('.dialog-container .dialog-footer input').contains('OK').click();\n+    cy.get('.dialog-container .dialog-footer button').contains('OK').click();\n \n     // Check the cells content for the new column\n     cy.assertCellEquals(0, 'id_column', '2253634'); // untouched\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex bb2544479..9e190c38d 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -20,10 +20,10 @@\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.47.0\",\n+        \"eslint\": \"^8.48.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^9.0.0\",\n         \"eslint-plugin-cypress\": \"^2.14.0\",\n-        \"prettier\": \"3.0.2\"\n+        \"prettier\": \"3.0.3\"\n     }\n }\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 74b9f5efc..116e2bbbf 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -66,10 +66,10 @@\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@^8.47.0\":\n-  version \"8.47.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.47.0.tgz#5478fdf443ff8158f9de171c704ae45308696c7d\"\n-  integrity sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==\n+\"@eslint/js@8.48.0\":\n+  version \"8.48.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb\"\n+  integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==\n \n \"@humanwhocodes/config-array@^0.11.10\":\n   version \"0.11.10\"\n@@ -590,15 +590,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4\n   resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800\"\n   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==\n \n-eslint@^8.47.0:\n-  version \"8.47.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.47.0.tgz#c95f9b935463fb4fad7005e626c7621052e90806\"\n-  integrity sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==\n+eslint@^8.48.0:\n+  version \"8.48.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155\"\n+  integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n     \"@eslint-community/regexpp\" \"^4.6.1\"\n     \"@eslint/eslintrc\" \"^2.1.2\"\n-    \"@eslint/js\" \"^8.47.0\"\n+    \"@eslint/js\" \"8.48.0\"\n     \"@humanwhocodes/config-array\" \"^0.11.10\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\n@@ -1303,10 +1303,10 @@ prelude-ls@^1.2.1:\n   resolved \"https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz\"\n   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==\n \n-prettier@3.0.2:\n-  version \"3.0.2\"\n-  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.0.2.tgz#78fcecd6d870551aa5547437cdae39d4701dca5b\"\n-  integrity sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==\n+prettier@3.0.3:\n+  version \"3.0.3\"\n+  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643\"\n+  integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==\n \n pretty-bytes@^5.6.0:\n   version \"5.6.0\"\ndiff --git a/main/tests/data/csv-with-bom.csv b/main/tests/data/csv-with-bom.csv\nnew file mode 100644\nindex 000000000..bdb3bcc64\n--- /dev/null\n+++ b/main/tests/data/csv-with-bom.csv\n@@ -0,0 +1,3 @@\n+ColA,ColB\n+A1,B1\n+A2,B2\n\\ No newline at end of file\ndiff --git a/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java b/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java\nindex 73d60f011..d5e1a060a 100644\n--- a/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java\n+++ b/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java\n@@ -15,7 +15,7 @@ import com.google.refine.util.ParsingUtilities;\n \n public class EncodingGuesserTests {\n \n-    // Guessing isn't as reliable for single-byte encodings, so we focus on a few multi-byte\n+    // Guessing isn't as reliable for single-byte encodings, so we focus on a few multibyte\n     // non-UTF8 encodings which are still in use (but <1% prevalence on web)\n     static String[] ENCODINGS = {\n             \"big5\",\n@@ -25,7 +25,7 @@ public class EncodingGuesserTests {\n     };\n \n     private static File getTestDir() {\n-        String dir = ClassLoader.getSystemResource(ENCODINGS[0] + \".html\").getPath();\n+        String dir = ClassLoader.getSystemResource(ENCODINGS[0] + \".txt\").getPath();\n         dir = dir.substring(0, dir.lastIndexOf('/'));\n         return new File(dir);\n     }\n@@ -46,21 +46,29 @@ public class EncodingGuesserTests {\n     public void testEncodingGuesser() throws IOException {\n \n         for (String encoding : ENCODINGS) {\n-            ImportingJob job = new ImportingJobStub();\n-            ObjectNode config = job.getOrCreateDefaultConfig();\n-            ObjectNode filesObj = ParsingUtilities.evaluateJsonStringToObjectNode(\n-                    String.format(\"{ \\\"files\\\": [ {\\\"location\\\": \\\"%s.txt\\\"}]}\", encoding));\n-            JSONUtilities.safePut(config, \"retrievalRecord\", filesObj);\n-\n-            EncodingGuesser.guess(job);\n-\n-            ObjectNode retrievalRecord = job.getRetrievalRecord();\n-            assertNotNull(retrievalRecord);\n-            ArrayNode fileRecords = JSONUtilities.getArray(retrievalRecord, \"files\");\n-            assertNotNull(fileRecords);\n-            assertEquals(fileRecords.size(), 1);\n-            ObjectNode record = JSONUtilities.getObjectElement(fileRecords, 0);\n-            assertEquals(JSONUtilities.getString(record, \"encoding\", null).toLowerCase(), encoding);\n+            checkEncoding(encoding + \".txt\", encoding);\n         }\n+\n+        checkEncoding(\"example-latin1.tsv\", \"windows-1252\"); // close enough - these overlap a lot\n+        checkEncoding(\"example-utf8.tsv\", \"utf-8\");\n+        checkEncoding(\"csv-with-bom.csv\", \"utf-8-bom\");\n+    }\n+\n+    private void checkEncoding(String filename, String encoding) throws IOException {\n+        ImportingJob job = new ImportingJobStub();\n+        ObjectNode config = job.getOrCreateDefaultConfig();\n+        ObjectNode filesObj = ParsingUtilities.evaluateJsonStringToObjectNode(\n+                String.format(\"{ \\\"files\\\": [ {\\\"location\\\": \\\"%s\\\"}]}\", filename));\n+        JSONUtilities.safePut(config, \"retrievalRecord\", filesObj);\n+\n+        EncodingGuesser.guess(job);\n+\n+        ObjectNode retrievalRecord = job.getRetrievalRecord();\n+        assertNotNull(retrievalRecord);\n+        ArrayNode fileRecords = JSONUtilities.getArray(retrievalRecord, \"files\");\n+        assertNotNull(fileRecords);\n+        assertEquals(fileRecords.size(), 1);\n+        ObjectNode record = JSONUtilities.getObjectElement(fileRecords, 0);\n+        assertEquals(JSONUtilities.getString(record, \"encoding\", null).toLowerCase(), encoding);\n     }\n }\ndiff --git a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\nindex 19fc71ce8..0de1291b2 100644\n--- a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n+++ b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n@@ -56,7 +56,6 @@ import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;\n import org.apache.hc.client5.http.entity.mime.StringBody;\n import org.apache.hc.core5.http.ContentType;\n import org.apache.hc.core5.http.HttpEntity;\n-import org.checkerframework.checker.units.qual.A;\n import org.testng.Assert;\n import org.testng.annotations.BeforeMethod;\n import org.testng.annotations.Test;\n@@ -110,7 +109,7 @@ public class ImportingUtilitiesTests extends ImporterTest {\n         File dirA = new File(tempDir, \"a\");\n         dirA.mkdir();\n         File conflicting = new File(dirA, \"dummy\");\n-        conflicting.createNewFile();\n+        Assert.assertTrue(conflicting.createNewFile());\n \n         File allocated = ImportingUtilities.allocateFile(dirA, \".././a/dummy\");\n         Assert.assertEquals(allocated, new File(dirA, \"dummy-2\"));\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #5998\r\n\r\nChanges proposed in this pull request:\r\n- Add quotes (\") around column name in title.\r\n- Focus on text input when dialog opens.\r\n- Change \"Submit Query\" to \"OK.\"\r\n\r\nAfter:\r\n\r\n![Add entities column dialog](https://github.com/OpenRefine/OpenRefine/assets/42903164/41d74005-7862-4807-8460-b5a83bfcc048)\r\n", "PR_Title": "Issue 5998 entity identifiers dialog improvements", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6021_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6021, "issue_title": "Issue 5998 entity identifiers dialog improvements", "issue_body": "Fixes #5998\r\n\r\nChanges proposed in this pull request:\r\n- Add quotes (\") around column name in title.\r\n- Focus on text input when dialog opens.\r\n- Change \"Submit Query\" to \"OK.\"\r\n\r\nAfter:\r\n\r\n![Add entities column dialog](https://github.com/OpenRefine/OpenRefine/assets/42903164/41d74005-7862-4807-8460-b5a83bfcc048)\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6483", "base_commit": "767e257c9f9d81024a6c0a3bde2b73f3cea53587", "patch": "diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml\nindex 857e0538a..ea722b947 100644\n--- a/extensions/gdata/pom.xml\n+++ b/extensions/gdata/pom.xml\n@@ -89,7 +89,7 @@\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-sheets</artifactId>\n-      <version>v4-rev20240312-2.0.0</version>\n+      <version>v4-rev20240319-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.fasterxml.jackson.core</groupId>\ndiff --git a/extensions/wikibase/module/scripts/dialogs/wikibase-dialog.html b/extensions/wikibase/module/scripts/dialogs/wikibase-dialog.html\nindex 80a26a324..3c32eb052 100644\n--- a/extensions/wikibase/module/scripts/dialogs/wikibase-dialog.html\n+++ b/extensions/wikibase/module/scripts/dialogs/wikibase-dialog.html\n@@ -14,8 +14,8 @@\n       <a class=\"button\" bind=\"discoverManifestsButton\" href=\"https://github.com/OpenRefine/wikibase-manifests\" target=\"_blank\"></a>\n     </div>\n     <div class=\"dialog-footer-bg\">\n+      <button class=\"button button-primary\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n-      <button class=\"button\" bind=\"okButton\"></button>\n     </div>\n   </div>\n </div>\ndiff --git a/main/src/com/google/refine/model/Recon.java b/main/src/com/google/refine/model/Recon.java\nindex 54fc9fe62..4875bff38 100644\n--- a/main/src/com/google/refine/model/Recon.java\n+++ b/main/src/com/google/refine/model/Recon.java\n@@ -214,6 +214,7 @@ public class Recon implements HasFields {\n             candidates = new ArrayList<ReconCandidate>(3);\n         }\n         candidates.add(candidate);\n+        error = null;\n     }\n \n     @JsonIgnore\n@@ -412,11 +413,11 @@ public class Recon implements HasFields {\n         this.judgment = judgment != null ? judgment : Judgment.None;\n         this.match = match;\n         this.error = error;\n-        if (error != null && match != null) {\n-            throw new IllegalArgumentException(\"there is a match hence no error\");\n-        }\n         this.features = features != null ? features : new Object[Feature_max];\n         this.candidates = candidates != null ? candidates : new ArrayList<>();\n+        if (error != null && !this.candidates.isEmpty()) {\n+            throw new IllegalArgumentException(\"Recon deserialization: inconsistent state - error & candidates not allowed together\");\n+        }\n         this.service = service != null ? service : \"unknown\";\n         this.identifierSpace = identifierSpace;\n         this.schemaSpace = schemaSpace;\ndiff --git a/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.html b/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.html\nindex 4b3e7819f..cfa397ad7 100644\n--- a/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.html\n+++ b/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.html\n@@ -15,7 +15,7 @@\n     </tr>\n   </table></div></div>\n   <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-    <button class=\"button\" bind=\"okButton\"></button>\n+    <button class=\"button button-primary\" bind=\"okButton\"></button>\n     <button class=\"button\" bind=\"cancelButton\"></button>\n   </div>\n </div>\ndiff --git a/main/webapp/modules/core/scripts/dialogs/common-transform-dialog.html b/main/webapp/modules/core/scripts/dialogs/common-transform-dialog.html\nindex cf431ce05..9260cdfe4 100644\n--- a/main/webapp/modules/core/scripts/dialogs/common-transform-dialog.html\n+++ b/main/webapp/modules/core/scripts/dialogs/common-transform-dialog.html\n@@ -8,7 +8,7 @@\n       </div>\n     </div>\n     <div  class=\"all-column-transform-dialog-container dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\"  bind=\"okButton\"></button>\n+      <button class=\"button button-primary\"  bind=\"okButton\"></button>\n       <button class=\"button\"  bind=\"cancelButton\"></button>\n     </div>\n </div>\ndiff --git a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.html b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.html\nindex 2104a85dd..7b33e0999 100644\n--- a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.html\n+++ b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.html\n@@ -20,7 +20,7 @@\n     </div>\n   </div>\n   <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-    <button class=\"button\" bind=\"okButton\"></button>\n+    <button class=\"button button-primary\" bind=\"okButton\"></button>\n     <button class=\"button\" bind=\"cancelButton\"></button>\n   </div>\n </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/add-column-by-fetching-urls-dialog.html b/main/webapp/modules/core/scripts/views/data-table/add-column-by-fetching-urls-dialog.html\nindex 0655bc74a..ceeae19fe 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/add-column-by-fetching-urls-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/add-column-by-fetching-urls-dialog.html\n@@ -34,7 +34,7 @@\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\" type=\"submit\" bind=\"okButton\"></button>\n+      <button class=\"button button-primary\" type=\"submit\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n     </form>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/add-column-by-reconciliation.html b/main/webapp/modules/core/scripts/views/data-table/add-column-by-reconciliation.html\nindex ecdde8301..60ad2bfc6 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/add-column-by-reconciliation.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/add-column-by-reconciliation.html\n@@ -23,7 +23,7 @@\n     </table></div>\n   </div>\n   <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-    <button class=\"button\" bind=\"okButton\"></button>\n+    <button class=\"button button-primary\" bind=\"okButton\"></button>\n     <button class=\"button\" bind=\"cancelButton\"></button>\n   </div>\n </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/add-column-dialog.html b/main/webapp/modules/core/scripts/views/data-table/add-column-dialog.html\nindex 850aa13c1..cc26f8f7b 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/add-column-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/add-column-dialog.html\n@@ -22,7 +22,7 @@\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\" type=\"submit\" bind=\"okButton\"></button>\n+      <button class=\"button button-primary\" type=\"submit\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </form>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/add-q-column-dialog.html b/main/webapp/modules/core/scripts/views/data-table/add-q-column-dialog.html\nindex 2b9dc48ca..f937133f3 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/add-q-column-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/add-q-column-dialog.html\n@@ -11,7 +11,7 @@\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button type=\"submit\" class=\"button\" bind=\"okButton\"></button>\n+      <button type=\"submit\" class=\"button button-primary\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/cell-editor.html b/main/webapp/modules/core/scripts/views/data-table/cell-editor.html\nindex 3b47d3b35..36c76c3e0 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/cell-editor.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/cell-editor.html\n@@ -14,7 +14,7 @@\n \n <div id=\"data-table-cell-editor-actions\">\n   <div class=\"data-table-cell-editor-action\">\n-    <button class=\"button\" bind=\"okButton\"></button>\n+    <button class=\"button button-primary\" bind=\"okButton\"></button>\n     <div class=\"data-table-cell-editor-key\" bind=\"or_views_enter\"></div>\n   </div>\n   <div class=\"data-table-cell-editor-action\">\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/column-join.html b/main/webapp/modules/core/scripts/views/data-table/column-join.html\nindex 275bb7231..dce2a4844 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/column-join.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/column-join.html\n@@ -58,7 +58,7 @@\n      </div>\n   </div>\n   <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-    <button class=\"button\" bind=\"okButton\"></button>\n+    <button class=\"button button-primary\" bind=\"okButton\"></button>\n     <button class=\"button\" bind=\"cancelButton\"></button>\n   </div>\n </div>\n\\ No newline at end of file\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/copy-recon-across-columns-dialog.html b/main/webapp/modules/core/scripts/views/data-table/copy-recon-across-columns-dialog.html\nindex 5bbc0878e..777589ec8 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/copy-recon-across-columns-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/copy-recon-across-columns-dialog.html\n@@ -31,7 +31,7 @@\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\" bind=\"okButton\"></button>\n+      <button class=\"button button-primary\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/key-value-columnize.html b/main/webapp/modules/core/scripts/views/data-table/key-value-columnize.html\nindex ae3bcc7bd..6280eb4bc 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/key-value-columnize.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/key-value-columnize.html\n@@ -16,7 +16,7 @@\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\" bind=\"okButton\"></button>\n+      <button class=\"button button-primary\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/rename-column.html b/main/webapp/modules/core/scripts/views/data-table/rename-column.html\nindex 5dbf32b68..c635671bb 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/rename-column.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/rename-column.html\n@@ -10,7 +10,7 @@\n                 </div>\n             </div>\n             <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-                <button type=\"submit\" class=\"button\" bind=\"okButton\"/>\n+                <button type=\"submit\" class=\"button button-primary\" bind=\"okButton\"/>\n                 <button class=\"button\" bind=\"cancelButton\"></button>\n             </div>\n         </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/replace-dialog.html b/main/webapp/modules/core/scripts/views/data-table/replace-dialog.html\nindex 43d3e0247..4cba5c015 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/replace-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/replace-dialog.html\n@@ -53,7 +53,7 @@\n       </div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\" bind=\"okButton\"></button>\n+      <button class=\"button button-primary\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/sorting-criterion-dialog.html b/main/webapp/modules/core/scripts/views/data-table/sorting-criterion-dialog.html\nindex 831af50b9..523f293a6 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/sorting-criterion-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/sorting-criterion-dialog.html\n@@ -47,7 +47,7 @@\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\" bind=\"okButton\"></button>\n+      <button class=\"button button-primary\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html b/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html\nindex cdcaaf7b6..46f9ef6c0 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/split-column-dialog.html\n@@ -52,7 +52,7 @@\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\" bind=\"okButton\"></button>\n+      <button class=\"button button-primary\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html b/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html\nindex f544d3bd5..36767bc15 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html\n@@ -55,7 +55,7 @@\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\" bind=\"okButton\"></button>\n+      <button class=\"button button-primary\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/text-transform-dialog.html b/main/webapp/modules/core/scripts/views/data-table/text-transform-dialog.html\nindex 87cf5bfdd..9c27e8ebf 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/text-transform-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/text-transform-dialog.html\n@@ -21,7 +21,7 @@\n     </div>\n   </div>\n   <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-    <button class=\"button\" bind=\"okButton\"></button>\n+    <button class=\"button button-primary\" bind=\"okButton\"></button>\n     <button class=\"button\" bind=\"cancelButton\"></button>\n   </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/transpose-columns-into-rows.html b/main/webapp/modules/core/scripts/views/data-table/transpose-columns-into-rows.html\nindex 0e1514a13..56f23b911 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/transpose-columns-into-rows.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/transpose-columns-into-rows.html\n@@ -62,7 +62,7 @@\n       </table></div>\n     </div>\n     <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-      <button class=\"button\" bind=\"okButton\"></button>\n+      <button class=\"button button-primary\" bind=\"okButton\"></button>\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/warn-of-pending-sort.html b/main/webapp/modules/core/scripts/views/data-table/warn-of-pending-sort.html\nindex 5cb4a77fe..f80aac8f1 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/warn-of-pending-sort.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/warn-of-pending-sort.html\n@@ -10,7 +10,7 @@\n             </div>\n         </div>\n         <div class=\"dialog-footer\" bind=\"dialogFooter\">\n-            <button class=\"button\" bind=\"okButton\"></button>\n+            <button class=\"button button-primary\" bind=\"okButton\"></button>\n             <button class=\"button\" bind=\"cancelButton\"></button>\n         </div>\n     </div>\ndiff --git a/main/webapp/modules/core/styles/reconciliation/recon-dialog.css b/main/webapp/modules/core/styles/reconciliation/recon-dialog.css\nindex e035a75ea..24dec397e 100644\n--- a/main/webapp/modules/core/styles/reconciliation/recon-dialog.css\n+++ b/main/webapp/modules/core/styles/reconciliation/recon-dialog.css\n@@ -104,7 +104,6 @@ a.recon-dialog-service-selector-remove {\n }\n .dialog-footer {\n   display: flex;\n-  justify-content: space-between;\n }\n \n .button-left {\ndiff --git a/pom.xml b/pom.xml\nindex 656dd1aaa..3c3637880 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -333,7 +333,7 @@\n         <!-- Signature -->\n         <groupId>org.apache.maven.plugins</groupId>\n         <artifactId>maven-gpg-plugin</artifactId>\n-        <version>3.2.1</version>\n+        <version>3.2.2</version>\n         <executions>\n             <execution>\n                 <id>sign-artifacts</id>\n", "test_patch": "diff --git a/main/tests/server/src/com/google/refine/model/ReconTests.java b/main/tests/server/src/com/google/refine/model/ReconTests.java\nindex 9d1c1ad5c..3e038494b 100644\n--- a/main/tests/server/src/com/google/refine/model/ReconTests.java\n+++ b/main/tests/server/src/com/google/refine/model/ReconTests.java\n@@ -34,6 +34,7 @@ import java.util.Set;\n import java.util.stream.Collectors;\n import java.util.stream.LongStream;\n \n+import com.fasterxml.jackson.databind.exc.ValueInstantiationException;\n import org.testng.Assert;\n import org.testng.annotations.Test;\n \n@@ -123,6 +124,45 @@ public class ReconTests {\n         TestUtils.isSerializedTo(r, json);\n     }\n \n+    @Test\n+    public void testsErrorWithMatchSerialization() throws Exception {\n+        String json = \"{\\\"id\\\":1533651559492945033,\"\n+                + \"\\\"service\\\":\\\"https://tools.wmflabs.org/openrefine-wikidata/en/api\\\",\"\n+                + \"\\\"identifierSpace\\\":\\\"http://www.wikidata.org/entity/\\\",\"\n+                + \"\\\"schemaSpace\\\":\\\"http://www.wikidata.org/prop/direct/\\\",\"\n+                + \"\\\"j\\\":\\\"matched\\\",\"\n+                + \"\\\"e\\\":\\\"fictional error message\\\",\"\n+                + \"\\\"m\\\":{\"\n+                + \"   \\\"id\\\":\\\"Q2892284\\\",\"\n+                + \"   \\\"name\\\":\\\"Baylor College of Medicine\\\",\"\n+                + \"   \\\"score\\\":98.57142857142858,\"\n+                + \"   \\\"types\\\":[\\\"Q16917\\\",\\\"Q23002054\\\",\\\"Q494230\\\"]\"\n+                + \"}\"\n+                + \"}\";\n+        Recon r = Recon.loadStreaming(json);\n+        Assert.assertEquals(r.error, \"fictional error message\");\n+        Assert.assertEquals(r.match.id, \"Q2892284\");\n+        TestUtils.isSerializedTo(r, json);\n+    }\n+\n+    @Test\n+    public void testsErrorWithCandidatesDeserialization() throws Exception {\n+        String json = \"{\\\"id\\\":1533651559492945033,\"\n+                + \"\\\"service\\\":\\\"https://tools.wmflabs.org/openrefine-wikidata/en/api\\\",\"\n+                + \"\\\"identifierSpace\\\":\\\"http://www.wikidata.org/entity/\\\",\"\n+                + \"\\\"schemaSpace\\\":\\\"http://www.wikidata.org/prop/direct/\\\",\"\n+                + \"\\\"j\\\":\\\"none\\\",\"\n+                + \"\\\"e\\\":\\\"fictional error message\\\",\"\n+                + \"\\\"c\\\":[{\"\n+                + \"   \\\"id\\\":\\\"Q2892284\\\",\"\n+                + \"   \\\"name\\\":\\\"Baylor College of Medicine\\\",\"\n+                + \"   \\\"score\\\":98.57142857142858,\"\n+                + \"   \\\"types\\\":[\\\"Q16917\\\",\\\"Q23002054\\\",\\\"Q494230\\\"]\"\n+                + \"}]\"\n+                + \"}\";\n+        Assert.assertThrows(ValueInstantiationException.class, () -> Recon.loadStreaming(json));\n+    }\n+\n     /**\n      * Test for issue https://github.com/OpenRefine/OpenRefine/issues/3785. Generating many recon objects within a short\n      * amount of time leads to collisions in id generation.\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Closes #6464.\r\n", "PR_Title": "Fix recon deserialization error for matched cells", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6483_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6483, "issue_title": "Fix recon deserialization error for matched cells", "issue_body": "Closes #6464.\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6285", "base_commit": "0dd9bd2022c08de59b877ef2f627005aac70267e", "patch": "diff --git a/benchmark/pom.xml b/benchmark/pom.xml\nindex f8fcae8a2..5858d30a1 100644\n--- a/benchmark/pom.xml\n+++ b/benchmark/pom.xml\n@@ -149,7 +149,7 @@\n         </plugin>\n         <plugin>\n           <artifactId>maven-surefire-plugin</artifactId>\n-          <version>3.2.3</version>\n+          <version>3.2.5</version>\n           <configuration>\n             <skipTests>true</skipTests>\n           </configuration>\ndiff --git a/extensions/database/pom.xml b/extensions/database/pom.xml\nindex 0a294e654..02c073747 100644\n--- a/extensions/database/pom.xml\n+++ b/extensions/database/pom.xml\n@@ -105,7 +105,7 @@\n     <dependency>\n       <groupId>org.xerial</groupId>\n       <artifactId>sqlite-jdbc</artifactId>\n-      <version>3.44.1.0</version>\n+      <version>3.45.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.fasterxml.jackson.core</groupId>\ndiff --git a/extensions/gdata/module/langs/translation-he.json b/extensions/gdata/module/langs/translation-he.json\nindex 23ed5de78..cac098096 100644\n--- a/extensions/gdata/module/langs/translation-he.json\n+++ b/extensions/gdata/module/langs/translation-he.json\n@@ -48,5 +48,7 @@\n     \"gdata-exporter/export-to-google-drive\": \"מיזם OpenRefine שומר בארכיון ל־Google Drive…\",\n     \"gdata-import/re-sign-in-another\": \"כניסה עם חשבון אחר\",\n     \"gdata-import/please-signin\": \"נא להיכנס כדי לאשר את הגישה לנתונים שלך ב־Google\",\n-    \"gdata-parsing/disable-auto-preview\": \"השבתת תצוגה מקדימה אוטומטית\"\n+    \"gdata-parsing/disable-auto-preview\": \"השבתת תצוגה מקדימה אוטומטית\",\n+    \"gdata-import/please-name-project\": \"נא לתת שם למיזם.\",\n+    \"gdata-import/errors\": \"שגיאות:\\n $1\"\n }\ndiff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml\nindex 2ed919c1b..159794763 100644\n--- a/extensions/gdata/pom.xml\n+++ b/extensions/gdata/pom.xml\n@@ -84,7 +84,7 @@\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-drive</artifactId>\n-      <version>v3-rev20231128-2.0.0</version>\n+      <version>v3-rev20240110-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.google.apis</groupId>\ndiff --git a/main/resources/com/google/refine/grel/ControlEvalError_he.properties b/main/resources/com/google/refine/grel/ControlEvalError_he.properties\nindex e69de29bb..5715cd62c 100644\n--- a/main/resources/com/google/refine/grel/ControlEvalError_he.properties\n+++ b/main/resources/com/google/refine/grel/ControlEvalError_he.properties\n@@ -0,0 +1,15 @@\n+expects_second_third_args_different={0} מצפה שהארגומנטים השני והשלישי יהיו שמות משתנים שונים\n+foreach_index=הארגומנט הראשון ל־forEachIndex הוא לא מערך או עצם JSON\n+filter=הארגומנט הראשון הוא לא מערך\n+foreach=הארגומנט הראשון ל־forEach הוא לא מערך או עצם JSON\n+\n+\n+# check arguments\n+expects_one_arg={0} מצפה לארגומנט אחד\n+expects_three_args={0} מצפה לשלושה ארגומנטים\n+expects_four_args={0} מצפה לארבעה ארגומנטים\n+expects_second_arg_var_name={0} מצפה שהארגומנט השני יהיה שם משתנה\n+expects_second_arg_index_var_name={0} מצפה שהארגומנט השני יהיה שם המשתנה של המפתח\n+for_range=הארגומנטים הראשון, השני והשלישי של forRange חייבים להיות מספרים\n+expects_five_args={0} מצפה לחמישה ארגומנטים\n+expects_third_arg_element_var_name={0} מצפה שהארגומנט השני יהיה שם המשתנה של הרכיב\ndiff --git a/main/src/com/google/refine/model/Column.java b/main/src/com/google/refine/model/Column.java\nindex 7c456cec6..7dd296055 100644\n--- a/main/src/com/google/refine/model/Column.java\n+++ b/main/src/com/google/refine/model/Column.java\n@@ -55,6 +55,7 @@ public class Column {\n     private ReconStats _reconStats;\n \n     transient protected Map<String, Object> _precomputes;\n+    private ReconConfig _sourceReconConfig;\n \n     @JsonCreator\n     public Column(\n@@ -95,6 +96,17 @@ public class Column {\n         return _reconConfig;\n     }\n \n+    @JsonProperty(\"sourceReconConfig\")\n+    public void setSourceReconConfig(ReconConfig sourceConfig) {\n+        this._sourceReconConfig = sourceConfig;\n+    }\n+\n+    @JsonProperty(\"sourceReconConfig\")\n+    @JsonInclude(Include.NON_NULL)\n+    public ReconConfig getSourceReconConfig() {\n+        return _sourceReconConfig;\n+    }\n+\n     @JsonProperty(\"reconStats\")\n     public void setReconStats(ReconStats stats) {\n         this._reconStats = stats;\ndiff --git a/main/src/com/google/refine/model/changes/DataExtensionChange.java b/main/src/com/google/refine/model/changes/DataExtensionChange.java\nindex 8adbcb9b7..1ba0366b5 100644\n--- a/main/src/com/google/refine/model/changes/DataExtensionChange.java\n+++ b/main/src/com/google/refine/model/changes/DataExtensionChange.java\n@@ -220,6 +220,9 @@ public class DataExtensionChange implements Change {\n                         _identifierSpace,\n                         _schemaSpace,\n                         columnType));\n+                if (project.columnModel.getColumnByName(_baseColumnName) != null) {\n+                    column.setSourceReconConfig(project.columnModel.getColumnByName(_baseColumnName).getReconConfig());\n+                }\n                 ReconStats reconStats = ReconStats.create(project, cellIndex);\n                 if (reconStats.matchedTopics > 0) {\n                     column.setReconStats(reconStats);\ndiff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json\nindex 2eec9bb9e..1c64feb83 100644\n--- a/main/webapp/modules/core/langs/translation-en.json\n+++ b/main/webapp/modules/core/langs/translation-en.json\n@@ -463,6 +463,8 @@\n     \"core-views/create-topic-cell\": \"Create a new item for this cell\",\n     \"core-views/create-topic\": \"Create new item\",\n     \"core-views/search-match\": \"Search for match\",\n+    \"core-views/see-more\": \"See more\",\n+    \"core-views/see-less\": \"See less\",\n     \"core-views/item-to-match\": \"Item to match\",\n     \"core-views/not-valid-number\": \"Not a valid number.\",\n     \"core-views/not-valid-date\": \"Not a valid date.\",\n@@ -524,6 +526,7 @@\n     \"core-views/warning-sel-judg\": \"Please select at least one kind of judgment to copy.\",\n     \"core-views/start-recon\": \"Start reconciling…\",\n     \"core-views/recon-text-fb\": \"Reconcile text in this column with items in another data source\",\n+    \"core-views/data-extended-from\" : \"Data extended from $1\",\n     \"core-views/facets\": \"Facets\",\n     \"core-views/by-judg\": \"By judgment\",\n     \"core-views/judgment\": \"$1: judgment\",\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/cell-renderers/recon-renderer.js b/main/webapp/modules/core/scripts/views/data-table/cell-renderers/recon-renderer.js\nindex 48a6df4b6..ac9d4e392 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/cell-renderers/recon-renderer.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/cell-renderers/recon-renderer.js\n@@ -90,8 +90,13 @@ class ReconCellRenderer {\n           var ul = $('<div></div>').addClass(\"data-table-recon-candidates\").appendTo(divContentRecon);\n           if (\"c\" in r && r.c.length > 0) {\n             var candidates = r.c;\n+            var visibleCandidates = 3;\n             var renderCandidate = function(candidate, index) {\n               var li = $('<div></div>').addClass(\"data-table-recon-candidate\").appendTo(ul);\n+              \n+              if (index >= visibleCandidates) {\n+                li.hide();\n+              }\n               var liSpan = $('<span></span>').appendTo(li);\n \n               $('<a href=\"javascript:{}\">&nbsp;</a>')\n@@ -128,7 +133,29 @@ class ReconCellRenderer {\n               }\n               $('<span></span>').addClass(\"data-table-recon-score\").text(\"(\" + score + \")\").appendTo(liSpan);\n             };\n-\n+            var visibilityChoices = $('<div>').addClass(\"data-table-recon-visibility\").appendTo(divContentRecon);\n+            if (candidates.length > visibleCandidates) {\n+              var isExpanded = false; // Variable to track visibility state\n+              var seeMoreLink = $('<a href=\"javascript:{}\"></a>')\n+              .on('click', function(evt) {\n+                var link = $(this);\n+                isExpanded = !isExpanded; // Toggle visibility state\n+                if (isExpanded) {\n+                  ul.find('.data-table-recon-candidate').show(); // Show all candidates\n+                  seeMoreLink.text($.i18n('core-views/see-less')); // Change link text to \"See Less\"\n+\n+                } \n+                else {\n+                  ul.find('.data-table-recon-candidate:not(:lt(' + visibleCandidates + '))').hide();\n+                  ul.find('.data-table-recon-candidate:last').show();\n+                  seeMoreLink.text($.i18n('core-views/see-more')); // Change link text to \"See More\"\n+                }\n+                return false;  \n+              })\n+              .text($.i18n('core-views/see-more'))\n+              .appendTo(visibilityChoices);\n+              seeMoreLink.after(\" | \");\n+          }\n             for (var i = 0; i < candidates.length; i++) {\n               renderCandidate(candidates[i], i);\n             }\n@@ -165,8 +192,7 @@ class ReconCellRenderer {\n             }\n             addSuggest = true;\n           }\n-\n-          var extraChoices = $('<div>').addClass(\"data-table-recon-extra\").appendTo(divContentRecon);\n+          var extraChoices = $('<div>').addClass(\"data-table-recon-extra\").appendTo(visibilityChoices);\n           if (addSuggest) {\n             $('<a href=\"javascript:{}\"></a>')\n             .on('click',function(evt) {\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js b/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js\nindex 2356e9071..1c7f1191f 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js\n@@ -94,6 +94,18 @@ DataTableColumnHeaderUI.prototype._render = function() {\n       .appendTo(whole);\n     }\n   }\n+  if(\"sourceReconConfig\" in this._column) {\n+    if(this._column.sourceReconConfig.service){\n+     var service = ReconciliationManager.getServiceFromUrl(this._column.sourceReconConfig.service);\n+     var serviceName;\n+     if(service) {\n+       serviceName=service.name;\n+     }\n+     if(serviceName){\n+      elmts.nameContainer.attr(\"title\",$.i18n('core-views/data-extended-from',service.name));\n+      }\n+    }\n+  }\n };\n \n DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) {\ndiff --git a/main/webapp/modules/core/styles/views/data-table-view.css b/main/webapp/modules/core/styles/views/data-table-view.css\nindex 0b4e6fe43..86cff4279 100644\n--- a/main/webapp/modules/core/styles/views/data-table-view.css\n+++ b/main/webapp/modules/core/styles/views/data-table-view.css\n@@ -279,21 +279,26 @@ a.data-table-recon-topic {\n   margin: 0 0.5em;\n }\n \n-a.data-table-recon-action, .data-table-recon-extra>a {\n+a.data-table-recon-action, .data-table-recon-extra>a, .data-table-recon-visibility>a {\n   text-decoration: none;\n   color: var(--link-secondary);\n }\n-.data-table-error-extra>a{\n-  font-size: 0.8em;;\n-  text-decoration: none;\n-  color: var(--link-secondary);\n+\n+.data-table-recon-visibility{\n+  font-size: 0.8em;\n }\n-a.data-table-recon-action, .data-table-recon-extra {\n+.data-table-recon-extra,.data-table-recon-visibily {\n+  display: inline;\n+  margin: 3px 0 0;\n+}\n+\n+a.data-table-recon-action{\n   font-size: 0.8em;\n   display: block;\n   margin: 3px 0 0;\n }\n \n+\n a.data-table-recon-match, a.data-table-recon-match-similar {\n   position: absolute;\n   top: 0;\ndiff --git a/packaging/pom.xml b/packaging/pom.xml\nindex 1e93b7c17..b21c43a56 100644\n--- a/packaging/pom.xml\n+++ b/packaging/pom.xml\n@@ -421,7 +421,7 @@\n       <plugin>\n         <groupId>com.akathist.maven.plugins.launch4j</groupId>\n         <artifactId>launch4j-maven-plugin</artifactId>\n-        <version>2.4.1</version>\n+        <version>2.5.0</version>\n         <executions>\n           <execution>\n             <id>l4j-clui-without-jre</id>\n@@ -508,7 +508,7 @@\n       <plugin>\n         <groupId>org.apache.maven.plugins</groupId>\n         <artifactId>maven-surefire-plugin</artifactId>\n-        <version>3.2.3</version>\n+        <version>3.2.5</version>\n         <configuration>\n           <skip>true</skip>\n         </configuration>\ndiff --git a/pom.xml b/pom.xml\nindex 35cd2ef0b..e25b50f4e 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -108,7 +108,7 @@\n     <httpmime.version>4.5.14</httpmime.version>\n     <owasp-encoder.version>1.2.3</owasp-encoder.version>\n     <jasypt.version>1.9.3</jasypt.version>\n-    <mockito.version>5.8.0</mockito.version>\n+    <mockito.version>5.9.0</mockito.version>\n \n     <!-- plugin versions -->\n     <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>\n@@ -118,7 +118,7 @@\n     <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>\n     <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>\n     <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>\n-    <surefire.version>3.2.3</surefire.version>\n+    <surefire.version>3.2.5</surefire.version>\n     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>\n     <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>\n     <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>\ndiff --git a/refine.bat b/refine.bat\nindex 3e6768dfd..2f4ce0bdc 100644\n--- a/refine.bat\n+++ b/refine.bat\n@@ -171,7 +171,6 @@ set REFINE_LIB_DIR=server\\target\\lib\n :gotLibDir\n \n if not \"%REFINE_VERBOSITY%\" == \"\" goto gotVerbosity\n-set REFINE_VERBOSITY=info\n :gotVerbosity\n set OPTS=%OPTS% -Drefine.verbosity=%REFINE_VERBOSITY%\n \ndiff --git a/server/src/com/google/refine/Refine.java b/server/src/com/google/refine/Refine.java\nindex e0b800616..f3c46efa1 100644\n--- a/server/src/com/google/refine/Refine.java\n+++ b/server/src/com/google/refine/Refine.java\n@@ -53,7 +53,9 @@ import javax.swing.JFrame;\n \n import com.google.util.threads.ThreadPoolExecutorAdapter;\n import org.apache.commons.lang.SystemUtils;\n-import org.apache.log4j.Level;\n+import org.apache.logging.log4j.Level;\n+import org.apache.logging.log4j.LogManager;\n+import org.apache.logging.log4j.core.config.Configurator;\n import org.eclipse.jetty.server.HttpConfiguration;\n import org.eclipse.jetty.server.HttpConnectionFactory;\n import org.eclipse.jetty.server.Server;\n@@ -96,7 +98,10 @@ public class Refine {\n         // System.setProperty(\"debug\",\"true\");\n \n         // set the log verbosity level\n-        org.apache.log4j.Logger.getRootLogger().setLevel(Level.toLevel(Configurations.get(\"refine.verbosity\", \"info\")));\n+        String logLevelArg = Configurations.get(\"refine.verbosity\");\n+        if (logLevelArg != null && !logLevelArg.isEmpty()) {\n+            Configurator.setAllLevels(LogManager.getRootLogger().getName(), Level.toLevel(logLevelArg));\n+        }\n \n         port = Configurations.getInteger(\"refine.port\", DEFAULT_PORT);\n         iface = Configurations.get(\"refine.interface\", DEFAULT_IFACE);\n", "test_patch": "diff --git a/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/actions/see-more-and-see-less.cy.js b/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/actions/see-more-and-see-less.cy.js\nnew file mode 100644\nindex 000000000..754034602\n--- /dev/null\n+++ b/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/actions/see-more-and-see-less.cy.js\n@@ -0,0 +1,47 @@\n+describe('Show more or less reconciliation candidates', () => {\n+    afterEach(() => {\n+        cy.addProjectForDeletion();\n+    });\n+    \n+    it('Testing see more / see less', () => {\n+        cy.visitOpenRefine();\n+        cy.navigateTo('Import project');\n+        cy.get('.grid-layout').should('to.contain', 'Locate an existing Refine project file');\n+\n+        //we're using here the \"no automatch\" project, so rows are reconciled and we have more than 3 matched candidates\n+        cy.get('#project-tar-file-input').attachFile('reconciled-project-no-automatch.zip')\n+        cy.get('#import-project-button').click();\n+\n+        //confirming that we have see more options\n+        cy.getCell(0, 'species').find('.data-table-recon-visibility').should('to.contain', 'See more');\n+        cy.getCell(1, 'species').find('.data-table-recon-visibility').should('to.contain', 'See more');\n+        cy.getCell(2, 'species').find('.data-table-recon-visibility').should('to.contain', 'See more');\n+        cy.getCell(3, 'species').find('.data-table-recon-visibility').should('to.contain', 'See more');\n+        cy.getCell(4, 'species').find('.data-table-recon-visibility').should('to.contain', 'See more');\n+        cy.getCell(5, 'species').find('.data-table-recon-visibility').should('to.contain', 'See more');\n+\n+        //confirming the initial no. of candidates\n+        cy.getCell(0, 'species').find('.data-table-recon-candidate:visible').should('have.length', 4);\n+\n+        //clicking the see more option\n+        cy.getCell(0, 'species').find('.data-table-recon-visibility').contains('See more').click();\n+\n+        //confirming the no. of candidates after we click on see more\n+        cy.getCell(0, 'species').find('.data-table-recon-candidate:visible').should('have.length', 6);\n+        \n+        //verifying that the see more option has changed to see less\n+        cy.getCell(0, 'species').find('.data-table-recon-visibility').should('to.contain', 'See less');\n+\n+        //clicking the see less option\n+        cy.getCell(0, 'species').find('.data-table-recon-visibility').contains('See less').click();\n+\n+        //confirming the no. of candidates after we click on see less\n+        cy.getCell(0, 'species').find('.data-table-recon-candidate:visible').should('have.length', 4);\n+\n+         \n+        \n+        \n+    });\n+});\n+\n+\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex 6251c1c73..4d986346e 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -16,7 +16,7 @@\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"13.6.2\",\n+        \"cypress\": \"13.6.3\",\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n@@ -24,6 +24,6 @@\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^9.1.0\",\n         \"eslint-plugin-cypress\": \"^2.15.1\",\n-        \"prettier\": \"3.1.1\"\n+        \"prettier\": \"3.2.4\"\n     }\n }\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 37db221b3..429daccc9 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -116,7 +116,7 @@\n   resolved \"https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz\"\n   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==\n \n-\"@types/node@*\", \"@types/node@^18.17.5\":\n+\"@types/node@*\":\n   version \"18.17.15\"\n   resolved \"https://registry.yarnpkg.com/@types/node/-/node-18.17.15.tgz#31301a273b9ca7d568fe6d1c35ae52e0fb3f8d6a\"\n   integrity sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==\n@@ -436,14 +436,13 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress@13.6.2:\n-  version \"13.6.2\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.6.2.tgz#c70df09db0a45063298b3cecba2fa21109768e08\"\n-  integrity sha512-TW3bGdPU4BrfvMQYv1z3oMqj71YI4AlgJgnrycicmPZAXtvywVFZW9DAToshO65D97rCWfG/kqMFsYB6Kp91gQ==\n+cypress@13.6.3:\n+  version \"13.6.3\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.6.3.tgz#54f03ca07ee56b2bc18211e7bd32abd2533982ba\"\n+  integrity sha512-d/pZvgwjAyZsoyJ3FOsJT5lDsqnxQ/clMqnNc++rkHjbkkiF2h9s0JsZSyyH4QXhVFW3zPFg82jD25roFLOdZA==\n   dependencies:\n     \"@cypress/request\" \"^3.0.0\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n-    \"@types/node\" \"^18.17.5\"\n     \"@types/sinonjs__fake-timers\" \"8.1.1\"\n     \"@types/sizzle\" \"^2.3.2\"\n     arch \"^2.2.0\"\n@@ -1309,10 +1308,10 @@ prelude-ls@^1.2.1:\n   resolved \"https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz\"\n   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==\n \n-prettier@3.1.1:\n-  version \"3.1.1\"\n-  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.1.1.tgz#6ba9f23165d690b6cbdaa88cb0807278f7019848\"\n-  integrity sha512-22UbSzg8luF4UuZtzgiUOfcGM8s4tjBv6dJRT7j275NXsy2jb4aJa4NNveul5x4eqlF1wuhuR2RElK71RvmVaw==\n+prettier@3.2.4:\n+  version \"3.2.4\"\n+  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283\"\n+  integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==\n \n pretty-bytes@^5.6.0:\n   version \"5.6.0\"\ndiff --git a/main/tests/server/src/com/google/refine/model/ColumnTests.java b/main/tests/server/src/com/google/refine/model/ColumnTests.java\nindex 0d34c1cef..7aa7c2523 100644\n--- a/main/tests/server/src/com/google/refine/model/ColumnTests.java\n+++ b/main/tests/server/src/com/google/refine/model/ColumnTests.java\n@@ -60,6 +60,19 @@ public class ColumnTests {\n                 + \"      {\\\"column\\\":\\\"organization_id\\\",\\\"propertyName\\\":\\\"SPARQL: P3500|P2427\\\",\\\"propertyID\\\":\\\"P3500|P2427\\\"}\"\n                 + \"    ],\"\n                 + \"    \\\"limit\\\":0},\"\n+                + \"\\\"sourceReconConfig\\\":{\"\n+                + \"   \\\"mode\\\":\\\"standard-service\\\",\"\n+                + \"   \\\"service\\\":\\\"https://tools.wmflabs.org/openrefine-wikidata/en/api\\\",\"\n+                + \"   \\\"identifierSpace\\\":\\\"http://www.wikidata.org/entity/\\\",\"\n+                + \"   \\\"schemaSpace\\\":\\\"http://www.wikidata.org/prop/direct/\\\",\"\n+                + \"   \\\"type\\\":{\\\"id\\\":\\\"Q43229\\\",\\\"name\\\":\\\"organization\\\"},\"\n+                + \"   \\\"autoMatch\\\":true,\"\n+                + \"   \\\"batchSize\\\":10,\"\n+                + \"   \\\"columnDetails\\\":[\"\n+                + \"      {\\\"column\\\":\\\"organization_country\\\",\\\"propertyName\\\":\\\"SPARQL: P17/P297\\\",\\\"propertyID\\\":\\\"P17/P297\\\"},\"\n+                + \"      {\\\"column\\\":\\\"organization_id\\\",\\\"propertyName\\\":\\\"SPARQL: P3500|P2427\\\",\\\"propertyID\\\":\\\"P3500|P2427\\\"}\"\n+                + \"    ],\"\n+                + \"    \\\"limit\\\":0},\"\n                 + \"\\\"reconStats\\\":{\"\n                 + \"    \\\"nonBlanks\\\":299,\"\n                 + \"    \\\"newTopics\\\":0,\"\ndiff --git a/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java\nindex b7e191ba0..b3067160d 100644\n--- a/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java\n@@ -68,6 +68,7 @@ import com.google.refine.model.Project;\n import com.google.refine.model.Recon;\n import com.google.refine.model.ReconCandidate;\n import com.google.refine.model.Row;\n+import com.google.refine.model.recon.DataExtensionReconConfig;\n import com.google.refine.model.recon.ReconciledDataExtensionJob;\n import com.google.refine.model.recon.ReconciledDataExtensionJob.DataExtensionConfig;\n import com.google.refine.operations.EngineDependentOperation;\n@@ -154,6 +155,9 @@ public class ExtendDataOperationTests extends RefineTest {\n     public void SetUp() throws IOException, ModelException {\n         OperationRegistry.registerOperation(getCoreModule(), \"extend-reconciled-data\", ExtendDataOperation.class);\n         project = createProjectWithColumns(\"DataExtensionTests\", \"country\");\n+        project.columnModel.getColumnByName(\"country\").setReconConfig(new DataExtensionReconConfig(RECON_SERVICE,\n+                RECON_IDENTIFIER_SPACE,\n+                RECON_SCHEMA_SPACE, null));\n \n         options = mock(Properties.class);\n         engine = new Engine(project);\n@@ -284,6 +288,9 @@ public class ExtendDataOperationTests extends RefineTest {\n \n             // Make sure we did not create any recon stats for that column (no reconciled value)\n             Assert.assertTrue(project.columnModel.getColumnByName(\"ISO 3166-1 alpha-2 code\").getReconStats() == null);\n+            // adding an assertion for sourceReconConfig\n+            Assert.assertTrue(project.columnModel.getColumnByName(\"ISO 3166-1 alpha-2 code\").getSourceReconConfig() != null);\n+\n         }\n     }\n \n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #5130\r\n\r\nChanges proposed in this pull request:\r\n- Adds a variable sourceReconConfig that contains the information about the reconconfig of the column from which data is extended from\r\n- Also updated the tests to test for sourceReconConfig\r\n- Finally, a tooltip is added to the new column which contains the extended data.\r\n", "PR_Title": "Improve how to indicate the data source following data extension#5130", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6285_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6285, "issue_title": "Improve how to indicate the data source following data extension#5130", "issue_body": "Fixes #5130\r\n\r\nChanges proposed in this pull request:\r\n- Adds a variable sourceReconConfig that contains the information about the reconconfig of the column from which data is extended from\r\n- Also updated the tests to test for sourceReconConfig\r\n- Finally, a tooltip is added to the new column which contains the extended data.\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-7247", "base_commit": "5620e00ed100a81a8156f650d4eafe5fa2de5e5c", "patch": "diff --git a/.github/workflows/snapshot_release.yml b/.github/workflows/snapshot_release.yml\nindex 87a1e1d78..2182420c5 100644\n--- a/.github/workflows/snapshot_release.yml\n+++ b/.github/workflows/snapshot_release.yml\n@@ -252,7 +252,7 @@ jobs:\n     - name: Upload release asset for Windows (with Java)\n       id: upload-release-asset-win-with-java\n       if: github.event_name == 'release'\n-      uses: shogo82148/actions-upload-release-asset@v1.7.8\n+      uses: shogo82148/actions-upload-release-asset@v1.8.0\n       with:\n         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}\n         asset_path: ./packaging/target/openrefine-win-with-java-${{ steps.version_string_variable.outputs.output_value }}.zip\n@@ -280,7 +280,7 @@ jobs:\n     - name: Upload Release Asset Linux\n       id: upload-release-asset-linux\n       if: github.event_name == 'release'\n-      uses: shogo82148/actions-upload-release-asset@v1.7.8\n+      uses: shogo82148/actions-upload-release-asset@v1.8.0\n       with:\n         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}\n         asset_path: ./packaging/target/openrefine-linux-${{ steps.version_string_variable.outputs.output_value }}.tar.gz\n@@ -297,7 +297,7 @@ jobs:\n     - name: Upload Release Asset Mac\n       id: upload-release-asset-mac\n       if: github.event_name == 'release'\n-      uses: shogo82148/actions-upload-release-asset@v1.7.8\n+      uses: shogo82148/actions-upload-release-asset@v1.8.0\n       with:\n         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}\n         asset_path: ./packaging/target/openrefine-mac-${{ steps.version_string_variable.outputs.output_value }}.dmg\n@@ -385,7 +385,7 @@ jobs:\n     - name: Upload release asset for Windows (with Java)\n       id: upload-release-asset-win-with-java-installer\n       if: github.event_name == 'release'\n-      uses: shogo82148/actions-upload-release-asset@v1.7.8\n+      uses: shogo82148/actions-upload-release-asset@v1.8.0\n       with:\n         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}\n         asset_path: ./packaging/target/openrefine-win-with-java-installer-${{ needs.mac_test_and_deploy.outputs.version_number_string }}.exe\ndiff --git a/benchmark/pom.xml b/benchmark/pom.xml\nindex 5b552f99c..fa70ac001 100644\n--- a/benchmark/pom.xml\n+++ b/benchmark/pom.xml\n@@ -149,7 +149,7 @@\n         </plugin>\n         <plugin>\n           <artifactId>maven-surefire-plugin</artifactId>\n-          <version>3.5.2</version>\n+          <version>3.5.3</version>\n           <configuration>\n             <skipTests>true</skipTests>\n           </configuration>\ndiff --git a/extensions/database/pom.xml b/extensions/database/pom.xml\nindex 25302ef82..df56cd828 100644\n--- a/extensions/database/pom.xml\n+++ b/extensions/database/pom.xml\n@@ -109,7 +109,7 @@\n     <dependency>\n       <groupId>org.mariadb.jdbc</groupId>\n       <artifactId>mariadb-java-client</artifactId>\n-      <version>3.5.2</version>\n+      <version>3.5.3</version>\n     </dependency>\n     <dependency>\n       <groupId>org.xerial</groupId>\ndiff --git a/main/src/com/google/refine/operations/row/RowAdditionOperation.java b/main/src/com/google/refine/operations/row/RowAdditionOperation.java\nindex f799f18c7..4afe4589d 100644\n--- a/main/src/com/google/refine/operations/row/RowAdditionOperation.java\n+++ b/main/src/com/google/refine/operations/row/RowAdditionOperation.java\n@@ -31,6 +31,7 @@ import java.util.List;\n import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n+import java.util.stream.Collectors;\n \n import com.fasterxml.jackson.annotation.JsonCreator;\n import com.fasterxml.jackson.annotation.JsonIgnore;\n@@ -49,15 +50,39 @@ public class RowAdditionOperation extends AbstractOperation {\n     final private List<Row> _rows;\n     final private int _insertionIndex;\n \n+    public RowAdditionOperation(\n+            List<Row> rows,\n+            int insertionIndex) {\n+        _rows = rows;\n+        _insertionIndex = insertionIndex;\n+    }\n+\n+    /**\n+     * Deserialization constructor to provide compatibility for the legacy serialization format. In this format, only\n+     * the number of rows is relevant: the contents of the rows must be ignored, because they might have been corrupted\n+     * due to mutability issues in https://github.com/OpenRefine/OpenRefine/issues/7245.\n+     * \n+     * @param addedRows\n+     *            the rows to add to the project\n+     * @param rows\n+     *            a legacy serialization field, whose length is is the only thing that matters. If provided, it will be\n+     *            converted to a list of empty rows of the same size.\n+     * @param insertionIndex\n+     *            the place in the grid where to insert this list.\n+     * @deprecated should not be called directly, is only provided for JSON deserialization.\n+     */\n+    @Deprecated\n     @JsonCreator\n     public RowAdditionOperation(\n-            @JsonProperty(\"rows\") List<Row> rows,\n+            @JsonProperty(\"addedRows\") List<Row> addedRows,\n+            @JsonProperty(\"rows\") List<Object> rows,\n             @JsonProperty(\"insertionIndex\") int insertionIndex) {\n-        _rows = rows;\n+        _rows = addedRows != null ? addedRows\n+                : (rows == null ? List.of() : rows.stream().map(r -> new Row(0)).collect(Collectors.toList()));\n         _insertionIndex = insertionIndex;\n     }\n \n-    @JsonProperty(\"rows\")\n+    @JsonProperty(\"addedRows\")\n     public List<Row> getRows() {\n         return _rows;\n     }\ndiff --git a/modules/core/src/main/java/com/google/refine/model/Cell.java b/modules/core/src/main/java/com/google/refine/model/Cell.java\nindex 119f90e0d..084452272 100644\n--- a/modules/core/src/main/java/com/google/refine/model/Cell.java\n+++ b/modules/core/src/main/java/com/google/refine/model/Cell.java\n@@ -193,6 +193,13 @@ public class Cell implements HasFields, Serializable {\n         return new Cell((Serializable) value, recon);\n     }\n \n+    /**\n+     * Return a deep copy of this object, making sure that if one instance is modified, the other isn't.\n+     */\n+    public Cell deepCopy() {\n+        return new Cell(value, recon == null ? null : recon.dup());\n+    }\n+\n     @Override\n     public String toString() {\n         // TODO this is kept like this for now, but it should rather be a string which makes the difference\ndiff --git a/modules/core/src/main/java/com/google/refine/model/Row.java b/modules/core/src/main/java/com/google/refine/model/Row.java\nindex 2aff00999..5550ec9fa 100644\n--- a/modules/core/src/main/java/com/google/refine/model/Row.java\n+++ b/modules/core/src/main/java/com/google/refine/model/Row.java\n@@ -38,6 +38,7 @@ import java.io.Writer;\n import java.util.ArrayList;\n import java.util.List;\n import java.util.Properties;\n+import java.util.stream.Collectors;\n \n import com.fasterxml.jackson.annotation.JsonCreator;\n import com.fasterxml.jackson.annotation.JsonIgnore;\n@@ -93,6 +94,19 @@ public class Row implements HasFields {\n         return row;\n     }\n \n+    /**\n+     * Make a deep copy of the row, making sure that if one is modified, the other isn't.\n+     */\n+    public Row deepCopy() {\n+        Row row = new Row(cells.size());\n+        row.flagged = flagged;\n+        row.starred = starred;\n+        row.cells.addAll(cells.stream()\n+                .map(cell -> cell == null ? null : cell.deepCopy())\n+                .collect(Collectors.toList()));\n+        return row;\n+    }\n+\n     @Override\n     public Object getField(String name, Properties bindings) {\n         if (FLAGGED.equals(name)) {\ndiff --git a/modules/core/src/main/java/com/google/refine/model/changes/RowAdditionChange.java b/modules/core/src/main/java/com/google/refine/model/changes/RowAdditionChange.java\nindex f3efb0f9c..5671d27e6 100644\n--- a/modules/core/src/main/java/com/google/refine/model/changes/RowAdditionChange.java\n+++ b/modules/core/src/main/java/com/google/refine/model/changes/RowAdditionChange.java\n@@ -33,6 +33,7 @@ import java.io.Writer;\n import java.util.ArrayList;\n import java.util.List;\n import java.util.Properties;\n+import java.util.stream.Collectors;\n \n import com.google.refine.ProjectManager;\n import com.google.refine.history.Change;\n@@ -57,7 +58,7 @@ public class RowAdditionChange implements Change {\n     @Override\n     public void apply(Project project) {\n         synchronized (project) {\n-            project.rows.addAll(_insertionIndex, _additionalRows);\n+            project.rows.addAll(_insertionIndex, _additionalRows.stream().map(row -> row.deepCopy()).collect(Collectors.toList()));\n \n             project.update();\n             project.columnModel.clearPrecomputes();\ndiff --git a/packaging/pom.xml b/packaging/pom.xml\nindex fe23fdbbb..8db7b5271 100644\n--- a/packaging/pom.xml\n+++ b/packaging/pom.xml\n@@ -475,7 +475,7 @@\n       <plugin>\n         <groupId>org.apache.maven.plugins</groupId>\n         <artifactId>maven-surefire-plugin</artifactId>\n-        <version>3.5.2</version>\n+        <version>3.5.3</version>\n         <configuration>\n           <skip>true</skip>\n         </configuration>\ndiff --git a/pom.xml b/pom.xml\nindex 042aaa7b4..ddb5b84aa 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -101,12 +101,12 @@\n     <odfdom-java.version>0.12.0</odfdom-java.version> <!-- do not update to 0.10.0, see issue #4397 -->\n     <vicino.version>1.2.1</vicino.version>\n     <clojure.version>1.12.0</clojure.version>\n-    <httpclient5.version>5.4.2</httpclient5.version>\n+    <httpclient5.version>5.4.3</httpclient5.version>\n     <httpcore5.version>5.3.4</httpcore5.version>\n     <univocity-csv.version>2.9.1</univocity-csv.version>\n     <swc-parser-lazy.version>3.1.9</swc-parser-lazy.version>\n     <commons-io.version>2.18.0</commons-io.version>\n-    <guava.version>33.4.5-jre</guava.version>\n+    <guava.version>33.4.6-jre</guava.version>\n     <jaxb-api.version>2.3.1</jaxb-api.version>\n     <juniversalchardet.version>2.5.0</juniversalchardet.version>\n     <testng.version>7.11.0</testng.version>\n@@ -122,7 +122,7 @@\n     <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>\n     <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>\n     <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>\n-    <surefire.version>3.5.2</surefire.version>\n+    <surefire.version>3.5.3</surefire.version>\n     <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>\n     <maven-clean-plugin.version>3.4.1</maven-clean-plugin.version>\n     <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>\n", "test_patch": "diff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex c787979ca..135c25edc 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -16,7 +16,7 @@\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"14.2.0\",\n+        \"cypress\": \"14.2.1\",\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 4f00238e3..d8a23880d 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -12,10 +12,10 @@\n   resolved \"https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9\"\n   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==\n \n-\"@cypress/request@^3.0.7\":\n-  version \"3.0.7\"\n-  resolved \"https://registry.yarnpkg.com/@cypress/request/-/request-3.0.7.tgz#6a74a4da98d9e5ae9121d6e2d9c14780c9b5cf1a\"\n-  integrity sha512-LzxlLEMbBOPYB85uXrDqvD4MgcenjRBLIns3zyhx7vTPj/0u2eQhzXvPiGcaJrV38Q9dbkExWp6cOHPJ+EtFYg==\n+\"@cypress/request@^3.0.8\":\n+  version \"3.0.8\"\n+  resolved \"https://registry.yarnpkg.com/@cypress/request/-/request-3.0.8.tgz#992f1f42ba03ebb14fa5d97290abe9d015ed0815\"\n+  integrity sha512-h0NFgh1mJmm1nr4jCwkGHwKneVYKghUyWe6TMNrk0B9zsjAJxpg8C4/+BAcmLgCPa1vj1V8rNUaILl+zYRUWBQ==\n   dependencies:\n     aws-sign2 \"~0.7.0\"\n     aws4 \"^1.8.0\"\n@@ -30,7 +30,7 @@\n     json-stringify-safe \"~5.0.1\"\n     mime-types \"~2.1.19\"\n     performance-now \"^2.1.0\"\n-    qs \"6.13.1\"\n+    qs \"6.14.0\"\n     safe-buffer \"^5.1.2\"\n     tough-cookie \"^5.0.0\"\n     tunnel-agent \"^0.6.0\"\n@@ -340,16 +340,21 @@ cachedir@^2.3.0:\n   resolved \"https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz\"\n   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==\n \n-call-bind@^1.0.7:\n-  version \"1.0.7\"\n-  resolved \"https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9\"\n-  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==\n+call-bind-apply-helpers@^1.0.1, call-bind-apply-helpers@^1.0.2:\n+  version \"1.0.2\"\n+  resolved \"https://registry.yarnpkg.com/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz#4b5428c222be985d79c3d82657479dbe0b59b2d6\"\n+  integrity sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==\n   dependencies:\n-    es-define-property \"^1.0.0\"\n     es-errors \"^1.3.0\"\n     function-bind \"^1.1.2\"\n-    get-intrinsic \"^1.2.4\"\n-    set-function-length \"^1.2.1\"\n+\n+call-bound@^1.0.2:\n+  version \"1.0.4\"\n+  resolved \"https://registry.yarnpkg.com/call-bound/-/call-bound-1.0.4.tgz#238de935d2a2a692928c538c7ccfa91067fd062a\"\n+  integrity sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==\n+  dependencies:\n+    call-bind-apply-helpers \"^1.0.2\"\n+    get-intrinsic \"^1.3.0\"\n \n callsites@^3.0.0:\n   version \"3.1.0\"\n@@ -466,12 +471,12 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress@14.2.0:\n-  version \"14.2.0\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-14.2.0.tgz#cd1a846385d4aae13b009dcaa2d88f5156cafcb1\"\n-  integrity sha512-u7fuc9JEpSYLOdu8mzZDZ/JWsHUzR5pc8i1TeSqMz/bafXp+6IweMAeyphsEJ6/13qbB6nwTEY1m+GUAp6GqCQ==\n+cypress@14.2.1:\n+  version \"14.2.1\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-14.2.1.tgz#2628696588d3d3961bf0ea0ad87baeb359790dcd\"\n+  integrity sha512-5xd0E7fUp0pjjib1D7ljkmCwFDgMkWuW06jWiz8dKrI7MNRrDo0C65i4Sh+oZ9YHjMHZRJBR0XZk1DfekOhOUw==\n   dependencies:\n-    \"@cypress/request\" \"^3.0.7\"\n+    \"@cypress/request\" \"^3.0.8\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n     \"@types/sinonjs__fake-timers\" \"8.1.1\"\n     \"@types/sizzle\" \"^2.3.2\"\n@@ -508,7 +513,7 @@ cypress@14.2.0:\n     process \"^0.11.10\"\n     proxy-from-env \"1.0.0\"\n     request-progress \"^3.0.0\"\n-    semver \"^7.5.3\"\n+    semver \"^7.7.1\"\n     supports-color \"^8.1.1\"\n     tmp \"~0.2.3\"\n     tree-kill \"1.2.2\"\n@@ -546,20 +551,20 @@ deep-is@^0.1.3:\n   resolved \"https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz\"\n   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=\n \n-define-data-property@^1.1.4:\n-  version \"1.1.4\"\n-  resolved \"https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e\"\n-  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==\n-  dependencies:\n-    es-define-property \"^1.0.0\"\n-    es-errors \"^1.3.0\"\n-    gopd \"^1.0.1\"\n-\n delayed-stream@~1.0.0:\n   version \"1.0.0\"\n   resolved \"https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz\"\n   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=\n \n+dunder-proto@^1.0.1:\n+  version \"1.0.1\"\n+  resolved \"https://registry.yarnpkg.com/dunder-proto/-/dunder-proto-1.0.1.tgz#d7ae667e1dc83482f8b70fd0f6eefc50da30f58a\"\n+  integrity sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==\n+  dependencies:\n+    call-bind-apply-helpers \"^1.0.1\"\n+    es-errors \"^1.3.0\"\n+    gopd \"^1.2.0\"\n+\n ecc-jsbn@~0.1.1:\n   version \"0.1.2\"\n   resolved \"https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz\"\n@@ -587,18 +592,23 @@ enquirer@^2.3.6:\n   dependencies:\n     ansi-colors \"^4.1.1\"\n \n-es-define-property@^1.0.0:\n-  version \"1.0.0\"\n-  resolved \"https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845\"\n-  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==\n-  dependencies:\n-    get-intrinsic \"^1.2.4\"\n+es-define-property@^1.0.1:\n+  version \"1.0.1\"\n+  resolved \"https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.1.tgz#983eb2f9a6724e9303f61addf011c72e09e0b0fa\"\n+  integrity sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==\n \n es-errors@^1.3.0:\n   version \"1.3.0\"\n   resolved \"https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f\"\n   integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==\n \n+es-object-atoms@^1.0.0, es-object-atoms@^1.1.1:\n+  version \"1.1.1\"\n+  resolved \"https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.1.1.tgz#1c4f2c4837327597ce69d2ca190a7fdd172338c1\"\n+  integrity sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==\n+  dependencies:\n+    es-errors \"^1.3.0\"\n+\n escape-string-regexp@^1.0.5:\n   version \"1.0.5\"\n   resolved \"https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz\"\n@@ -857,16 +867,29 @@ function-bind@^1.1.2:\n   resolved \"https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c\"\n   integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==\n \n-get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:\n-  version \"1.2.4\"\n-  resolved \"https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd\"\n-  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==\n+get-intrinsic@^1.2.5, get-intrinsic@^1.3.0:\n+  version \"1.3.0\"\n+  resolved \"https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.3.0.tgz#743f0e3b6964a93a5491ed1bffaae054d7f98d01\"\n+  integrity sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==\n   dependencies:\n+    call-bind-apply-helpers \"^1.0.2\"\n+    es-define-property \"^1.0.1\"\n     es-errors \"^1.3.0\"\n+    es-object-atoms \"^1.1.1\"\n     function-bind \"^1.1.2\"\n-    has-proto \"^1.0.1\"\n-    has-symbols \"^1.0.3\"\n-    hasown \"^2.0.0\"\n+    get-proto \"^1.0.1\"\n+    gopd \"^1.2.0\"\n+    has-symbols \"^1.1.0\"\n+    hasown \"^2.0.2\"\n+    math-intrinsics \"^1.1.0\"\n+\n+get-proto@^1.0.1:\n+  version \"1.0.1\"\n+  resolved \"https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1\"\n+  integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==\n+  dependencies:\n+    dunder-proto \"^1.0.1\"\n+    es-object-atoms \"^1.0.0\"\n \n get-stream@^5.0.0, get-stream@^5.1.0:\n   version \"5.2.0\"\n@@ -913,12 +936,10 @@ globals@^15.11.0:\n   resolved \"https://registry.yarnpkg.com/globals/-/globals-15.11.0.tgz#b96ed4c6998540c6fb824b24b5499216d2438d6e\"\n   integrity sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==\n \n-gopd@^1.0.1:\n-  version \"1.0.1\"\n-  resolved \"https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c\"\n-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==\n-  dependencies:\n-    get-intrinsic \"^1.1.3\"\n+gopd@^1.2.0:\n+  version \"1.2.0\"\n+  resolved \"https://registry.yarnpkg.com/gopd/-/gopd-1.2.0.tgz#89f56b8217bdbc8802bd299df6d7f1081d7e51a1\"\n+  integrity sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==\n \n graceful-fs@^4.1.6, graceful-fs@^4.2.0:\n   version \"4.2.6\"\n@@ -930,24 +951,12 @@ has-flag@^4.0.0:\n   resolved \"https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz\"\n   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==\n \n-has-property-descriptors@^1.0.2:\n-  version \"1.0.2\"\n-  resolved \"https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854\"\n-  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==\n-  dependencies:\n-    es-define-property \"^1.0.0\"\n-\n-has-proto@^1.0.1:\n-  version \"1.0.1\"\n-  resolved \"https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0\"\n-  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==\n-\n-has-symbols@^1.0.3:\n-  version \"1.0.3\"\n-  resolved \"https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8\"\n-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==\n+has-symbols@^1.1.0:\n+  version \"1.1.0\"\n+  resolved \"https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.1.0.tgz#fc9c6a783a084951d0b971fe1018de813707a338\"\n+  integrity sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==\n \n-hasown@^2.0.0:\n+hasown@^2.0.2:\n   version \"2.0.2\"\n   resolved \"https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003\"\n   integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==\n@@ -1179,12 +1188,10 @@ log-update@^4.0.0:\n     slice-ansi \"^4.0.0\"\n     wrap-ansi \"^6.2.0\"\n \n-lru-cache@^6.0.0:\n-  version \"6.0.0\"\n-  resolved \"https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94\"\n-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==\n-  dependencies:\n-    yallist \"^4.0.0\"\n+math-intrinsics@^1.1.0:\n+  version \"1.1.0\"\n+  resolved \"https://registry.yarnpkg.com/math-intrinsics/-/math-intrinsics-1.1.0.tgz#a0dd74be81e2aa5c2f27e65ce283605ee4e2b7f9\"\n+  integrity sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==\n \n merge-stream@^2.0.0:\n   version \"2.0.0\"\n@@ -1237,10 +1244,10 @@ npm-run-path@^4.0.0:\n   dependencies:\n     path-key \"^3.0.0\"\n \n-object-inspect@^1.13.1:\n-  version \"1.13.2\"\n-  resolved \"https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff\"\n-  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==\n+object-inspect@^1.13.3:\n+  version \"1.13.4\"\n+  resolved \"https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.4.tgz#8375265e21bc20d0fa582c22e1b13485d6e00213\"\n+  integrity sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==\n \n once@^1.3.1, once@^1.4.0:\n   version \"1.4.0\"\n@@ -1364,12 +1371,12 @@ punycode@^2.1.0:\n   resolved \"https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz\"\n   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==\n \n-qs@6.13.1:\n-  version \"6.13.1\"\n-  resolved \"https://registry.yarnpkg.com/qs/-/qs-6.13.1.tgz#3ce5fc72bd3a8171b85c99b93c65dd20b7d1b16e\"\n-  integrity sha512-EJPeIn0CYrGu+hli1xilKAPXODtJ12T0sP63Ijx2/khC2JtuaN3JyNIpvmnkmaEtha9ocbG4A4cMcr+TvqvwQg==\n+qs@6.14.0:\n+  version \"6.14.0\"\n+  resolved \"https://registry.yarnpkg.com/qs/-/qs-6.14.0.tgz#c63fa40680d2c5c941412a0e899c89af60c0a930\"\n+  integrity sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==\n   dependencies:\n-    side-channel \"^1.0.6\"\n+    side-channel \"^1.1.0\"\n \n request-progress@^3.0.0:\n   version \"3.0.0\"\n@@ -1408,24 +1415,10 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:\n   resolved \"https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz\"\n   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==\n \n-semver@^7.5.3:\n-  version \"7.5.3\"\n-  resolved \"https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e\"\n-  integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==\n-  dependencies:\n-    lru-cache \"^6.0.0\"\n-\n-set-function-length@^1.2.1:\n-  version \"1.2.2\"\n-  resolved \"https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449\"\n-  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==\n-  dependencies:\n-    define-data-property \"^1.1.4\"\n-    es-errors \"^1.3.0\"\n-    function-bind \"^1.1.2\"\n-    get-intrinsic \"^1.2.4\"\n-    gopd \"^1.0.1\"\n-    has-property-descriptors \"^1.0.2\"\n+semver@^7.7.1:\n+  version \"7.7.1\"\n+  resolved \"https://registry.yarnpkg.com/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f\"\n+  integrity sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==\n \n shebang-command@^2.0.0:\n   version \"2.0.0\"\n@@ -1439,15 +1432,45 @@ shebang-regex@^3.0.0:\n   resolved \"https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz\"\n   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==\n \n-side-channel@^1.0.6:\n-  version \"1.0.6\"\n-  resolved \"https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2\"\n-  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==\n+side-channel-list@^1.0.0:\n+  version \"1.0.0\"\n+  resolved \"https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad\"\n+  integrity sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==\n   dependencies:\n-    call-bind \"^1.0.7\"\n     es-errors \"^1.3.0\"\n-    get-intrinsic \"^1.2.4\"\n-    object-inspect \"^1.13.1\"\n+    object-inspect \"^1.13.3\"\n+\n+side-channel-map@^1.0.1:\n+  version \"1.0.1\"\n+  resolved \"https://registry.yarnpkg.com/side-channel-map/-/side-channel-map-1.0.1.tgz#d6bb6b37902c6fef5174e5f533fab4c732a26f42\"\n+  integrity sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==\n+  dependencies:\n+    call-bound \"^1.0.2\"\n+    es-errors \"^1.3.0\"\n+    get-intrinsic \"^1.2.5\"\n+    object-inspect \"^1.13.3\"\n+\n+side-channel-weakmap@^1.0.2:\n+  version \"1.0.2\"\n+  resolved \"https://registry.yarnpkg.com/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz#11dda19d5368e40ce9ec2bdc1fb0ecbc0790ecea\"\n+  integrity sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==\n+  dependencies:\n+    call-bound \"^1.0.2\"\n+    es-errors \"^1.3.0\"\n+    get-intrinsic \"^1.2.5\"\n+    object-inspect \"^1.13.3\"\n+    side-channel-map \"^1.0.1\"\n+\n+side-channel@^1.1.0:\n+  version \"1.1.0\"\n+  resolved \"https://registry.yarnpkg.com/side-channel/-/side-channel-1.1.0.tgz#c3fcff9c4da932784873335ec9765fa94ff66bc9\"\n+  integrity sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==\n+  dependencies:\n+    es-errors \"^1.3.0\"\n+    object-inspect \"^1.13.3\"\n+    side-channel-list \"^1.0.0\"\n+    side-channel-map \"^1.0.1\"\n+    side-channel-weakmap \"^1.0.2\"\n \n signal-exit@^3.0.2:\n   version \"3.0.3\"\n@@ -1670,11 +1693,6 @@ wrappy@1:\n   resolved \"https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz\"\n   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=\n \n-yallist@^4.0.0:\n-  version \"4.0.0\"\n-  resolved \"https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72\"\n-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==\n-\n yauzl@^2.10.0:\n   version \"2.10.0\"\n   resolved \"https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz\"\ndiff --git a/main/tests/server/src/com/google/refine/operations/row/RowAdditionOperationTests.java b/main/tests/server/src/com/google/refine/operations/row/RowAdditionOperationTests.java\nindex a9590fbfe..89a102579 100644\n--- a/main/tests/server/src/com/google/refine/operations/row/RowAdditionOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/row/RowAdditionOperationTests.java\n@@ -30,6 +30,7 @@ package com.google.refine.operations.row;\n import static org.testng.Assert.assertEquals;\n \n import java.io.IOException;\n+import java.io.Serializable;\n import java.util.ArrayList;\n import java.util.List;\n import java.util.Map;\n@@ -45,7 +46,9 @@ import org.testng.annotations.BeforeTest;\n import org.testng.annotations.Test;\n \n import com.google.refine.RefineTest;\n+import com.google.refine.model.Cell;\n import com.google.refine.model.ColumnsDiff;\n+import com.google.refine.model.Project;\n import com.google.refine.model.Row;\n import com.google.refine.operations.OperationDescription;\n import com.google.refine.operations.OperationRegistry;\n@@ -54,7 +57,8 @@ import com.google.refine.util.TestUtils;\n \n public class RowAdditionOperationTests extends RefineTest {\n \n-    String json;\n+    String legacyJson;\n+    String newJson;\n     RowAdditionOperation op;\n \n     @BeforeSuite\n@@ -64,9 +68,17 @@ public class RowAdditionOperationTests extends RefineTest {\n \n     @BeforeMethod\n     public void setUp() {\n-        json = \"{\"\n+        // JSON serialization before 3.9.3, which might contain some corrupted cells because of mutability issues,\n+        // manifesting themselves in https://github.com/OpenRefine/OpenRefine/issues/7245\n+        legacyJson = \"{\"\n                 + \"\\\"op\\\":\\\"core/row-addition\\\",\"\n-                + \"\\\"rows\\\":[{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]},{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]}],\"\n+                + \"\\\"rows\\\":[{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[{\\\"foo\\\":3}]},{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]}],\"\n+                + \"\\\"index\\\":0,\"\n+                + \"\\\"description\\\":\" + new TextNode(OperationDescription.row_addition_brief()).toString() + \"}\";\n+        // JSON serialization from 3.9.3 on\n+        newJson = \"{\"\n+                + \"\\\"op\\\":\\\"core/row-addition\\\",\"\n+                + \"\\\"addedRows\\\":[{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]},{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]}],\"\n                 + \"\\\"index\\\":0,\"\n                 + \"\\\"description\\\":\" + new TextNode(OperationDescription.row_addition_brief()).toString() + \"}\";\n \n@@ -85,15 +97,21 @@ public class RowAdditionOperationTests extends RefineTest {\n     }\n \n     @Test\n-    public void testDeserialization() throws IOException {\n-        RowAdditionOperation op = ParsingUtilities.mapper.readValue(json, RowAdditionOperation.class);\n-        TestUtils.isSerializedTo(op, json);\n+    public void testLegacyDeserialization() throws IOException {\n+        RowAdditionOperation op = ParsingUtilities.mapper.readValue(legacyJson, RowAdditionOperation.class);\n+        TestUtils.isSerializedTo(op, newJson);\n+    }\n+\n+    @Test\n+    public void testNewDeserialization() throws IOException {\n+        RowAdditionOperation op = ParsingUtilities.mapper.readValue(newJson, RowAdditionOperation.class);\n+        TestUtils.isSerializedTo(op, newJson);\n     }\n \n     @Test\n     public void testSerialization() throws JsonProcessingException {\n         String serializedObject = ParsingUtilities.mapper.writeValueAsString(op);\n-        assertEquals(serializedObject, json);\n+        assertEquals(serializedObject, newJson);\n     }\n \n     @Test\n@@ -106,7 +124,36 @@ public class RowAdditionOperationTests extends RefineTest {\n     public void testRename() {\n         RowAdditionOperation renamed = op.renameColumns(Map.of(\"foo\", \"bar\"));\n \n-        TestUtils.isSerializedTo(renamed, json);\n+        TestUtils.isSerializedTo(renamed, newJson);\n+    }\n+\n+    // regression test for https://github.com/OpenRefine/OpenRefine/issues/7245\n+    @Test\n+    public void mutabilityBugRegressionTest() throws Exception {\n+        Project project = createProject(new String[] { \"foo\", \"bar\" },\n+                new Serializable[][] {\n+                        { \"a\", \"b \" },\n+                        { null, \"c\" },\n+                });\n+\n+        RowAdditionOperation op = ParsingUtilities.mapper.readValue(newJson, RowAdditionOperation.class);\n+\n+        // add the two rows at the beginning\n+        runOperation(op, project);\n+        // and then edit a cell in the first row\n+        project.rows.get(0).setCell(0, new Cell(\"hello\", null));\n+\n+        Project expected = createProject(new String[] { \"foo\", \"bar\" },\n+                new Serializable[][] {\n+                        { \"hello\", null },\n+                        { null, null },\n+                        { \"a\", \"b \" },\n+                        { null, \"c\" },\n+                });\n+        assertProjectEquals(project, expected);\n+\n+        // the operation metadata is still unchanged\n+        TestUtils.isSerializedTo(op, newJson);\n     }\n \n }\ndiff --git a/modules/core/src/test/java/com/google/refine/model/CellTests.java b/modules/core/src/test/java/com/google/refine/model/CellTests.java\nindex 1fecf9e1e..b2048df01 100644\n--- a/modules/core/src/test/java/com/google/refine/model/CellTests.java\n+++ b/modules/core/src/test/java/com/google/refine/model/CellTests.java\n@@ -184,4 +184,17 @@ public class CellTests {\n         assertNotEquals(c1, \"foo\");\n         assertEquals(c1.hashCode(), new Cell(\"foo\", recon).hashCode());\n     }\n+\n+    @Test\n+    public void testDeepCopy() {\n+        Recon recon = mock(Recon.class);\n+        Recon reconDup = mock(Recon.class);\n+        when(recon.dup()).thenReturn(reconDup);\n+\n+        Cell c1 = new Cell(\"foo\", recon);\n+        Cell c2 = c1.deepCopy();\n+\n+        assertEquals(c2.value, \"foo\");\n+        assertEquals(c2.recon, reconDup);\n+    }\n }\ndiff --git a/modules/core/src/test/java/com/google/refine/model/RowTests.java b/modules/core/src/test/java/com/google/refine/model/RowTests.java\nindex 8337acd1b..c37662ef6 100644\n--- a/modules/core/src/test/java/com/google/refine/model/RowTests.java\n+++ b/modules/core/src/test/java/com/google/refine/model/RowTests.java\n@@ -35,6 +35,9 @@ package com.google.refine.model;\n \n import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.when;\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertFalse;\n+import static org.testng.Assert.assertTrue;\n \n import java.io.StringWriter;\n import java.util.Properties;\n@@ -187,4 +190,18 @@ public class RowTests extends RefineTest {\n         Assert.assertTrue((Boolean) row.getField(\"starred\", options));\n     }\n \n+    @Test\n+    public void deepCopy() {\n+        Row row = new Row(1);\n+        row.flagged = true;\n+        row.setCell(0, new Cell(\"original value\", null));\n+\n+        Row copied = row.deepCopy();\n+        row.starred = true;\n+        row.setCell(0, new Cell(\"new value\", null));\n+\n+        assertTrue(copied.flagged);\n+        assertFalse(copied.starred);\n+        assertEquals(copied.cells.get(0).value, \"original value\");\n+    }\n }\ndiff --git a/modules/core/src/test/java/com/google/refine/model/changes/RowAdditionChangeTests.java b/modules/core/src/test/java/com/google/refine/model/changes/RowAdditionChangeTests.java\nindex b742aa489..3d6a48ffd 100644\n--- a/modules/core/src/test/java/com/google/refine/model/changes/RowAdditionChangeTests.java\n+++ b/modules/core/src/test/java/com/google/refine/model/changes/RowAdditionChangeTests.java\n@@ -29,7 +29,7 @@ package com.google.refine.model.changes;\n \n import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertNotNull;\n-import static org.testng.Assert.assertSame;\n+import static org.testng.Assert.assertNotSame;\n import static org.testng.Assert.assertTrue;\n \n import java.io.IOException;\n@@ -107,13 +107,18 @@ public class RowAdditionChangeTests extends RefineTest {\n     }\n \n     @Test\n-    // After prepend apply, project's new prepended rows are identical those passed to constructor\n+    // After prepend apply, project's new prepended rows are equal those passed to constructor\n+    // but not identical, because otherwise modifying the row will change the operation's metadata.\n+    // See https://github.com/OpenRefine/OpenRefine/issues/7245\n     public void testPrependApplyRowIdentity() {\n         change.apply(project);\n         for (int i = insertionIndex; i < newRows.size(); i++) {\n             Row actual = project.rows.get(i);\n             Row expected = newRows.get(i);\n-            assertSame(actual, expected);\n+            assertNotSame(actual, expected);\n+            assertEquals(actual.flagged, expected.flagged);\n+            assertEquals(actual.starred, expected.starred);\n+            assertEquals(actual.cells, expected.cells);\n         }\n     }\n \n@@ -205,6 +210,8 @@ public class RowAdditionChangeTests extends RefineTest {\n \n     @Test\n     // After append apply, project's new append rows are identical those passed to constructor\n+    // but not identical, because otherwise modifying the row will change the operation's metadata.\n+    // See https://github.com/OpenRefine/OpenRefine/issues/7245\n     public void testAppendApplyRowIdentity() {\n         insertionIndex = project.rows.size();\n         change = new RowAdditionChange(newRows, insertionIndex);\n@@ -213,7 +220,10 @@ public class RowAdditionChangeTests extends RefineTest {\n         for (int i = insertionIndex; i < newRows.size(); i++) {\n             Row actual = project.rows.get(insertionIndex + i);\n             Row expected = newRows.get(i);\n-            assertSame(actual, expected);\n+            assertNotSame(actual, expected);\n+            assertEquals(actual.flagged, expected.flagged);\n+            assertEquals(actual.starred, expected.starred);\n+            assertEquals(actual.cells, expected.cells);\n         }\n     }\n \n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #7245.\r\n\r\nSee [my comment](https://github.com/OpenRefine/OpenRefine/issues/7245#issuecomment-2780552271) for an explanation of the root cause of the issue.\r\n\r\nTo fix it, I have:\r\n* made sure that the operation doesn't add its own list of rows to the project, but a copy of it, so that its metadata remains unchanged when further changes happen to the grid\r\n* introduced a new serialization format for the operation. The goal with this move is to make sure that we are able to deserialize all values that have already made it into people's workspaces. Using the fact that the row addition operation only lets the user add empty rows for now, I change the deserialization code so that the `rows` parameter of the operation is parsed as a generic array, and only its length is taken into account to generate a fresh list of empty rows (we really should have gone for just encoding the number of rows in the operation metadata, not the rows, but it's too late). A new parameter (`addedRows`) is introduced, which can be used in the future to retain actual row data (if the UI is ever made to support it), in which case the injection of the `Pool` object will need to be added on top.\r\n\r\nI have also added a regression test to demonstrate the fix.\r\n\r\nI would recommend to release this as 3.9.3 as soon as possible.", "PR_Title": "Fix deserialization of RowAdditionOperation.", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-7247_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 7247, "issue_title": "Fix deserialization of RowAdditionOperation.", "issue_body": "Fixes #7245.\r\n\r\nSee [my comment](https://github.com/OpenRefine/OpenRefine/issues/7245#issuecomment-2780552271) for an explanation of the root cause of the issue.\r\n\r\nTo fix it, I have:\r\n* made sure that the operation doesn't add its own list of rows to the project, but a copy of it, so that its metadata remains unchanged when further changes happen to the grid\r\n* introduced a new serialization format for the operation. The goal with this move is to make sure that we are able to deserialize all values that have already made it into people's workspaces. Using the fact that the row addition operation only lets the user add empty rows for now, I change the deserialization code so that the `rows` parameter of the operation is parsed as a generic array, and only its length is taken into account to generate a fresh list of empty rows (we really should have gone for just encoding the number of rows in the operation metadata, not the rows, but it's too late). A new parameter (`addedRows`) is introduced, which can be used in the future to retain actual row data (if the UI is ever made to support it), in which case the injection of the `Pool` object will need to be added on top.\r\n\r\nI have also added a regression test to demonstrate the fix.\r\n\r\nI would recommend to release this as 3.9.3 as soon as possible."}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6503", "base_commit": "fd81e5b545e50ce366fd925bb955a81ffb7610a9", "patch": "diff --git a/.github/workflows/snapshot_release.yml b/.github/workflows/snapshot_release.yml\nindex 21ce82ff3..cdd5fbf84 100644\n--- a/.github/workflows/snapshot_release.yml\n+++ b/.github/workflows/snapshot_release.yml\n@@ -24,7 +24,7 @@ jobs:\n       - name: Setup Node\n         uses: actions/setup-node@v4\n         with:\n-          node-version: '16'\n+          node-version: '20'\n       - id: set-matrix\n         run: npm install --save glob@8.1.0 && node main/tests/cypress/build-test-matrix.js >> $GITHUB_OUTPUT\n         env:\n@@ -60,7 +60,7 @@ jobs:\n       - name: Setup Node\n         uses: actions/setup-node@v4\n         with:\n-          node-version: '16'\n+          node-version: '20'\n \n       - name: Restore Tests dependency cache\n         uses: actions/cache@v4\ndiff --git a/benchmark/pom.xml b/benchmark/pom.xml\nindex 107242029..52e731806 100644\n--- a/benchmark/pom.xml\n+++ b/benchmark/pom.xml\n@@ -58,7 +58,7 @@\n       <plugin>\n         <groupId>org.apache.maven.plugins</groupId>\n         <artifactId>maven-compiler-plugin</artifactId>\n-        <version>3.10.1</version>\n+        <version>3.13.0</version>\n         <configuration>\n           <compilerVersion>${javac.target}</compilerVersion>\n           <source>${javac.target}</source>\n@@ -145,7 +145,7 @@\n         </plugin>\n         <plugin>\n           <artifactId>maven-source-plugin</artifactId>\n-          <version>3.2.1</version>\n+          <version>3.3.1</version>\n         </plugin>\n         <plugin>\n           <artifactId>maven-surefire-plugin</artifactId>\ndiff --git a/extensions/phonetic/.gitignore b/extensions/phonetic/.gitignore\ndeleted file mode 100644\nindex 17b5c9465..000000000\n--- a/extensions/phonetic/.gitignore\n+++ /dev/null\n@@ -1,1 +0,0 @@\n-module/MOD-INF/classes/\ndiff --git a/extensions/phonetic/module/MOD-INF/controller.js b/extensions/phonetic/module/MOD-INF/controller.js\ndeleted file mode 100644\nindex 6d652f685..000000000\n--- a/extensions/phonetic/module/MOD-INF/controller.js\n+++ /dev/null\n@@ -1,60 +0,0 @@\n-/*\n-\n-Copyright 2010, Google Inc.\n-All rights reserved.\n-\n-Redistribution and use in source and binary forms, with or without\n-modification, are permitted provided that the following conditions are\n-met:\n-\n- * Redistributions of source code must retain the above copyright\n-notice, this list of conditions and the following disclaimer.\n- * Redistributions in binary form must reproduce the above\n-copyright notice, this list of conditions and the following disclaimer\n-in the documentation and/or other materials provided with the\n-distribution.\n- * Neither the name of Google Inc. nor the names of its\n-contributors may be used to endorse or promote products derived from\n-this software without specific prior written permission.\n-\n-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n-\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,           \n-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY           \n-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n-\n- */\n-\n-var html = \"text/html\";\n-var encoding = \"UTF-8\";\n-var ClientSideResourceManager = Packages.com.google.refine.ClientSideResourceManager;\n-\n-/*\n- * Function invoked to initialize the extension.\n- */\n-function init() {\n-  // Register new keyers\n-  Packages.com.google.refine.clustering.binning.KeyerFactory.put(\"daitch-mokotoff\", new Packages.org.openrefine.phonetic.keyers.DaitchMokotoffKeyer());\n-  Packages.com.google.refine.clustering.binning.KeyerFactory.put(\"beider-morse\", new Packages.org.openrefine.phonetic.keyers.BeiderMorseKeyer());\n-\n-  // Similarly, we could register new distances like this:\n-  // Packages.com.google.refine.clustering.knn.DistanceFactory.put(\"my-distance\", new Packages.org.openrefine.mydistances.MyDistance());\n-\n-    /*\n-     * Resources: just some javascript to load the localized strings\n-     */\n-    ClientSideResourceManager.addPaths(\n-      \"project/scripts\",\n-      module,\n-      [\n-        \"scripts/load-language.js\",\n-      ]\n-    );\n-\n-}\ndiff --git a/extensions/phonetic/module/MOD-INF/module.properties b/extensions/phonetic/module/MOD-INF/module.properties\ndeleted file mode 100644\nindex e207201d3..000000000\n--- a/extensions/phonetic/module/MOD-INF/module.properties\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-name = phonetic\n-description = OpenRefine Phonetic Clustering extension\n-templating.macros = macros.vm\n-requires = core\ndiff --git a/extensions/phonetic/module/langs/translation-en.json b/extensions/phonetic/module/langs/translation-en.json\ndeleted file mode 100644\nindex 5cd9e72e6..000000000\n--- a/extensions/phonetic/module/langs/translation-en.json\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-{\n-    \"clustering-keyers/beider-morse\": \"Beider-Morse\",\n-    \"clustering-keyers/daitch-mokotoff\": \"Daitch-Mokotoff\"\n-}\ndiff --git a/extensions/phonetic/module/macros.vm b/extensions/phonetic/module/macros.vm\ndeleted file mode 100644\nindex 18a83bfce..000000000\n--- a/extensions/phonetic/module/macros.vm\n+++ /dev/null\n@@ -1,14 +0,0 @@\n-#*\n-  This file contains common velocity macros used in all .vt files.\n-  For Velocity documentation, see:\n-  \n-  http://velocity.apache.org/engine/releases/velocity-1.5/user-guide.html\n-*#\n-\n-#macro( makeAList $list )\n-  <ul>\n-    #foreach($item in $list)\n-      <li>$item</li>\n-    #end\n-  </ul>\n-#end\n\\ No newline at end of file\ndiff --git a/extensions/phonetic/module/scripts/load-language.js b/extensions/phonetic/module/scripts/load-language.js\ndeleted file mode 100644\nindex 2a05202b4..000000000\n--- a/extensions/phonetic/module/scripts/load-language.js\n+++ /dev/null\n@@ -1,1 +0,0 @@\n-I18NUtil.init(\"phonetic\");\ndiff --git a/extensions/phonetic/pom.xml b/extensions/phonetic/pom.xml\ndeleted file mode 100644\nindex 438072841..000000000\n--- a/extensions/phonetic/pom.xml\n+++ /dev/null\n@@ -1,92 +0,0 @@\n-<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n-\t xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n-  <modelVersion>4.0.0</modelVersion>\n-\n-  <groupId>org.openrefine</groupId>\n-  <artifactId>phonetic</artifactId>\n-  <packaging>jar</packaging>\n-  <version>3.9-SNAPSHOT</version>\n-\n-  <name>OpenRefine - Phonetic clustering extension</name>\n-  <description>Adds a few advanced phonetic clustering methods</description>\n-  <url>http://openrefine.org/</url>\n-  <parent>\n-    <groupId>org.openrefine</groupId>\n-    <artifactId>extensions</artifactId>\n-    <version>3.9-SNAPSHOT</version>\n-  </parent>\n-\n-  <build>\n-    <finalName>openrefine-sample</finalName>\n-    <resources>\n-      <resource>\n-        <directory>src</directory>\n-      </resource>\n-    </resources>\n-    <sourceDirectory>src</sourceDirectory>\n-    <testSourceDirectory>tests/src</testSourceDirectory>\n-    <outputDirectory>module/MOD-INF/classes</outputDirectory>\n-    <plugins>\n-      <plugin>\n-        <groupId>org.apache.maven.plugins</groupId>\n-        <artifactId>maven-surefire-plugin</artifactId>\n-        <version>${surefire.version}</version>\n-        <configuration>\n-          <suiteXmlFiles>\n-            <suiteXmlFile>tests/conf/tests.xml</suiteXmlFile>\n-          </suiteXmlFiles>\n-        </configuration>\n-      </plugin>\n-      <plugin>\n-        <groupId>org.apache.maven.plugins</groupId>\n-        <artifactId>maven-dependency-plugin</artifactId>\n-\t<version>${maven-dependency-plugin.version}</version>\n-        <executions>\n-            <execution>\n-            <phase>compile</phase>\n-            <goals>\n-                <goal>copy-dependencies</goal>\n-            </goals>\n-            <configuration>\n-                <outputDirectory>module/MOD-INF/lib</outputDirectory>\n-                <includeScope>runtime</includeScope>\n-            </configuration>\n-            </execution>\n-        </executions>\n-      </plugin>\n-    </plugins>\n-  </build>\n-\n-  <dependencies>\n-     <dependency>\n-      <groupId>${project.groupId}</groupId>\n-      <artifactId>main</artifactId>\n-      <version>${project.version}</version>\n-      <scope>provided</scope>\n-    </dependency>\n-    <dependency>\n-      <groupId>javax.servlet</groupId>\n-      <artifactId>javax.servlet-api</artifactId>\n-      <version>${servlet-api.version}</version>\n-      <scope>provided</scope>\n-    </dependency>\n-\n-   <!-- test dependencies -->\n-\n-    <dependency>\n-      <groupId>org.testng</groupId>\n-      <artifactId>testng</artifactId>\n-      <version>${testng.version}</version>\n-      <scope>test</scope>\n-    </dependency>\n-    <dependency>\n-      <groupId>org.apache.logging.log4j</groupId>\n-      <artifactId>log4j-slf4j-impl</artifactId>\n-      <version>${log4j.version}</version>\n-      <scope>test</scope>\n-    </dependency>\n-\n-  </dependencies>\n-\n-</project>\n-\ndiff --git a/extensions/pom.xml b/extensions/pom.xml\nindex 8243ffc22..592a15135 100644\n--- a/extensions/pom.xml\n+++ b/extensions/pom.xml\n@@ -23,7 +23,6 @@\n         <module>database</module>\n         <module>gdata</module>\n         <module>pc-axis</module>\n-        <module>phonetic</module>\n         <!-- Add new extensions here -->\n   </modules>\n \n@@ -50,7 +49,7 @@\n       <plugin>\n         <groupId>org.jacoco</groupId>\n         <artifactId>jacoco-maven-plugin</artifactId>\n-        <version>0.8.11</version>\n+        <version>0.8.12</version>\n         <executions>\n             <execution>\n                 <id>prepare-agent</id>\ndiff --git a/extensions/phonetic/src/org/openrefine/phonetic/keyers/BeiderMorseKeyer.java b/main/src/com/google/refine/clustering/binning/BeiderMorseKeyer.java\nsimilarity index 91%\nrename from extensions/phonetic/src/org/openrefine/phonetic/keyers/BeiderMorseKeyer.java\nrename to main/src/com/google/refine/clustering/binning/BeiderMorseKeyer.java\nindex af2759231..eb0ea843a 100644\n--- a/extensions/phonetic/src/org/openrefine/phonetic/keyers/BeiderMorseKeyer.java\n+++ b/main/src/com/google/refine/clustering/binning/BeiderMorseKeyer.java\n@@ -1,11 +1,9 @@\n \n-package org.openrefine.phonetic.keyers;\n+package com.google.refine.clustering.binning;\n \n import org.apache.commons.codec.EncoderException;\n import org.apache.commons.codec.language.bm.BeiderMorseEncoder;\n \n-import com.google.refine.clustering.binning.Keyer;\n-\n public class BeiderMorseKeyer extends Keyer {\n \n     protected BeiderMorseEncoder encoder = new BeiderMorseEncoder();\ndiff --git a/extensions/phonetic/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyer.java b/main/src/com/google/refine/clustering/binning/DaitchMokotoffKeyer.java\nsimilarity index 77%\nrename from extensions/phonetic/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyer.java\nrename to main/src/com/google/refine/clustering/binning/DaitchMokotoffKeyer.java\nindex 8d7b1879e..96ba20b6c 100644\n--- a/extensions/phonetic/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyer.java\n+++ b/main/src/com/google/refine/clustering/binning/DaitchMokotoffKeyer.java\n@@ -1,10 +1,8 @@\n \n-package org.openrefine.phonetic.keyers;\n+package com.google.refine.clustering.binning;\n \n import org.apache.commons.codec.language.DaitchMokotoffSoundex;\n \n-import com.google.refine.clustering.binning.Keyer;\n-\n public class DaitchMokotoffKeyer extends Keyer {\n \n     protected DaitchMokotoffSoundex encoder = new DaitchMokotoffSoundex();\ndiff --git a/main/src/com/google/refine/exporters/ExporterRegistry.java b/main/src/com/google/refine/exporters/ExporterRegistry.java\nindex 00c4e3092..10c777aa2 100644\n--- a/main/src/com/google/refine/exporters/ExporterRegistry.java\n+++ b/main/src/com/google/refine/exporters/ExporterRegistry.java\n@@ -36,29 +36,10 @@ package com.google.refine.exporters;\n import java.util.HashMap;\n import java.util.Map;\n \n-import com.google.refine.exporters.sql.SqlExporter;\n-\n-abstract public class ExporterRegistry {\n+public class ExporterRegistry {\n \n     static final private Map<String, Exporter> s_formatToExporter = new HashMap<String, Exporter>();\n \n-    static {\n-        s_formatToExporter.put(\"csv\", new CsvExporter());\n-        s_formatToExporter.put(\"tsv\", new CsvExporter('\\t'));\n-        s_formatToExporter.put(\"*sv\", new CsvExporter());\n-\n-        s_formatToExporter.put(\"xls\", new XlsExporter(false));\n-        s_formatToExporter.put(\"xlsx\", new XlsExporter(true));\n-\n-        s_formatToExporter.put(\"ods\", new OdsExporter());\n-\n-        s_formatToExporter.put(\"html\", new HtmlTableExporter());\n-\n-        s_formatToExporter.put(\"template\", new TemplatingExporter());\n-\n-        s_formatToExporter.put(\"sql\", new SqlExporter());\n-    }\n-\n     static public void registerExporter(String format, Exporter exporter) {\n         s_formatToExporter.put(format.toLowerCase(), exporter);\n     }\ndiff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js\nindex 2bf658289..344b1dfa4 100644\n--- a/main/webapp/modules/core/MOD-INF/controller.js\n+++ b/main/webapp/modules/core/MOD-INF/controller.js\n@@ -319,6 +319,19 @@ function registerImporting() {\n   );\n }\n \n+function registerExporters() {\n+   var ER = Packages.com.google.refine.exporters.ExporterRegistry;\n+   ER.registerExporter(\"csv\", new Packages.com.google.refine.exporters.CsvExporter());\n+   ER.registerExporter(\"tsv\", new Packages.com.google.refine.exporters.CsvExporter('\\t'.charAt(0)));\n+   ER.registerExporter(\"*sv\", new Packages.com.google.refine.exporters.CsvExporter());\n+   ER.registerExporter(\"xls\", new Packages.com.google.refine.exporters.XlsExporter(false));\n+   ER.registerExporter(\"xlsx\", new Packages.com.google.refine.exporters.XlsExporter(true));\n+   ER.registerExporter(\"ods\", new Packages.com.google.refine.exporters.OdsExporter());\n+   ER.registerExporter(\"html\", new Packages.com.google.refine.exporters.HtmlTableExporter());\n+   ER.registerExporter(\"template\", new Packages.com.google.refine.exporters.TemplatingExporter());\n+   ER.registerExporter(\"sql\", new Packages.com.google.refine.exporters.sql.SqlExporter());\n+}\n+\n function registerDistances() {\n    var DF = Packages.com.google.refine.clustering.knn.DistanceFactory;\n    var VicinoDistance = Packages.com.google.refine.clustering.knn.VicinoDistance;\n@@ -332,6 +345,8 @@ function registerKeyers() {\n    KF.put(\"ngram-fingerprint\", new Packages.com.google.refine.clustering.binning.NGramFingerprintKeyer());\n    KF.put(\"metaphone3\", new Packages.com.google.refine.clustering.binning.Metaphone3Keyer());\n    KF.put(\"cologne-phonetic\", new Packages.com.google.refine.clustering.binning.ColognePhoneticKeyer());\n+   KF.put(\"daitch-mokotoff\", new Packages.com.google.refine.clustering.binning.DaitchMokotoffKeyer());\n+   KF.put(\"beider-morse\", new Packages.com.google.refine.clustering.binning.BeiderMorseKeyer());\n }\n \n /*\n@@ -343,6 +358,7 @@ function init() {\n   registerCommands();\n   registerOperations();\n   registerImporting();\n+  registerExporters();\n   registerDistances();\n   registerKeyers();\n \ndiff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json\nindex fec7180b5..c636782c8 100644\n--- a/main/webapp/modules/core/langs/translation-en.json\n+++ b/main/webapp/modules/core/langs/translation-en.json\n@@ -218,6 +218,8 @@\n     \"clustering-keyers/ngram-fingerprint\": \"n-Gram fingerprint\",\n     \"clustering-keyers/metaphone3\": \"Metaphone3\",\n     \"clustering-keyers/cologne-phonetic\": \"Cologne phonetic\",\n+    \"clustering-keyers/beider-morse\": \"Beider-Morse\",\n+    \"clustering-keyers/daitch-mokotoff\": \"Daitch-Mokotoff\",\n     \"core-dialogs/distance-fun\": \"Distance function\",\n     \"clustering-distances/levenshtein\": \"Levenshtein\",\n     \"clustering-distances/ppm\": \"PPM\",\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/cell-ui.js b/main/webapp/modules/core/scripts/views/data-table/cell-ui.js\nindex 3d1ac1c74..c1a8d56c1 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/cell-ui.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/cell-ui.js\n@@ -85,7 +85,11 @@ DataTableCellUI.prototype._render = function() {\n \n   var renderedCell = undefined;\n   for (let record of CellRendererRegistry.renderers) {\n-    renderedCell = record.renderer.render(this._rowIndex, this._cellIndex, cell, this);\n+    try {\n+      renderedCell = record.renderer.render(this._rowIndex, this._cellIndex, cell, this);\n+    } catch (e) {\n+      continue;\n+    }\n     if (renderedCell) {\n       break;\n     }\ndiff --git a/pom.xml b/pom.xml\nindex fcd4be35e..542db8eb2 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -100,11 +100,11 @@\n     <httpcore.version>4.4.16</httpcore.version>\n     <univocity-csv.version>2.9.1</univocity-csv.version>\n     <swc-parser-lazy.version>3.1.9</swc-parser-lazy.version>\n-    <commons-io.version>2.16.0</commons-io.version>\n+    <commons-io.version>2.16.1</commons-io.version>\n     <guava.version>33.1.0-jre</guava.version>\n     <jaxb-api.version>2.3.1</jaxb-api.version>\n     <juniversalchardet.version>2.4.0</juniversalchardet.version>\n-    <testng.version>7.9.0</testng.version>\n+    <testng.version>7.10.1</testng.version>\n     <httpmime.version>4.5.14</httpmime.version>\n     <owasp-encoder.version>1.2.3</owasp-encoder.version>\n     <jasypt.version>1.9.3</jasypt.version>\n@@ -112,11 +112,11 @@\n \n     <!-- plugin versions -->\n     <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>\n-    <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>\n+    <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>\n     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>\n     <exec-maven-plugin.version>3.2.0</exec-maven-plugin.version>\n     <maven-dependency-plugin.version>3.6.1</maven-dependency-plugin.version>\n-    <jacoco-maven-plugin.version>0.8.11</jacoco-maven-plugin.version>\n+    <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>\n     <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>\n     <surefire.version>3.2.5</surefire.version>\n     <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>\n@@ -263,7 +263,7 @@\n         <!-- Pluging to generate release source -->\n         <groupId>org.apache.maven.plugins</groupId>\n         <artifactId>maven-source-plugin</artifactId>\n-        <version>3.2.1</version>\n+        <version>3.3.1</version>\n         <executions>\n           <execution>\n             <id>attach-sources</id>\n", "test_patch": "diff --git a/.github/workflows/pull_request_e2e.yml b/.github/workflows/pull_request_e2e.yml\nindex dca92d736..fb09561a5 100644\n--- a/.github/workflows/pull_request_e2e.yml\n+++ b/.github/workflows/pull_request_e2e.yml\n@@ -26,7 +26,7 @@ jobs:\n       - name: Setup Node\n         uses: actions/setup-node@v4\n         with:\n-          node-version: '16'\n+          node-version: '20'\n       - id: set-matrix\n         run: npm install --save glob@8.1.0 && node main/tests/cypress/build-test-matrix.js >> $GITHUB_OUTPUT\n         env:\n@@ -58,7 +58,7 @@ jobs:\n       - name: Setup Node\n         uses: actions/setup-node@v4\n         with:\n-          node-version: '16'\n+          node-version: '20'\n \n       - name: Restore Tests dependency cache\n         uses: actions/cache@v4\ndiff --git a/extensions/phonetic/tests/conf/tests.xml b/extensions/phonetic/tests/conf/tests.xml\ndeleted file mode 100644\nindex 7ad8efc22..000000000\n--- a/extensions/phonetic/tests/conf/tests.xml\n+++ /dev/null\n@@ -1,14 +0,0 @@\n-<!DOCTYPE suite SYSTEM \"https://testng.org/testng-1.0.dtd\" >\n- \n-<suite name=\"Wikidata extension\">\n-  <test name=\"tests\">\n-    <groups>\n-      <run>\n-        <exclude name=\"broken\" />\n-      </run>\n-    </groups>\n-    <packages>\n-      <package name=\"org.openrefine.phonetic.*\" />\n-    </packages>\n-  </test>\n-</suite>\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex 6d2dd4f0e..800370113 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -6,7 +6,7 @@\n     \"author\": \"OpenRefine\",\n     \"private\": true,\n     \"engines\": {\n-        \"node\": \">=16.0.0\",\n+        \"node\": \">=20.0.0\",\n         \"npm\":  \">=8.11.0\",\n         \"yarn\": \">=1.22.15\"\n     },\n@@ -16,11 +16,11 @@\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"13.7.1\",\n+        \"cypress\": \"13.7.2\",\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.57.0\",\n+        \"eslint\": \"^9.0.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^9.1.0\",\n         \"eslint-plugin-cypress\": \"^2.15.1\",\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 9264ebdc2..17be768c5 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -51,32 +51,32 @@\n   resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8\"\n   integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==\n \n-\"@eslint/eslintrc@^2.1.4\":\n-  version \"2.1.4\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad\"\n-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==\n+\"@eslint/eslintrc@^3.0.2\":\n+  version \"3.0.2\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.0.2.tgz#36180f8e85bf34d2fe3ccc2261e8e204a411ab4e\"\n+  integrity sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg==\n   dependencies:\n     ajv \"^6.12.4\"\n     debug \"^4.3.2\"\n-    espree \"^9.6.0\"\n-    globals \"^13.19.0\"\n+    espree \"^10.0.1\"\n+    globals \"^14.0.0\"\n     ignore \"^5.2.0\"\n     import-fresh \"^3.2.1\"\n     js-yaml \"^4.1.0\"\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@8.57.0\":\n-  version \"8.57.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f\"\n-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==\n+\"@eslint/js@9.0.0\":\n+  version \"9.0.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-9.0.0.tgz#1a9e4b4c96d8c7886e0110ed310a0135144a1691\"\n+  integrity sha512-RThY/MnKrhubF6+s1JflwUjPEsnCEmYCWwqa/aRISKWNXGZ9epUwft4bUMM35SdKF9xvBrLydAM1RDHd1Z//ZQ==\n \n-\"@humanwhocodes/config-array@^0.11.14\":\n-  version \"0.11.14\"\n-  resolved \"https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b\"\n-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==\n+\"@humanwhocodes/config-array@^0.12.3\":\n+  version \"0.12.3\"\n+  resolved \"https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.12.3.tgz#a6216d90f81a30bedd1d4b5d799b47241f318072\"\n+  integrity sha512-jsNnTBlMWuTpDkeE3on7+dWJi0D6fdDfeANj/w7MpS8ztROCoLvIO2nG0CcFj+E4k8j4QrSTh4Oryi3i2G669g==\n   dependencies:\n-    \"@humanwhocodes/object-schema\" \"^2.0.2\"\n+    \"@humanwhocodes/object-schema\" \"^2.0.3\"\n     debug \"^4.3.1\"\n     minimatch \"^3.0.5\"\n \n@@ -85,10 +85,10 @@\n   resolved \"https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c\"\n   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==\n \n-\"@humanwhocodes/object-schema@^2.0.2\":\n-  version \"2.0.2\"\n-  resolved \"https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917\"\n-  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==\n+\"@humanwhocodes/object-schema@^2.0.3\":\n+  version \"2.0.3\"\n+  resolved \"https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3\"\n+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==\n \n \"@nodelib/fs.scandir@2.1.5\":\n   version \"2.1.5\"\n@@ -138,20 +138,15 @@\n   dependencies:\n     \"@types/node\" \"*\"\n \n-\"@ungap/structured-clone@^1.2.0\":\n-  version \"1.2.0\"\n-  resolved \"https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406\"\n-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==\n-\n acorn-jsx@^5.3.2:\n   version \"5.3.2\"\n   resolved \"https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937\"\n   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==\n \n-acorn@^8.9.0:\n-  version \"8.9.0\"\n-  resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59\"\n-  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==\n+acorn@^8.11.3:\n+  version \"8.11.3\"\n+  resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a\"\n+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==\n \n aggregate-error@^3.0.0:\n   version \"3.1.0\"\n@@ -436,10 +431,10 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress@13.7.1:\n-  version \"13.7.1\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.7.1.tgz#d1208eb04efd46ef52a30480a5da71a03373261a\"\n-  integrity sha512-4u/rpFNxOFCoFX/Z5h+uwlkBO4mWzAjveURi3vqdSu56HPvVdyGTxGw4XKGWt399Y1JwIn9E1L9uMXQpc0o55w==\n+cypress@13.7.2:\n+  version \"13.7.2\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.7.2.tgz#61e841382abb20e0a9a063086ee0d850af3ef6bc\"\n+  integrity sha512-FF5hFI5wlRIHY8urLZjJjj/YvfCBrRpglbZCLr/cYcL9MdDe0+5usa8kTIrDHthlEc9lwihbkb5dmwqBDNS2yw==\n   dependencies:\n     \"@cypress/request\" \"^3.0.0\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n@@ -520,13 +515,6 @@ delayed-stream@~1.0.0:\n   resolved \"https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz\"\n   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=\n \n-doctrine@^3.0.0:\n-  version \"3.0.0\"\n-  resolved \"https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz\"\n-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==\n-  dependencies:\n-    esutils \"^2.0.2\"\n-\n ecc-jsbn@~0.1.1:\n   version \"0.1.2\"\n   resolved \"https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz\"\n@@ -581,54 +569,55 @@ eslint-plugin-cypress@^2.15.1:\n   dependencies:\n     globals \"^13.20.0\"\n \n-eslint-scope@^7.2.2:\n-  version \"7.2.2\"\n-  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f\"\n-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==\n+eslint-scope@^8.0.1:\n+  version \"8.0.1\"\n+  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.1.tgz#a9601e4b81a0b9171657c343fb13111688963cfc\"\n+  integrity sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==\n   dependencies:\n     esrecurse \"^4.3.0\"\n     estraverse \"^5.2.0\"\n \n-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:\n+eslint-visitor-keys@^3.3.0:\n   version \"3.4.3\"\n   resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800\"\n   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==\n \n-eslint@^8.57.0:\n-  version \"8.57.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668\"\n-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==\n+eslint-visitor-keys@^4.0.0:\n+  version \"4.0.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb\"\n+  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==\n+\n+eslint@^9.0.0:\n+  version \"9.0.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-9.0.0.tgz#6270548758e390343f78c8afd030566d86927d40\"\n+  integrity sha512-IMryZ5SudxzQvuod6rUdIUz29qFItWx281VhtFVc2Psy/ZhlCeD/5DT6lBIJ4H3G+iamGJoTln1v+QSuPw0p7Q==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n     \"@eslint-community/regexpp\" \"^4.6.1\"\n-    \"@eslint/eslintrc\" \"^2.1.4\"\n-    \"@eslint/js\" \"8.57.0\"\n-    \"@humanwhocodes/config-array\" \"^0.11.14\"\n+    \"@eslint/eslintrc\" \"^3.0.2\"\n+    \"@eslint/js\" \"9.0.0\"\n+    \"@humanwhocodes/config-array\" \"^0.12.3\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\n-    \"@ungap/structured-clone\" \"^1.2.0\"\n     ajv \"^6.12.4\"\n     chalk \"^4.0.0\"\n     cross-spawn \"^7.0.2\"\n     debug \"^4.3.2\"\n-    doctrine \"^3.0.0\"\n     escape-string-regexp \"^4.0.0\"\n-    eslint-scope \"^7.2.2\"\n-    eslint-visitor-keys \"^3.4.3\"\n-    espree \"^9.6.1\"\n+    eslint-scope \"^8.0.1\"\n+    eslint-visitor-keys \"^4.0.0\"\n+    espree \"^10.0.1\"\n     esquery \"^1.4.2\"\n     esutils \"^2.0.2\"\n     fast-deep-equal \"^3.1.3\"\n-    file-entry-cache \"^6.0.1\"\n+    file-entry-cache \"^8.0.0\"\n     find-up \"^5.0.0\"\n     glob-parent \"^6.0.2\"\n-    globals \"^13.19.0\"\n     graphemer \"^1.4.0\"\n     ignore \"^5.2.0\"\n     imurmurhash \"^0.1.4\"\n     is-glob \"^4.0.0\"\n     is-path-inside \"^3.0.3\"\n-    js-yaml \"^4.1.0\"\n     json-stable-stringify-without-jsonify \"^1.0.1\"\n     levn \"^0.4.1\"\n     lodash.merge \"^4.6.2\"\n@@ -638,14 +627,14 @@ eslint@^8.57.0:\n     strip-ansi \"^6.0.1\"\n     text-table \"^0.2.0\"\n \n-espree@^9.6.0, espree@^9.6.1:\n-  version \"9.6.1\"\n-  resolved \"https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f\"\n-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==\n+espree@^10.0.1:\n+  version \"10.0.1\"\n+  resolved \"https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f\"\n+  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==\n   dependencies:\n-    acorn \"^8.9.0\"\n+    acorn \"^8.11.3\"\n     acorn-jsx \"^5.3.2\"\n-    eslint-visitor-keys \"^3.4.1\"\n+    eslint-visitor-keys \"^4.0.0\"\n \n esquery@^1.4.2:\n   version \"1.4.2\"\n@@ -760,12 +749,12 @@ figures@^3.2.0:\n   dependencies:\n     escape-string-regexp \"^1.0.5\"\n \n-file-entry-cache@^6.0.1:\n-  version \"6.0.1\"\n-  resolved \"https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027\"\n-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==\n+file-entry-cache@^8.0.0:\n+  version \"8.0.0\"\n+  resolved \"https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f\"\n+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==\n   dependencies:\n-    flat-cache \"^3.0.4\"\n+    flat-cache \"^4.0.0\"\n \n find-up@^5.0.0:\n   version \"5.0.0\"\n@@ -775,18 +764,18 @@ find-up@^5.0.0:\n     locate-path \"^6.0.0\"\n     path-exists \"^4.0.0\"\n \n-flat-cache@^3.0.4:\n-  version \"3.0.4\"\n-  resolved \"https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz\"\n-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==\n+flat-cache@^4.0.0:\n+  version \"4.0.1\"\n+  resolved \"https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c\"\n+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==\n   dependencies:\n-    flatted \"^3.1.0\"\n-    rimraf \"^3.0.2\"\n+    flatted \"^3.2.9\"\n+    keyv \"^4.5.4\"\n \n-flatted@^3.1.0:\n-  version \"3.1.1\"\n-  resolved \"https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz\"\n-  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==\n+flatted@^3.2.9:\n+  version \"3.3.1\"\n+  resolved \"https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a\"\n+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==\n \n forever-agent@~0.6.1:\n   version \"0.6.1\"\n@@ -879,13 +868,18 @@ global-dirs@^3.0.0:\n   dependencies:\n     ini \"2.0.0\"\n \n-globals@^13.19.0, globals@^13.20.0:\n+globals@^13.20.0:\n   version \"13.20.0\"\n   resolved \"https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82\"\n   integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==\n   dependencies:\n     type-fest \"^0.20.2\"\n \n+globals@^14.0.0:\n+  version \"14.0.0\"\n+  resolved \"https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e\"\n+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==\n+\n graceful-fs@^4.1.6, graceful-fs@^4.2.0:\n   version \"4.2.6\"\n   resolved \"https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee\"\n@@ -1047,6 +1041,11 @@ jsbn@~0.1.0:\n   resolved \"https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz\"\n   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=\n \n+json-buffer@3.0.1:\n+  version \"3.0.1\"\n+  resolved \"https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13\"\n+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==\n+\n json-schema-traverse@^0.4.1:\n   version \"0.4.1\"\n   resolved \"https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz\"\n@@ -1086,6 +1085,13 @@ jsprim@^2.0.2:\n     json-schema \"0.4.0\"\n     verror \"1.10.0\"\n \n+keyv@^4.5.4:\n+  version \"4.5.4\"\n+  resolved \"https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93\"\n+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==\n+  dependencies:\n+    json-buffer \"3.0.1\"\n+\n lazy-ass@^1.6.0:\n   version \"1.6.0\"\n   resolved \"https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz\"\n@@ -1393,7 +1399,7 @@ reusify@^1.0.4:\n   resolved \"https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76\"\n   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==\n \n-rimraf@^3.0.0, rimraf@^3.0.2:\n+rimraf@^3.0.0:\n   version \"3.0.2\"\n   resolved \"https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz\"\n   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==\ndiff --git a/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java b/main/tests/server/src/com/google/refine/clustering/binning/BeiderMorseKeyerTest.java\nsimilarity index 83%\nrename from extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java\nrename to main/tests/server/src/com/google/refine/clustering/binning/BeiderMorseKeyerTest.java\nindex adca635f8..85b5b4666 100644\n--- a/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java\n+++ b/main/tests/server/src/com/google/refine/clustering/binning/BeiderMorseKeyerTest.java\n@@ -1,12 +1,10 @@\n \n-package org.openrefine.phonetic.keyers;\n+package com.google.refine.clustering.binning;\n \n import static org.testng.Assert.assertEquals;\n \n import org.testng.annotations.Test;\n \n-import com.google.refine.clustering.binning.Keyer;\n-\n public class BeiderMorseKeyerTest {\n \n     Keyer keyer = new BeiderMorseKeyer();\ndiff --git a/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java b/main/tests/server/src/com/google/refine/clustering/binning/DaitchMokotoffKeyerTest.java\nsimilarity index 84%\nrename from extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java\nrename to main/tests/server/src/com/google/refine/clustering/binning/DaitchMokotoffKeyerTest.java\nindex 50129ff1b..c699803e3 100644\n--- a/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java\n+++ b/main/tests/server/src/com/google/refine/clustering/binning/DaitchMokotoffKeyerTest.java\n@@ -1,12 +1,10 @@\n \n-package org.openrefine.phonetic.keyers;\n+package com.google.refine.clustering.binning;\n \n import static org.testng.Assert.assertEquals;\n \n import org.testng.annotations.Test;\n \n-import com.google.refine.clustering.binning.Keyer;\n-\n public class DaitchMokotoffKeyerTest {\n \n     protected Keyer keyer = new DaitchMokotoffKeyer();\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Closes #6488.\r\n", "PR_Title": "Merge phonetic extension into the main app", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6503_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6503, "issue_title": "Merge phonetic extension into the main app", "issue_body": "Closes #6488.\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-5994", "base_commit": "0eb17ffa3a0cc948c089b1961b6fbff321df8536", "patch": "diff --git a/main/src/com/google/refine/expr/functions/Length.java b/main/src/com/google/refine/expr/functions/Length.java\nindex d7fde5db9..6ca73c740 100644\n--- a/main/src/com/google/refine/expr/functions/Length.java\n+++ b/main/src/com/google/refine/expr/functions/Length.java\n@@ -37,6 +37,8 @@ import java.util.Collection;\n import java.util.Properties;\n \n import com.fasterxml.jackson.databind.node.ArrayNode;\n+import com.fasterxml.jackson.databind.node.ObjectNode;\n+\n import com.google.refine.expr.EvalError;\n import com.google.refine.expr.HasFieldsList;\n import com.google.refine.grel.ControlFunctionRegistry;\n@@ -61,6 +63,8 @@ public class Length implements Function {\n                     return ((HasFieldsList) v).length();\n                 } else if (v instanceof ArrayNode) {\n                     return ((ArrayNode) v).size();\n+                } else if (v instanceof ObjectNode) {\n+                    return ((ObjectNode) v).size();\n                 } else {\n                     String s = (v instanceof String ? (String) v : v.toString());\n                     return s.length();\ndiff --git a/pom.xml b/pom.xml\nindex 7522c027c..4f5ef1c2d 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -81,7 +81,7 @@\n     <okhttp.version>4.10.0</okhttp.version>\n     <jena.version>4.8.0</jena.version>\n     <poi.version>5.2.3</poi.version>\n-    <commons-lang3.version>3.12.0</commons-lang3.version>\n+    <commons-lang3.version>3.13.0</commons-lang3.version>\n     <commons-fileupload.version>1.5</commons-fileupload.version>\n     <commons-collections.version>3.2.2</commons-collections.version>\n     <commons-text.version>1.10.0</commons-text.version>\n", "test_patch": "diff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex a9a8bbea0..e480e5008 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -20,7 +20,7 @@\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.45.0\",\n+        \"eslint\": \"^8.46.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^8.9.0\",\n         \"eslint-plugin-cypress\": \"^2.13.3\",\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 110041631..135b33a3e 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -46,15 +46,15 @@\n   dependencies:\n     eslint-visitor-keys \"^3.3.0\"\n \n-\"@eslint-community/regexpp@^4.4.0\":\n-  version \"4.4.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.0.tgz#3e61c564fcd6b921cb789838631c5ee44df09403\"\n-  integrity sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==\n+\"@eslint-community/regexpp@^4.6.1\":\n+  version \"4.6.2\"\n+  resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8\"\n+  integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==\n \n-\"@eslint/eslintrc@^2.1.0\":\n-  version \"2.1.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d\"\n-  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==\n+\"@eslint/eslintrc@^2.1.1\":\n+  version \"2.1.1\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.1.tgz#18d635e24ad35f7276e8a49d135c7d3ca6a46f93\"\n+  integrity sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==\n   dependencies:\n     ajv \"^6.12.4\"\n     debug \"^4.3.2\"\n@@ -66,10 +66,10 @@\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@8.44.0\":\n-  version \"8.44.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af\"\n-  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==\n+\"@eslint/js@^8.46.0\":\n+  version \"8.46.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.46.0.tgz#3f7802972e8b6fe3f88ed1aabc74ec596c456db6\"\n+  integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==\n \n \"@humanwhocodes/config-array@^0.11.10\":\n   version \"0.11.10\"\n@@ -161,7 +161,7 @@ aggregate-error@^3.0.0:\n     clean-stack \"^2.0.0\"\n     indent-string \"^4.0.0\"\n \n-ajv@^6.10.0, ajv@^6.12.4:\n+ajv@^6.12.4:\n   version \"6.12.6\"\n   resolved \"https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz\"\n   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==\n@@ -581,40 +581,40 @@ eslint-plugin-cypress@^2.13.3:\n   dependencies:\n     globals \"^11.12.0\"\n \n-eslint-scope@^7.2.0:\n-  version \"7.2.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b\"\n-  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==\n+eslint-scope@^7.2.2:\n+  version \"7.2.2\"\n+  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f\"\n+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==\n   dependencies:\n     esrecurse \"^4.3.0\"\n     estraverse \"^5.2.0\"\n \n-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:\n-  version \"3.4.1\"\n-  resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994\"\n-  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==\n+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2:\n+  version \"3.4.2\"\n+  resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f\"\n+  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==\n \n-eslint@^8.45.0:\n-  version \"8.45.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78\"\n-  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==\n+eslint@^8.46.0:\n+  version \"8.46.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.46.0.tgz#a06a0ff6974e53e643acc42d1dcf2e7f797b3552\"\n+  integrity sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n-    \"@eslint-community/regexpp\" \"^4.4.0\"\n-    \"@eslint/eslintrc\" \"^2.1.0\"\n-    \"@eslint/js\" \"8.44.0\"\n+    \"@eslint-community/regexpp\" \"^4.6.1\"\n+    \"@eslint/eslintrc\" \"^2.1.1\"\n+    \"@eslint/js\" \"^8.46.0\"\n     \"@humanwhocodes/config-array\" \"^0.11.10\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\n-    ajv \"^6.10.0\"\n+    ajv \"^6.12.4\"\n     chalk \"^4.0.0\"\n     cross-spawn \"^7.0.2\"\n     debug \"^4.3.2\"\n     doctrine \"^3.0.0\"\n     escape-string-regexp \"^4.0.0\"\n-    eslint-scope \"^7.2.0\"\n-    eslint-visitor-keys \"^3.4.1\"\n-    espree \"^9.6.0\"\n+    eslint-scope \"^7.2.2\"\n+    eslint-visitor-keys \"^3.4.2\"\n+    espree \"^9.6.1\"\n     esquery \"^1.4.2\"\n     esutils \"^2.0.2\"\n     fast-deep-equal \"^3.1.3\"\n@@ -637,10 +637,10 @@ eslint@^8.45.0:\n     strip-ansi \"^6.0.1\"\n     text-table \"^0.2.0\"\n \n-espree@^9.6.0:\n-  version \"9.6.0\"\n-  resolved \"https://registry.yarnpkg.com/espree/-/espree-9.6.0.tgz#80869754b1c6560f32e3b6929194a3fe07c5b82f\"\n-  integrity sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==\n+espree@^9.6.0, espree@^9.6.1:\n+  version \"9.6.1\"\n+  resolved \"https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f\"\n+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==\n   dependencies:\n     acorn \"^8.9.0\"\n     acorn-jsx \"^5.3.2\"\ndiff --git a/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java b/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java\nindex 3e04d14d6..14bc957bd 100644\n--- a/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java\n+++ b/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java\n@@ -27,9 +27,35 @@\n \n package com.google.refine.expr.functions;\n \n+import static org.testng.Assert.assertEquals;\n+\n+import java.util.Properties;\n+\n import org.testng.annotations.Test;\n \n-import com.google.refine.util.TestUtils;\n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.databind.node.ArrayNode;\n+import com.fasterxml.jackson.databind.node.ObjectNode;\n+\n+import com.google.refine.RefineTest;\n+import com.google.refine.grel.Function;\n+import com.google.refine.util.ParsingUtilities;\n+\n+public class LengthTests extends RefineTest {\n+\n+    static Properties bindings = new Properties();\n+\n+    @Test\n+    public void testLength() throws JsonProcessingException {\n+        Function f = new Length();\n+        assertEquals(f.call(bindings, new Object[] { Long.valueOf(123) }), 3);\n+        assertEquals(f.call(bindings, new Object[] { Double.valueOf(123.1) }), 5);\n+        assertEquals(f.call(bindings, new Object[] { \"12345\" }), 5);\n+\n+        ArrayNode array = (ArrayNode) ParsingUtilities.mapper.readTree(\"[1,2,3]\");\n+        assertEquals(f.call(bindings, new Object[] { array }), 3);\n \n-public class LengthTests {\n+        ObjectNode dict = (ObjectNode) ParsingUtilities.mapper.readTree(\"{\\\"a\\\": \\\"b\\\", \\\"c\\\": \\\"d\\\"}\");\n+        assertEquals(f.call(bindings, new Object[] { dict }), 2);\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Also add tests for other uses of length() function.\r\n\r\nFixes #5991\r\n", "PR_Title": "length() returns # of keys in object. Fixes #5991", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-5994_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 5994, "issue_title": "length() returns # of keys in object. Fixes #5991", "issue_body": "Also add tests for other uses of length() function.\r\n\r\nFixes #5991\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6914", "base_commit": "1fb15128227512c360187237f2b2e0c64332ecb6", "patch": "diff --git a/main/src/com/google/refine/importers/JsonImporter.java b/main/src/com/google/refine/importers/JsonImporter.java\nindex 1d8505dd9..ce8e0367e 100644\n--- a/main/src/com/google/refine/importers/JsonImporter.java\n+++ b/main/src/com/google/refine/importers/JsonImporter.java\n@@ -44,6 +44,7 @@ import com.fasterxml.jackson.core.JsonParseException;\n import com.fasterxml.jackson.core.JsonParser;\n import com.fasterxml.jackson.core.JsonParser.NumberType;\n import com.fasterxml.jackson.core.JsonToken;\n+import com.fasterxml.jackson.core.StreamReadFeature;\n import com.fasterxml.jackson.core.json.JsonReadFeature;\n import com.fasterxml.jackson.databind.JsonNode;\n import com.fasterxml.jackson.databind.node.ArrayNode;\n@@ -92,7 +93,7 @@ public class JsonImporter extends TreeImportingParserBase {\n                 ObjectNode firstFileRecord = fileRecords.get(0);\n                 File file = ImportingUtilities.getFile(job, firstFileRecord);\n                 JsonFactory factory = JsonFactory.builder().enable(JsonReadFeature.ALLOW_JAVA_COMMENTS)\n-                        .enable(JsonReadFeature.ALLOW_YAML_COMMENTS).build();\n+                        .enable(JsonReadFeature.ALLOW_YAML_COMMENTS).enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION).build();\n                 JsonParser parser = factory.createParser(file);\n                 parser.enable(JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS);\n \n@@ -103,6 +104,7 @@ public class JsonImporter extends TreeImportingParserBase {\n                 }\n             } catch (IOException e) {\n                 logger.error(\"Error generating parser UI initialization data for JSON file\", e);\n+                JSONUtilities.safePut(options, \"error\", e.toString());\n             }\n         }\n \n@@ -141,64 +143,52 @@ public class JsonImporter extends TreeImportingParserBase {\n         return null;\n     }\n \n-    final static private JsonNode parseForPreview(JsonParser parser, PreviewParsingState state) {\n-        try {\n-            JsonToken token = parser.nextToken();\n-            state.tokenCount++;\n-            return parseForPreview(parser, state, token);\n-        } catch (IOException e) {\n-            return null;\n-        }\n+    final static private JsonNode parseForPreview(JsonParser parser, PreviewParsingState state) throws IOException {\n+        JsonToken token = parser.nextToken();\n+        state.tokenCount++;\n+        return parseForPreview(parser, state, token);\n     }\n \n-    final static private ObjectNode parseObjectForPreview(JsonParser parser, PreviewParsingState state) {\n+    final static private ObjectNode parseObjectForPreview(JsonParser parser, PreviewParsingState state) throws IOException {\n         ObjectNode result = ParsingUtilities.mapper.createObjectNode();\n         loop: while (state.tokenCount < PREVIEW_PARSING_LIMIT) {\n-            try {\n-                JsonToken token = parser.nextToken();\n-                if (token == null) {\n-                    break;\n-                }\n-                state.tokenCount++;\n-\n-                switch (token) {\n-                    case FIELD_NAME:\n-                        String fieldName = parser.getText();\n-                        JsonNode fieldValue = parseForPreview(parser, state);\n-                        JSONUtilities.safePut(result, fieldName, fieldValue);\n-                        break;\n-                    case END_OBJECT:\n-                        break loop;\n-                    default:\n-                        break loop;\n-                }\n-            } catch (IOException e) {\n+            JsonToken token = parser.nextToken();\n+            if (token == null) {\n                 break;\n             }\n+            state.tokenCount++;\n+\n+            switch (token) {\n+                case FIELD_NAME:\n+                    String fieldName = parser.getText();\n+                    JsonNode fieldValue = parseForPreview(parser, state);\n+                    JSONUtilities.safePut(result, fieldName, fieldValue);\n+                    break;\n+                case END_OBJECT:\n+                    break loop;\n+                default:\n+                    break loop;\n+            }\n         }\n         return result;\n     }\n \n-    final static private ArrayNode parseArrayForPreview(JsonParser parser, PreviewParsingState state) {\n+    final static private ArrayNode parseArrayForPreview(JsonParser parser, PreviewParsingState state) throws IOException {\n         ArrayNode result = ParsingUtilities.mapper.createArrayNode();\n         loop: while (state.tokenCount < PREVIEW_PARSING_LIMIT) {\n-            try {\n-                JsonToken token = parser.nextToken();\n-                if (token == null) {\n-                    break;\n-                }\n-                state.tokenCount++;\n-\n-                switch (token) {\n-                    case END_ARRAY:\n-                        break loop;\n-                    default:\n-                        JsonNode element = parseForPreview(parser, state, token);\n-                        result.add(element);\n-                }\n-            } catch (IOException e) {\n+            JsonToken token = parser.nextToken();\n+            if (token == null) {\n                 break;\n             }\n+            state.tokenCount++;\n+\n+            switch (token) {\n+                case END_ARRAY:\n+                    break loop;\n+                default:\n+                    JsonNode element = parseForPreview(parser, state, token);\n+                    result.add(element);\n+            }\n         }\n         return result;\n     }\n", "test_patch": "diff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/commands/PreviewWikibaseSchemaCommandTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/commands/PreviewWikibaseSchemaCommandTest.java\nindex e45f0e019..0b9220d15 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/commands/PreviewWikibaseSchemaCommandTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/commands/PreviewWikibaseSchemaCommandTest.java\n@@ -30,6 +30,7 @@ import static org.testng.Assert.assertEquals;\n \n import java.io.IOException;\n import java.io.Serializable;\n+import java.util.Locale;\n \n import javax.servlet.ServletException;\n \n@@ -40,6 +41,7 @@ import org.testng.annotations.AfterMethod;\n import org.testng.annotations.BeforeMethod;\n import org.testng.annotations.Test;\n \n+import com.google.refine.util.LocaleUtils;\n import com.google.refine.util.ParsingUtilities;\n \n import org.openrefine.wikibase.testing.TestingData;\n@@ -48,6 +50,8 @@ import org.openrefine.wikibase.utils.EntityCacheStub;\n \n public class PreviewWikibaseSchemaCommandTest extends SchemaCommandTest {\n \n+    private String localeSetting;\n+\n     @BeforeMethod\n     public void SetUp() {\n         command = new PreviewWikibaseSchemaCommand();\n@@ -121,6 +125,17 @@ public class PreviewWikibaseSchemaCommandTest extends SchemaCommandTest {\n                 \"{\\\"code\\\":\\\"error\\\",\\\"message\\\":\\\"Wikibase manifest could not be parsed. Error message: invalid manifest format\\\"}\");\n     }\n \n+    @BeforeMethod\n+    public void setLocale() {\n+        localeSetting = Locale.getDefault().getLanguage();\n+        LocaleUtils.setLocale(\"en\");\n+    }\n+\n+    @AfterMethod\n+    public void unsetLocale() {\n+        LocaleUtils.setLocale(localeSetting);\n+    }\n+\n     @Test\n     public void testWarningData() throws Exception {\n \ndiff --git a/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java b/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java\nindex 43dacc72d..726e1a4ce 100644\n--- a/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java\n+++ b/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java\n@@ -33,6 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.importers;\n \n+import static org.testng.Assert.assertEquals;\n+\n import java.io.ByteArrayInputStream;\n import java.io.File;\n import java.io.IOException;\n@@ -40,6 +42,7 @@ import java.io.InputStream;\n import java.io.Serializable;\n import java.lang.reflect.Method;\n import java.nio.charset.StandardCharsets;\n+import java.nio.file.Files;\n import java.util.ArrayList;\n import java.util.LinkedList;\n import java.util.List;\n@@ -109,7 +112,7 @@ public class JsonImporterTests extends ImporterTest {\n         Row row = project.rows.get(0);\n         Assert.assertNotNull(row);\n         Assert.assertNotNull(row.getCell(1));\n-        Assert.assertEquals(row.getCell(1).value, \"Author 1, The\");\n+        assertEquals(row.getCell(1).value, \"Author 1, The\");\n     }\n \n     @Test\n@@ -120,14 +123,27 @@ public class JsonImporterTests extends ImporterTest {\n         Row row = project.rows.get(0);\n         Assert.assertNotNull(row);\n         Assert.assertNotNull(row.getCell(1));\n-        Assert.assertEquals(row.getCell(1).value, \"Author 1, The\");\n+        assertEquals(row.getCell(1).value, \"Author 1, The\");\n     }\n \n     @Test\n-    public void canThrowError() {\n+    public void canThrowError() throws IOException {\n         String errJSON = getSampleWithError();\n+        ObjectNode fileRecord = ParsingUtilities.mapper.createObjectNode();\n+        JSONUtilities.safePut(fileRecord, \"origin\", \"clipboard\");\n+        JSONUtilities.safePut(fileRecord, \"declaredEncoding\", StandardCharsets.UTF_8.toString());\n+        JSONUtilities.safePut(fileRecord, \"declaredMimeType\", \"text/json\");\n+        JSONUtilities.safePut(fileRecord, \"format\", \"text/json\");\n+        JSONUtilities.safePut(fileRecord, \"fileName\", \"(clipboard)\");\n+        File jsonFile = new File(job.getRawDataDir(), \"test.json\");\n+        Files.write(jsonFile.toPath(), errJSON.getBytes(StandardCharsets.UTF_8));\n+        JSONUtilities.safePut(fileRecord, \"location\", \"test.json\");\n         ObjectNode options = SUT.createParserUIInitializationData(\n-                job, new LinkedList<>(), \"text/json\");\n+                job, List.of(fileRecord), \"text/json\");\n+        assertEquals(options.get(\"error\").asText(),\n+                \"com.fasterxml.jackson.core.JsonParseException: Unexpected character (';' (code 59)): was expecting comma to separate Object entries\\n\"\n+                        +\n+                        \" at [Source: (File); line: 1, column: 11]\");\n         ArrayNode path = ParsingUtilities.mapper.createArrayNode();\n         JSONUtilities.append(path, JsonImporter.ANONYMOUS);\n         JSONUtilities.safePut(options, \"recordPath\", path);\n@@ -137,7 +153,7 @@ public class JsonImporterTests extends ImporterTest {\n \n         inputStream = new ByteArrayInputStream(errJSON.getBytes(StandardCharsets.UTF_8));\n         ImportColumnGroup rootColumnGroup = new ImportColumnGroup();\n-        List<Exception> exceptions = new ArrayList<Exception>();\n+        List<Exception> exceptions = new ArrayList<>();\n \n         SUT.parseOneFile(\n                 project,\n@@ -150,7 +166,7 @@ public class JsonImporterTests extends ImporterTest {\n                 options,\n                 exceptions);\n         Assert.assertFalse(exceptions.isEmpty());\n-        Assert.assertEquals(\"Unexpected character (';' (code 59)): was expecting comma to separate Object entries\",\n+        assertEquals(\"Unexpected character (';' (code 59)): was expecting comma to separate Object entries\",\n                 exceptions.get(0).getMessage());\n     }\n \n@@ -369,8 +385,8 @@ public class JsonImporterTests extends ImporterTest {\n             }\n             i++;\n             if (i == 3) {\n-                Assert.assertEquals(Token.Value, token);\n-                Assert.assertEquals(\"field\", parser.getFieldName());\n+                assertEquals(Token.Value, token);\n+                assertEquals(\"field\", parser.getFieldName());\n             }\n         }\n \n@@ -384,8 +400,8 @@ public class JsonImporterTests extends ImporterTest {\n             }\n             i++;\n             if (i == 3) {\n-                Assert.assertEquals(Token.StartEntity, token);\n-                Assert.assertEquals(parser.getFieldName(), \"field\");\n+                assertEquals(Token.StartEntity, token);\n+                assertEquals(parser.getFieldName(), \"field\");\n             }\n         }\n \n@@ -399,16 +415,16 @@ public class JsonImporterTests extends ImporterTest {\n             }\n             i++;\n             if (i == 3) {\n-                Assert.assertEquals(token, Token.StartEntity);\n-                Assert.assertEquals(parser.getFieldName(), \"field\");\n+                assertEquals(token, Token.StartEntity);\n+                assertEquals(parser.getFieldName(), \"field\");\n             }\n             if (i == 4) {\n-                Assert.assertEquals(token, Token.StartEntity);\n-                Assert.assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);\n+                assertEquals(token, Token.StartEntity);\n+                assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);\n             }\n             if (i == 6) {\n-                Assert.assertEquals(token, Token.StartEntity);\n-                Assert.assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);\n+                assertEquals(token, Token.StartEntity);\n+                assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);\n             }\n         }\n     }\n@@ -428,9 +444,9 @@ public class JsonImporterTests extends ImporterTest {\n             }\n             i++;\n             if (i == 3) {\n-                Assert.assertEquals(Token.Value, token);\n-                Assert.assertEquals(\"\\tfield\", parser.getFieldName());\n-                Assert.assertEquals(\"\\tvalue\", parser.getFieldValue());\n+                assertEquals(Token.Value, token);\n+                assertEquals(\"\\tfield\", parser.getFieldName());\n+                assertEquals(\"\\tvalue\", parser.getFieldValue());\n             }\n         }\n     }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6911 \r\n\r\nChanges proposed in this pull request:\r\n- Set language before test as the test validates label which is language specific\r\n- \r\n- \r\n", "PR_Title": "wikibase: Test failure when run on non-English locales", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6914_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6914, "issue_title": "wikibase: Test failure when run on non-English locales", "issue_body": "Fixes #6911 \r\n\r\nChanges proposed in this pull request:\r\n- Set language before test as the test validates label which is language specific\r\n- \r\n- \r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-7053", "base_commit": "b637e7a10110bd97ff09ee8569d771d8a239d1d9", "patch": "diff --git a/extensions/wikibase/src/org/openrefine/wikibase/editing/EditBatchProcessor.java b/extensions/wikibase/src/org/openrefine/wikibase/editing/EditBatchProcessor.java\nindex 4a227b8a6..a027f7104 100644\n--- a/extensions/wikibase/src/org/openrefine/wikibase/editing/EditBatchProcessor.java\n+++ b/extensions/wikibase/src/org/openrefine/wikibase/editing/EditBatchProcessor.java\n@@ -29,6 +29,7 @@ import java.util.ArrayList;\n import java.util.Collections;\n import java.util.LinkedList;\n import java.util.List;\n+import java.util.Locale;\n import java.util.Map;\n import java.util.OptionalLong;\n import java.util.Set;\n@@ -39,6 +40,8 @@ import org.slf4j.LoggerFactory;\n import org.wikidata.wdtk.datamodel.interfaces.EntityDocument;\n import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;\n import org.wikidata.wdtk.datamodel.interfaces.EntityUpdate;\n+import org.wikidata.wdtk.datamodel.interfaces.LabeledDocument;\n+import org.wikidata.wdtk.datamodel.interfaces.MonolingualTextValue;\n import org.wikidata.wdtk.wikibaseapi.ApiConnection;\n import org.wikidata.wdtk.wikibaseapi.EditingResult;\n import org.wikidata.wdtk.wikibaseapi.WikibaseDataEditor;\n@@ -183,14 +186,19 @@ public class EditBatchProcessor {\n                 // New entities\n                 ReconEntityIdValue newCell = (ReconEntityIdValue) update.getEntityId();\n                 EntityIdValue createdDocId;\n+                String name = \"\";\n                 if (update instanceof MediaInfoEdit) {\n                     MediaFileUtils mediaFileUtils = new MediaFileUtils(connection);\n                     createdDocId = ((MediaInfoEdit) update).uploadNewFile(editor, mediaFileUtils, summary, tags, filePageWaitTime,\n                             filePageMaxWaitTime);\n+                    name = \"File:\".concat(((MediaInfoEdit) update).getFileName());\n                 } else {\n-                    createdDocId = editor.createEntityDocument(update.toNewEntity(), summary, tags).getEntityId();\n+                    LabeledDocument labeledDocument = (LabeledDocument) editor.createEntityDocument(update.toNewEntity(), summary, tags);\n+                    createdDocId = labeledDocument.getEntityId();\n+                    name = getDocumentLabel(labeledDocument.getLabels(), createdDocId.getId());\n                 }\n                 library.setId(newCell.getReconInternalId(), createdDocId.getId());\n+                library.setName(newCell.getReconInternalId(), name);\n                 newEntityUrl = createdDocId.getSiteIri() + createdDocId.getId();\n             } else {\n                 // Existing entities\n@@ -372,4 +380,22 @@ public class EditBatchProcessor {\n         batchCursor = 0;\n     }\n \n+    private String getDocumentLabel(Map<String, MonolingualTextValue> labels, String defaultName) {\n+        if (labels == null || labels.isEmpty()) {\n+            return defaultName;\n+        }\n+        String docLabel = null;\n+        String defaultLanguage = Locale.getDefault().getLanguage();\n+        for (Map.Entry<String, MonolingualTextValue> entry : labels.entrySet()) {\n+            String language = entry.getKey();\n+            MonolingualTextValue labelValue = entry.getValue();\n+            if (defaultLanguage.equals(language)) {\n+                return labelValue.getText();\n+            }\n+            if (docLabel == null) {\n+                docLabel = labelValue.getText();\n+            }\n+        }\n+        return docLabel == null ? defaultName : docLabel;\n+    }\n }\ndiff --git a/extensions/wikibase/src/org/openrefine/wikibase/editing/NewEntityLibrary.java b/extensions/wikibase/src/org/openrefine/wikibase/editing/NewEntityLibrary.java\nindex 696b1df6c..020a3087b 100644\n--- a/extensions/wikibase/src/org/openrefine/wikibase/editing/NewEntityLibrary.java\n+++ b/extensions/wikibase/src/org/openrefine/wikibase/editing/NewEntityLibrary.java\n@@ -50,15 +50,19 @@ import com.google.refine.model.recon.StandardReconConfig;\n  */\n public class NewEntityLibrary {\n \n-    private Map<Long, String> map;\n+    private Map<Long, String> reconToEntityId;\n+    private Map<Long, String> reconToName;\n \n     public NewEntityLibrary() {\n-        map = new HashMap<>();\n+        reconToEntityId = new HashMap<>();\n+        reconToName = new HashMap<>();\n     }\n \n     @JsonCreator\n-    public NewEntityLibrary(@JsonProperty(\"qidMap\") Map<Long, String> map) {\n-        this.map = map;\n+    public NewEntityLibrary(@JsonProperty(\"qidMap\") Map<Long, String> reconToEntityId,\n+            @JsonProperty(\"nameMap\") Map<Long, String> reconToName) {\n+        this.reconToEntityId = reconToEntityId;\n+        this.reconToName = reconToName;\n     }\n \n     /**\n@@ -69,7 +73,11 @@ public class NewEntityLibrary {\n      * @return the id (or null if unallocated yet)\n      */\n     public String getId(long id) {\n-        return map.get(id);\n+        return reconToEntityId.get(id);\n+    }\n+\n+    public String getName(long id) {\n+        return reconToName.get(id);\n     }\n \n     /**\n@@ -81,7 +89,11 @@ public class NewEntityLibrary {\n      *            : the associated id returned by Wikibase\n      */\n     public void setId(long id, String returnedId) {\n-        map.put(id, returnedId);\n+        reconToEntityId.put(id, returnedId);\n+    }\n+\n+    public void setName(long id, String name) {\n+        reconToName.put(id, name);\n     }\n \n     /**\n@@ -110,15 +122,17 @@ public class NewEntityLibrary {\n                 Recon recon = cell.recon;\n                 boolean changed = false;\n                 if (Recon.Judgment.New.equals(recon.judgment) && !reset\n-                        && map.containsKey(recon.id)) {\n+                        && reconToEntityId.containsKey(recon.id)) {\n                     recon.judgment = Recon.Judgment.Matched;\n-                    recon.match = new ReconCandidate(map.get(recon.id), cell.value.toString(),\n+                    recon.match = new ReconCandidate(reconToEntityId.get(recon.id).toString(),\n+                            reconToName != null && reconToName.get(recon.id) != null ? reconToName.get(recon.id).toString()\n+                                    : cell.value.toString(),\n                             new String[0], 100);\n                     recon.addCandidate(recon.match);\n                     changed = true;\n \n                 } else if (Recon.Judgment.Matched.equals(recon.judgment) && reset\n-                        && map.containsKey(recon.id)) {\n+                        && reconToEntityId.containsKey(recon.id)) {\n                     recon.judgment = Recon.Judgment.New;\n                     if (recon.candidates != null) {\n                         recon.candidates.remove(recon.candidates.size() - 1);\n@@ -155,7 +169,12 @@ public class NewEntityLibrary {\n      */\n     @JsonProperty(\"qidMap\")\n     public Map<Long, String> getIdMap() {\n-        return map;\n+        return reconToEntityId;\n+    }\n+\n+    @JsonProperty(\"nameMap\")\n+    public Map<Long, String> getNameMap() {\n+        return reconToName;\n     }\n \n     @Override\n@@ -164,16 +183,19 @@ public class NewEntityLibrary {\n             return false;\n         }\n         NewEntityLibrary otherLibrary = (NewEntityLibrary) other;\n-        return map.equals(otherLibrary.getIdMap());\n+        return reconToEntityId.equals(otherLibrary.getIdMap()) && (reconToName != null && reconToName.equals(otherLibrary.getNameMap()));\n     }\n \n     @Override\n     public int hashCode() {\n-        return map.hashCode();\n+        return reconToEntityId.hashCode() + (reconToName != null ? reconToName.hashCode() : 0);\n     }\n \n     @Override\n     public String toString() {\n-        return map.toString();\n+        return \"{\" +\n+                \"reconToEntityId=\" + reconToEntityId +\n+                \", reconToName=\" + reconToName +\n+                '}';\n     }\n }\ndiff --git a/extensions/wikibase/src/org/openrefine/wikibase/operations/PerformWikibaseEditsOperation.java b/extensions/wikibase/src/org/openrefine/wikibase/operations/PerformWikibaseEditsOperation.java\nindex 2bdb3fd83..c8f0e4b17 100644\n--- a/extensions/wikibase/src/org/openrefine/wikibase/operations/PerformWikibaseEditsOperation.java\n+++ b/extensions/wikibase/src/org/openrefine/wikibase/operations/PerformWikibaseEditsOperation.java\n@@ -210,6 +210,7 @@ public class PerformWikibaseEditsOperation extends EngineDependentOperation {\n             if (newEntityLibrary != null) {\n                 writer.write(\"newItems=\");\n                 ObjectMapper mapper = new ObjectMapper();\n+                mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);\n                 writer.write(mapper.writeValueAsString(newEntityLibrary) + \"\\n\");\n             }\n             writer.write(\"/ec/\\n\"); // end of change\n@@ -287,6 +288,7 @@ public class PerformWikibaseEditsOperation extends EngineDependentOperation {\n                 onDone.add(createFacetAction);\n \n             }\n+\n         }\n \n         @Override\ndiff --git a/extensions/wikibase/src/org/openrefine/wikibase/updates/MediaInfoEdit.java b/extensions/wikibase/src/org/openrefine/wikibase/updates/MediaInfoEdit.java\nindex dede650c5..a930b21fa 100644\n--- a/extensions/wikibase/src/org/openrefine/wikibase/updates/MediaInfoEdit.java\n+++ b/extensions/wikibase/src/org/openrefine/wikibase/updates/MediaInfoEdit.java\n@@ -314,7 +314,9 @@ public class MediaInfoEdit extends LabeledStatementEntityEdit {\n         ReconEntityIdValue reconEntityIdValue = (ReconEntityIdValue) id;\n         MediaInfoIdValue mid = response.getMid(mediaFileUtils.getApiConnection(), reconEntityIdValue.getRecon().identifierSpace);\n         NewEntityLibrary library = new NewEntityLibrary();\n+        String label = this.fileName.startsWith(\"File:\") ? this.fileName : \"File:\".concat(this.fileName);\n         library.setId(reconEntityIdValue.getReconInternalId(), mid.getId());\n+        library.setName(reconEntityIdValue.getReconInternalId(), label);\n         ReconEntityRewriter rewriter = new ReconEntityRewriter(library, id);\n         try {\n             MediaInfoEdit rewritten = (MediaInfoEdit) rewriter.rewrite(this);\n", "test_patch": "diff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/EditBatchProcessorTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/EditBatchProcessorTest.java\nindex 26d959216..e3aa9e7b3 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/EditBatchProcessorTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/EditBatchProcessorTest.java\n@@ -143,6 +143,7 @@ public class EditBatchProcessorTest extends WikidataRefineTest {\n \n         NewEntityLibrary expectedLibrary = new NewEntityLibrary();\n         expectedLibrary.setId(1234L, \"Q1234\");\n+        expectedLibrary.setName(1234L, \"better label\");\n         assertEquals(expectedLibrary, library);\n     }\n \ndiff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java\nindex b25f029fe..3edcbf01a 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java\n@@ -49,7 +49,9 @@ public class NewEntityLibraryTest extends WikidataRefineTest {\n     public void setUp() {\n         library = new NewEntityLibrary();\n         library.setId(1234L, \"Q345\");\n+        library.setName(1234L, \"new uni\");\n         library.setId(3289L, \"Q384\");\n+        library.setName(3289L, \"University of Ljubljana\");\n     }\n \n     @Test\n@@ -87,7 +89,7 @@ public class NewEntityLibraryTest extends WikidataRefineTest {\n     @Test\n     public void testSerialize() {\n         JacksonSerializationTest.canonicalSerialization(NewEntityLibrary.class, library,\n-                \"{\\\"qidMap\\\":{\\\"1234\\\":\\\"Q345\\\",\\\"3289\\\":\\\"Q384\\\"}}\");\n+                \"{\\\"qidMap\\\":{\\\"1234\\\":\\\"Q345\\\",\\\"3289\\\":\\\"Q384\\\"},\\\"nameMap\\\":{\\\"1234\\\":\\\"new uni\\\",\\\"3289\\\":\\\"University of Ljubljana\\\"}}\");\n     }\n \n     private void isMatchedTo(String qid, Cell cell) {\ndiff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/ReconEntityRewriterTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/ReconEntityRewriterTest.java\nindex cfbaae0d3..5808289f7 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/ReconEntityRewriterTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/ReconEntityRewriterTest.java\n@@ -61,6 +61,7 @@ public class ReconEntityRewriterTest {\n     public void testSuccessfulRewrite() {\n         rewriter = new ReconEntityRewriter(library, TestingData.newIdA);\n         library.setId(4567L, \"Q1234\");\n+        library.setName(4567L, \"Q1234\");\n         assertEquals(newlyCreated, rewriter.copy(TestingData.newIdB));\n     }\n \n@@ -75,6 +76,7 @@ public class ReconEntityRewriterTest {\n     public void testSubjectRewritten() {\n         ItemIdValue subject = TestingData.newIdB;\n         library.setId(4567L, \"Q1234\");\n+        library.setName(4567L, \"Q1234\");\n         rewriter = new ReconEntityRewriter(library, subject);\n         assertEquals(newlyCreated, rewriter.copy(subject));\n     }\n@@ -90,6 +92,7 @@ public class ReconEntityRewriterTest {\n         ItemIdValue subject = TestingData.newIdA;\n         rewriter = new ReconEntityRewriter(library, subject);\n         library.setId(4567L, \"Q1234\");\n+        library.setName(4567L, \"label\");\n         TermedStatementEntityEdit update = new ItemEditBuilder(subject)\n                 .addStatement(TestingData.generateStatementAddition(subject, TestingData.newIdB))\n                 .addStatement(TestingData.generateStatementDeletion(subject, TestingData.existingId))\n@@ -115,6 +118,7 @@ public class ReconEntityRewriterTest {\n         ItemIdValue subject = TestingData.newIdA;\n         rewriter = new ReconEntityRewriter(library, subject);\n         library.setId(4567L, \"Q1234\");\n+        library.setName(4567L, \"Q1234\");\n         TermedStatementEntityEdit update = new ItemEditBuilder(TestingData.newIdB)\n                 .addDescription(Datamodel.makeMonolingualTextValue(\"beschreibung\", \"de\"), false)\n                 .addAlias(Datamodel.makeMonolingualTextValue(\"darstellung\", \"de\"))\n@@ -134,6 +138,7 @@ public class ReconEntityRewriterTest {\n         ItemIdValue subject = TestingData.matchedId;\n         rewriter = new ReconEntityRewriter(library, subject);\n         library.setId(4567L, \"Q1234\");\n+        library.setName(4567L, \"label\");\n         TermedStatementEntityEdit update = new ItemEditBuilder(subject)\n                 .addStatement(TestingData.generateStatementAddition(subject, TestingData.newIdB))\n                 .addStatement(TestingData.generateStatementDeletion(subject, TestingData.existingId))\n@@ -159,6 +164,7 @@ public class ReconEntityRewriterTest {\n         ItemIdValue subject = TestingData.existingId;\n         rewriter = new ReconEntityRewriter(library, subject);\n         library.setId(7654L, \"P1234\");\n+        library.setName(7654L, \"label\");\n         TermedStatementEntityEdit update = new ItemEditBuilder(subject)\n                 .addStatement(TestingData.generateStatementAddition(subject, TestingData.newPropertyIdB))\n                 .addStatement(TestingData.generateStatementDeletion(subject, TestingData.existingPropertyId))\ndiff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/operations/PerformWikibaseEditsOperationTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/operations/PerformWikibaseEditsOperationTest.java\nindex 5f35fd64a..83f1e59fc 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/operations/PerformWikibaseEditsOperationTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/operations/PerformWikibaseEditsOperationTest.java\n@@ -95,4 +95,25 @@ public class PerformWikibaseEditsOperationTest extends OperationTest {\n         assertEquals(changeString, saveChange(change));\n     }\n \n+    @Test\n+    public void testLoadChange_v2()\n+            throws Exception {\n+        String changeString = \"newItems={\\\"qidMap\\\":{\\\"1234\\\":\\\"Q789\\\"},\\\"nameMap\\\":{\\\"1234\\\":\\\"Non-existent entity\\\"}}\\n\" + \"/ec/\\n\";\n+        LineNumberReader reader = makeReader(changeString);\n+        Change change = PerformWikibaseEditsOperation.PerformWikibaseEditsChange.load(reader, pool);\n+\n+        project.rows.get(0).cells.set(0, TestingData.makeNewItemCell(1234L, \"my new item\"));\n+\n+        change.apply(project);\n+\n+        assertEquals(Recon.Judgment.Matched, project.rows.get(0).cells.get(0).recon.judgment);\n+        assertEquals(\"Q789\", project.rows.get(0).cells.get(0).recon.match.id);\n+        assertEquals(\"Non-existent entity\", project.rows.get(0).cells.get(0).recon.match.name);\n+\n+        change.revert(project);\n+\n+        assertEquals(Recon.Judgment.New, project.rows.get(0).cells.get(0).recon.judgment);\n+\n+        assertEquals(changeString, saveChange(change));\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6996 \r\nChanges proposed in this pull request:\r\n- Extended NewEntityLibrary to also hold label for new entities \r\n- Updated EditBatchProcessor performEdit to set label from the value set in NewEntityLibrary\r\n- Updated test cases \r\n", "PR_Title": "wikibase: Improve recon name for created entities", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-7053_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 7053, "issue_title": "wikibase: Improve recon name for created entities", "issue_body": "Fixes #6996 \r\nChanges proposed in this pull request:\r\n- Extended NewEntityLibrary to also hold label for new entities \r\n- Updated EditBatchProcessor performEdit to set label from the value set in NewEntityLibrary\r\n- Updated test cases \r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6962", "base_commit": "dac141c2049e651ff63ac339639add5b7e02ba51", "patch": "diff --git a/.github/workflows/snapshot_release.yml b/.github/workflows/snapshot_release.yml\nindex 97fdad8e8..46b8b0fd9 100644\n--- a/.github/workflows/snapshot_release.yml\n+++ b/.github/workflows/snapshot_release.yml\n@@ -42,11 +42,6 @@ jobs:\n           ref: ${{ github.event.pull_request.head.ref }}\n           repository: ${{ github.event.pull_request.head.repo.full_name }}\n \n-      - name: Set up secrets\n-        run: |\n-          echo \"CYPRESS_RECORD_KEY=$(echo YzE3ZDU4OGItZTBkOC00ZjJmLTg4NjYtNzJmNmFmYmRhNGQxCg== | base64 -d)\" >> $GITHUB_ENV\n-          echo \"CYPRESS_PROJECT_ID=s5du3k\" >> $GITHUB_ENV\n-\n       - name: Set up Java 11\n         uses: actions/setup-java@v4\n         with:\n@@ -87,8 +82,8 @@ jobs:\n           ./refine e2e_tests\n         env:\n           CYPRESS_BROWSER: ${{ matrix.browser }}\n-          CYPRESS_RECORD_KEY: ${{ env.CYPRESS_RECORD_KEY }}\n-          CYPRESS_PROJECT_ID: ${{ env.CYPRESS_PROJECT_ID }}\n+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}\n+          CYPRESS_PROJECT_ID: ${{ vars.CYPRESS_PROJECT_ID }}\n           CYPRESS_CI_BUILD_ID: '${{ github.run_id }}'\n           CYPRESS_SPECS: ${{ matrix.specs.paths }}\n           CYPRESS_GROUP: ${{ matrix.specs.group }}\ndiff --git a/benchmark/pom.xml b/benchmark/pom.xml\nindex 720be7997..c3c649056 100644\n--- a/benchmark/pom.xml\n+++ b/benchmark/pom.xml\n@@ -141,7 +141,7 @@\n         </plugin>\n         <plugin>\n           <artifactId>maven-site-plugin</artifactId>\n-          <version>3.20.0</version>\n+          <version>3.21.0</version>\n         </plugin>\n         <plugin>\n           <artifactId>maven-source-plugin</artifactId>\ndiff --git a/extensions/database/pom.xml b/extensions/database/pom.xml\nindex 223271ac5..55b2d2507 100644\n--- a/extensions/database/pom.xml\n+++ b/extensions/database/pom.xml\n@@ -109,12 +109,12 @@\n     <dependency>\n       <groupId>org.mariadb.jdbc</groupId>\n       <artifactId>mariadb-java-client</artifactId>\n-      <version>3.4.1</version>\n+      <version>3.5.0</version>\n     </dependency>\n     <dependency>\n       <groupId>org.xerial</groupId>\n       <artifactId>sqlite-jdbc</artifactId>\n-      <version>3.46.1.3</version>\n+      <version>3.47.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.fasterxml.jackson.core</groupId>\ndiff --git a/modules/core/src/main/java/com/google/refine/importing/ImportingUtilities.java b/modules/core/src/main/java/com/google/refine/importing/ImportingUtilities.java\nindex 0e4898964..7942f67e3 100644\n--- a/modules/core/src/main/java/com/google/refine/importing/ImportingUtilities.java\n+++ b/modules/core/src/main/java/com/google/refine/importing/ImportingUtilities.java\n@@ -301,7 +301,6 @@ public class ImportingUtilities {\n                     JSONUtilities.safePut(fileRecord, \"origin\", \"clipboard\");\n                     JSONUtilities.safePut(fileRecord, \"declaredEncoding\", encoding);\n                     JSONUtilities.safePut(fileRecord, \"declaredMimeType\", (String) null);\n-                    JSONUtilities.safePut(fileRecord, \"format\", \"text\");\n                     JSONUtilities.safePut(fileRecord, \"fileName\", \"(clipboard)\");\n                     JSONUtilities.safePut(fileRecord, \"location\", getRelativePath(file, rawDataDir));\n \n@@ -309,6 +308,7 @@ public class ImportingUtilities {\n                             calculateProgressPercent(update.totalExpectedSize, update.totalRetrievedSize));\n \n                     JSONUtilities.safePut(fileRecord, \"size\", saveStreamToFile(stream, file, null));\n+                    JSONUtilities.safePut(fileRecord, \"format\", guessBetterFormat(file, fileRecord));\n                     JSONUtilities.append(fileRecords, fileRecord);\n \n                     clipboardCount++;\n@@ -439,7 +439,6 @@ public class ImportingUtilities {\n                             calculateProgressPercent(update.totalExpectedSize, update.totalRetrievedSize));\n \n                     JSONUtilities.safePut(fileRecord, \"size\", saveStreamToFile(stream, file, null));\n-                    JSONUtilities.safePut(fileRecord, \"format\", guessBetterFormat(file, request.getCharacterEncoding(), \"text\"));\n                     // TODO: This needs to be refactored to be able to test import from archives\n                     if (postProcessRetrievedFile(rawDataDir, file, fileRecord, fileRecords, progress)) {\n                         archiveCount++;\n@@ -700,10 +699,7 @@ public class ImportingUtilities {\n \n     static public void postProcessSingleRetrievedFile(File file, ObjectNode fileRecord) {\n         if (!fileRecord.has(\"format\")) {\n-            JSONUtilities.safePut(fileRecord, \"format\",\n-                    ImportingManager.getFormat(\n-                            file.getName(),\n-                            JSONUtilities.getString(fileRecord, \"declaredMimeType\", null)));\n+            JSONUtilities.safePut(fileRecord, \"format\", guessBetterFormat(file, fileRecord));\n         }\n     }\n \n@@ -1048,6 +1044,13 @@ public class ImportingUtilities {\n         return bestFormat;\n     }\n \n+    static String guessBetterFormat(File file, ObjectNode fileRecord) {\n+        String encoding = JSONUtilities.getString(fileRecord, \"declaredEncoding\", null);\n+        String bestFormat = ImportingManager.getFormat(file.getName(), JSONUtilities.getString(fileRecord, \"declaredMimeType\", null));\n+        bestFormat = bestFormat == null ? \"text\" : bestFormat;\n+        return guessBetterFormat(file, encoding, bestFormat);\n+    }\n+\n     static void rankFormats(ImportingJob job, final String bestFormat, ArrayNode rankedFormats) {\n         final Map<String, String[]> formatToSegments = new HashMap<String, String[]>();\n \ndiff --git a/pom.xml b/pom.xml\nindex 53724fe57..8c4f6e554 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -101,8 +101,8 @@\n     <odfdom-java.version>0.12.0</odfdom-java.version> <!-- do not update to 0.10.0, see issue #4397 -->\n     <vicino.version>1.2.1</vicino.version>\n     <clojure.version>1.12.0</clojure.version>\n-    <httpclient5.version>5.4</httpclient5.version>\n-    <httpcore5.version>5.3</httpcore5.version>\n+    <httpclient5.version>5.4.1</httpclient5.version>\n+    <httpcore5.version>5.3.1</httpcore5.version>\n     <univocity-csv.version>2.9.1</univocity-csv.version>\n     <swc-parser-lazy.version>3.1.9</swc-parser-lazy.version>\n     <commons-io.version>2.17.0</commons-io.version>\n@@ -119,8 +119,8 @@\n     <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>\n     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>\n     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>\n-    <exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>\n-    <maven-dependency-plugin.version>3.8.0</maven-dependency-plugin.version>\n+    <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>\n+    <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>\n     <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>\n     <surefire.version>3.5.1</surefire.version>\n     <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>\n", "test_patch": "diff --git a/.github/workflows/pull_request_e2e.yml b/.github/workflows/pull_request_e2e.yml\nindex fb09561a5..0b0810892 100644\n--- a/.github/workflows/pull_request_e2e.yml\n+++ b/.github/workflows/pull_request_e2e.yml\n@@ -40,11 +40,6 @@ jobs:\n     steps:\n       - uses: actions/checkout@v4\n \n-      - name: Set up secrets\n-        run: |\n-          echo \"CYPRESS_RECORD_KEY=$(echo YzE3ZDU4OGItZTBkOC00ZjJmLTg4NjYtNzJmNmFmYmRhNGQxCg== | base64 -d)\" >> $GITHUB_ENV\n-          echo \"CYPRESS_PROJECT_ID=s5du3k\" >> $GITHUB_ENV\n-\n       - name: Set up Java 17\n         uses: actions/setup-java@v4\n         with:\n@@ -85,8 +80,8 @@ jobs:\n           ./refine e2e_tests\n         env:\n           CYPRESS_BROWSER: ${{ matrix.browser }}\n-          CYPRESS_RECORD_KEY: ${{ env.CYPRESS_RECORD_KEY }}\n-          CYPRESS_PROJECT_ID: ${{ env.CYPRESS_PROJECT_ID }}\n+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}\n+          CYPRESS_PROJECT_ID: ${{ vars.CYPRESS_PROJECT_ID }}\n           CYPRESS_CI_BUILD_ID: '${{ github.run_id }}'\n           CYPRESS_SPECS: ${{ matrix.specs.paths }}\n           CYPRESS_GROUP: ${{ matrix.specs.group }}\ndiff --git a/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.cy.js b/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.cy.js\nindex 8d94a1985..3b191f161 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.cy.js\n@@ -4,25 +4,23 @@\n  */\n \n /*\n-   IMPORTANT: Any test reliant on Facet Actions (Edit,Include/Exclude) should wait 100 msec to ensure the event\n+   IMPORTANT: Any test reliant on Facet Actions (Edit,Include/Exclude) should wait >100 msec to ensure the event\n    handlers are setup, otherwise clicking on the action will do nothing.\n    Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n  */\n-const clickFacetAction = (facetType, text, action, setVisibility = false) => {\n+const clickFacetAction = (facetType, text, action) => {\n   cy.getFacetContainer(facetType)\n-      .contains(text)\n-      .parent()\n-      .within(() => {\n-        const elem = cy.contains(action);\n-\n-        if (setVisibility) {\n-          elem.invoke('css', 'visibility', 'visible')\n-              .should('have.css', 'visibility', 'visible')\n-              .click();\n-        } else {\n-          elem.click();\n-        }\n-      });\n+    .contains(text)\n+    .parent()\n+    .invoke('trigger', 'mouseenter'); // include/exclude not visible until we mouse over\n+  // start a new chain after the trigger\n+  cy.getFacetContainer(facetType)\n+    .contains(text)\n+    .siblings()\n+    .get(\".facet-choice-toggle\")\n+    .contains(action)\n+    .should('have.css', 'visibility', 'visible') // partially occluded, so \"be.visible\" won't work\n+    .click();\n };\n \n describe(__filename, function () {\n@@ -226,28 +224,28 @@ describe(__filename, function () {\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n-    clickFacetAction('Shrt_Desc','ALLSPICE,GROUND', 'include', true);\n+    cy.wait(150);\n+    clickFacetAction('Shrt_Desc','ALLSPICE,GROUND', 'include');\n     cy.getCell(0, 'Shrt_Desc').should('contain', 'ALLSPICE,GROUND');\n     cy.get('#tool-panel').contains('1 matching rows');\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n-    clickFacetAction('Shrt_Desc','ANISE SEED', 'include', true);\n+    cy.wait(150);\n+    clickFacetAction('Shrt_Desc','ANISE SEED', 'include');\n     cy.getCell(1, 'Shrt_Desc').should('contain', 'ANISE SEED');\n     cy.get('#tool-panel').contains('2 matching rows');\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n-    clickFacetAction('Shrt_Desc','BUTTER OIL,ANHYDROUS', 'include', true);\n+    cy.wait(150);\n+    clickFacetAction('Shrt_Desc','BUTTER OIL,ANHYDROUS', 'include');\n     cy.getCell(0, 'Shrt_Desc').should('contain', 'BUTTER OIL,ANHYDROUS');\n     cy.get('#tool-panel').contains('3 matching rows');\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n+    cy.wait(150);\n     clickFacetAction('Shrt_Desc','ALLSPICE,GROUND', 'exclude');\n     cy.get('#tool-panel').contains('2 matching rows');\n   });\n@@ -258,9 +256,9 @@ describe(__filename, function () {\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n+    cy.wait(150);\n     // do a basic facetting, expect 1 row\n-    clickFacetAction('Shrt_Desc','ALLSPICE,GROUND','include',true);\n+    clickFacetAction('Shrt_Desc','ALLSPICE,GROUND','include');\n     cy.getCell(0, 'Shrt_Desc').should('to.contain', 'ALLSPICE,GROUND');\n     cy.get('#tool-panel').contains('1 matching rows');\n \n@@ -285,7 +283,7 @@ describe(__filename, function () {\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n+    cy.wait(150);\n     // do a basic facetting, expect 1 row\n     clickFacetAction('Shrt_Desc','ALLSPICE,GROUND','include',true);\n     cy.get('#tool-panel').contains('1 matching rows');\n@@ -342,7 +340,7 @@ describe(__filename, function () {\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n+    cy.wait(150);\n \n     cy.get('div.facet-body-inner > div:nth-child(8)')\n         .contains('15.87')\n@@ -380,27 +378,15 @@ describe(__filename, function () {\n     );\n   });\n \n-  // // This test is unstable, mouseover behavior is unpredictable\n-  // // This might be because the element is detached from the DOM in the middle\n-  // // it('Test include/exlude toggle', function () {\n-  // // \tcy.loadAndVisitProject('food.small');\n-  // // \tcy.columnActionClick('NDB_No', ['Facet', 'Text facet']);\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"]').trigger('mouseover');\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').contains('include').should('be.visible');\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').click();\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').contains('exclude');\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').click();\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').contains('include');\n-  // // });\n-\n-  // it('Test collapsing facet panels', function () {\n-  // The following test does not work\n-  // Because the facet panels uses soem weird CSS with overflow:hidden, Cypress can not detect it\n-  // //// # cy.loadAndVisitProject('food.small');\n-  // //// # cy.columnActionClick('NDB_No', ['Facet', 'Text facet']);\n-  // //// # ensure facet inner panel is visible\n-  // //// # cy.get('#refine-tabs-facets .facets-container li:nth-child(1) .facet-body-inner').should('be.visible');\n-  // //// #collapse the panel\n-  // //// # cy.get('#refine-tabs-facets .facets-container li:nth-child(1) a[bind=\"minimizeButton\"]').click();\n-  // ////\n+  it('Test collapsing facet panels', function () {\n+    cy.loadAndVisitProject('food.small');\n+    cy.columnActionClick('NDB_No', ['Facet', 'Text facet']);\n+    // ensure facet inner panel is visible\n+    cy.get('#refine-tabs-facets .facets-container li:nth-child(1) .facet-body-inner').should('be.visible');\n+    // collapse the panel\n+    cy.get('#refine-tabs-facets .facets-container li:nth-child(1) a[bind=\"minimizeButton\"]').click();\n+    // Make sure the body is hidden\n+    cy.get('#refine-tabs-facets .facets-container li:nth-child(1) .facet-body').should('not.be.visible');\n+  });\n+\n });\ndiff --git a/main/tests/cypress/cypress/e2e/project/grid/viewpanel-header/rows_records.cy.js b/main/tests/cypress/cypress/e2e/project/grid/viewpanel-header/rows_records.cy.js\nindex d1555205c..37ad9315a 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/viewpanel-header/rows_records.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/viewpanel-header/rows_records.cy.js\n@@ -1,137 +1,7 @@\n-const jsonValue = `[\n-  {\n-     \"id\":\"0001\",\n-     \"type\":\"donut\",\n-     \"name\":\"Cake\",\n-     \"ppu\":0.55,\n-     \"batters\":{\n-        \"batter\":[\n-           {\n-              \"id\":\"1001\",\n-              \"type\":\"Regular\"\n-           },\n-           {\n-              \"id\":\"1002\",\n-              \"type\":\"Chocolate\"\n-           },\n-           {\n-              \"id\":\"1003\",\n-              \"type\":\"Blueberry\"\n-           },\n-           {\n-              \"id\":\"1004\",\n-              \"type\":\"Devil's Food\"\n-           }\n-        ]\n-     },\n-     \"topping\":[\n-        {\n-           \"id\":\"5001\",\n-           \"type\":\"None\"\n-        },\n-        {\n-           \"id\":\"5002\",\n-           \"type\":\"Glazed\"\n-        },\n-        {\n-           \"id\":\"5005\",\n-           \"type\":\"Sugar\"\n-        },\n-        {\n-           \"id\":\"5007\",\n-           \"type\":\"Powdered Sugar\"\n-        },\n-        {\n-           \"id\":\"5006\",\n-           \"type\":\"Chocolate with Sprinkles\"\n-        },\n-        {\n-           \"id\":\"5003\",\n-           \"type\":\"Chocolate\"\n-        },\n-        {\n-           \"id\":\"5004\",\n-           \"type\":\"Maple\"\n-        }\n-     ]\n-  },\n-  {\n-     \"id\":\"0002\",\n-     \"type\":\"donut\",\n-     \"name\":\"Raised\",\n-     \"ppu\":0.55,\n-     \"batters\":{\n-        \"batter\":[\n-           {\n-              \"id\":\"1001\",\n-              \"type\":\"Regular\"\n-           }\n-        ]\n-     },\n-     \"topping\":[\n-        {\n-           \"id\":\"5001\",\n-           \"type\":\"None\"\n-        },\n-        {\n-           \"id\":\"5002\",\n-           \"type\":\"Glazed\"\n-        },\n-        {\n-           \"id\":\"5005\",\n-           \"type\":\"Sugar\"\n-        },\n-        {\n-           \"id\":\"5003\",\n-           \"type\":\"Chocolate\"\n-        },\n-        {\n-           \"id\":\"5004\",\n-           \"type\":\"Maple\"\n-        }\n-     ]\n-  },\n-  {\n-     \"id\":\"0003\",\n-     \"type\":\"donut\",\n-     \"name\":\"Old Fashioned\",\n-     \"ppu\":0.55,\n-     \"batters\":{\n-        \"batter\":[\n-           {\n-              \"id\":\"1001\",\n-              \"type\":\"Regular\"\n-           },\n-           {\n-              \"id\":\"1002\",\n-              \"type\":\"Chocolate\"\n-           }\n-        ]\n-     },\n-     \"topping\":[\n-        {\n-           \"id\":\"5001\",\n-           \"type\":\"None\"\n-        },\n-        {\n-           \"id\":\"5002\",\n-           \"type\":\"Glazed\"\n-        },\n-        {\n-           \"id\":\"5003\",\n-           \"type\":\"Chocolate\"\n-        },\n-        {\n-           \"id\":\"5004\",\n-           \"type\":\"Maple\"\n-        }\n-     ]\n-  }\n-]`;\n describe(__filename, function () {\n   afterEach(() => {\n-    cy.addProjectForDeletion();\n-  });\n+    cy.addProjectForDeletion()\n+  })\n \n   it('ensures rows and records display same in csv file', function () {\n     cy.loadAndVisitProject('food.small');\n@@ -146,7 +16,9 @@ describe(__filename, function () {\n   });\n   it('ensures rows and records are different for 3-level json file', function () {\n     const projectName = Date.now();\n-    cy.loadAndVisitSampleJSONProject(projectName, jsonValue);\n+    cy.fixture('donut-records').then((jsonValue) => {\n+      cy.loadAndVisitSampleJSONProject(projectName, jsonValue);\n+    });\n     cy.get('span[bind=\"modeSelectors\"]').contains('records').click();\n     cy.get('span:contains(\"records\")').should('length',3);\n     cy.get('tr td:nth-child(3)').then((recordNumber) => {\ndiff --git a/main/tests/cypress/cypress/fixtures/donut-records.json b/main/tests/cypress/cypress/fixtures/donut-records.json\nnew file mode 100644\nindex 000000000..3d6fac6b1\n--- /dev/null\n+++ b/main/tests/cypress/cypress/fixtures/donut-records.json\n@@ -0,0 +1,130 @@\n+[\n+  {\n+     \"id\":\"0001\",\n+     \"type\":\"donut\",\n+     \"name\":\"Cake\",\n+     \"ppu\":0.55,\n+     \"batters\":{\n+        \"batter\":[\n+           {\n+              \"id\":\"1001\",\n+              \"type\":\"Regular\"\n+           },\n+           {\n+              \"id\":\"1002\",\n+              \"type\":\"Chocolate\"\n+           },\n+           {\n+              \"id\":\"1003\",\n+              \"type\":\"Blueberry\"\n+           },\n+           {\n+              \"id\":\"1004\",\n+              \"type\":\"Devil's Food\"\n+           }\n+        ]\n+     },\n+     \"topping\":[\n+        {\n+           \"id\":\"5001\",\n+           \"type\":\"None\"\n+        },\n+        {\n+           \"id\":\"5002\",\n+           \"type\":\"Glazed\"\n+        },\n+        {\n+           \"id\":\"5005\",\n+           \"type\":\"Sugar\"\n+        },\n+        {\n+           \"id\":\"5007\",\n+           \"type\":\"Powdered Sugar\"\n+        },\n+        {\n+           \"id\":\"5006\",\n+           \"type\":\"Chocolate with Sprinkles\"\n+        },\n+        {\n+           \"id\":\"5003\",\n+           \"type\":\"Chocolate\"\n+        },\n+        {\n+           \"id\":\"5004\",\n+           \"type\":\"Maple\"\n+        }\n+     ]\n+  },\n+  {\n+     \"id\":\"0002\",\n+     \"type\":\"donut\",\n+     \"name\":\"Raised\",\n+     \"ppu\":0.55,\n+     \"batters\":{\n+        \"batter\":[\n+           {\n+              \"id\":\"1001\",\n+              \"type\":\"Regular\"\n+           }\n+        ]\n+     },\n+     \"topping\":[\n+        {\n+           \"id\":\"5001\",\n+           \"type\":\"None\"\n+        },\n+        {\n+           \"id\":\"5002\",\n+           \"type\":\"Glazed\"\n+        },\n+        {\n+           \"id\":\"5005\",\n+           \"type\":\"Sugar\"\n+        },\n+        {\n+           \"id\":\"5003\",\n+           \"type\":\"Chocolate\"\n+        },\n+        {\n+           \"id\":\"5004\",\n+           \"type\":\"Maple\"\n+        }\n+     ]\n+  },\n+  {\n+     \"id\":\"0003\",\n+     \"type\":\"donut\",\n+     \"name\":\"Old Fashioned\",\n+     \"ppu\":0.55,\n+     \"batters\":{\n+        \"batter\":[\n+           {\n+              \"id\":\"1001\",\n+              \"type\":\"Regular\"\n+           },\n+           {\n+              \"id\":\"1002\",\n+              \"type\":\"Chocolate\"\n+           }\n+        ]\n+     },\n+     \"topping\":[\n+        {\n+           \"id\":\"5001\",\n+           \"type\":\"None\"\n+        },\n+        {\n+           \"id\":\"5002\",\n+           \"type\":\"Glazed\"\n+        },\n+        {\n+           \"id\":\"5003\",\n+           \"type\":\"Chocolate\"\n+        },\n+        {\n+           \"id\":\"5004\",\n+           \"type\":\"Maple\"\n+        }\n+     ]\n+  }\n+]\ndiff --git a/main/tests/cypress/cypress/support/commands.js b/main/tests/cypress/cypress/support/commands.js\nindex 72ccf187a..3eda5e710 100644\n--- a/main/tests/cypress/cypress/support/commands.js\n+++ b/main/tests/cypress/cypress/support/commands.js\n@@ -335,13 +335,13 @@ Cypress.Commands.add('dragAndDrop', (sourceSelector, targetSelector, position =\n Cypress.Commands.add(\n   'loadAndVisitSampleJSONProject',\n   (projectName, fixture) => {\n+    const jsonText = JSON.stringify(fixture)\n     cy.visitOpenRefine();\n     cy.navigateTo('Create project');\n     cy.get('#create-project-ui-source-selection-tabs > a')\n       .contains('Clipboard')\n       .click();\n-\n-    cy.get('textarea').invoke('val', fixture);\n+    cy.get('textarea').invoke('val', jsonText);\n     cy.get(\n       '.create-project-ui-source-selection-tab-body.selected button.button-primary'\n     )\ndiff --git a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\nindex aa75b61c8..a44686a12 100644\n--- a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n+++ b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n@@ -94,8 +94,7 @@ public class ImportingUtilitiesTests extends ImporterTest {\n     @BeforeMethod\n     public void setUp() {\n         super.setUp();\n-        ImportingManager.registerFormatGuesser(\"text\", new TextFormatGuesser());\n-        ImportingManager.registerFormatGuesser(\"text/line-based\", new LineBasedFormatGuesser());\n+        importFlowSettings();\n     }\n \n     @Test\n@@ -594,7 +593,7 @@ public class ImportingUtilitiesTests extends ImporterTest {\n     @Test\n     public void testFormatForMultipleExcelFiles() throws IOException, FileUploadException {\n         testMultipleFiles(\"dates\", \"excel95\", \".xls\",\n-                ContentType.create(\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"), \"binary\");\n+                ContentType.create(\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"), \"binary/text/xml/xls/xlsx\");\n     }\n \n     @Test\n@@ -602,6 +601,11 @@ public class ImportingUtilitiesTests extends ImporterTest {\n         testMultipleFiles(\"grid_small\", \"grid_small\", \".json\", ContentType.create(\"text/json\"), \"text/json\");\n     }\n \n+    @Test\n+    public void testFormatForMultipleODSFiles() throws IOException, FileUploadException {\n+        testMultipleFiles(\"films\", \"films\", \".ods\", ContentType.create(\"application/vnd.oasis.opendocument.spreadsheet\"), \"text/xml/ods\");\n+    }\n+\n     private void testMultipleFiles(String file1, String file2, String fileSuffix, ContentType contentType, String expectedFormat)\n             throws IOException, FileUploadException {\n \n@@ -666,4 +670,65 @@ public class ImportingUtilitiesTests extends ImporterTest {\n         assertEquals(expectedFormat, JSONUtilities.getArray(retrievalRecord, \"files\").get(0).get(\"format\").asText());\n         assertEquals(expectedFormat, JSONUtilities.getArray(retrievalRecord, \"files\").get(1).get(\"format\").asText());\n     }\n+\n+    private void importFlowSettings() {\n+        // Register Format guessers\n+        ImportingManager.registerFormatGuesser(\"text\", new TextFormatGuesser());\n+        ImportingManager.registerFormatGuesser(\"text/line-based\", new LineBasedFormatGuesser());\n+\n+        // Extension to format mappings\n+        ImportingManager.registerExtension(\".txt\", \"text\");\n+        ImportingManager.registerExtension(\".csv\", \"text/line-based/*sv\");\n+        ImportingManager.registerExtension(\".tsv\", \"text/line-based/*sv\");\n+        ImportingManager.registerExtension(\".xml\", \"text/xml\");\n+        ImportingManager.registerExtension(\".atom\", \"text/xml\");\n+        ImportingManager.registerExtension(\".json\", \"text/json\");\n+        ImportingManager.registerExtension(\".js\", \"text/json\");\n+        ImportingManager.registerExtension(\".xls\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerExtension(\".xlsx\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerExtension(\".ods\", \"text/xml/ods\");\n+        ImportingManager.registerExtension(\".nt\", \"text/rdf/nt\");\n+        ImportingManager.registerExtension(\".ntriples\", \"text/rdf/nt\");\n+        ImportingManager.registerExtension(\".n3\", \"text/rdf/n3\");\n+        ImportingManager.registerExtension(\".ttl\", \"text/rdf/ttl\");\n+        ImportingManager.registerExtension(\".jsonld\", \"text/rdf/ld+json\");\n+        ImportingManager.registerExtension(\".rdf\", \"text/rdf/xml\");\n+        ImportingManager.registerExtension(\".marc\", \"text/marc\");\n+        ImportingManager.registerExtension(\".mrc\", \"text/marc\");\n+        ImportingManager.registerExtension(\".wiki\", \"text/wiki\");\n+\n+        // Mime type to format mappings\n+        ImportingManager.registerMimeType(\"text/plain\", \"text\");\n+        ImportingManager.registerMimeType(\"text/csv\", \"text/line-based/*sv\");\n+        ImportingManager.registerMimeType(\"text/x-csv\", \"text/line-based/*sv\");\n+        ImportingManager.registerMimeType(\"text/tab-separated-value\", \"text/line-based/*sv\");\n+        ImportingManager.registerMimeType(\"text/tab-separated-values\", \"text/line-based/*sv\");\n+        ImportingManager.registerMimeType(\"text/fixed-width\", \"text/line-based/fixed-width\");\n+        ImportingManager.registerMimeType(\"application/n-triples\", \"text/rdf/nt\");\n+        ImportingManager.registerMimeType(\"text/n3\", \"text/rdf/n3\");\n+        ImportingManager.registerMimeType(\"text/rdf+n3\", \"text/rdf/n3\");\n+        ImportingManager.registerMimeType(\"text/turtle\", \"text/rdf/ttl\");\n+        ImportingManager.registerMimeType(\"application/xml\", \"text/xml\");\n+        ImportingManager.registerMimeType(\"text/xml\", \"text/xml\");\n+        ImportingManager.registerMimeType(\"+xml\", \"text/xml\"); // suffix will be tried only as fallback\n+        ImportingManager.registerMimeType(\"application/rdf+xml\", \"text/rdf/xml\");\n+        ImportingManager.registerMimeType(\"application/ld+json\", \"text/rdf/ld+json\");\n+        ImportingManager.registerMimeType(\"application/atom+xml\", \"text/xml\");\n+        ImportingManager.registerMimeType(\"application/msexcel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/x-msexcel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/x-ms-excel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/vnd.ms-excel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/x-excel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/xls\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/x-xls\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/vnd.openxmlformats-officedocument.spreadsheetml.template\",\n+                \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/vnd.oasis.opendocument.spreadsheet\", \"text/xml/ods\");\n+        ImportingManager.registerMimeType(\"application/json\", \"text/json\");\n+        ImportingManager.registerMimeType(\"application/javascript\", \"text/json\");\n+        ImportingManager.registerMimeType(\"text/json\", \"text/json\");\n+        ImportingManager.registerMimeType(\"+json\", \"text/json\"); // suffix will be tried only as fallback\n+        ImportingManager.registerMimeType(\"application/marc\", \"text/marc\");\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6584\n\nChanges proposed in this pull request:\n- adds new file `donut-records.json` to Cypress fixtures. \n", "PR_Title": "Fixes #6584 add Cypress fixture for records", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6962_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6962, "issue_title": "Fixes #6584 add Cypress fixture for records", "issue_body": "Fixes #6584\n\nChanges proposed in this pull request:\n- adds new file `donut-records.json` to Cypress fixtures. \n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6912", "base_commit": "97bc585e47d77a86a33cc0fa8d30b6d1e8deef6a", "patch": "diff --git a/main/src/com/google/refine/importers/JsonImporter.java b/main/src/com/google/refine/importers/JsonImporter.java\nindex 1d8505dd9..ce8e0367e 100644\n--- a/main/src/com/google/refine/importers/JsonImporter.java\n+++ b/main/src/com/google/refine/importers/JsonImporter.java\n@@ -44,6 +44,7 @@ import com.fasterxml.jackson.core.JsonParseException;\n import com.fasterxml.jackson.core.JsonParser;\n import com.fasterxml.jackson.core.JsonParser.NumberType;\n import com.fasterxml.jackson.core.JsonToken;\n+import com.fasterxml.jackson.core.StreamReadFeature;\n import com.fasterxml.jackson.core.json.JsonReadFeature;\n import com.fasterxml.jackson.databind.JsonNode;\n import com.fasterxml.jackson.databind.node.ArrayNode;\n@@ -92,7 +93,7 @@ public class JsonImporter extends TreeImportingParserBase {\n                 ObjectNode firstFileRecord = fileRecords.get(0);\n                 File file = ImportingUtilities.getFile(job, firstFileRecord);\n                 JsonFactory factory = JsonFactory.builder().enable(JsonReadFeature.ALLOW_JAVA_COMMENTS)\n-                        .enable(JsonReadFeature.ALLOW_YAML_COMMENTS).build();\n+                        .enable(JsonReadFeature.ALLOW_YAML_COMMENTS).enable(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION).build();\n                 JsonParser parser = factory.createParser(file);\n                 parser.enable(JsonParser.Feature.ALLOW_UNQUOTED_CONTROL_CHARS);\n \n@@ -103,6 +104,7 @@ public class JsonImporter extends TreeImportingParserBase {\n                 }\n             } catch (IOException e) {\n                 logger.error(\"Error generating parser UI initialization data for JSON file\", e);\n+                JSONUtilities.safePut(options, \"error\", e.toString());\n             }\n         }\n \n@@ -141,64 +143,52 @@ public class JsonImporter extends TreeImportingParserBase {\n         return null;\n     }\n \n-    final static private JsonNode parseForPreview(JsonParser parser, PreviewParsingState state) {\n-        try {\n-            JsonToken token = parser.nextToken();\n-            state.tokenCount++;\n-            return parseForPreview(parser, state, token);\n-        } catch (IOException e) {\n-            return null;\n-        }\n+    final static private JsonNode parseForPreview(JsonParser parser, PreviewParsingState state) throws IOException {\n+        JsonToken token = parser.nextToken();\n+        state.tokenCount++;\n+        return parseForPreview(parser, state, token);\n     }\n \n-    final static private ObjectNode parseObjectForPreview(JsonParser parser, PreviewParsingState state) {\n+    final static private ObjectNode parseObjectForPreview(JsonParser parser, PreviewParsingState state) throws IOException {\n         ObjectNode result = ParsingUtilities.mapper.createObjectNode();\n         loop: while (state.tokenCount < PREVIEW_PARSING_LIMIT) {\n-            try {\n-                JsonToken token = parser.nextToken();\n-                if (token == null) {\n-                    break;\n-                }\n-                state.tokenCount++;\n-\n-                switch (token) {\n-                    case FIELD_NAME:\n-                        String fieldName = parser.getText();\n-                        JsonNode fieldValue = parseForPreview(parser, state);\n-                        JSONUtilities.safePut(result, fieldName, fieldValue);\n-                        break;\n-                    case END_OBJECT:\n-                        break loop;\n-                    default:\n-                        break loop;\n-                }\n-            } catch (IOException e) {\n+            JsonToken token = parser.nextToken();\n+            if (token == null) {\n                 break;\n             }\n+            state.tokenCount++;\n+\n+            switch (token) {\n+                case FIELD_NAME:\n+                    String fieldName = parser.getText();\n+                    JsonNode fieldValue = parseForPreview(parser, state);\n+                    JSONUtilities.safePut(result, fieldName, fieldValue);\n+                    break;\n+                case END_OBJECT:\n+                    break loop;\n+                default:\n+                    break loop;\n+            }\n         }\n         return result;\n     }\n \n-    final static private ArrayNode parseArrayForPreview(JsonParser parser, PreviewParsingState state) {\n+    final static private ArrayNode parseArrayForPreview(JsonParser parser, PreviewParsingState state) throws IOException {\n         ArrayNode result = ParsingUtilities.mapper.createArrayNode();\n         loop: while (state.tokenCount < PREVIEW_PARSING_LIMIT) {\n-            try {\n-                JsonToken token = parser.nextToken();\n-                if (token == null) {\n-                    break;\n-                }\n-                state.tokenCount++;\n-\n-                switch (token) {\n-                    case END_ARRAY:\n-                        break loop;\n-                    default:\n-                        JsonNode element = parseForPreview(parser, state, token);\n-                        result.add(element);\n-                }\n-            } catch (IOException e) {\n+            JsonToken token = parser.nextToken();\n+            if (token == null) {\n                 break;\n             }\n+            state.tokenCount++;\n+\n+            switch (token) {\n+                case END_ARRAY:\n+                    break loop;\n+                default:\n+                    JsonNode element = parseForPreview(parser, state, token);\n+                    result.add(element);\n+            }\n         }\n         return result;\n     }\ndiff --git a/main/webapp/modules/core/langs/translation-he.json b/main/webapp/modules/core/langs/translation-he.json\nindex db9a2b761..0688e7ef0 100644\n--- a/main/webapp/modules/core/langs/translation-he.json\n+++ b/main/webapp/modules/core/langs/translation-he.json\n@@ -290,7 +290,7 @@\n     \"core-project/odf\": \"גיליון נתונים ODF\",\n     \"core-project/custom-tabular\": \"מייצא טבלאי מותאם אישית…\",\n     \"core-project/templating\": \"נוצרת תבנית…\",\n-    \"core-project/json-invalid\": \"ה־JSON שהדבקת אינו תקני\",\n+    \"core-project/json-invalid\": \"תבנית JSON שגויה: $1\",\n     \"core-project/undo-history\": \"היסטוריית ביטולים אינסופית\",\n     \"core-project/mistakes\": \"אל תחששו לבצע טעויות. כל שינוי שתעשו יוצג כאן, ותוכלו לבטל כל שינוי בכל עת.\",\n     \"core-project/learn-more\": \"מידע נוסף &laquo;\",\ndiff --git a/main/webapp/modules/core/langs/translation-ja.json b/main/webapp/modules/core/langs/translation-ja.json\nindex a9c31baad..45af7226b 100644\n--- a/main/webapp/modules/core/langs/translation-ja.json\n+++ b/main/webapp/modules/core/langs/translation-ja.json\n@@ -331,7 +331,7 @@\n     \"core-project/clear-selection\": \"全ファセットの選択をクリア\",\n     \"core-project/open\": \"開く\",\n     \"core-project/facet-filter\": \"ファセット/フィルタ\",\n-    \"core-project/json-invalid\": \"貼り付けたJSONは無効です\",\n+    \"core-project/json-invalid\": \"JSON形式としては無効: $1\",\n     \"core-project/last-op-er\": \"最後の操作でエラーが発生しました\",\n     \"core-project/apply-operation\": \"操作履歴を適用\",\n     \"core-project/sql-export\": \"SQL…\",\n@@ -917,5 +917,6 @@\n     \"core-dialogs/edit-name\": \"関数名\",\n     \"core-dialogs/action\": \"アクション\",\n     \"core-views/warning-function-name\": \"関数名を入力してください.\",\n-    \"core-views/warning-delete-functions\": \"本当にこの関数を削除しますか?\"\n+    \"core-views/warning-delete-functions\": \"本当にこの関数を削除しますか?\",\n+    \"core-index-parser/store-blank-columns\": \"空白カラムも保存\"\n }\n", "test_patch": "diff --git a/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java b/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java\nindex 43dacc72d..726e1a4ce 100644\n--- a/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java\n+++ b/main/tests/server/src/com/google/refine/importers/JsonImporterTests.java\n@@ -33,6 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.importers;\n \n+import static org.testng.Assert.assertEquals;\n+\n import java.io.ByteArrayInputStream;\n import java.io.File;\n import java.io.IOException;\n@@ -40,6 +42,7 @@ import java.io.InputStream;\n import java.io.Serializable;\n import java.lang.reflect.Method;\n import java.nio.charset.StandardCharsets;\n+import java.nio.file.Files;\n import java.util.ArrayList;\n import java.util.LinkedList;\n import java.util.List;\n@@ -109,7 +112,7 @@ public class JsonImporterTests extends ImporterTest {\n         Row row = project.rows.get(0);\n         Assert.assertNotNull(row);\n         Assert.assertNotNull(row.getCell(1));\n-        Assert.assertEquals(row.getCell(1).value, \"Author 1, The\");\n+        assertEquals(row.getCell(1).value, \"Author 1, The\");\n     }\n \n     @Test\n@@ -120,14 +123,27 @@ public class JsonImporterTests extends ImporterTest {\n         Row row = project.rows.get(0);\n         Assert.assertNotNull(row);\n         Assert.assertNotNull(row.getCell(1));\n-        Assert.assertEquals(row.getCell(1).value, \"Author 1, The\");\n+        assertEquals(row.getCell(1).value, \"Author 1, The\");\n     }\n \n     @Test\n-    public void canThrowError() {\n+    public void canThrowError() throws IOException {\n         String errJSON = getSampleWithError();\n+        ObjectNode fileRecord = ParsingUtilities.mapper.createObjectNode();\n+        JSONUtilities.safePut(fileRecord, \"origin\", \"clipboard\");\n+        JSONUtilities.safePut(fileRecord, \"declaredEncoding\", StandardCharsets.UTF_8.toString());\n+        JSONUtilities.safePut(fileRecord, \"declaredMimeType\", \"text/json\");\n+        JSONUtilities.safePut(fileRecord, \"format\", \"text/json\");\n+        JSONUtilities.safePut(fileRecord, \"fileName\", \"(clipboard)\");\n+        File jsonFile = new File(job.getRawDataDir(), \"test.json\");\n+        Files.write(jsonFile.toPath(), errJSON.getBytes(StandardCharsets.UTF_8));\n+        JSONUtilities.safePut(fileRecord, \"location\", \"test.json\");\n         ObjectNode options = SUT.createParserUIInitializationData(\n-                job, new LinkedList<>(), \"text/json\");\n+                job, List.of(fileRecord), \"text/json\");\n+        assertEquals(options.get(\"error\").asText(),\n+                \"com.fasterxml.jackson.core.JsonParseException: Unexpected character (';' (code 59)): was expecting comma to separate Object entries\\n\"\n+                        +\n+                        \" at [Source: (File); line: 1, column: 11]\");\n         ArrayNode path = ParsingUtilities.mapper.createArrayNode();\n         JSONUtilities.append(path, JsonImporter.ANONYMOUS);\n         JSONUtilities.safePut(options, \"recordPath\", path);\n@@ -137,7 +153,7 @@ public class JsonImporterTests extends ImporterTest {\n \n         inputStream = new ByteArrayInputStream(errJSON.getBytes(StandardCharsets.UTF_8));\n         ImportColumnGroup rootColumnGroup = new ImportColumnGroup();\n-        List<Exception> exceptions = new ArrayList<Exception>();\n+        List<Exception> exceptions = new ArrayList<>();\n \n         SUT.parseOneFile(\n                 project,\n@@ -150,7 +166,7 @@ public class JsonImporterTests extends ImporterTest {\n                 options,\n                 exceptions);\n         Assert.assertFalse(exceptions.isEmpty());\n-        Assert.assertEquals(\"Unexpected character (';' (code 59)): was expecting comma to separate Object entries\",\n+        assertEquals(\"Unexpected character (';' (code 59)): was expecting comma to separate Object entries\",\n                 exceptions.get(0).getMessage());\n     }\n \n@@ -369,8 +385,8 @@ public class JsonImporterTests extends ImporterTest {\n             }\n             i++;\n             if (i == 3) {\n-                Assert.assertEquals(Token.Value, token);\n-                Assert.assertEquals(\"field\", parser.getFieldName());\n+                assertEquals(Token.Value, token);\n+                assertEquals(\"field\", parser.getFieldName());\n             }\n         }\n \n@@ -384,8 +400,8 @@ public class JsonImporterTests extends ImporterTest {\n             }\n             i++;\n             if (i == 3) {\n-                Assert.assertEquals(Token.StartEntity, token);\n-                Assert.assertEquals(parser.getFieldName(), \"field\");\n+                assertEquals(Token.StartEntity, token);\n+                assertEquals(parser.getFieldName(), \"field\");\n             }\n         }\n \n@@ -399,16 +415,16 @@ public class JsonImporterTests extends ImporterTest {\n             }\n             i++;\n             if (i == 3) {\n-                Assert.assertEquals(token, Token.StartEntity);\n-                Assert.assertEquals(parser.getFieldName(), \"field\");\n+                assertEquals(token, Token.StartEntity);\n+                assertEquals(parser.getFieldName(), \"field\");\n             }\n             if (i == 4) {\n-                Assert.assertEquals(token, Token.StartEntity);\n-                Assert.assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);\n+                assertEquals(token, Token.StartEntity);\n+                assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);\n             }\n             if (i == 6) {\n-                Assert.assertEquals(token, Token.StartEntity);\n-                Assert.assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);\n+                assertEquals(token, Token.StartEntity);\n+                assertEquals(parser.getFieldName(), JsonImporter.ANONYMOUS);\n             }\n         }\n     }\n@@ -428,9 +444,9 @@ public class JsonImporterTests extends ImporterTest {\n             }\n             i++;\n             if (i == 3) {\n-                Assert.assertEquals(Token.Value, token);\n-                Assert.assertEquals(\"\\tfield\", parser.getFieldName());\n-                Assert.assertEquals(\"\\tvalue\", parser.getFieldValue());\n+                assertEquals(Token.Value, token);\n+                assertEquals(\"\\tfield\", parser.getFieldName());\n+                assertEquals(\"\\tvalue\", parser.getFieldValue());\n             }\n         }\n     }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6454\r\n\r\nChanges proposed in this pull request:\r\n- Add error reporting to JSON preview parse. \r\n", "PR_Title": "Add error reporting to JSON preview parse. Fixes #6454", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6912_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6912, "issue_title": "Add error reporting to JSON preview parse. Fixes #6454", "issue_body": "Fixes #6454\r\n\r\nChanges proposed in this pull request:\r\n- Add error reporting to JSON preview parse. \r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6227", "base_commit": "fe25b5d7db3347f1a29a8cc483ad9b2cf1eec5f9", "patch": "diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml\nindex 59375016a..2ed919c1b 100644\n--- a/extensions/gdata/pom.xml\n+++ b/extensions/gdata/pom.xml\n@@ -84,7 +84,7 @@\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-drive</artifactId>\n-      <version>v3-rev20231120-2.0.0</version>\n+      <version>v3-rev20231128-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.google.apis</groupId>\ndiff --git a/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java b/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java\nindex 353d3a3f5..a54c8eaf8 100644\n--- a/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java\n+++ b/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java\n@@ -22,7 +22,7 @@ public class FileNameScrutinizer extends EditScrutinizer {\n     // see https://commons.wikimedia.org/wiki/Commons:File_naming\n     public static final int maxFileNameBytes = 240;\n     public static final Pattern forbiddenFileNameChars = Pattern.compile(\n-            \".*([^ %!\\\"$&'()*,\\\\-./\\\\d:;=?@\\\\p{L}\\\\p{Mc}\\\\\\\\^_`~\\\\x80-\\\\xFF+]|%[0-9A-Fa-f]{2}|&[A-Za-z0-9\\\\x80-\\\\xff]+;|&#[0-9]+;|&#x[0-9A-Fa-f]+;).*\");\n+            \".*([^ %!\\\"$&'()*,\\\\-./\\\\d:;=?@\\\\p{L}\\\\p{M}\\\\p{N}\\\\\\\\^_`~\\\\x80-\\\\xFF+]|%[0-9A-Fa-f]{2}|&[A-Za-z0-9\\\\x80-\\\\xff]+;|&#[0-9]+;|&#x[0-9A-Fa-f]+;).*\");\n \n     public static final String duplicateFileNamesInBatchType = \"duplicate-file-names-in-batch\";\n     public static final String fileNamesAlreadyExistOnWikiType = \"file-names-already-exist-on-wiki\";\n@@ -98,7 +98,7 @@ public class FileNameScrutinizer extends EditScrutinizer {\n             // Invalid characters\n             Matcher matcher = forbiddenFileNameChars.matcher(fileName);\n             if (matcher.matches()) {\n-                QAWarning issue = new QAWarning(invalidCharactersInFileNameType, null, QAWarning.Severity.CRITICAL,\n+                QAWarning issue = new QAWarning(invalidCharactersInFileNameType, null, QAWarning.Severity.IMPORTANT,\n                         1);\n                 issue.setProperty(\"example_filename\", fileName);\n                 issue.setProperty(\"invalid_character\", matcher.group(1));\n", "test_patch": "diff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java\nindex abb1da6c4..5ced94b25 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java\n@@ -78,6 +78,16 @@ public class FileNameScrutinizerTest extends ScrutinizerTest {\n         assertNoWarningRaised();\n     }\n \n+    @Test\n+    public void testValidCharactersInFilenameNonAscii() {\n+        MediaInfoEdit edit = new MediaInfoEditBuilder(TestingData.newMidA)\n+                .addFileName(\"সমাচার দর্পণ - ৮ অক্টোবর ১৮৩৬.pdf\")\n+                .build();\n+\n+        scrutinize(edit);\n+        assertNoWarningRaised();\n+    }\n+\n     @Test()\n     public void testInvalidCharactersInFilenameTab() throws IOException, MediaWikiApiErrorException {\n         MediaInfoEdit edit = new MediaInfoEditBuilder(TestingData.newMidA)\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "I can't find authoritative documentation about this so this is pretty much example driven. To reflect that, I have lowered the severity of the check so that users are not prevented from uploading if the check incorrectly fails.\r\n\r\nCloses #5656.", "PR_Title": "Widen regex of allowed characters in Commons filenames.", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6227_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6227, "issue_title": "Widen regex of allowed characters in Commons filenames.", "issue_body": "I can't find authoritative documentation about this so this is pretty much example driven. To reflect that, I have lowered the severity of the check so that users are not prevented from uploading if the check incorrectly fails.\r\n\r\nCloses #5656."}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6141", "base_commit": "3b35205efa4bcebffe531dbf06b21b80c4d27579", "patch": "diff --git a/main/src/com/google/refine/util/HttpClient.java b/main/src/com/google/refine/util/HttpClient.java\nindex 6cdada46f..4ae8bfb71 100644\n--- a/main/src/com/google/refine/util/HttpClient.java\n+++ b/main/src/com/google/refine/util/HttpClient.java\n@@ -28,9 +28,6 @@\n package com.google.refine.util;\n \n import java.io.IOException;\n-import java.net.MalformedURLException;\n-import java.net.URISyntaxException;\n-import java.net.URL;\n import java.nio.charset.StandardCharsets;\n import java.util.Collections;\n import java.util.List;\n@@ -244,20 +241,13 @@ public class HttpClient {\n     }\n \n     public String getResponse(String urlString, Header[] headers, HttpClientResponseHandler<String> responseHandler) throws IOException {\n-        try {\n-            // Use of URL constructor below is purely to get additional error checking to mimic\n-            // previous behavior for the tests.\n-            new URL(urlString).toURI();\n-        } catch (IllegalArgumentException | MalformedURLException | URISyntaxException e) {\n-            return null;\n-        }\n \n         HttpGet httpGet = new HttpGet(urlString);\n \n         if (headers != null && headers.length > 0) {\n             httpGet.setHeaders(headers);\n         }\n-        httpGet.setConfig(defaultRequestConfig); // FIXME: Redundant? already includes in client builder\n+        httpGet.setConfig(defaultRequestConfig); // FIXME: Redundant? already included in client builder\n         return httpClient.execute(httpGet, responseHandler);\n     }\n \ndiff --git a/main/webapp/modules/core/scripts/util/dialog.js b/main/webapp/modules/core/scripts/util/dialog.js\nindex dca9275e4..db9dbcc9d 100644\n--- a/main/webapp/modules/core/scripts/util/dialog.js\n+++ b/main/webapp/modules/core/scripts/util/dialog.js\n@@ -83,7 +83,7 @@ DialogSystem.showDialog = function(elmt, onCancel) {\n   }\n \n   elmt.attr(\"tabindex\", -1);\n-  elmt.focus();\n+  elmt.trigger('focus');\n \n   return level;\n };\n", "test_patch": "diff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java\nindex 095dca2cc..9a148037c 100644\n--- a/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java\n@@ -51,6 +51,7 @@ import org.testng.annotations.Test;\n \n import com.google.refine.RefineTest;\n import com.google.refine.browsing.EngineConfig;\n+import com.google.refine.expr.EvalError;\n import com.google.refine.expr.ExpressionUtils;\n import com.google.refine.model.AbstractOperation;\n import com.google.refine.model.Cell;\n@@ -193,7 +194,7 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {\n             server.enqueue(new MockResponse());\n \n             Row row0 = new Row(2);\n-            row0.setCell(0, new Cell(\"auinrestrsc\", null)); // malformed -> null\n+            row0.setCell(0, new Cell(\"auinrestrsc\", null)); // malformed -> error\n             project.rows.add(row0);\n             Row row1 = new Row(2);\n             row1.setCell(0, new Cell(url.toString(), null)); // fine\n@@ -217,8 +218,8 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {\n \n             int newCol = project.columnModel.getColumnByName(\"junk\").getCellIndex();\n             // Inspect rows\n-            Assert.assertEquals(project.rows.get(0).getCellValue(newCol), null);\n-            Assert.assertTrue(project.rows.get(1).getCellValue(newCol) != null);\n+            Assert.assertTrue(project.rows.get(0).getCellValue(newCol) instanceof EvalError);\n+            Assert.assertNotNull(project.rows.get(1).getCellValue(newCol));\n             Assert.assertTrue(ExpressionUtils.isError(project.rows.get(2).getCellValue(newCol)));\n         }\n     }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6137 \r\n\r\nChanges proposed in this pull request:\r\n- Instead of swallowing URL/URI syntax errors and returning `null` to the user, return an `EvalError` object with the message from the exception\r\n- change the test behavior to match\r\n\r\n", "PR_Title": "Return error, not null, on bad URL. Fixes #6137.", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6141_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6141, "issue_title": "Return error, not null, on bad URL. Fixes #6137.", "issue_body": "Fixes #6137 \r\n\r\nChanges proposed in this pull request:\r\n- Instead of swallowing URL/URI syntax errors and returning `null` to the user, return an `EvalError` object with the message from the exception\r\n- change the test behavior to match\r\n\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6050", "base_commit": "4f44598c336e4a7c139a256494175be87f30a748", "patch": "diff --git a/extensions/database/src/com/google/refine/extension/database/DatabaseConfiguration.java b/extensions/database/src/com/google/refine/extension/database/DatabaseConfiguration.java\nindex c9b8976bd..4f4a14bef 100644\n--- a/extensions/database/src/com/google/refine/extension/database/DatabaseConfiguration.java\n+++ b/extensions/database/src/com/google/refine/extension/database/DatabaseConfiguration.java\n@@ -29,6 +29,9 @@\n \n package com.google.refine.extension.database;\n \n+import java.net.URI;\n+import java.net.URISyntaxException;\n+\n public class DatabaseConfiguration {\n \n     private String connectionName;\n@@ -123,4 +126,17 @@ public class DatabaseConfiguration {\n                 + databaseSchema + \", useSSL=\" + useSSL + \"]\";\n     }\n \n+    public URI toURI() {\n+        try {\n+            return new URI(\n+                    \"jdbc:\" + databaseType.toLowerCase(),\n+                    databaseHost + ((databasePort == 0) ? \"\" : (\":\" + databasePort)),\n+                    \"/\" + databaseName,\n+                    useSSL ? \"useSSL=true\" : null,\n+                    null\n+            );\n+        } catch (URISyntaxException e) {\n+            throw new IllegalArgumentException(e);\n+        }\n+    }\n }\ndiff --git a/extensions/database/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManager.java b/extensions/database/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManager.java\nindex 422735d1c..93d63c00e 100644\n--- a/extensions/database/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManager.java\n+++ b/extensions/database/src/com/google/refine/extension/database/mariadb/MariaDBConnectionManager.java\n@@ -134,7 +134,7 @@ public class MariaDBConnectionManager {\n \n             Class.forName(type.getClassPath());\n             DriverManager.setLoginTimeout(10);\n-            String dbURL = getDatabaseUrl(databaseConfiguration);\n+            String dbURL = databaseConfiguration.toURI().toString();\n             connection = DriverManager.getConnection(dbURL, databaseConfiguration.getDatabaseUser(),\n                     databaseConfiguration.getDatabasePassword());\n \n@@ -162,14 +162,6 @@ public class MariaDBConnectionManager {\n                 logger.warn(\"Non-Managed connection could not be closed. Whoops!\", e);\n             }\n         }\n-\n     }\n \n-    private static String getDatabaseUrl(DatabaseConfiguration dbConfig) {\n-\n-        int port = dbConfig.getDatabasePort();\n-        return \"jdbc:\" + dbConfig.getDatabaseType().toLowerCase() + \"://\" + dbConfig.getDatabaseHost()\n-                + ((port == 0) ? \"\" : (\":\" + port)) + \"/\" + dbConfig.getDatabaseName();\n-\n-    }\n }\ndiff --git a/extensions/database/src/com/google/refine/extension/database/mysql/MySQLConnectionManager.java b/extensions/database/src/com/google/refine/extension/database/mysql/MySQLConnectionManager.java\nindex f4a7ce5dd..4fea86a90 100644\n--- a/extensions/database/src/com/google/refine/extension/database/mysql/MySQLConnectionManager.java\n+++ b/extensions/database/src/com/google/refine/extension/database/mysql/MySQLConnectionManager.java\n@@ -129,7 +129,7 @@ public class MySQLConnectionManager {\n                     return connection;\n                 }\n             }\n-            String dbURL = getDatabaseUrl(databaseConfiguration);\n+            String dbURL = databaseConfiguration.toURI().toString();\n             Class.forName(type.getClassPath());\n \n             // logger.info(\"*** type.getClassPath() ::{}, {}**** \", type.getClassPath());\n@@ -166,11 +166,4 @@ public class MySQLConnectionManager {\n \n     }\n \n-    private String getDatabaseUrl(DatabaseConfiguration dbConfig) {\n-\n-        int port = dbConfig.getDatabasePort();\n-        return \"jdbc:\" + dbConfig.getDatabaseType() + \"://\" + dbConfig.getDatabaseHost()\n-                + ((port == 0) ? \"\" : (\":\" + port)) + \"/\" + dbConfig.getDatabaseName() + \"?useSSL=\" + dbConfig.isUseSSL();\n-\n-    }\n }\ndiff --git a/extensions/database/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManager.java b/extensions/database/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManager.java\nindex bea76d091..1637c222e 100644\n--- a/extensions/database/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManager.java\n+++ b/extensions/database/src/com/google/refine/extension/database/pgsql/PgSQLConnectionManager.java\n@@ -136,7 +136,7 @@ public class PgSQLConnectionManager {\n \n             Class.forName(type.getClassPath());\n             DriverManager.setLoginTimeout(10);\n-            String dbURL = getDatabaseUrl(databaseConfiguration);\n+            String dbURL = databaseConfiguration.toURI().toString();\n             connection = DriverManager.getConnection(dbURL, databaseConfiguration.getDatabaseUser(),\n                     databaseConfiguration.getDatabasePassword());\n \n@@ -165,11 +165,4 @@ public class PgSQLConnectionManager {\n \n     }\n \n-    private static String getDatabaseUrl(DatabaseConfiguration dbConfig) {\n-\n-        int port = dbConfig.getDatabasePort();\n-        return \"jdbc:\" + dbConfig.getDatabaseType().toLowerCase() + \"://\" + dbConfig.getDatabaseHost()\n-                + ((port == 0) ? \"\" : (\":\" + port)) + \"/\" + dbConfig.getDatabaseName();\n-\n-    }\n }\ndiff --git a/extensions/database/src/com/google/refine/extension/database/sqlite/SQLiteConnectionManager.java b/extensions/database/src/com/google/refine/extension/database/sqlite/SQLiteConnectionManager.java\nindex 5b9b4cfcd..7d42e002a 100644\n--- a/extensions/database/src/com/google/refine/extension/database/sqlite/SQLiteConnectionManager.java\n+++ b/extensions/database/src/com/google/refine/extension/database/sqlite/SQLiteConnectionManager.java\n@@ -35,6 +35,8 @@ import com.google.refine.extension.database.SQLType;\n import org.slf4j.Logger;\n import org.slf4j.LoggerFactory;\n \n+import java.net.URI;\n+import java.net.URISyntaxException;\n import java.sql.Connection;\n import java.sql.DriverManager;\n import java.sql.SQLException;\n@@ -66,7 +68,12 @@ public class SQLiteConnectionManager {\n     }\n \n     public static String getDatabaseUrl(DatabaseConfiguration dbConfig) {\n-        return \"jdbc:\" + dbConfig.getDatabaseType().toLowerCase() + \":\" + dbConfig.getDatabaseName();\n+        try {\n+            URI uri = new URI(\"jdbc:\" + dbConfig.getDatabaseType().toLowerCase(), dbConfig.getDatabaseName(), null);\n+            return uri.toASCIIString();\n+        } catch (URISyntaxException e) {\n+            throw new IllegalArgumentException(e);\n+        }\n     }\n \n     /**\ndiff --git a/main/src/com/google/refine/sorting/StringCriterion.java b/main/src/com/google/refine/sorting/StringCriterion.java\nindex 9abcc6f40..8d314ce4b 100644\n--- a/main/src/com/google/refine/sorting/StringCriterion.java\n+++ b/main/src/com/google/refine/sorting/StringCriterion.java\n@@ -54,11 +54,11 @@ public class StringCriterion extends Criterion {\n         super();\n         collator = Collator.getInstance();\n         collator.setDecomposition(Collator.FULL_DECOMPOSITION);\n-        collator.setStrength(Collator.SECONDARY);\n     }\n \n     @Override\n     public KeyMaker createKeyMaker() {\n+        collator.setStrength(caseSensitive ? Collator.IDENTICAL : Collator.SECONDARY);\n         return new KeyMaker() {\n \n             @Override\n", "test_patch": "diff --git a/extensions/database/tests/src/com/google/refine/extension/database/DatabaseConfigurationTest.java b/extensions/database/tests/src/com/google/refine/extension/database/DatabaseConfigurationTest.java\nnew file mode 100644\nindex 000000000..5a571e8f0\n--- /dev/null\n+++ b/extensions/database/tests/src/com/google/refine/extension/database/DatabaseConfigurationTest.java\n@@ -0,0 +1,21 @@\n+package com.google.refine.extension.database;\n+\n+import org.testng.annotations.Test;\n+\n+import static org.testng.Assert.assertEquals;\n+\n+public class DatabaseConfigurationTest {\n+\n+    @Test\n+    public void testToURI() {\n+        DatabaseConfiguration config = new DatabaseConfiguration();\n+        config.setDatabaseType(\"mysql\");\n+        config.setDatabaseHost(\"my.host\");\n+        // maliciously crafted database name which attempts to enable local file reads for an exploit\n+        config.setDatabaseName(\"test?allowLoadLocalInfile=true#\");\n+\n+        String url = config.toURI().toString();\n+        // the database name is escaped, preventing the exploit\n+        assertEquals(url, \"jdbc:mysql://my.host/test%3FallowLoadLocalInfile=true%23\");\n+    }\n+}\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex c81d6360a..ff8194229 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -16,7 +16,7 @@\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"13.1.0\",\n+        \"cypress\": \"13.2.0\",\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 208e0a6ab..f5f0020d7 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -116,10 +116,10 @@\n   resolved \"https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz\"\n   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==\n \n-\"@types/node@*\", \"@types/node@^16.18.39\":\n-  version \"16.18.39\"\n-  resolved \"https://registry.yarnpkg.com/@types/node/-/node-16.18.39.tgz#aa39a1a87a40ef6098ee69689a1acb0c1b034832\"\n-  integrity sha512-8q9ZexmdYYyc5/cfujaXb4YOucpQxAV4RMG0himLyDUOEr8Mr79VrqsFI+cQ2M2h89YIuy95lbxuYjxT4Hk4kQ==\n+\"@types/node@*\", \"@types/node@^18.17.5\":\n+  version \"18.17.15\"\n+  resolved \"https://registry.yarnpkg.com/@types/node/-/node-18.17.15.tgz#31301a273b9ca7d568fe6d1c35ae52e0fb3f8d6a\"\n+  integrity sha512-2yrWpBk32tvV/JAd3HNHWuZn/VDN1P+72hWirHnvsvTGSqbANi+kSeuQR9yAHnbvaBvHDsoTdXV0Fe+iRtHLKA==\n \n \"@types/sinonjs__fake-timers@8.1.1\":\n   version \"8.1.1\"\n@@ -431,14 +431,14 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress@13.1.0:\n-  version \"13.1.0\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.1.0.tgz#18f268e66662cd91b1766db18bd1f63a66592205\"\n-  integrity sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==\n+cypress@13.2.0:\n+  version \"13.2.0\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.2.0.tgz#10f73d06a0764764ffbb903a31e96e2118dcfc1d\"\n+  integrity sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==\n   dependencies:\n     \"@cypress/request\" \"^3.0.0\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n-    \"@types/node\" \"^16.18.39\"\n+    \"@types/node\" \"^18.17.5\"\n     \"@types/sinonjs__fake-timers\" \"8.1.1\"\n     \"@types/sizzle\" \"^2.3.2\"\n     arch \"^2.2.0\"\ndiff --git a/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java b/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java\nindex 87cc866ea..6a460b934 100644\n--- a/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/row/RowReorderOperationTests.java\n@@ -63,7 +63,9 @@ public class RowReorderOperationTests extends RefineTest {\n                         \"8,b\\n\" +\n                         \",d\\n\" +\n                         \"2,f\\n\" +\n-                        \"1,h\\n\");\n+                        \"1,h\\n\" +\n+                        \"9,F\\n\" +\n+                        \"10,f\\n\");\n     }\n \n     @AfterMethod\n@@ -81,10 +83,48 @@ public class RowReorderOperationTests extends RefineTest {\n         Process process = op.createProcess(project, new Properties());\n         process.performImmediate();\n \n-        Assert.assertEquals(\"h\", project.rows.get(0).cells.get(1).value);\n-        Assert.assertEquals(\"f\", project.rows.get(1).cells.get(1).value);\n-        Assert.assertEquals(\"b\", project.rows.get(2).cells.get(1).value);\n-        Assert.assertEquals(\"d\", project.rows.get(3).cells.get(1).value);\n+        Assert.assertEquals(project.rows.get(0).cells.get(1).value, \"h\");\n+        Assert.assertEquals(project.rows.get(1).cells.get(1).value, \"f\");\n+        Assert.assertEquals(project.rows.get(2).cells.get(1).value, \"b\");\n+        Assert.assertEquals(project.rows.get(3).cells.get(1).value, \"F\");\n+        Assert.assertEquals(project.rows.get(4).cells.get(1).value, \"f\");\n+        Assert.assertEquals(project.rows.get(5).cells.get(1).value, \"d\");\n+    }\n+\n+    @Test\n+    public void testReverseSort() throws Exception {\n+        String sortingJson = \"{\\\"criteria\\\":[{\\\"column\\\":\\\"key\\\",\\\"valueType\\\":\\\"number\\\",\\\"reverse\\\":true,\\\"blankPosition\\\":-1,\\\"errorPosition\\\":1}]}\";\n+        SortingConfig sortingConfig = SortingConfig.reconstruct(sortingJson);\n+        project.rows.get(1).cells.set(0, new Cell(\"\", null));\n+        AbstractOperation op = new RowReorderOperation(\n+                Mode.RowBased, sortingConfig);\n+        Process process = op.createProcess(project, new Properties());\n+        process.performImmediate();\n+\n+        Assert.assertEquals(project.rows.get(5).cells.get(1).value, \"h\");\n+        Assert.assertEquals(project.rows.get(4).cells.get(1).value, \"f\");\n+        Assert.assertEquals(project.rows.get(3).cells.get(1).value, \"b\");\n+        Assert.assertEquals(project.rows.get(2).cells.get(1).value, \"F\");\n+        Assert.assertEquals(project.rows.get(1).cells.get(1).value, \"f\");\n+        Assert.assertEquals(project.rows.get(0).cells.get(1).value, \"d\"); // controlled by blankPosition, not reverse\n+    }\n+\n+    @Test\n+    public void testStringSort() throws Exception {\n+        String sortingJson = \"{\\\"criteria\\\":[{\\\"column\\\":\\\"first\\\",\\\"valueType\\\":\\\"string\\\",\\\"reverse\\\":false,\\\"blankPosition\\\":2,\\\"errorPosition\\\":1,\\\"caseSensitive\\\":true}]}\";\n+        SortingConfig sortingConfig = SortingConfig.reconstruct(sortingJson);\n+        project.rows.get(1).cells.set(0, new Cell(\"\", null));\n+        AbstractOperation op = new RowReorderOperation(\n+                Mode.RowBased, sortingConfig);\n+        Process process = op.createProcess(project, new Properties());\n+        process.performImmediate();\n+\n+        Assert.assertEquals(project.rows.get(0).cells.get(1).value, \"b\");\n+        Assert.assertEquals(project.rows.get(1).cells.get(1).value, \"d\");\n+        Assert.assertEquals(project.rows.get(2).cells.get(1).value, \"f\");\n+        Assert.assertEquals(project.rows.get(3).cells.get(1).value, \"f\");\n+        Assert.assertEquals(project.rows.get(4).cells.get(1).value, \"F\");\n+        Assert.assertEquals(project.rows.get(5).cells.get(1).value, \"h\");\n     }\n \n     @Test\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6047\r\n\r\nChanges proposed in this pull request:\r\n- Fix the case sensitive parameter being ignored for string sorts\r\n- Correct parameter ordering for asserts in tests\r\n- Add tests for reversed sort parameter, empty item position, and string sort\r\n", "PR_Title": "Fix case sensitive string sort. Fixes #6047", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6050_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6050, "issue_title": "Fix case sensitive string sort. Fixes #6047", "issue_body": "Fixes #6047\r\n\r\nChanges proposed in this pull request:\r\n- Fix the case sensitive parameter being ignored for string sorts\r\n- Correct parameter ordering for asserts in tests\r\n- Add tests for reversed sort parameter, empty item position, and string sort\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "TheAlgorithms/Java", "instance_id": "TheAlgorithms__Java-4172", "base_commit": "db9c78a59899ceaaec8702323031e73a2491e1c7", "patch": "diff --git a/DIRECTORY.md b/DIRECTORY.md\nindex fb49d163..6f246ff1 100644\n--- a/DIRECTORY.md\n+++ b/DIRECTORY.md\n@@ -30,6 +30,7 @@\n             * [Blowfish](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/ciphers/Blowfish.java)\n             * [Caesar](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/ciphers/Caesar.java)\n             * [ColumnarTranspositionCipher](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/ciphers/ColumnarTranspositionCipher.java)\n+            * [DES](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/ciphers/DES.java)\n             * [HillCipher](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/ciphers/HillCipher.java)\n             * [Polybius](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/ciphers/Polybius.java)\n             * [ProductCipher](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/ciphers/ProductCipher.java)\n@@ -151,14 +152,15 @@\n               * [AVLSimple](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/AVLSimple.java)\n               * [AVLTree](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/AVLTree.java)\n               * [BinaryTree](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/BinaryTree.java)\n+              * [BSTFromSortedArray](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/BSTFromSortedArray.java)\n               * [BSTIterative](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/BSTIterative.java)\n               * [BSTRecursive](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/BSTRecursive.java)\n               * [BSTRecursiveGeneric](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/BSTRecursiveGeneric.java)\n               * [CeilInBinarySearchTree](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/CeilInBinarySearchTree.java)\n+              * [CheckBinaryTreeIsValidBST](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/CheckBinaryTreeIsValidBST.java)\n               * [CheckIfBinaryTreeBalanced](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/CheckIfBinaryTreeBalanced.java)\n               * [CheckTreeIsSymmetric](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/CheckTreeIsSymmetric.java)\n               * [CreateBinaryTreeFromInorderPreorder](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/CreateBinaryTreeFromInorderPreorder.java)\n-              * [CreateBSTFromSortedArray](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/CreateBSTFromSortedArray.java)\n               * [FenwickTree](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/FenwickTree.java)\n               * [GenericTree](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/GenericTree.java)\n               * [InorderTraversal](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/InorderTraversal.java)\n@@ -166,7 +168,6 @@\n               * [LazySegmentTree](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/LazySegmentTree.java)\n               * [LCA](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/LCA.java)\n               * [LevelOrderTraversal](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/LevelOrderTraversal.java)\n-              * [LevelOrderTraversalHelper](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/LevelOrderTraversalHelper.java)\n               * [nearestRightKey](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/nearestRightKey.java)\n               * [PostOrderTraversal](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/PostOrderTraversal.java)\n               * [PreOrderTraversal](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/PreOrderTraversal.java)\n@@ -175,9 +176,7 @@\n               * [SameTreesCheck](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/SameTreesCheck.java)\n               * [SegmentTree](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/SegmentTree.java)\n               * [TreeRandomNode](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/TreeRandomNode.java)\n-              * [TreeTraversal](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/TreeTraversal.java)\n               * [TrieImp](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/TrieImp.java)\n-              * [ValidBSTOrNot](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/ValidBSTOrNot.java)\n               * [VerticalOrderTraversal](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/VerticalOrderTraversal.java)\n               * [ZigzagTraversal](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/datastructures/trees/ZigzagTraversal.java)\n           * devutils\n@@ -202,6 +201,7 @@\n             * [BoundaryFill](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/dynamicprogramming/BoundaryFill.java)\n             * [BruteForceKnapsack](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/dynamicprogramming/BruteForceKnapsack.java)\n             * [CatalanNumber](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/dynamicprogramming/CatalanNumber.java)\n+            * [ClimbingStairs](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/dynamicprogramming/ClimbingStairs.java)\n             * [CoinChange](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/dynamicprogramming/CoinChange.java)\n             * [CountFriendsPairing](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/dynamicprogramming/CountFriendsPairing.java)\n             * [DiceThrow](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/dynamicprogramming/DiceThrow.java)\n@@ -382,6 +382,7 @@\n             * [KochSnowflake](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/KochSnowflake.java)\n             * [Krishnamurthy](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/Krishnamurthy.java)\n             * [LinearCongruentialGenerator](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/LinearCongruentialGenerator.java)\n+            * [LineSweep](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/LineSweep.java)\n             * [LowestBasePalindrome](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/LowestBasePalindrome.java)\n             * [Luhn](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/Luhn.java)\n             * [Mandelbrot](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/Mandelbrot.java)\n@@ -403,7 +404,6 @@\n             * [StackPostfixNotation](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/StackPostfixNotation.java)\n             * [StringMatchFiniteAutomata](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/StringMatchFiniteAutomata.java)\n             * [Sudoku](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/Sudoku.java)\n-            * [ThreeSum](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/ThreeSum.java)\n             * [TopKWords](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/TopKWords.java)\n             * [TowerOfHanoi](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/TowerOfHanoi.java)\n             * [TwoPointers](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/others/TwoPointers.java)\n@@ -526,6 +526,7 @@\n               * [LFSRTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/ciphers/a5/LFSRTest.java)\n             * [BlowfishTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/ciphers/BlowfishTest.java)\n             * [CaesarTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/ciphers/CaesarTest.java)\n+            * [DESTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/ciphers/DESTest.java)\n             * [PolybiusTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/ciphers/PolybiusTest.java)\n             * [RSATest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/ciphers/RSATest.java)\n             * [SimpleSubCipherTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/ciphers/SimpleSubCipherTest.java)\n@@ -575,7 +576,10 @@\n               * [PriorityQueuesTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/queues/PriorityQueuesTest.java)\n             * trees\n               * [BinaryTreeTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/BinaryTreeTest.java)\n+              * [BSTFromSortedArrayTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/BSTFromSortedArrayTest.java)\n+              * [BSTIterativeTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/BSTIterativeTest.java)\n               * [CeilInBinarySearchTreeTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/CeilInBinarySearchTreeTest.java)\n+              * [CheckBinaryTreeIsValidBSTTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/CheckBinaryTreeIsValidBSTTest.java)\n               * [CheckTreeIsSymmetricTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/CheckTreeIsSymmetricTest.java)\n               * [InorderTraversalTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/InorderTraversalTest.java)\n               * [KDTreeTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/KDTreeTest.java)\n@@ -585,7 +589,6 @@\n               * [PreOrderTraversalTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/PreOrderTraversalTest.java)\n               * [SameTreesCheckTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/SameTreesCheckTest.java)\n               * [TreeTestUtils](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/TreeTestUtils.java)\n-              * [ValidBSTOrNotTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/ValidBSTOrNotTest.java)\n               * [VerticalOrderTraversalTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/VerticalOrderTraversalTest.java)\n               * [ZigzagTraversalTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/ZigzagTraversalTest.java)\n           * divideandconquer\n@@ -593,6 +596,7 @@\n             * [StrassenMatrixMultiplicationTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/divideandconquer/StrassenMatrixMultiplicationTest.java)\n           * dynamicprogramming\n             * [CatalanNumberTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/dynamicprogramming/CatalanNumberTest.java)\n+            * [climbStairsTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/dynamicprogramming/climbStairsTest.java)\n             * [EggDroppingTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/dynamicprogramming/EggDroppingTest.java)\n             * [KnapsackMemoizationTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/dynamicprogramming/KnapsackMemoizationTest.java)\n             * [LevenshteinDistanceTests](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/dynamicprogramming/LevenshteinDistanceTests.java)\n@@ -674,6 +678,7 @@\n             * [CRCAlgorithmTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/CRCAlgorithmTest.java)\n             * [FirstFitCPUTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/FirstFitCPUTest.java)\n             * [KadaneAlogrithmTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/KadaneAlogrithmTest.java)\n+            * [LineSweepTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/LineSweepTest.java)\n             * [LinkListSortTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/LinkListSortTest.java)\n             * [NewManShanksPrimeTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/NewManShanksPrimeTest.java)\n             * [NextFitTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/NextFitTest.java)\n@@ -731,6 +736,7 @@\n             * [CheckAnagramsTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/strings/CheckAnagramsTest.java)\n             * [CheckVowelsTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/strings/CheckVowelsTest.java)\n             * [HammingDistanceTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/strings/HammingDistanceTest.java)\n+            * [HorspoolSearchTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/strings/HorspoolSearchTest.java)\n             * [IsomorphicTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/strings/IsomorphicTest.java)\n             * [LetterCombinationsOfPhoneNumberTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/strings/LetterCombinationsOfPhoneNumberTest.java)\n             * [longestNonRepeativeSubstringTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/strings/longestNonRepeativeSubstringTest.java)\ndiff --git a/src/main/java/com/thealgorithms/ciphers/DES.java b/src/main/java/com/thealgorithms/ciphers/DES.java\nnew file mode 100644\nindex 00000000..8b226e28\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/ciphers/DES.java\n@@ -0,0 +1,344 @@\n+package com.thealgorithms.ciphers;\n+\n+/**\n+ * This class is build to demonstrate the application of the DES-algorithm on a\n+ * plain English message. The supplied key must be in form of a 64 bit binary String.\n+ */\n+public class DES {\n+\n+    private String key;\n+    private String subKeys[];\n+\n+    private void sanitize(String key) {\n+        int length = key.length();\n+        if (length != 64) {\n+            throw new IllegalArgumentException(\"DES key must be supplied as a 64 character binary string\");\n+        }\n+    }\n+\n+    DES(String key) {\n+        sanitize(key);\n+        this.key = key;\n+        subKeys = getSubkeys(key);\n+    }\n+\n+    public String getKey() {\n+        return this.key;\n+    }\n+\n+    public void setKey(String key) {\n+        sanitize(key);\n+        this.key = key;\n+    }\n+\t\n+    //Permutation table to convert initial 64 bit key to 56 bit key\n+\tprivate static int[] PC1 = \n+\t{  \n+\t\t57, 49, 41, 33, 25, 17,  9,\n+        1, 58, 50, 42, 34, 26, 18,\n+        10,  2, 59, 51, 43, 35, 27,\n+        19, 11,  3, 60, 52, 44, 36,\n+        63, 55, 47, 39, 31, 23, 15,\n+        7, 62, 54, 46, 38, 30, 22,\n+        14,  6, 61, 53, 45, 37, 29,\n+        21, 13,  5, 28, 20, 12,  4\n+\t};\n+\n+    //Lookup table used to shift the initial key, in order to generate the subkeys\n+    private static int[] KEY_SHIFTS = \n+\t{\n+\t\t1,  1,  2,  2,  2,  2,  2,  2,  1,  2,  2,  2,  2,  2,  2,  1\n+\t};\n+\n+    //Table to convert the 56 bit subkeys to 48 bit subkeys\n+    private static int[] PC2 = \n+\t{\n+\t\t14, 17, 11, 24,  1,  5,\n+        3, 28, 15,  6, 21, 10,\n+        23, 19, 12,  4, 26,  8,\n+        16,  7, 27, 20, 13,  2,\n+        41, 52, 31, 37, 47, 55,\n+        30, 40, 51, 45, 33, 48,\n+        44, 49, 39, 56, 34, 53,\n+        46, 42, 50, 36, 29, 32\n+\t};\n+\n+    //Initial permutatation of each 64 but message block\n+    private static int[] IP = \n+\t{\n+\t\t 58, 50, 42, 34, 26, 18, 10 , 2,\n+         60, 52, 44, 36, 28, 20, 12, 4,\n+         62, 54, 46, 38, 30, 22, 14, 6,\n+         64, 56, 48, 40, 32, 24, 16, 8,\n+         57, 49, 41, 33, 25, 17, 9, 1,\n+         59, 51, 43, 35, 27, 19, 11, 3,\n+         61, 53, 45, 37, 29, 21, 13, 5,\n+         63, 55, 47, 39, 31, 23, 15, 7\n+\t};\n+\n+    //Expansion table to convert right half of message blocks from 32 bits to 48 bits\n+    private static int[] expansion = \n+\t{\n+\t\t32,  1,  2,  3,  4,  5,\n+\t\t4,  5,  6,  7,  8,  9, \n+\t\t8,  9, 10, 11, 12, 13, \n+\t\t12, 13, 14, 15, 16, 17,\n+\t\t16, 17, 18, 19, 20, 21, \n+\t\t20, 21, 22, 23, 24, 25, \n+\t\t24, 25, 26, 27, 28, 29, \n+\t\t28, 29, 30, 31, 32,  1\n+\t};\n+ \n+    //The eight substitution boxes are defined below\n+    private static int[][] s1 = {\n+\t\t{14, 4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7},\n+\t\t{0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11,  9,  5,  3,  8},\n+\t\t{4, 1, 14,  8, 13,  6, 2, 11, 15, 12,  9,  7,  3, 10,  5,  0},\n+\t\t{15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13}\n+\t };\n+\n+\tprivate static int[][] s2 = {\n+\t\t\t{15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10},\n+\t\t\t{3, 13,  4, 7, 15,  2,  8, 14, 12,  0, 1, 10,  6,  9, 11,  5},\n+\t\t\t{0, 14, 7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15},\n+\t\t\t{13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14,  9}\n+\t\t };\n+\t\n+\tprivate static int[][] s3 = {\n+\t\t\t{10, 0, 9, 14, 6, 3, 15, 5,  1, 13, 12, 7, 11, 4, 2,  8},\n+\t\t\t{13, 7, 0, 9, 3,  4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1},\n+\t\t\t{13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14,  7},\n+\t\t\t{1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12}\n+\t\t };\n+\t\n+\tprivate static int[][] s4 = {\n+\t\t\t{7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15},\n+\t\t\t{13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14,  9},\n+\t\t\t{10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4},\n+\t\t\t{3, 15, 0, 6, 10, 1, 13, 8, 9,  4, 5, 11, 12, 7, 2, 14}\n+\t\t };\n+\t\n+\tprivate static int[][] s5 = {\n+\t\t\t{2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9},\n+\t\t\t{14, 11, 2, 12,  4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6},\n+\t\t\t{4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14},\n+\t\t\t{11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3}\n+\t\t  };\n+\t\n+\tprivate static int[][] s6 = {\n+\t\t\t{12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11},\n+\t\t\t{10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8},\n+\t\t\t{9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6},\n+\t\t\t{4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13}\n+\t\t  };\n+\t\n+\tprivate static int[][] s7 = {\n+\t\t\t{4, 11, 2, 14, 15,  0, 8, 13 , 3, 12, 9 , 7,  5, 10, 6, 1},\n+\t\t\t{13 , 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6},\n+\t\t\t{1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2},\n+\t\t\t{6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12}\n+\t\t  };\n+\t\n+\tprivate static int[][] s8 = {\n+\t\t\t{13, 2, 8,  4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7},\n+\t\t\t{1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6 ,11, 0, 14, 9, 2},\n+\t\t\t{7, 11, 4, 1, 9, 12, 14, 2,  0, 6, 10 ,13, 15, 3, 5, 8},\n+\t\t\t{2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6 ,11}\n+\t\t};\n+\t\n+\tprivate static int[][][] s = {s1, s2, s3, s4, s5, s6, s7, s8};\n+\n+    //Permutation table, used in the feistel function post s-box usage\n+    static int[] permutation = \n+\t{\n+\t\t16,  7, 20, 21, \n+\t\t29, 12, 28, 17, \n+\t\t 1, 15, 23, 26, \n+\t\t 5, 18, 31, 10, \n+\t\t 2,  8, 24, 14, \n+\t\t32, 27,  3,  9, \n+\t\t19, 13, 30,  6, \n+\t\t22, 11,  4, 25\n+\t};\n+\n+    //Table used for final inversion of the message box after 16 rounds of Feistel Function\n+    static int[] IPinverse = \n+\t{\n+\t\t40, 8, 48, 16, 56, 24, 64, 32,\n+\t    39, 7, 47, 15, 55, 23, 63, 31,\n+\t    38, 6, 46, 14, 54, 22, 62, 30,\n+\t    37, 5, 45, 13, 53, 21, 61, 29,\n+\t    36, 4, 44, 12, 52, 20, 60, 28,\n+\t    35, 3, 43 ,11, 51, 19, 59, 27,\n+\t    34, 2, 42, 10, 50, 18, 58, 26,\n+\t    33, 1, 41, 9, 49, 17, 57, 25\n+\t};\n+\n+    private String[] getSubkeys(String originalKey) {\n+        StringBuilder permutedKey = new StringBuilder(); //Initial permutation of keys via PC1\n+        int i, j;\n+        for (i = 0; i < 56; i++) {\n+            permutedKey.append(originalKey.charAt(PC1[i] - 1)); \n+        }\n+        String subKeys[] = new String[16];\n+        String initialPermutedKey = permutedKey.toString();\n+        String C0 = initialPermutedKey.substring(0, 28), D0 = initialPermutedKey.substring(28);\n+        \n+        //We will now operate on the left and right halves of the permutedKey\n+        for (i = 0; i < 16; i++) {\n+            String Cn = C0.substring(KEY_SHIFTS[i]) + C0.substring(0, KEY_SHIFTS[i]);\n+            String Dn = D0.substring(KEY_SHIFTS[i]) + D0.substring(0, KEY_SHIFTS[i]);\n+            subKeys[i] = Cn + Dn;\n+            C0 = Cn; //Re-assign the values to create running permutation\n+            D0 = Dn;\n+        }\n+\n+        //Let us shrink the keys to 48 bits (well, characters here) using PC2\n+        for (i = 0; i < 16; i++) {\n+            String key = subKeys[i];\n+            permutedKey.setLength(0);\n+            for (j = 0; j < 48; j++) {\n+                permutedKey.append(key.charAt(PC2[j] - 1));\n+            }\n+            subKeys[i] = permutedKey.toString();\n+        }\n+\n+        return subKeys;\n+    }\n+\n+    private String XOR(String a, String b) {\n+        int i, l = a.length();\n+        StringBuilder xor = new StringBuilder();\n+        for (i = 0; i < l; i++) {\n+            int firstBit = a.charAt(i) - 48; // 48 is '0' in ascii\n+            int secondBit = b.charAt(i) - 48;\n+            xor.append((firstBit ^ secondBit));\n+        }\n+        return xor.toString();\n+    }\n+\n+    private String createPaddedString(String s, int desiredLength, char pad) {\n+        int i, l = s.length();\n+        StringBuilder paddedString = new StringBuilder();\n+        int diff = desiredLength - l;\n+        for (i = 0; i < diff; i++) {\n+            paddedString.append(pad);\n+        }\n+        return paddedString.toString();\n+    }\n+\n+    private String pad(String s, int desiredLength) {\n+        return createPaddedString(s, desiredLength, '0') + s;\n+    }\n+\n+    private String padLast(String s, int desiredLength) {\n+        return s + createPaddedString(s, desiredLength, '\\u0000');\n+    }\n+\n+    private String feistel(String messageBlock, String key) {\n+        int i;\n+        StringBuilder expandedKey = new StringBuilder();\n+        for (i = 0; i < 48; i++) {\n+            expandedKey.append(messageBlock.charAt(expansion[i] - 1));\n+        }\n+        String mixedKey = XOR(expandedKey.toString(), key);\n+        StringBuilder substitutedString = new StringBuilder();\n+\n+        //Let us now use the s-boxes to transform each 6 bit (length here) block to 4 bits\n+        for (i = 0; i < 48; i += 6) {\n+            String block = mixedKey.substring(i, i + 6);\n+            int row = (block.charAt(0) - 48) * 2 + (block.charAt(5) - 48);\n+            int col = (block.charAt(1) - 48) * 8 + (block.charAt(2) - 48) * 4 + (block.charAt(3) - 48) * 2 + (block.charAt(4) - 48);\n+            String substitutedBlock = pad(Integer.toBinaryString(s[i / 6][row][col]), 4);\n+            substitutedString.append(substitutedBlock);\n+        }\n+\n+        StringBuilder permutedString = new StringBuilder(); \n+        for (i = 0; i < 32; i++) {\n+            permutedString.append(substitutedString.charAt(permutation[i] - 1));\n+        }\n+\n+        return permutedString.toString();\n+    }\n+\n+    private String encryptBlock(String message, String keys[]) {\n+        StringBuilder permutedMessage = new StringBuilder();\n+        int i;\n+        for (i = 0; i < 64; i++) {\n+            permutedMessage.append(message.charAt(IP[i] - 1));\n+        }\n+        String L0 = permutedMessage.substring(0, 32), R0 = permutedMessage.substring(32);\n+\n+        //Iterate 16 times\n+        for (i = 0; i < 16; i++) {\n+            String Ln = R0; // Previous Right block\n+            String Rn = XOR(L0, feistel(R0, keys[i]));\n+            L0 = Ln;\n+            R0 = Rn;\n+        }\n+\n+        String combinedBlock = R0 + L0; //Reverse the 16th block\n+        permutedMessage.setLength(0);\n+        for (i = 0; i < 64; i++) {\n+            permutedMessage.append(combinedBlock.charAt(IPinverse[i] - 1));\n+        }\n+        return permutedMessage.toString();\n+    }\n+\n+    //To decode, we follow the same process as encoding, but with reversed keys\n+    private String decryptBlock(String message, String keys[]) {\n+        String reversedKeys[] = new String[keys.length];\n+        for (int i = 0; i < keys.length; i++) {\n+            reversedKeys[i] = keys[keys.length - i - 1];\n+        }\n+        return encryptBlock(message, reversedKeys);\n+    }\n+\n+    /**\n+     * @param message Message to be encrypted\n+     * @return The encrypted message, as a binary string\n+     */\n+    public String encrypt(String message) {\n+        StringBuilder encryptedMessage = new StringBuilder();\n+        int l = message.length(), i, j;\n+        if (l % 8 != 0) {\n+            int desiredLength = (l / 8 + 1) * 8;\n+            l = desiredLength;\n+            message = padLast(message, desiredLength);\n+        }\n+\n+        for (i = 0; i < l; i+= 8) {\n+            String block = message.substring(i, i + 8);\n+            StringBuilder bitBlock = new StringBuilder();\n+            byte[] bytes = block.getBytes();\n+            for (j = 0; j < 8; j++) {\n+                bitBlock.append(pad(Integer.toBinaryString(bytes[j]), 8));\n+            }\n+            encryptedMessage.append(encryptBlock(bitBlock.toString(), subKeys));\n+        }\n+        return encryptedMessage.toString();\n+    }\n+\n+    /**\n+     * @param message The encrypted string. Expects it to be a multiple of 64 bits, in binary format\n+     * @return The decrypted String, in plain English\n+     */\n+    public String decrypt(String message) {\n+        StringBuilder decryptedMessage = new StringBuilder();\n+        int l = message.length(), i, j;\n+        if (l % 64 != 0) {\n+            throw new IllegalArgumentException(\"Encrypted message should be a multiple of 64 characters in length\");\n+        }\n+        for (i = 0; i < l; i+= 64) {\n+            String block = message.substring(i, i + 64);\n+            String result = decryptBlock(block.toString(), subKeys);\n+            byte res[] = new byte[8];\n+            for (j = 0; j < 64; j+=8) {\n+                res[j / 8] = (byte)Integer.parseInt(result.substring(j, j + 8), 2);\n+            }\n+            decryptedMessage.append(new String(res));\n+        }\n+        return decryptedMessage.toString().replace(\"\\0\", \"\"); // Get rid of the null bytes used for padding\n+    }\n+\n+}\n\\ No newline at end of file\n", "test_patch": "diff --git a/src/test/java/com/thealgorithms/ciphers/DESTest.java b/src/test/java/com/thealgorithms/ciphers/DESTest.java\nnew file mode 100644\nindex 00000000..a0c529d5\n--- /dev/null\n+++ b/src/test/java/com/thealgorithms/ciphers/DESTest.java\n@@ -0,0 +1,51 @@\n+package com.thealgorithms.ciphers;\n+\n+import static org.junit.jupiter.api.Assertions.*;\n+\n+import org.junit.jupiter.api.BeforeEach;\n+import org.junit.jupiter.api.Test;\n+\n+//Test example taken from https://page.math.tu-berlin.de/~kant/teaching/hess/krypto-ws2006/des.htm\n+public class DESTest {\n+\n+    DES des;\n+\n+    @BeforeEach\n+    public void setUp() {\n+        des = new DES(\"0000111000110010100100100011001011101010011011010000110101110011\");\n+    }\n+\n+    @Test\n+    void testEncrypt() {\n+        //given\n+        String plainText = \"Your lips are smoother than vaseline\\r\\n\";\n+        //This is equal to c0999fdde378d7ed727da00bca5a84ee47f269a4d6438190d9d52f78f5358499828ac9b453e0e653 in hexadecimal\n+        String expectedOutput = \"11000000100110011001111111011101111000110111100011010111111\" +\n+        \"011010111001001111101101000000000101111001010010110101000010011101110010001111111001\" +\n+        \"001101001101001001101011001000011100000011001000011011001110101010010111101111000111\" +\n+        \"101010011010110000100100110011000001010001010110010011011010001010011111000001110011001010011\";\n+\n+        //when\n+        String cipherText = des.encrypt(plainText);\n+\n+        //then\n+        assertEquals(expectedOutput, cipherText);\n+    }\n+\n+    @Test\n+    void testDecrypt() {\n+        //given\n+       //This is equal to c0999fdde378d7ed727da00bca5a84ee47f269a4d6438190d9d52f78f5358499828ac9b453e0e653 in hexadecimal\n+       String cipherText = \"11000000100110011001111111011101111000110111100011010111111\" +\n+       \"011010111001001111101101000000000101111001010010110101000010011101110010001111111001\" +\n+       \"001101001101001001101011001000011100000011001000011011001110101010010111101111000111\" +\n+       \"101010011010110000100100110011000001010001010110010011011010001010011111000001110011001010011\";\n+        String expectedOutput = \"Your lips are smoother than vaseline\\r\\n\";;\n+\n+        //when\n+        String plainText = des.decrypt(cipherText);\n+\n+        //then\n+        assertEquals(expectedOutput, plainText);\n+    }\n+}\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n \r\nThis closes #4167 \r\n", "PR_Title": "Des", "docker_image": "xinzhou1997/swe_rpg_java:TheAlgorithms__Java-4172_linux", "log_parser": "def parse_java_mvn(log: str) -> dict[str, str]:\n    \"\"\"Parse Maven logs into {identifier: status}.\"\"\"\n    results = {}\n\n    failure_re = re.compile(\n        r\"^\\[ERROR\\]\\s+(?P<class>[A-Za-z0-9_$.]+)\\.(?P<method>[A-Za-z0-9_$.]+?)(?::(?P<line>\\d+))?\\b\"\n    )\n    running_re = re.compile(r\"^(?:\\[INFO\\]\\s+)?Running\\s+([A-Za-z0-9_$.]+)$\")\n    summary_re = re.compile(\n        r\"Tests run:\\s*(\\d+),\\s*Failures:\\s*(\\d+),\\s*Errors:\\s*(\\d+),\\s*Skipped:\\s*(\\d+)\"\n    )\n\n    seen_running = set()\n    current_running = None\n\n    for raw in log.splitlines():\n        line = raw.strip()\n        if not line:\n            continue\n        rm = running_re.match(line)\n        if rm:\n            running_name = rm.group(1)\n            current_running = running_name\n            seen_running.add(running_name)\n            continue\n        fm = failure_re.match(line)\n        if fm:\n            clazz = fm.group(\"class\")\n            method = fm.group(\"method\")\n            test_id = f\"{clazz}.{method}\"\n            results[test_id] = \"FAILED\"\n            results.setdefault(clazz, \"FAILED\")\n            continue\n\n        sm = summary_re.search(line)\n        if sm:\n            _tests_run, failures, errors, skipped = map(int, sm.groups())\n            if failures > 0 or errors > 0:\n                status = \"FAILED\"\n            elif skipped > 0:\n                status = \"SKIPPED\"\n            else:\n                status = \"PASSED\"\n            if current_running:\n                results.setdefault(current_running, status)\n            current_running = None\n\n    if not results and seen_running:\n        for clazz in seen_running:\n            results.setdefault(clazz, \"PASSED\")\n    return results\n", "test_cmds": ["bash -c '{ mvn --batch-mode test ; } > /tmp/test.log 2>&1'"], "rebuild_cmds": ["unset _JAVA_OPTIONS"], "issues": [{"issue_number": 4172, "issue_title": "Des", "issue_body": "<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n \r\nThis closes #4167 \r\n"}], "print_cmds": ["cat /tmp/test.log"], "working_dir": "/Java"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6320", "base_commit": "3c59a779af6ca76a842a20bbf3220eddb5c62da9", "patch": "diff --git a/.github/workflows/snapshot_release.yml b/.github/workflows/snapshot_release.yml\nindex 4cd3ce040..9683bf2ab 100644\n--- a/.github/workflows/snapshot_release.yml\n+++ b/.github/workflows/snapshot_release.yml\n@@ -63,7 +63,7 @@ jobs:\n           node-version: '16'\n \n       - name: Restore Tests dependency cache\n-        uses: actions/cache@v3\n+        uses: actions/cache@v4\n         with:\n           path: |\n             ~/cache\n@@ -245,7 +245,7 @@ jobs:\n \n     - name: Package and upload to OSSRH\n       run: |\n-        mvn -B package deploy -DskipTests=true -DrepositoryId=ossrh -Dapple.notarization.username=$APPLE_USERNAME -Dapple.notarization.password=$APPLE_PASSWORD -Dapple.notarization.team.id=$APPLE_TEAM_ID\n+        mvn -B deploy -DskipTests=true -DrepositoryId=ossrh -Dapple.notarization.username=$APPLE_USERNAME -Dapple.notarization.password=$APPLE_PASSWORD -Dapple.notarization.team.id=$APPLE_TEAM_ID\n       env:\n         OSSRH_USER: ${{ secrets.OSSRH_USER }}\n         OSSRH_PASS: ${{ secrets.OSSRH_PASS }}\ndiff --git a/CONTRIBUTING.md b/CONTRIBUTING.md\nindex 3a812db33..31264c060 100644\n--- a/CONTRIBUTING.md\n+++ b/CONTRIBUTING.md\n@@ -24,12 +24,12 @@ When browsing our documentation, feel free to use the edit button to suggest imp\n ##  Contributing code \n \n You can contribute code in various ways:\n-- Fix bugs or implement new features. Follow [our guide towards your first code contribution](https://openrefine.org/docs/technical-reference/contributing#your-first-code-pull-request).\n+- Fix bugs or implement new features. Follow [our guide towards your first code contribution](https://openrefine.org/docs/technical-reference/code-contributions)\n - Develop an OpenRefine extension\n - Develop a reconciliation service\n \n All developers including new distributions and plugin developers are invited to leverage the following OpenRefine project management areas to avoid splitting the community in different communication channels.\n-- the [official documentation](https://openrefine.org/docs/technical-reference/technical-reference-index) for shared documentation between both user docs and [technical reference](https://docs.openrefine.org/technical-reference/technical-reference-index)\n+- the [official documentation](https://openrefine.org/docs/) for shared documentation between both user docs and [technical reference](https://docs.openrefine.org/technical-reference/contributing)\n - the [developer forum](https://forum.openrefine.org/c/dev/8) for technical questions, new feature development and anything code related. We invite you to share you idea there first. Someone may be able to point out to existing development saving you hours of research and development. \n - [OpenRefine github issue tracker](https://github.com/OpenRefine/OpenRefine/issues) for requesting new features and bug reports.\n - [Gitter Chat](https://gitter.im/OpenRefine/OpenRefine)\ndiff --git a/GOVERNANCE.md b/GOVERNANCE.md\nindex bf0a74484..7feb82b87 100644\n--- a/GOVERNANCE.md\n+++ b/GOVERNANCE.md\n@@ -90,15 +90,16 @@ Advisory Committee members:\n * Can be part of the Admin team for the project on GitHub\n \n #### Conflict of Interest\n-In the event of any conflict of interest (a Committee Member, their family member, or someone with whom the Committee Member has a close academic or employment relationship is involved in a decision), the Committee Member must immediately notify other Committee Members. The Committee Member will be asked to recuse themselves from ongoing conversations, and decision process regarding the Transaction.  \n+In the event of any conflict of interest (a Committee Member, their family member, or someone with whom the Committee Member has a close academic or employment relationship is involved in a decision), the Committee Member must immediately notify other Committee Members. The Committee Members will be asked to recuse themselves from ongoing conversations and decision processes regarding the Transaction.  \n \n #### Current list of Advisory Committee members\n * Jan Ainali\n * Antonin Delpeuch\n-* [Open Position]\n+* Julie Faure-Lacroix\n+* Esther Jackson\n \n ### Project Manager\n-OpenRefine's Project Manager (paid position) works closely with OpenRefine’s advisory and steering committees, and with its communities of users and contributors.\n+OpenRefine's Project Manager (paid position) works closely with OpenRefine’s advisory and steering committees and with its communities of users and contributors.\n \n The Project Manager:\n * Helps to improve OpenRefine's governance and community diversity\ndiff --git a/extensions/database/pom.xml b/extensions/database/pom.xml\nindex 5826dd92c..66ccf7d4f 100644\n--- a/extensions/database/pom.xml\n+++ b/extensions/database/pom.xml\n@@ -105,7 +105,7 @@\n     <dependency>\n       <groupId>org.xerial</groupId>\n       <artifactId>sqlite-jdbc</artifactId>\n-      <version>3.45.0.0</version>\n+      <version>3.45.1.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.fasterxml.jackson.core</groupId>\ndiff --git a/extensions/database/src/com/google/refine/extension/database/DatabaseConfiguration.java b/extensions/database/src/com/google/refine/extension/database/DatabaseConfiguration.java\nindex 277feb032..7d11e18f7 100644\n--- a/extensions/database/src/com/google/refine/extension/database/DatabaseConfiguration.java\n+++ b/extensions/database/src/com/google/refine/extension/database/DatabaseConfiguration.java\n@@ -67,6 +67,13 @@ public class DatabaseConfiguration {\n     }\n \n     public void setDatabaseHost(String databaseServer) {\n+        // forbid setting settings inside the host parameter:\n+        // https://dev.mysql.com/doc/connector-j/en/connector-j-reference-jdbc-url-format.html\n+        if (databaseServer == null ||\n+                databaseServer.contains(\"(\") ||\n+                databaseServer.contains(\"=\")) {\n+            throw new IllegalArgumentException(\"Invalid host supplied\");\n+        }\n         this.databaseHost = databaseServer;\n     }\n \ndiff --git a/extensions/wikibase/module/langs/translation-nl.json b/extensions/wikibase/module/langs/translation-nl.json\nindex 3191073f6..cc8840267 100644\n--- a/extensions/wikibase/module/langs/translation-nl.json\n+++ b/extensions/wikibase/module/langs/translation-nl.json\n@@ -129,5 +129,9 @@\n     \"wikibase-account/password-remember-me-title\": \"Je wachtwoord wordt niet opgeslagen. Vink dit vakje niet aan als je op een publieke computer werkt.\",\n     \"wikibase-account/owner-only-consumer-remember-me-title\": \"Je inloggegevens worden onversleuteld opgeslagen in cookies. Vink dit vakje niet aan als je op een publieke computer werkt.\",\n     \"perform-wikibase-edits/review-your-edits\": \"Je gaat zo dadelijk $1 bewerkingen uploaden naar <a href=\\\"$2\\\" target=\\\"_blank\\\">$3</a>. Kijk deze grondig na. Grote batch-bewerkingen moeten eerst via een <a href=\\\"https://www.wikidata.org/wiki/Wikidata:Requests_for_permissions/Bot\\\" target=\\\"_blank\\\">bot-review</a> gecheckt worden.\",\n-    \"wikibase-account/consumer-token-label\": \"Consumententoken\"\n+    \"wikibase-account/consumer-token-label\": \"Consumententoken\",\n+    \"wikibase-management/discover-manifests\": \"Ontdek Wikibase-instanties…\",\n+    \"wikibase-management/cancel\": \"Annuleren\",\n+    \"wikibase-management/ok\": \"OKÉ\",\n+    \"wikibase-addition/version-error\": \"Manifest versie $1 wordt niet ondersteund. OpenRefine ondersteund alleen manifest versies 1.x en 2.x.\"\n }\ndiff --git a/main/src/com/google/refine/commands/recon/ReconClearOneCellCommand.java b/main/src/com/google/refine/commands/recon/ReconClearOneCellCommand.java\nindex 8508e8468..eabf19441 100644\n--- a/main/src/com/google/refine/commands/recon/ReconClearOneCellCommand.java\n+++ b/main/src/com/google/refine/commands/recon/ReconClearOneCellCommand.java\n@@ -155,6 +155,7 @@ public class ReconClearOneCellCommand extends Command {\n             } else {\n                 int newChange = 0;\n                 int matchChange = 0;\n+                int errorChange = 0;\n \n                 if (oldJudgment == Judgment.New) {\n                     newChange--;\n@@ -162,11 +163,14 @@ public class ReconClearOneCellCommand extends Command {\n                 if (oldJudgment == Judgment.Matched) {\n                     matchChange--;\n                 }\n+                if (oldJudgment == Judgment.Error)\n+                    errorChange--;\n \n                 stats = new ReconStats(\n                         stats.nonBlanks + 1,\n                         stats.newTopics + newChange,\n-                        stats.matchedTopics + matchChange);\n+                        stats.matchedTopics + matchChange,\n+                        stats.errorTopics + errorChange);\n             }\n \n             String description = \"Clear recon data for single cell on row \" + (rowIndex + 1) +\ndiff --git a/main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java b/main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java\nindex 8b83a6691..c093e6cb0 100644\n--- a/main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java\n+++ b/main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java\n@@ -190,10 +190,18 @@ public class ReconJudgeOneCellCommand extends Command {\n             newCell.recon.judgmentBatchSize = 1;\n \n             if (judgment == Judgment.None) {\n-                newCell.recon.judgment = Recon.Judgment.None;\n+                if (cell.recon.error == null) {\n+                    newCell.recon.judgment = Recon.Judgment.None;\n+                } else {\n+                    newCell.recon.judgment = Recon.Judgment.Error;\n+                }\n                 newCell.recon.match = null;\n-\n                 description = \"Discard recon judgment for \" + cellDescription;\n+\n+            } else if (judgment == Judgment.Error) {\n+\n+                throw new IllegalArgumentException(\"Cannot manually set judgment to 'error'\");\n+\n             } else if (judgment == Judgment.New) {\n                 newCell.recon.judgment = Recon.Judgment.New;\n                 newCell.recon.match = null;\n@@ -222,6 +230,7 @@ public class ReconJudgeOneCellCommand extends Command {\n             } else {\n                 int newChange = 0;\n                 int matchChange = 0;\n+                int errorsChange = 0;\n \n                 if (oldJudgment == Judgment.New) {\n                     newChange--;\n@@ -229,17 +238,24 @@ public class ReconJudgeOneCellCommand extends Command {\n                 if (oldJudgment == Judgment.Matched) {\n                     matchChange--;\n                 }\n+                if (oldJudgment == Judgment.Error) {\n+                    errorsChange--;\n+                }\n                 if (newCell.recon.judgment == Judgment.New) {\n                     newChange++;\n                 }\n                 if (newCell.recon.judgment == Judgment.Matched) {\n                     matchChange++;\n                 }\n+                if (newCell.recon.judgment == Judgment.Error) {\n+                    errorsChange++;\n+                }\n \n                 stats = new ReconStats(\n                         stats.nonBlanks,\n                         stats.newTopics + newChange,\n-                        stats.matchedTopics + matchChange);\n+                        stats.matchedTopics + matchChange,\n+                        stats.errorTopics + errorsChange);\n             }\n \n             Change change = new ReconChange(\ndiff --git a/main/src/com/google/refine/model/Recon.java b/main/src/com/google/refine/model/Recon.java\nindex b1a531d23..5d9304b8e 100644\n--- a/main/src/com/google/refine/model/Recon.java\n+++ b/main/src/com/google/refine/model/Recon.java\n@@ -69,7 +69,8 @@ public class Recon implements HasFields {\n         @JsonProperty(\"none\")\n         None, @JsonProperty(\"matched\")\n         Matched, @JsonProperty(\"new\")\n-        New\n+        New, @JsonProperty(\"error\")\n+        Error\n     }\n \n     @Deprecated\n@@ -78,6 +79,8 @@ public class Recon implements HasFields {\n             return \"matched\";\n         } else if (judgment == Judgment.New) {\n             return \"new\";\n+        } else if (judgment == Judgment.Error) {\n+            return \"errors\";\n         } else {\n             return \"none\";\n         }\n@@ -89,6 +92,8 @@ public class Recon implements HasFields {\n             return Judgment.Matched;\n         } else if (\"new\".equals(s)) {\n             return Judgment.New;\n+        } else if (\"errors\".equals(s)) {\n+            return Judgment.Error;\n         } else {\n             return Judgment.None;\n         }\n@@ -198,6 +203,7 @@ public class Recon implements HasFields {\n \n         r.match = match;\n         r.matchRank = matchRank;\n+        r.error = error;\n     }\n \n     public void addCandidate(ReconCandidate candidate) {\ndiff --git a/main/src/com/google/refine/model/ReconStats.java b/main/src/com/google/refine/model/ReconStats.java\nindex 11325e789..ce55c9434 100644\n--- a/main/src/com/google/refine/model/ReconStats.java\n+++ b/main/src/com/google/refine/model/ReconStats.java\n@@ -51,21 +51,26 @@ public class ReconStats {\n     final public int newTopics;\n     @JsonProperty(\"matchedTopics\")\n     final public int matchedTopics;\n+    @JsonProperty(\"errorTopics\")\n+    final public int errorTopics;\n \n     @JsonCreator\n     public ReconStats(\n             @JsonProperty(\"nonBlanks\") int nonBlanks,\n             @JsonProperty(\"newTopics\") int newTopics,\n-            @JsonProperty(\"matchedTopics\") int matchedTopics) {\n+            @JsonProperty(\"matchedTopics\") int matchedTopics,\n+            @JsonProperty(\"errorTopics\") int errorTopics) {\n         this.nonBlanks = nonBlanks;\n         this.newTopics = newTopics;\n         this.matchedTopics = matchedTopics;\n+        this.errorTopics = errorTopics;\n     }\n \n     static public ReconStats create(Project project, int cellIndex) {\n         int nonBlanks = 0;\n         int newTopics = 0;\n         int matchedTopics = 0;\n+        int errorTopics = 0;\n \n         for (Row row : project.rows) {\n             Cell cell = row.getCell(cellIndex);\n@@ -77,12 +82,14 @@ public class ReconStats {\n                         newTopics++;\n                     } else if (cell.recon.judgment == Judgment.Matched) {\n                         matchedTopics++;\n+                    } else if (cell.recon.judgment == Judgment.Error) {\n+                        errorTopics++;\n                     }\n                 }\n             }\n         }\n \n-        return new ReconStats(nonBlanks, newTopics, matchedTopics);\n+        return new ReconStats(nonBlanks, newTopics, matchedTopics, errorTopics);\n     }\n \n     public void save(Writer writer) {\ndiff --git a/main/src/com/google/refine/model/recon/StandardReconConfig.java b/main/src/com/google/refine/model/recon/StandardReconConfig.java\nindex 8101facf0..80d0b45cc 100644\n--- a/main/src/com/google/refine/model/recon/StandardReconConfig.java\n+++ b/main/src/com/google/refine/model/recon/StandardReconConfig.java\n@@ -464,12 +464,14 @@ public class StandardReconConfig extends ReconConfig {\n         } catch (IOException e) {\n             Recon recon = new Recon(historyEntryID, identifierSpace, schemaSpace);\n             recon.error = e.getMessage();\n+            recon.judgment = Judgment.Error;\n             recons.add(recon);\n         }\n \n         if (o == null) { // utility method returns null instead of throwing\n             Recon recon = new Recon(historyEntryID, identifierSpace, schemaSpace);\n             recon.error = \"The reconciliation service returned an invalid response\";\n+            recon.judgment = Judgment.Error;\n             recons.add(recon);\n \n         } else {\n@@ -488,11 +490,13 @@ public class StandardReconConfig extends ReconConfig {\n                     } else {\n                         recon = new Recon(historyEntryID, identifierSpace, schemaSpace);\n                         recon.error = \"The service returned a JSON response without \\\"result\\\" field for query \" + key;\n+                        recon.judgment = Judgment.Error;\n \n                     }\n                 } else {\n                     recon = new Recon(historyEntryID, identifierSpace, schemaSpace);\n                     recon.error = \"The service returned a JSON response without \\\"\" + key + \"\\\" field \";\n+                    recon.judgment = Judgment.Error;\n                 }\n \n                 if (recon != null) {\n@@ -506,6 +510,7 @@ public class StandardReconConfig extends ReconConfig {\n         while (recons.size() < jobs.size()) {\n             Recon recon = new Recon(historyEntryID, identifierSpace, schemaSpace);\n             recon.error = \"No. of recon objects was less than no. of jobs\";\n+            recon.judgment = Judgment.Error;\n             recons.add(recon);\n         }\n \ndiff --git a/main/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperation.java b/main/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperation.java\nindex 369404f2e..079fd98be 100644\n--- a/main/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperation.java\n+++ b/main/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperation.java\n@@ -222,8 +222,10 @@ public class ReconJudgeSimilarCellsOperation extends EngineDependentMassCellOper\n                                     recon.judgment = Recon.Judgment.New;\n                                     recon.match = null;\n                                 } else if (_judgment == Judgment.None) {\n-                                    recon.judgment = Recon.Judgment.None;\n+                                    recon.judgment = recon.error == null ? Recon.Judgment.None : Recon.Judgment.Error;\n                                     recon.match = null;\n+                                } else if (_judgment == Judgment.Error) {\n+                                    throw new IllegalArgumentException(\"Cannot manually set judgment to 'error'\");\n                                 }\n \n                                 _dupReconMap.put(cell.recon.id, recon);\ndiff --git a/packaging/pom.xml b/packaging/pom.xml\nindex b21c43a56..073ee37f7 100644\n--- a/packaging/pom.xml\n+++ b/packaging/pom.xml\n@@ -26,7 +26,7 @@\n     <mac.dmg.path>${project.build.directory}/${project.build.finalName}-mac-${project.version}.dmg</mac.dmg.path>\n     <mac.signing.identity>Code for Science and Society, Inc.</mac.signing.identity>\n     <!-- Apple Notarization settings -->\n-    <apple.notarization.timeout>10m</apple.notarization.timeout>\n+    <apple.notarization.timeout>15m</apple.notarization.timeout>\n \n     <windows.jre.path>${project.build.directory}/windows_jre</windows.jre.path>\n     <windows.jre.url>https://api.adoptium.net/v3/binary/latest/${embedded.jre.version}/ga/windows/x64/jre/hotspot/normal/eclipse?project=jdk</windows.jre.url>\ndiff --git a/pom.xml b/pom.xml\nindex 4098e5c8d..3d0d5ca85 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -75,7 +75,7 @@\n     <jackson.version>2.16.1</jackson.version>\n     <servlet-api.version>4.0.1</servlet-api.version>\n     <butterfly.version>1.2.5</butterfly.version>\n-    <slf4j.version>2.0.11</slf4j.version>\n+    <slf4j.version>2.0.12</slf4j.version>\n     <log4j.version>2.22.1</log4j.version>\n     <jetty.version>10.0.16</jetty.version>\n     <okhttp.version>4.12.0</okhttp.version>\n@@ -88,7 +88,7 @@\n     <commons-validator.version>1.8.0</commons-validator.version>\n     <org-jvnet-localizer.version>1.31</org-jvnet-localizer.version>\n     <!-- v1.15 of commons-codec is needed for Jena 3.14+ - copied from org.apache.jena:jena:pom -->\n-    <commons-codec.version>1.16.0</commons-codec.version>\n+    <commons-codec.version>1.16.1</commons-codec.version>\n     <commons-compress.version>1.25.0</commons-compress.version>\n     <velocity.version>2.3</velocity.version>\n     <marc4j.version>2.9.5</marc4j.version>\n", "test_patch": "diff --git a/.github/workflows/pull_request_e2e.yml b/.github/workflows/pull_request_e2e.yml\nindex 391b52c9b..48ab36bef 100644\n--- a/.github/workflows/pull_request_e2e.yml\n+++ b/.github/workflows/pull_request_e2e.yml\n@@ -61,7 +61,7 @@ jobs:\n           node-version: '16'\n \n       - name: Restore Tests dependency cache\n-        uses: actions/cache@v3\n+        uses: actions/cache@v4\n         with:\n           path: |\n             ~/cache\ndiff --git a/extensions/database/tests/src/com/google/refine/extension/database/DatabaseConfigurationTest.java b/extensions/database/tests/src/com/google/refine/extension/database/DatabaseConfigurationTest.java\nindex ef101c896..b45f19b58 100644\n--- a/extensions/database/tests/src/com/google/refine/extension/database/DatabaseConfigurationTest.java\n+++ b/extensions/database/tests/src/com/google/refine/extension/database/DatabaseConfigurationTest.java\n@@ -2,6 +2,7 @@\n package com.google.refine.extension.database;\n \n import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertThrows;\n \n import org.testng.annotations.Test;\n \n@@ -19,4 +20,13 @@ public class DatabaseConfigurationTest {\n         // the database name is escaped, preventing the exploit\n         assertEquals(url, \"jdbc:mysql://my.host/test%3FallowLoadLocalInfile=true%23\");\n     }\n+\n+    @Test\n+    public void testSetMaliciousHost() {\n+        DatabaseConfiguration config = new DatabaseConfiguration();\n+        config.setDatabaseType(\"mysql\");\n+\n+        assertThrows(IllegalArgumentException.class,\n+                () -> config.setDatabaseHost(\"127.0.0.1:3306,(allowLoadLocalInfile=true,allowUrlInLocalInfile=true),127.0.0.1\"));\n+    }\n }\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex 0ab6dd681..c5eb1ace6 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -24,6 +24,6 @@\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^9.1.0\",\n         \"eslint-plugin-cypress\": \"^2.15.1\",\n-        \"prettier\": \"3.2.4\"\n+        \"prettier\": \"3.2.5\"\n     }\n }\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 7a601b5e3..07e07f4cb 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -1308,10 +1308,10 @@ prelude-ls@^1.2.1:\n   resolved \"https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz\"\n   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==\n \n-prettier@3.2.4:\n-  version \"3.2.4\"\n-  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.2.4.tgz#4723cadeac2ce7c9227de758e5ff9b14e075f283\"\n-  integrity sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==\n+prettier@3.2.5:\n+  version \"3.2.5\"\n+  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.2.5.tgz#e52bc3090586e824964a8813b09aba6233b28368\"\n+  integrity sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==\n \n pretty-bytes@^5.6.0:\n   version \"5.6.0\"\ndiff --git a/main/tests/server/src/com/google/refine/model/ColumnTests.java b/main/tests/server/src/com/google/refine/model/ColumnTests.java\nindex 7aa7c2523..f367dd415 100644\n--- a/main/tests/server/src/com/google/refine/model/ColumnTests.java\n+++ b/main/tests/server/src/com/google/refine/model/ColumnTests.java\n@@ -76,7 +76,8 @@ public class ColumnTests {\n                 + \"\\\"reconStats\\\":{\"\n                 + \"    \\\"nonBlanks\\\":299,\"\n                 + \"    \\\"newTopics\\\":0,\"\n-                + \"    \\\"matchedTopics\\\":222\"\n+                + \"    \\\"matchedTopics\\\":222,\"\n+                + \"    \\\"errorTopics\\\":0\"\n                 + \"}}\";\n         TestUtils.isSerializedTo(Column.load(json), json);\n     }\ndiff --git a/main/tests/server/src/com/google/refine/model/ReconStatsTests.java b/main/tests/server/src/com/google/refine/model/ReconStatsTests.java\nindex aa394f297..2e2f50189 100644\n--- a/main/tests/server/src/com/google/refine/model/ReconStatsTests.java\n+++ b/main/tests/server/src/com/google/refine/model/ReconStatsTests.java\n@@ -35,7 +35,7 @@ public class ReconStatsTests {\n \n     @Test\n     public void serializeReconStats() {\n-        ReconStats rs = new ReconStats(3, 1, 2);\n-        TestUtils.isSerializedTo(rs, \"{\\\"nonBlanks\\\":3,\\\"newTopics\\\":1,\\\"matchedTopics\\\":2}\");\n+        ReconStats rs = new ReconStats(3, 1, 2, 0);\n+        TestUtils.isSerializedTo(rs, \"{\\\"nonBlanks\\\":3,\\\"newTopics\\\":1,\\\"matchedTopics\\\":2,\\\"errorTopics\\\":0}\");\n     }\n }\ndiff --git a/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java b/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java\nindex 967a4a52b..78158431c 100644\n--- a/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java\n+++ b/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java\n@@ -298,6 +298,7 @@ public class StandardReconConfigTests extends RefineTest {\n             Cell cell = row.cells.get(1);\n             assertNotNull(cell.value);\n             assertNotNull(cell.recon.error);\n+            assertEquals(cell.recon.judgment, Recon.Judgment.Error);\n             // the recon object has error attribute\n         }\n     }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6232 \r\n\r\nChanges proposed in this pull request:\r\n- The reconciliation errors can now be selected through facets \r\n- A test is also added in the StandardReconConfigTests file that checks that the judgment has been set to error in case of an error.\r\n\r\n", "PR_Title": "The reconciliation errors are now selectable by facets", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6320_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6320, "issue_title": "The reconciliation errors are now selectable by facets", "issue_body": "Fixes #6232 \r\n\r\nChanges proposed in this pull request:\r\n- The reconciliation errors can now be selected through facets \r\n- A test is also added in the StandardReconConfigTests file that checks that the judgment has been set to error in case of an error.\r\n\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6779", "base_commit": "88278652115fc6f0241ad5d1a341769dc583ec2c", "patch": "diff --git a/README.md b/README.md\nindex a31129741..87c740b67 100644\n--- a/README.md\n+++ b/README.md\n@@ -1,7 +1,7 @@\n # OpenRefine\n \n [![DOI](https://zenodo.org/badge/6220644.svg)](https://zenodo.org/badge/latestdoi/6220644)\n-[![Join the chat at https://gitter.im/OpenRefine/OpenRefine](https://badges.gitter.im/OpenRefine/OpenRefine.svg)](https://gitter.im/OpenRefine/OpenRefine) \n+[![Join the chat at https://gitter.im/OpenRefine/OpenRefine](https://badges.gitter.im/OpenRefine/OpenRefine.svg)](https://gitter.im/OpenRefine/OpenRefine)\n [![Snapshot release](https://github.com/OpenRefine/OpenRefine/actions/workflows/snapshot_release.yml/badge.svg)](https://github.com/OpenRefine/OpenRefine/actions/workflows/snapshot_release.yml) [![Coverage Status](https://coveralls.io/repos/github/OpenRefine/OpenRefine/badge.svg?branch=master)](https://coveralls.io/github/OpenRefine/OpenRefine?branch=master) [![Translation progress](https://hosted.weblate.org/widgets/openrefine/-/svg-badge.svg)](https://hosted.weblate.org/engage/openrefine/?utm_source=widget)\n \n OpenRefine is a Java-based power tool that allows you to load data, understand it,\n@@ -30,7 +30,7 @@ If you have cloned this repository to your computer, you can run OpenRefine with\n * `./refine` on Mac OS and Linux\n * `refine.bat` on Windows\n \n-This requires [JDK 11](https://adoptium.net/) or newer, [Apache Maven](https://maven.apache.org/) and [NPM](https://www.npmjs.com/) 16 or newer.\n+This requires [JDK 11](https://adoptium.net/) or newer, [Apache Maven](https://maven.apache.org/) and [Node.js 18](https://nodejs.org/) or newer.\n \n ## Documentation\n \ndiff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml\nindex 3842e9f18..95a9ab82b 100644\n--- a/extensions/gdata/pom.xml\n+++ b/extensions/gdata/pom.xml\n@@ -83,12 +83,12 @@\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-drive</artifactId>\n-      <version>v3-rev20240722-2.0.0</version>\n+      <version>v3-rev20240730-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-sheets</artifactId>\n-      <version>v4-rev20240716-2.0.0</version>\n+      <version>v4-rev20240730-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.fasterxml.jackson.core</groupId>\ndiff --git a/extensions/wikibase/src/org/openrefine/wikibase/schema/WbDateConstant.java b/extensions/wikibase/src/org/openrefine/wikibase/schema/WbDateConstant.java\nindex cbc86100e..eedb5bbd3 100644\n--- a/extensions/wikibase/src/org/openrefine/wikibase/schema/WbDateConstant.java\n+++ b/extensions/wikibase/src/org/openrefine/wikibase/schema/WbDateConstant.java\n@@ -25,10 +25,12 @@\n package org.openrefine.wikibase.schema;\n \n import java.text.ParseException;\n-import java.text.ParsePosition;\n-import java.text.SimpleDateFormat;\n+import java.time.format.DateTimeFormatter;\n+import java.time.format.DateTimeParseException;\n+import java.time.temporal.ChronoField;\n+import java.time.temporal.TemporalAccessor;\n+import java.time.temporal.TemporalQuery;\n import java.util.Calendar;\n-import java.util.Date;\n import java.util.Map;\n import java.util.Map.Entry;\n import java.util.regex.Matcher;\n@@ -55,16 +57,16 @@ public class WbDateConstant implements WbExpression<TimeValue> {\n      * Map of formats accepted by the parser. Each format is associated to the time precision it induces (an integer\n      * according to Wikibase's data model).\n      */\n-    public static Map<SimpleDateFormat, Integer> acceptedFormats = ImmutableMap.<SimpleDateFormat, Integer> builder()\n-            .put(new SimpleDateFormat(\"yyyy'M'\"), 6)\n-            .put(new SimpleDateFormat(\"yyyy'C'\"), 7)\n-            .put(new SimpleDateFormat(\"yyyy'D'\"), 8)\n-            .put(new SimpleDateFormat(\"yyyy\"), 9)\n-            .put(new SimpleDateFormat(\"yyyy-MM\"), 10)\n-            .put(new SimpleDateFormat(\"yyyy-MM-dd\"), 11)\n+    public static Map<DateTimeFormatter, Integer> acceptedFormats = ImmutableMap.<DateTimeFormatter, Integer> builder()\n+            .put(DateTimeFormatter.ofPattern(\"yyyy'M'\"), 6)\n+            .put(DateTimeFormatter.ofPattern(\"yyyy'C'\"), 7)\n+            .put(DateTimeFormatter.ofPattern(\"yyyy'D'\"), 8)\n+            .put(DateTimeFormatter.ofPattern(\"yyyy\"), 9)\n+            .put(DateTimeFormatter.ofPattern(\"yyyy-MM\"), 10)\n+            .put(DateTimeFormatter.ofPattern(\"yyyy-MM-dd['T'HH:mm[:ss]['Z']]\"), 11)\n             .build();\n \n-    public static Pattern calendarSuffixPattern = Pattern.compile(\"_(Q[1-9][0-9]*)$\");\n+    public static Pattern calendarSuffixPattern = Pattern.compile(\"(.*)_(Q[1-9][0-9]*)$\");\n \n     private TimeValue parsed;\n     private final String origDatestamp;\n@@ -112,9 +114,8 @@ public class WbDateConstant implements WbExpression<TimeValue> {\n      */\n     public static TimeValue parse(String datestamp)\n             throws ParseException {\n-        Date bestDate = null;\n+        TimeValue bestDate = null;\n         int precision = 0; // default precision (will be overridden if successfully parsed)\n-        int maxLength = 0; // the maximum length parsed\n         boolean bceFlag = false; // judge whether this is a BCE year\n         String calendarIri = TimeValue.CM_GREGORIAN_PRO; // Gregorian calendar is assumed by default\n \n@@ -135,54 +136,52 @@ public class WbDateConstant implements WbExpression<TimeValue> {\n             bceFlag = true;\n         }\n \n-        for (Entry<SimpleDateFormat, Integer> entry : acceptedFormats.entrySet()) {\n-            ParsePosition position = new ParsePosition(0);\n-            Date date = entry.getKey().parse(trimmedDatestamp, position);\n+        Matcher matcher = calendarSuffixPattern.matcher(trimmedDatestamp);\n+        if (matcher.find()) {\n+            String calendarQid = matcher.group(2);\n+            calendarIri = Datamodel.SITE_WIKIDATA + calendarQid;\n+            trimmedDatestamp = matcher.group(1);\n+        }\n \n-            if (date == null) {\n+        for (Entry<DateTimeFormatter, Integer> entry : acceptedFormats.entrySet()) {\n+            TemporalQuery<TimeValue> temporalQuery = getTemporalQuery(entry.getValue(), bceFlag, calendarIri);\n+            TimeValue date;\n+            try {\n+                date = entry.getKey().parse(trimmedDatestamp, temporalQuery);\n+            } catch (DateTimeParseException e) {\n                 continue;\n             }\n \n-            // Potentially parse the calendar Qid after the date\n-            int consumedUntil = position.getIndex();\n-            if (consumedUntil < trimmedDatestamp.length()) {\n-                Matcher matcher = calendarSuffixPattern.matcher(\n-                        trimmedDatestamp.subSequence(position.getIndex(), trimmedDatestamp.length()));\n-                if (matcher.find()) {\n-                    String calendarQid = matcher.group(1);\n-                    calendarIri = Datamodel.SITE_WIKIDATA + calendarQid;\n-                    consumedUntil = trimmedDatestamp.length();\n-                }\n-            }\n-\n             // Ignore parses which failed or do not consume all the input\n-            if (date != null && position.getIndex() > maxLength\n-            // only allow to partially consume the input if the precision is day and followed by a T (as in ISO)\n-                    && (consumedUntil == trimmedDatestamp.length()\n-                            || (entry.getValue() == 11 && trimmedDatestamp.charAt(consumedUntil) == 'T'))) {\n-                precision = entry.getValue();\n-                bestDate = date;\n-                maxLength = position.getIndex();\n-            }\n+            precision = entry.getValue();\n+            bestDate = date;\n         }\n         if (bestDate == null || precision == 0) {\n             throw new ParseException(\"Invalid date.\", 0);\n         } else {\n-            Calendar calendar = Calendar.getInstance();\n-            calendar = Calendar.getInstance();\n-            calendar.setTime(bestDate);\n-            long year = calendar.get(Calendar.YEAR);\n-            int month = precision < 10 ? 0 : calendar.get(Calendar.MONTH) + 1;\n-            int day_of_month = precision < 11 ? 0 : calendar.get(Calendar.DAY_OF_MONTH);\n-            if (bceFlag)\n-                year = -1 * year;\n-            return Datamodel.makeTimeValue(year, (byte) month,\n-                    (byte) day_of_month, (byte) calendar.get(Calendar.HOUR_OF_DAY),\n-                    (byte) calendar.get(Calendar.MINUTE), (byte) calendar.get(Calendar.SECOND), (byte) precision, 0, 0,\n-                    0, calendarIri);\n+            return bestDate;\n         }\n     }\n \n+    protected static TemporalQuery<TimeValue> getTemporalQuery(int precision, boolean bceFlag, String calendarIri) {\n+        return new TemporalQuery<>() {\n+\n+            @Override\n+            public TimeValue queryFrom(TemporalAccessor temporal) {\n+                long year = temporal.get(ChronoField.YEAR);\n+                int month = precision < 10 ? 0 : temporal.get(ChronoField.MONTH_OF_YEAR);\n+                int day_of_month = precision < 11 ? 0 : temporal.get(ChronoField.DAY_OF_MONTH);\n+                if (bceFlag)\n+                    year = -1 * year;\n+                return Datamodel.makeTimeValue(year, (byte) month,\n+                        (byte) day_of_month, (byte) 0,\n+                        (byte) 0, (byte) 0, (byte) precision, 0, 0,\n+                        0, calendarIri);\n+            }\n+\n+        };\n+    }\n+\n     /**\n      * @return the original datestamp\n      */\ndiff --git a/main/src/com/google/refine/expr/functions/strings/LevenshteinDistance.java b/main/src/com/google/refine/expr/functions/strings/LevenshteinDistance.java\nnew file mode 100644\nindex 000000000..98eafb56b\n--- /dev/null\n+++ b/main/src/com/google/refine/expr/functions/strings/LevenshteinDistance.java\n@@ -0,0 +1,82 @@\n+/*\n+\n+Copyright 2024, OpenRefine contributors\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are\n+met:\n+\n+    * Redistributions of source code must retain the above copyright\n+notice, this list of conditions and the following disclaimer.\n+    * Redistributions in binary form must reproduce the above\n+copyright notice, this list of conditions and the following disclaimer\n+in the documentation and/or other materials provided with the\n+distribution.\n+    * Neither the name of Google Inc. nor the names of its\n+contributors may be used to endorse or promote products derived from\n+this software without specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+*/\n+\n+package com.google.refine.expr.functions.strings;\n+\n+import java.util.Properties;\n+\n+import com.google.refine.clustering.knn.SimilarityDistance;\n+import com.google.refine.clustering.knn.VicinoDistance;\n+import com.google.refine.expr.EvalError;\n+import com.google.refine.grel.ControlFunctionRegistry;\n+import com.google.refine.grel.EvalErrorMessage;\n+import com.google.refine.grel.Function;\n+\n+public class LevenshteinDistance implements Function {\n+\n+    /**\n+     * Calculate the number of edits required to make one value match another.\n+     * \n+     * @param bindings\n+     *            bindings\n+     * @param args\n+     *            arguments\n+     * @return result\n+     */\n+    @Override\n+    public Object call(Properties bindings, Object[] args) {\n+        if (args != null && args.length == 2 && args[0] instanceof String && args[1] instanceof String) {\n+            String s1 = (String) args[0];\n+            String s2 = (String) args[1];\n+\n+            SimilarityDistance levenshteinDistance = new VicinoDistance(new edu.mit.simile.vicino.distances.LevenshteinDistance());\n+            return levenshteinDistance.compute(s1, s2);\n+        }\n+        return new EvalError(EvalErrorMessage.expects_two_strings(ControlFunctionRegistry.getFunctionName(this)));\n+    }\n+\n+    @Override\n+    public String getDescription() {\n+        return \"Calculate the number of edits required to make one value match another.\";\n+    }\n+\n+    @Override\n+    public String getParams() {\n+        return \"string s1, string s2\";\n+    }\n+\n+    @Override\n+    public String getReturns() {\n+        return \"number\";\n+    }\n+}\ndiff --git a/main/src/com/google/refine/grel/ControlFunctionRegistry.java b/main/src/com/google/refine/grel/ControlFunctionRegistry.java\nindex 799b1da61..81ca595f5 100644\n--- a/main/src/com/google/refine/grel/ControlFunctionRegistry.java\n+++ b/main/src/com/google/refine/grel/ControlFunctionRegistry.java\n@@ -112,6 +112,7 @@ import com.google.refine.expr.functions.strings.Find;\n import com.google.refine.expr.functions.strings.Fingerprint;\n import com.google.refine.expr.functions.strings.IndexOf;\n import com.google.refine.expr.functions.strings.LastIndexOf;\n+import com.google.refine.expr.functions.strings.LevenshteinDistance;\n import com.google.refine.expr.functions.strings.MD5;\n import com.google.refine.expr.functions.strings.Match;\n import com.google.refine.expr.functions.strings.NGram;\n@@ -265,6 +266,7 @@ public class ControlFunctionRegistry {\n         registerFunction(\"ngram\", new NGram());\n         registerFunction(\"match\", new Match());\n         registerFunction(\"find\", new Find());\n+        registerFunction(\"levenshteinDistance\", new LevenshteinDistance());\n \n         registerFunction(\"parseUri\", new ParseUri());\n \ndiff --git a/packaging/THIRD-PARTY.txt b/packaging/THIRD-PARTY.txt\nindex 62f4002ef..62768f437 100644\n--- a/packaging/THIRD-PARTY.txt\n+++ b/packaging/THIRD-PARTY.txt\n@@ -41,7 +41,6 @@ Lists of 109 third-party dependencies.\n      (CDDL/GPLv2+CE) JavaBeans Activation Framework API jar (javax.activation:javax.activation-api:1.2.0 - http://java.net/all/javax.activation-api/)\n      (CDDL + GPLv2 with classpath exception) Java Servlet API (javax.servlet:javax.servlet-api:4.0.1 - https://javaee.github.io/servlet-spec/)\n      (CDDL 1.1) (GPL2 w/ CPE) jaxb-api (javax.xml.bind:jaxb-api:2.3.1 - https://github.com/javaee/jaxb-spec/jaxb-api)\n-     (Eclipse Public License 1.0) JUnit (junit:junit:4.13 - http://junit.org)\n      (The Apache Software License, Version 2.0) jsonic (net.arnx:jsonic:1.2.11 - http://jsonic.sourceforge.jp/)\n      (Apache License, Version 2.0) Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.12.22 - https://bytebuddy.net/byte-buddy)\n      (Apache License, Version 2.0) Byte Buddy agent (net.bytebuddy:byte-buddy-agent:1.12.22 - https://bytebuddy.net/byte-buddy-agent)\ndiff --git a/pom.xml b/pom.xml\nindex d7d4d5ad3..ffe30bc82 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -78,13 +78,13 @@\n     <jackson.version>2.17.2</jackson.version>\n     <servlet-api.version>4.0.1</servlet-api.version>\n     <butterfly.version>1.2.5</butterfly.version>\n-    <slf4j.version>2.0.13</slf4j.version>\n+    <slf4j.version>2.0.16</slf4j.version>\n     <log4j.version>2.23.1</log4j.version>\n     <jetty.version>10.0.16</jetty.version>\n     <okhttp.version>4.12.0</okhttp.version>\n     <jena.version>4.10.0</jena.version>\n     <poi.version>5.3.0</poi.version>\n-    <commons-lang3.version>3.15.0</commons-lang3.version>\n+    <commons-lang3.version>3.16.0</commons-lang3.version>\n     <commons-fileupload.version>1.5</commons-fileupload.version>\n     <commons-collections.version>3.2.2</commons-collections.version>\n     <commons-text.version>1.12.0</commons-text.version>\n@@ -92,7 +92,7 @@\n     <org-jvnet-localizer.version>1.31</org-jvnet-localizer.version>\n     <!-- v1.15 of commons-codec is needed for Jena 3.14+ - copied from org.apache.jena:jena:pom -->\n     <commons-codec.version>1.17.1</commons-codec.version>\n-    <commons-compress.version>1.26.2</commons-compress.version>\n+    <commons-compress.version>1.27.0</commons-compress.version>\n     <velocity.version>2.3</velocity.version>\n     <marc4j.version>2.9.5</marc4j.version>\n     <jsoup.version>1.18.1</jsoup.version>\n@@ -117,7 +117,7 @@\n     <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>\n     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>\n     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>\n-    <exec-maven-plugin.version>3.3.0</exec-maven-plugin.version>\n+    <exec-maven-plugin.version>3.4.0</exec-maven-plugin.version>\n     <maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>\n     <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>\n     <surefire.version>3.3.1</surefire.version>\n@@ -312,7 +312,7 @@\n         <!-- Signature -->\n         <groupId>org.apache.maven.plugins</groupId>\n         <artifactId>maven-gpg-plugin</artifactId>\n-        <version>3.2.4</version>\n+        <version>3.2.5</version>\n         <executions>\n             <execution>\n                 <id>sign-artifacts</id>\n", "test_patch": "diff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/manifests/ManifestTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/manifests/ManifestTest.java\nindex 6a633f14c..6451adfc3 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/manifests/ManifestTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/manifests/ManifestTest.java\n@@ -3,6 +3,7 @@ package org.openrefine.wikibase.manifests;\n \n import static org.testng.Assert.assertFalse;\n import static org.testng.Assert.assertNull;\n+// The version below has parameter order backwards from the standard TestNG assertEquals we use everywhere else\n import static org.testng.AssertJUnit.assertEquals;\n \n import java.io.IOException;\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex 5f0cb8503..fbf63cb8c 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -20,10 +20,10 @@\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^9.8.0\",\n+        \"eslint\": \"^9.9.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^9.1.0\",\n-        \"eslint-plugin-cypress\": \"^3.4.0\",\n+        \"eslint-plugin-cypress\": \"^3.5.0\",\n         \"prettier\": \"3.3.3\"\n     }\n }\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex f7ed19f18..ee8520b31 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -75,10 +75,10 @@\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@9.8.0\":\n-  version \"9.8.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-9.8.0.tgz#ae9bc14bb839713c5056f5018bcefa955556d3a4\"\n-  integrity sha512-MfluB7EUfxXtv3i/++oh89uzAr4PDI4nn201hsp+qaXqsjAWzinlZEHEfPgAX4doIlKvPG/i0A9dpKxOLII8yA==\n+\"@eslint/js@9.9.0\":\n+  version \"9.9.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-9.9.0.tgz#d8437adda50b3ed4401964517b64b4f59b0e2638\"\n+  integrity sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==\n \n \"@eslint/object-schema@^2.1.4\":\n   version \"2.1.4\"\n@@ -567,10 +567,10 @@ eslint-config-prettier@^9.1.0:\n   resolved \"https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz#31af3d94578645966c082fcb71a5846d3c94867f\"\n   integrity sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==\n \n-eslint-plugin-cypress@^3.4.0:\n-  version \"3.4.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-3.4.0.tgz#6a7f508cda7579184265b50129b853e0c06c9944\"\n-  integrity sha512-Rrrr3Ri6wHqzrRr+TyUV7bDS4UnMMrFY1R1PP2F7XdGfe9txDC6lQEshyoNOWqGoPkbbeDm1x1XPc/adxemsnA==\n+eslint-plugin-cypress@^3.5.0:\n+  version \"3.5.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-3.5.0.tgz#380ef5049ad80ebeca923db69e4aa96e72fcd893\"\n+  integrity sha512-JZQ6XnBTNI8h1B9M7wJSFzc48SYbh7VMMKaNTQOFa3BQlnmXPrVc4PKen8R+fpv6VleiPeej6VxloGb42zdRvw==\n   dependencies:\n     globals \"^13.20.0\"\n \n@@ -592,16 +592,16 @@ eslint-visitor-keys@^4.0.0:\n   resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb\"\n   integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==\n \n-eslint@^9.8.0:\n-  version \"9.8.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-9.8.0.tgz#a4f4a090c8ea2d10864d89a6603e02ce9f649f0f\"\n-  integrity sha512-K8qnZ/QJzT2dLKdZJVX6W4XOwBzutMYmt0lqUS+JdXgd+HTYFlonFgkJ8s44d/zMPPCnOOk0kMWCApCPhiOy9A==\n+eslint@^9.9.0:\n+  version \"9.9.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-9.9.0.tgz#8d214e69ae4debeca7ae97daebbefe462072d975\"\n+  integrity sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n     \"@eslint-community/regexpp\" \"^4.11.0\"\n     \"@eslint/config-array\" \"^0.17.1\"\n     \"@eslint/eslintrc\" \"^3.1.0\"\n-    \"@eslint/js\" \"9.8.0\"\n+    \"@eslint/js\" \"9.9.0\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@humanwhocodes/retry\" \"^0.3.0\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\ndiff --git a/main/tests/server/src/com/google/refine/ProjectManagerTests.java b/main/tests/server/src/com/google/refine/ProjectManagerTests.java\nindex 7128fc421..d48ee2258 100644\n--- a/main/tests/server/src/com/google/refine/ProjectManagerTests.java\n+++ b/main/tests/server/src/com/google/refine/ProjectManagerTests.java\n@@ -41,7 +41,7 @@ import static org.mockito.Mockito.times;\n import static org.mockito.Mockito.verify;\n import static org.mockito.Mockito.verifyNoMoreInteractions;\n import static org.mockito.Mockito.when;\n-import static org.testng.AssertJUnit.assertEquals;\n+import static org.testng.Assert.assertEquals;\n \n import java.lang.reflect.Field;\n import java.time.Instant;\n@@ -238,8 +238,8 @@ public class ProjectManagerTests extends RefineTest {\n     }\n \n     protected void AssertProjectRegistered() {\n-        Assert.assertEquals(SUT.getProject(project.id), project);\n-        Assert.assertEquals(SUT.getProjectMetadata(project.id), metadata);\n+        assertEquals(SUT.getProject(project.id), project);\n+        assertEquals(SUT.getProjectMetadata(project.id), metadata);\n     }\n \n     protected void whenGetSaveTimes(Project proj, ProjectMetadata meta) {\ndiff --git a/main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java b/main/tests/server/src/com/google/refine/clustering/binning/FingerprintKeyerTests.java\nsimilarity index 85%\nrename from main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java\nrename to main/tests/server/src/com/google/refine/clustering/binning/FingerprintKeyerTests.java\nindex ba24449f0..81dac8c21 100644\n--- a/main/tests/server/src/com/google/refine/clustering/binning/KeyerTests.java\n+++ b/main/tests/server/src/com/google/refine/clustering/binning/FingerprintKeyerTests.java\n@@ -39,11 +39,8 @@ import org.testng.annotations.BeforeTest;\n import org.testng.annotations.Test;\n \n import com.google.refine.RefineTest;\n-import com.google.refine.expr.MetaParser;\n-import com.google.refine.expr.ParsingException;\n-import com.google.refine.grel.Parser;\n \n-public class KeyerTests extends RefineTest {\n+public class FingerprintKeyerTests extends RefineTest {\n \n     private static Keyer keyer;\n \n@@ -131,16 +128,6 @@ public class KeyerTests extends RefineTest {\n         logger = LoggerFactory.getLogger(this.getClass());\n     }\n \n-    @BeforeMethod\n-    public void registerGRELParser() {\n-        MetaParser.registerLanguageParser(\"grel\", \"GREL\", Parser.grelParser, \"value\");\n-    }\n-\n-    @AfterMethod\n-    public void unregisterGRELParser() {\n-        MetaParser.unregisterLanguageParser(\"grel\");\n-    }\n-\n     @BeforeMethod\n     public void SetUp() {\n         keyer = new FingerprintKeyer();\n@@ -164,36 +151,4 @@ public class KeyerTests extends RefineTest {\n                     \"Fingerprint for string: \" + ss[0] + \" failed\");\n         }\n     }\n-\n-    @Test\n-    public void testUserDefinedKeyer1() {\n-        try {\n-            String expression = \"value.fingerprint()\";\n-            keyer = new UserDefinedKeyer(expression);\n-        } catch (ParsingException e) {\n-            throw new RuntimeException(e);\n-        }\n-        for (String[] ss : testStrings) {\n-            Assert.assertEquals(ss.length, 2, \"Invalid test\"); // Not a valid test\n-            Assert.assertEquals(keyer.key(ss[0]), ss[1],\n-                    \"User defined keying for string: \" + ss[0] + \" failed\");\n-        }\n-    }\n-\n-    @Test\n-    public void testUserDefinedKeyer2() {\n-        try {\n-            String expression = \"value + ' world'\";\n-            keyer = new UserDefinedKeyer(expression);\n-        } catch (ParsingException e) {\n-            throw new RuntimeException(e);\n-        }\n-\n-        String[] strs = { \"hello\", \"new\", \"fantastic\" };\n-        for (String s : strs) {\n-            String output = keyer.key(s);\n-            Assert.assertEquals(output, s + \" world\",\n-                    \"User defined keying for string: \" + s + \" failed\");\n-        }\n-    }\n }\ndiff --git a/main/tests/server/src/com/google/refine/clustering/binning/UserDefinedKeyerTests.java b/main/tests/server/src/com/google/refine/clustering/binning/UserDefinedKeyerTests.java\nnew file mode 100644\nindex 000000000..e1637ad93\n--- /dev/null\n+++ b/main/tests/server/src/com/google/refine/clustering/binning/UserDefinedKeyerTests.java\n@@ -0,0 +1,99 @@\n+/*\n+Copyright 2024 OpenRefine contributors\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are\n+met:\n+\n+    * Redistributions of source code must retain the above copyright\n+notice, this list of conditions and the following disclaimer.\n+    * Redistributions in binary form must reproduce the above\n+copyright notice, this list of conditions and the following disclaimer\n+in the documentation and/or other materials provided with the\n+distribution.\n+    * Neither the names of the project or its\n+contributors may be used to endorse or promote products derived from\n+this software without specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,           \n+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY           \n+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+*/\n+\n+package com.google.refine.clustering.binning;\n+\n+import org.testng.Assert;\n+import org.testng.annotations.AfterMethod;\n+import org.testng.annotations.BeforeMethod;\n+import org.testng.annotations.Test;\n+\n+import com.google.refine.expr.MetaParser;\n+import com.google.refine.expr.ParsingException;\n+import com.google.refine.grel.Parser;\n+\n+public class UserDefinedKeyerTests {\n+\n+    private Keyer keyer;\n+    // some sample test cases taken from KeyerTests\n+    private static final String[][] testStrings = {\n+            { \" école ÉCole ecoLe \", \"ecole\" },\n+            { \" d c b a \", \"a b c d\" },\n+            { \"\\tABC \\t DEF \", \"abc def\" }, // test leading and trailing whitespace\n+            { \"bbb\\taaa\", \"aaa bbb\" },\n+//        {\"å\",\"aa\"}, // Requested by issue #650, but conflicts with diacritic folding\n+            { \"æø\", \"aeoe\" }, // Norwegian replacements from #650\n+            { \"©ß\", \"css\" }, // issue #409 esszet\n+    };\n+\n+    @BeforeMethod\n+    public void registerGRELParser() {\n+        MetaParser.registerLanguageParser(\"grel\", \"GREL\", Parser.grelParser, \"value\");\n+    }\n+\n+    @AfterMethod\n+    public void unregisterGRELParser() {\n+        MetaParser.unregisterLanguageParser(\"grel\");\n+    }\n+\n+    @Test\n+    public void testUserDefinedKeyer1() {\n+        try {\n+            String expression = \"value.fingerprint()\";\n+            keyer = new UserDefinedKeyer(expression);\n+        } catch (ParsingException e) {\n+            throw new RuntimeException(e);\n+        }\n+        for (String[] ss : testStrings) {\n+            Assert.assertEquals(ss.length, 2, \"Invalid test\"); // Not a valid test\n+            Assert.assertEquals(keyer.key(ss[0]), ss[1],\n+                    \"User defined keying for string: \" + ss[0] + \" failed\");\n+        }\n+    }\n+\n+    @Test\n+    public void testUserDefinedKeyer2() {\n+        try {\n+            String expression = \"value + ' world'\";\n+            keyer = new UserDefinedKeyer(expression);\n+        } catch (ParsingException e) {\n+            throw new RuntimeException(e);\n+        }\n+\n+        String[] strs = { \"hello\", \"new\", \"fantastic\" };\n+        for (String s : strs) {\n+            String output = keyer.key(s);\n+            Assert.assertEquals(output, s + \" world\",\n+                    \"User defined keying for string: \" + s + \" failed\");\n+        }\n+    }\n+\n+}\ndiff --git a/main/tests/server/src/com/google/refine/expr/functions/strings/LevenshteinDistanceTest.java b/main/tests/server/src/com/google/refine/expr/functions/strings/LevenshteinDistanceTest.java\nnew file mode 100644\nindex 000000000..7ef7261c4\n--- /dev/null\n+++ b/main/tests/server/src/com/google/refine/expr/functions/strings/LevenshteinDistanceTest.java\n@@ -0,0 +1,73 @@\n+/*\n+\n+Copyright 2024, OpenRefine contributors\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are\n+met:\n+\n+    * Redistributions of source code must retain the above copyright\n+notice, this list of conditions and the following disclaimer.\n+    * Redistributions in binary form must reproduce the above\n+copyright notice, this list of conditions and the following disclaimer\n+in the documentation and/or other materials provided with the\n+distribution.\n+    * Neither the name of Google Inc. nor the names of its\n+contributors may be used to endorse or promote products derived from\n+this software without specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,\n+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY\n+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+*/\n+\n+package com.google.refine.expr.functions.strings;\n+\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertTrue;\n+\n+import org.testng.annotations.Test;\n+\n+import com.google.refine.expr.EvalError;\n+import com.google.refine.grel.GrelTestBase;\n+\n+public class LevenshteinDistanceTest extends GrelTestBase {\n+\n+    @Test\n+    public void testValidArguments() {\n+        assertEquals(invoke(\"levenshteinDistance\", new Object[] { \"New York\", \"NewYork\" }), 1.0);\n+        assertEquals(invoke(\"levenshteinDistance\", new Object[] { \"M. Makeba\", \"Miriam Makeba\" }), 5.0);\n+    }\n+\n+    @Test\n+    public void testInvalidArguments() {\n+        assertTrue(invoke(\"levenshteinDistance\") instanceof EvalError);\n+        assertTrue(invoke(\"levenshteinDistance\", new Object[] { \"test\" }) instanceof EvalError);\n+        assertTrue(invoke(\"levenshteinDistance\", new Object[] { \"test\", new Object() }) instanceof EvalError);\n+    }\n+\n+    @Test\n+    public void testEmptyStrings() {\n+        assertEquals(invoke(\"levenshteinDistance\", new Object[] { \"\", \"\" }), 0.0);\n+    }\n+\n+    @Test\n+    public void testSingleCharacterStrings() {\n+        assertEquals(invoke(\"levenshteinDistance\", new Object[] { \"a\", \"b\" }), 1.0);\n+    }\n+\n+    @Test\n+    public void testDifferentLengthStrings() {\n+        assertEquals(invoke(\"levenshteinDistance\", new Object[] { \"\", \"abc\" }), 3.0);\n+    }\n+}\ndiff --git a/main/tests/server/src/com/google/refine/expr/util/CalenderParserTest.java b/main/tests/server/src/com/google/refine/expr/util/CalenderParserTest.java\nindex fcb16026b..e2cd4588f 100644\n--- a/main/tests/server/src/com/google/refine/expr/util/CalenderParserTest.java\n+++ b/main/tests/server/src/com/google/refine/expr/util/CalenderParserTest.java\n@@ -1,10 +1,10 @@\n \n package com.google.refine.expr.util;\n \n-import static org.junit.Assert.assertEquals;\n-import static org.junit.Assert.assertNotNull;\n-import static org.junit.Assert.assertNull;\n-import static org.junit.Assert.assertThrows;\n+import static org.testng.Assert.assertNotNull;\n+import static org.testng.Assert.assertNull;\n+// TODO: The static import below should really use the native parameter ordering, but we're too lazy to switch all the calls\n+import static org.testng.AssertJUnit.assertEquals; // JUnit compatible parameter order\n \n import java.util.ArrayList;\n import java.util.Calendar;\n@@ -182,132 +182,100 @@ public class CalenderParserTest {\n         assertEquals(expected, CalendarParser.getOrderString(input));\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenNegativeNumberInDateStr_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Found negative number in date \\\"-22/02/2024\\\"\")\n+    public void shouldThrowExceptionWhenNegativeNumberInDateStr_parseTest() throws CalendarParserException {\n         String dateStr = \"-22/02/2024\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.DD_MM_YY));\n-        assertEquals(String.format(\"Found negative number in date \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.DD_MM_YY);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenYearMissingDD_MM_YY_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Year missing from \\\"20/01/\\\"\")\n+    public void shouldThrowExceptionWhenYearMissingDD_MM_YY_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.DD_MM_YY));\n-        assertEquals(String.format(\"Year missing from \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.DD_MM_YY);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenMonthMissingDD_MM_YY_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Month missing from \\\"20//2024\\\"\")\n+    public void shouldThrowExceptionWhenMonthMissingDD_MM_YY_parseTest() throws CalendarParserException {\n         String dateStr = \"20//2024\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.DD_MM_YY));\n-        assertEquals(String.format(\"Month missing from \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.DD_MM_YY);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenDateMissingMM_DD_YY_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"^Day missing from .*\")\n+    public void shouldThrowExceptionWhenDateMissingMM_DD_YY_parseTest() throws CalendarParserException {\n         String dateStr = \"01//2024\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.MM_DD_YY));\n-        assertEquals(String.format(\"Day missing from \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.MM_DD_YY);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenMonthAndYearAreMissingDD_MM_YY_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"^Year and month missing from .*\")\n+    public void shouldThrowExceptionWhenMonthAndYearAreMissingDD_MM_YY_parseTest() throws CalendarParserException {\n         String dateStr = \"20/\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.DD_MM_YY));\n-        assertEquals(String.format(\"Year and month missing from \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.DD_MM_YY);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenMonthAndDayAreMissingYY_DD_MM_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"^Day and month missing from .*\")\n+    public void shouldThrowExceptionWhenMonthAndDayAreMissingYY_DD_MM_parseTest() throws CalendarParserException {\n         String dateStr = \"2024-\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Day and month missing from \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenHourValueIsBad_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Bad hour 28 in .*\")\n+    public void shouldThrowExceptionWhenHourValueIsBad_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 28:30:54:003 pm +05:30\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Bad hour 28 in \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenHourIsBad_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Bad hour string \\\"1hour\\\" in .*\")\n+    public void shouldThrowExceptionWhenHourIsBad_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 1hour:30:54:003 pm +05:30\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Bad hour string \\\"1hour\\\" in \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenMinuteValueIsBad_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Bad minute 90 in .*\")\n+    public void shouldThrowExceptionWhenMinuteValueIsBad_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 8:90:54:003 pm +05:30\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Bad minute 90 in \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenMinuteIsBad_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Bad minute string \\\"30Minute\\\" in .*\")\n+    public void shouldThrowExceptionWhenMinuteIsBad_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 2:30Minute:54:003 pm +05:30\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Bad minute string \\\"30Minute\\\" in \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenSecondValueIsBad_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Bad second 94 in .*\")\n+    public void shouldThrowExceptionWhenSecondValueIsBad_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 8:30:94:003 pm +05:30\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Bad second 94 in \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenSecondIsBad_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Bad second string \\\"54Sec\\\" in .*\")\n+    public void shouldThrowExceptionWhenSecondIsBad_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 2:30:54Sec:003 pm +05:30\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Bad second string \\\"54Sec\\\" in \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenMilliSecondValueIsBad_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Bad millisecond 1111 in .*\")\n+    public void shouldThrowExceptionWhenMilliSecondValueIsBad_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 8:30:44:1111 pm +05:30\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Bad millisecond 1111 in \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenMilliSecondIsBad_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Bad millisecond string \\\"003milli\\\" in .*\")\n+    public void shouldThrowExceptionWhenMilliSecondIsBad_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 2:30:54:003milli pm +05:30\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Bad millisecond string \\\"003milli\\\" in \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenBadTime_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"Unrecognized time \\\"hour:minute:second\\\" in date .*\")\n+    public void shouldThrowExceptionWhenBadTime_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 hour:minute:second\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Unrecognized time \\\"hour:minute:second\\\" in date \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n-    @Test\n-    public void shouldThrowExceptionWhenBadTimeZone_parseTest() {\n+    @Test(expectedExceptions = CalendarParserException.class, expectedExceptionsMessageRegExp = \"^Bad time zone minute offset \\\"30min\\\" in .*\")\n+    public void shouldThrowExceptionWhenBadTimeZone_parseTest() throws CalendarParserException {\n         String dateStr = \"20/01/2024 8:30:54:003 pm +05:30min\";\n-        CalendarParserException exception = assertThrows(CalendarParserException.class,\n-                () -> CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM));\n-        assertEquals(String.format(\"Bad time zone minute offset \\\"30min\\\" in \\\"%s\\\"\", dateStr), exception.getMessage());\n+        CalendarParser.parse(dateStr, CalendarParser.YY_DD_MM);\n     }\n \n     private static Calendar getCalendar(int year, int month, int date, int hour, int minutes, int seconds, int milliSeconds,\ndiff --git a/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java b/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java\nindex 4f59715c0..89460d18c 100644\n--- a/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java\n+++ b/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java\n@@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.importers;\n \n-import static org.testng.AssertJUnit.assertEquals;\n-import static org.testng.AssertJUnit.assertFalse;\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertFalse;\n \n import java.io.File;\n import java.io.IOException;\n@@ -584,7 +584,7 @@ public class SeparatorBasedImporterTests extends ImporterTest {\n     public void testThatDefaultGuessIsATabSeparatorAndDefaultProcessQuotesToFalse() {\n         ObjectNode options = SUT.createParserUIInitializationData(\n                 job, new LinkedList<>(), \"text/json\");\n-        assertEquals(\"\\\\t\", options.get(\"separator\").textValue());\n+        assertEquals(options.get(\"separator\").textValue(), \"\\\\t\");\n         assertFalse(options.get(\"processQuotes\").asBoolean());\n     }\n \n@@ -593,7 +593,7 @@ public class SeparatorBasedImporterTests extends ImporterTest {\n         List<ObjectNode> fileRecords = prepareFileRecords(\"food.small.csv\");\n         ObjectNode options = SUT.createParserUIInitializationData(\n                 job, fileRecords, \"text/csv\");\n-        assertEquals(\",\", options.get(\"separator\").textValue());\n+        assertEquals(options.get(\"separator\").textValue(), \",\");\n     }\n \n     @Test\n@@ -601,7 +601,7 @@ public class SeparatorBasedImporterTests extends ImporterTest {\n         List<ObjectNode> fileRecords = prepareFileRecords(\"movies-condensed.tsv\");\n         ObjectNode options = SUT.createParserUIInitializationData(\n                 job, fileRecords, \"text/tsv\");\n-        assertEquals(\"\\\\t\", options.get(\"separator\").textValue());\n+        assertEquals(options.get(\"separator\").textValue(), \"\\\\t\");\n         assertFalse(options.get(\"processQuotes\").asBoolean());\n     }\n \ndiff --git a/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java b/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java\nindex 2827588a4..07e431695 100644\n--- a/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java\n+++ b/main/tests/server/src/com/google/refine/importers/XmlImporterTests.java\n@@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.importers;\n \n-import static org.junit.Assert.assertNotEquals;\n-import static org.junit.Assert.assertNotNull;\n+import static org.testng.Assert.assertNotEquals;\n+import static org.testng.Assert.assertNotNull;\n \n import java.io.ByteArrayInputStream;\n import java.io.File;\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6774.\r\n\r\nMigrates away from `SimpleDateFormat` which is known not to be thread-safe. The existing tests are hopefully sufficient to guarantee that behavior is preserved.", "PR_Title": "fix: Ensure thread safety of Wikibase date parsing", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6779_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6779, "issue_title": "fix: Ensure thread safety of Wikibase date parsing", "issue_body": "Fixes #6774.\r\n\r\nMigrates away from `SimpleDateFormat` which is known not to be thread-safe. The existing tests are hopefully sufficient to guarantee that behavior is preserved."}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-7176", "base_commit": "d92d8e5be0037b8fbe9e099d30d0a3cab091b00e", "patch": "diff --git a/benchmark/pom.xml b/benchmark/pom.xml\nindex 88ee01a56..5b552f99c 100644\n--- a/benchmark/pom.xml\n+++ b/benchmark/pom.xml\n@@ -125,7 +125,7 @@\n         </plugin>\n         <plugin>\n           <artifactId>maven-install-plugin</artifactId>\n-          <version>3.1.3</version>\n+          <version>3.1.4</version>\n         </plugin>\n         <plugin>\n           <artifactId>maven-jar-plugin</artifactId>\ndiff --git a/extensions/database/pom.xml b/extensions/database/pom.xml\nindex ed9948802..25302ef82 100644\n--- a/extensions/database/pom.xml\n+++ b/extensions/database/pom.xml\n@@ -84,7 +84,7 @@\n     <dependency>\n       <groupId>com.google.http-client</groupId>\n       <artifactId>google-http-client-jackson2</artifactId>\n-      <version>1.46.2</version>\n+      <version>1.46.3</version>\n       <exclusions>\n         <exclusion>\n           <groupId>org.apache.httpcomponents</groupId>\ndiff --git a/main/src/com/google/refine/operations/cell/KeyValueColumnizeOperation.java b/main/src/com/google/refine/operations/cell/KeyValueColumnizeOperation.java\nindex ea78ff24d..1fde3c6c4 100644\n--- a/main/src/com/google/refine/operations/cell/KeyValueColumnizeOperation.java\n+++ b/main/src/com/google/refine/operations/cell/KeyValueColumnizeOperation.java\n@@ -116,6 +116,14 @@ public class KeyValueColumnizeOperation extends AbstractOperation {\n         return Optional.empty();\n     }\n \n+    @Override\n+    public KeyValueColumnizeOperation renameColumns(Map<String, String> newColumnNames) {\n+        return new KeyValueColumnizeOperation(\n+                newColumnNames.getOrDefault(_keyColumnName, _keyColumnName),\n+                newColumnNames.getOrDefault(_valueColumnName, _valueColumnName),\n+                _noteColumnName == null ? null : newColumnNames.getOrDefault(_noteColumnName, _noteColumnName));\n+    }\n+\n     @Override\n     protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n         int keyColumnIndex = project.columnModel.getColumnIndexByName(_keyColumnName);\ndiff --git a/main/src/com/google/refine/operations/cell/MultiValuedCellJoinOperation.java b/main/src/com/google/refine/operations/cell/MultiValuedCellJoinOperation.java\nindex f5397aeed..9730538f4 100644\n--- a/main/src/com/google/refine/operations/cell/MultiValuedCellJoinOperation.java\n+++ b/main/src/com/google/refine/operations/cell/MultiValuedCellJoinOperation.java\n@@ -35,6 +35,7 @@ package com.google.refine.operations.cell;\n \n import java.util.ArrayList;\n import java.util.List;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -101,6 +102,14 @@ public class MultiValuedCellJoinOperation extends AbstractOperation {\n         return Optional.of(ColumnsDiff.modifySingleColumn(_columnName));\n     }\n \n+    @Override\n+    public MultiValuedCellJoinOperation renameColumns(Map<String, String> newColumnNames) {\n+        return new MultiValuedCellJoinOperation(\n+                newColumnNames.getOrDefault(_columnName, _columnName),\n+                newColumnNames.getOrDefault(_keyColumnName, _keyColumnName),\n+                _separator);\n+    }\n+\n     @Override\n     protected String getBriefDescription(Project project) {\n         return OperationDescription.cell_multivalued_cell_join_brief(_columnName);\ndiff --git a/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java b/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\nindex 4dbecdca2..cfba9de77 100644\n--- a/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\n+++ b/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\n@@ -35,6 +35,7 @@ package com.google.refine.operations.cell;\n \n import java.util.ArrayList;\n import java.util.List;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n import java.util.regex.Pattern;\n@@ -188,6 +189,22 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n         return Optional.of(ColumnsDiff.modifySingleColumn(_columnName));\n     }\n \n+    @Override\n+    public MultiValuedCellSplitOperation renameColumns(Map<String, String> newColumnNames) {\n+        if (\"separator\".equals(_mode)) {\n+            return new MultiValuedCellSplitOperation(\n+                    newColumnNames.getOrDefault(_columnName, _columnName),\n+                    newColumnNames.getOrDefault(_keyColumnName, _keyColumnName),\n+                    _separator,\n+                    _regex);\n+        } else {\n+            return new MultiValuedCellSplitOperation(\n+                    newColumnNames.getOrDefault(_columnName, _columnName),\n+                    newColumnNames.getOrDefault(_keyColumnName, _keyColumnName),\n+                    _fieldLengths);\n+        }\n+    }\n+\n     @Override\n     protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n         Column column = project.columnModel.getColumnByName(_columnName);\ndiff --git a/main/src/com/google/refine/operations/cell/TextTransformOperation.java b/main/src/com/google/refine/operations/cell/TextTransformOperation.java\nindex 27d823f4a..95fb78364 100644\n--- a/main/src/com/google/refine/operations/cell/TextTransformOperation.java\n+++ b/main/src/com/google/refine/operations/cell/TextTransformOperation.java\n@@ -35,6 +35,7 @@ package com.google.refine.operations.cell;\n \n import java.io.Serializable;\n import java.util.List;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Properties;\n import java.util.Set;\n@@ -142,6 +143,25 @@ public class TextTransformOperation extends EngineDependentMassCellOperation {\n         return Optional.of(ColumnsDiff.modifySingleColumn(_columnName));\n     }\n \n+    @Override\n+    public TextTransformOperation renameColumns(Map<String, String> newColumnNames) {\n+        String renamedExpression;\n+        try {\n+            Evaluable evaluable = MetaParser.parse(_expression);\n+            Evaluable renamedEvaluable = evaluable.renameColumnDependencies(newColumnNames);\n+            renamedExpression = renamedEvaluable.getFullSource();\n+        } catch (ParsingException e) {\n+            return this;\n+        }\n+        return new TextTransformOperation(\n+                _engineConfig.renameColumnDependencies(newColumnNames),\n+                newColumnNames.getOrDefault(_columnName, _columnName),\n+                renamedExpression,\n+                _onError,\n+                _repeat,\n+                _repeatCount);\n+    }\n+\n     @Override\n     protected RowVisitor createRowVisitor(Project project, List<CellChange> cellChanges, long historyEntryID) throws Exception {\n         Column column = project.columnModel.getColumnByName(_columnName);\ndiff --git a/main/src/com/google/refine/operations/cell/TransposeColumnsIntoRowsOperation.java b/main/src/com/google/refine/operations/cell/TransposeColumnsIntoRowsOperation.java\nindex eb68a2cd8..9fec75744 100644\n--- a/main/src/com/google/refine/operations/cell/TransposeColumnsIntoRowsOperation.java\n+++ b/main/src/com/google/refine/operations/cell/TransposeColumnsIntoRowsOperation.java\n@@ -35,6 +35,7 @@ package com.google.refine.operations.cell;\n \n import java.util.ArrayList;\n import java.util.List;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -203,6 +204,28 @@ public class TransposeColumnsIntoRowsOperation extends AbstractOperation {\n         return Optional.empty();\n     }\n \n+    @Override\n+    public TransposeColumnsIntoRowsOperation renameColumns(Map<String, String> newColumnNames) {\n+        if (_combinedColumnName != null) {\n+            return new TransposeColumnsIntoRowsOperation(\n+                    newColumnNames.getOrDefault(_startColumnName, _startColumnName),\n+                    _columnCount,\n+                    _ignoreBlankCells,\n+                    _fillDown,\n+                    newColumnNames.getOrDefault(_combinedColumnName, _combinedColumnName),\n+                    _prependColumnName,\n+                    _separator);\n+        } else {\n+            return new TransposeColumnsIntoRowsOperation(\n+                    newColumnNames.getOrDefault(_startColumnName, _startColumnName),\n+                    _columnCount,\n+                    _ignoreBlankCells,\n+                    _fillDown,\n+                    newColumnNames.getOrDefault(_keyColumnName, _keyColumnName),\n+                    newColumnNames.getOrDefault(_valueColumnName, _valueColumnName));\n+        }\n+    }\n+\n     @Override\n     protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n         if (_combinedColumnName != null) {\ndiff --git a/main/src/com/google/refine/operations/cell/TransposeRowsIntoColumnsOperation.java b/main/src/com/google/refine/operations/cell/TransposeRowsIntoColumnsOperation.java\nindex d087d34f5..3201a4958 100644\n--- a/main/src/com/google/refine/operations/cell/TransposeRowsIntoColumnsOperation.java\n+++ b/main/src/com/google/refine/operations/cell/TransposeRowsIntoColumnsOperation.java\n@@ -35,6 +35,7 @@ package com.google.refine.operations.cell;\n \n import java.util.ArrayList;\n import java.util.List;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -95,6 +96,13 @@ public class TransposeRowsIntoColumnsOperation extends AbstractOperation {\n         return Optional.empty();\n     }\n \n+    @Override\n+    public TransposeRowsIntoColumnsOperation renameColumns(Map<String, String> newColumnNames) {\n+        return new TransposeRowsIntoColumnsOperation(\n+                newColumnNames.getOrDefault(_columnName, _columnName),\n+                _rowCount);\n+    }\n+\n     @Override\n     protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n         List<Column> newColumns = new ArrayList<Column>();\ndiff --git a/main/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperation.java b/main/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperation.java\nindex 0d44f7aa5..1ed0a9e06 100644\n--- a/main/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperation.java\n+++ b/main/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperation.java\n@@ -39,6 +39,7 @@ import java.io.IOException;\n import java.io.Serializable;\n import java.util.ArrayList;\n import java.util.List;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Properties;\n import java.util.Set;\n@@ -227,6 +228,28 @@ public class ColumnAdditionByFetchingURLsOperation extends EngineDependentOperat\n         return Optional.of(ColumnsDiff.builder().addColumn(_newColumnName, _baseColumnName).build());\n     }\n \n+    @Override\n+    public ColumnAdditionByFetchingURLsOperation renameColumns(Map<String, String> newColumnNames) {\n+        String renamedExpression;\n+        try {\n+            Evaluable evaluable = MetaParser.parse(_urlExpression);\n+            Evaluable renamedEvaluable = evaluable.renameColumnDependencies(newColumnNames);\n+            renamedExpression = renamedEvaluable.getFullSource();\n+        } catch (ParsingException e) {\n+            return this;\n+        }\n+        return new ColumnAdditionByFetchingURLsOperation(\n+                _engineConfig.renameColumnDependencies(newColumnNames),\n+                newColumnNames.getOrDefault(_baseColumnName, _baseColumnName),\n+                renamedExpression,\n+                _onError,\n+                newColumnNames.getOrDefault(_newColumnName, _newColumnName),\n+                _columnInsertIndex,\n+                _delay,\n+                _cacheResponses,\n+                _httpHeadersJson);\n+    }\n+\n     @Override\n     public Process createProcess(Project project, Properties options) throws Exception {\n         Engine engine = createEngine(project);\ndiff --git a/main/src/com/google/refine/operations/column/ColumnMoveOperation.java b/main/src/com/google/refine/operations/column/ColumnMoveOperation.java\nindex 77e43e915..0ba909930 100644\n--- a/main/src/com/google/refine/operations/column/ColumnMoveOperation.java\n+++ b/main/src/com/google/refine/operations/column/ColumnMoveOperation.java\n@@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.operations.column;\n \n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -105,4 +106,9 @@ public class ColumnMoveOperation extends AbstractOperation {\n     public Optional<ColumnsDiff> getColumnsDiff() {\n         return Optional.of(ColumnsDiff.empty());\n     }\n+\n+    @Override\n+    public ColumnMoveOperation renameColumns(Map<String, String> newColumnNames) {\n+        return new ColumnMoveOperation(newColumnNames.getOrDefault(_columnName, _columnName), _index);\n+    }\n }\ndiff --git a/main/src/com/google/refine/operations/column/ColumnRemovalOperation.java b/main/src/com/google/refine/operations/column/ColumnRemovalOperation.java\nindex eb20212aa..d1dcfd793 100644\n--- a/main/src/com/google/refine/operations/column/ColumnRemovalOperation.java\n+++ b/main/src/com/google/refine/operations/column/ColumnRemovalOperation.java\n@@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.operations.column;\n \n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -84,6 +85,11 @@ public class ColumnRemovalOperation extends AbstractOperation {\n         return Optional.of(ColumnsDiff.builder().deleteColumn(_columnName).build());\n     }\n \n+    @Override\n+    public ColumnRemovalOperation renameColumns(Map<String, String> newColumnNames) {\n+        return new ColumnRemovalOperation(newColumnNames.getOrDefault(_columnName, _columnName));\n+    }\n+\n     @Override\n     protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n         Column column = project.columnModel.getColumnByName(_columnName);\ndiff --git a/main/src/com/google/refine/operations/column/ColumnRenameOperation.java b/main/src/com/google/refine/operations/column/ColumnRenameOperation.java\nindex 69cc04d1a..f80112228 100644\n--- a/main/src/com/google/refine/operations/column/ColumnRenameOperation.java\n+++ b/main/src/com/google/refine/operations/column/ColumnRenameOperation.java\n@@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.operations.column;\n \n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -92,6 +93,13 @@ public class ColumnRenameOperation extends AbstractOperation {\n         return Optional.of(ColumnsDiff.builder().deleteColumn(_oldColumnName).addColumn(_newColumnName, _oldColumnName).build());\n     }\n \n+    @Override\n+    public ColumnRenameOperation renameColumns(Map<String, String> newColumnNames) {\n+        return new ColumnRenameOperation(\n+                newColumnNames.getOrDefault(_oldColumnName, _oldColumnName),\n+                newColumnNames.getOrDefault(_newColumnName, _newColumnName));\n+    }\n+\n     @Override\n     protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n         if (project.columnModel.getColumnByName(_oldColumnName) == null) {\ndiff --git a/main/src/com/google/refine/operations/column/ColumnReorderOperation.java b/main/src/com/google/refine/operations/column/ColumnReorderOperation.java\nindex eff3efeef..33d151e4e 100644\n--- a/main/src/com/google/refine/operations/column/ColumnReorderOperation.java\n+++ b/main/src/com/google/refine/operations/column/ColumnReorderOperation.java\n@@ -34,6 +34,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n package com.google.refine.operations.column;\n \n import java.util.List;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n import java.util.stream.Collectors;\n@@ -84,6 +85,12 @@ public class ColumnReorderOperation extends AbstractOperation {\n         return Optional.empty(); // we don't know what columns there were before, so we can't diff them\n     }\n \n+    @Override\n+    public ColumnReorderOperation renameColumns(Map<String, String> newColumnNames) {\n+        return new ColumnReorderOperation(\n+                _columnNames.stream().map(name -> newColumnNames.getOrDefault(name, name)).collect(Collectors.toList()));\n+    }\n+\n     @Override\n     protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n         return new HistoryEntry(\ndiff --git a/main/src/com/google/refine/operations/column/ColumnSplitOperation.java b/main/src/com/google/refine/operations/column/ColumnSplitOperation.java\nindex 4bfb3b7c0..fa7406ccb 100644\n--- a/main/src/com/google/refine/operations/column/ColumnSplitOperation.java\n+++ b/main/src/com/google/refine/operations/column/ColumnSplitOperation.java\n@@ -36,6 +36,7 @@ package com.google.refine.operations.column;\n import java.io.Serializable;\n import java.util.ArrayList;\n import java.util.List;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n import java.util.regex.Pattern;\n@@ -217,6 +218,27 @@ public class ColumnSplitOperation extends EngineDependentOperation {\n         return Optional.empty(); // sadly the columns created depend on the data and the name of existing columns\n     }\n \n+    @Override\n+    public ColumnSplitOperation renameColumns(Map<String, String> newColumnNames) {\n+        if (\"separator\".equals(_mode)) {\n+            return new ColumnSplitOperation(\n+                    _engineConfig.renameColumnDependencies(newColumnNames),\n+                    newColumnNames.getOrDefault(_columnName, _columnName),\n+                    _guessCellType,\n+                    _removeOriginalColumn,\n+                    _separator,\n+                    _regex,\n+                    _maxColumns);\n+        } else {\n+            return new ColumnSplitOperation(\n+                    _engineConfig.renameColumnDependencies(newColumnNames),\n+                    newColumnNames.getOrDefault(_columnName, _columnName),\n+                    _guessCellType,\n+                    _removeOriginalColumn,\n+                    _fieldLengths);\n+        }\n+    }\n+\n     @Override\n     protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n         Engine engine = createEngine(project);\ndiff --git a/main/webapp/modules/core/scripts/index/parser-interfaces/wikitext-parser-ui.html b/main/webapp/modules/core/scripts/index/parser-interfaces/wikitext-parser-ui.html\nindex b0f543ec9..79a6c3b47 100644\n--- a/main/webapp/modules/core/scripts/index/parser-interfaces/wikitext-parser-ui.html\n+++ b/main/webapp/modules/core/scripts/index/parser-interfaces/wikitext-parser-ui.html\n@@ -1,46 +1,46 @@\n <div class=\"grid-layout layout-tight\"><table role=\"presentation\">\n       <tr><td colspan=\"2\" id=\"or-import-colsep\"></td></tr>\n-         \n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"wikiCheckbox\" id=\"$reconcileWiki\" /></td><td><label for=\"$reconcileWiki\" id=\"or-import-wiki-base-url\"></label>\n+\n+      <tr><td><input type=\"checkbox\" bind=\"wikiCheckbox\" id=\"$reconcileWiki\" /></td><td><label for=\"$reconcileWiki\" id=\"or-import-wiki-base-url\"></label>\n         <input bind=\"wikiUrlInput\" spellcheck=\"false\" type=\"text\" class=\"lightweight\" size=\"30\" id=\"$wikiUrl\" /></td></tr>\n \n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"headerLinesCheckbox\" id=\"$headers\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"headerLinesCheckbox\" id=\"$headers\" /></td>\n         <td><label for=\"$headers\" id=\"or-import-parse\"></label>\n           <input bind=\"headerLinesInput\" type=\"number\" class=\"lightweight\" size=\"7\" value=\"1\" />\n           <label for=\"$headers\" id=\"or-import-header\"></label></td></tr>\n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"limitCheckbox\" id=\"$limit\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"limitCheckbox\" id=\"$limit\" /></td>\n         <td><label for=\"$limit\" id=\"or-import-load\"></label>\n           <input bind=\"limitInput\" type=\"number\" class=\"lightweight\" size=\"7\" value=\"0\" />\n           <label for=\"$limit\" id=\"or-import-rows2\"></label></td></tr>\n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"guessCellValueTypesCheckbox\" id=\"$guess\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"guessCellValueTypesCheckbox\" id=\"$guess\" /></td>\n         <td><label for=\"$guess\" id=\"or-import-parseCell\"></label></td></tr>\n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"blankSpanningCellsCheckbox\" id=\"$blank-spanning-cells\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"blankSpanningCellsCheckbox\" id=\"$blank-spanning-cells\" /></td>\n         <td><label for=\"$blank-spanning-cells\" id=\"or-import-blankSpanningCells\"></label></td></tr>\n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"storeBlankRowsCheckbox\" id=\"$store-blank-rows\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"storeBlankRowsCheckbox\" id=\"$store-blank-rows\" /></td>\n         <td colspan=\"2\"><label for=\"$store-blank-rows\" id=\"or-import-blank\"></label></td></tr>\n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"storeBlankColumnsCheckbox\" id=\"$store-blank-columns\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"storeBlankColumnsCheckbox\" id=\"$store-blank-columns\" /></td>\n         <td colspan=\"2\"><label for=\"$store-blank-columns\" id=\"or-import-blank-columns\"></label></td></tr>\n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"includeRawTemplatesCheckbox\" id=\"$include-raw-templates\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"includeRawTemplatesCheckbox\" id=\"$include-raw-templates\" /></td>\n         <td colspan=\"2\"><label for=\"$include-raw-templates\" id=\"or-import-includeRawTemplates\"></label></td></tr>\n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"parseReferencesCheckbox\" id=\"$parse-references\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"parseReferencesCheckbox\" id=\"$parse-references\" /></td>\n         <td colspan=\"2\"><label for=\"$parse-references\" id=\"or-import-parseReferences\"></label></td></tr>\n \n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"storeBlankCellsAsNullsCheckbox\" id=\"$store-blank-cells\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"storeBlankCellsAsNullsCheckbox\" id=\"$store-blank-cells\" /></td>\n         <td colspan=\"2\"><label for=\"$store-blank-cells\" id=\"or-import-null\"></label></td></tr>\n         \n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"includeFileSourcesCheckbox\" id=\"$include-file-sources\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"includeFileSourcesCheckbox\" id=\"$include-file-sources\" /></td>\n         <td><label for=\"$include-file-sources\" id=\"or-import-source\"></label></td></tr>\n \n-      <tr><td width=\"1%\"><input type=\"checkbox\" bind=\"includeArchiveFileCheckbox\" id=\"$include-archive-file\" /></td>\n+      <tr><td><input type=\"checkbox\" bind=\"includeArchiveFileCheckbox\" id=\"$include-archive-file\" /></td>\n         <td><label for=\"$include-archive-file\" id=\"or-import-archive\"></label></td></tr>\n \n       <tr>\n-        <td width=\"1%\"></td>\n+        <td></td>\n         <td><button class=\"button\" bind=\"previewButton\"></button></td>\n       </tr>\n       <tr>\n-          <td width=\"1%\"></td>\n-          <td width=\"1%\"><input type=\"checkbox\" bind=\"disableAutoPreviewCheckbox\" id=\"$disable\" />\n+          <td></td>\n+          <td><input type=\"checkbox\" bind=\"disableAutoPreviewCheckbox\" id=\"$disable\" />\n             <label for=\"$disable\" id=\"or-disable-auto-preview\"></label></td>\n       </tr>\n </table></div>\ndiff --git a/pom.xml b/pom.xml\nindex e0daf734e..dc88d31eb 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -77,10 +77,10 @@\n     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n \n     <!-- dependency versions -->\n-    <jackson.version>2.18.2</jackson.version>\n+    <jackson.version>2.18.3</jackson.version>\n     <servlet-api.version>4.0.1</servlet-api.version>\n     <butterfly.version>1.2.6</butterfly.version>\n-    <slf4j.version>2.0.16</slf4j.version>\n+    <slf4j.version>2.0.17</slf4j.version>\n     <log4j.version>2.24.3</log4j.version>\n     <jetty.version>10.0.16</jetty.version>\n     <okhttp.version>4.12.0</okhttp.version>\n@@ -113,7 +113,7 @@\n     <httpmime.version>4.5.14</httpmime.version>\n     <owasp-encoder.version>1.3.1</owasp-encoder.version>\n     <jasypt.version>1.9.3</jasypt.version>\n-    <mockito.version>5.15.2</mockito.version>\n+    <mockito.version>5.16.0</mockito.version>\n \n     <!-- plugin versions -->\n     <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>\n@@ -126,7 +126,7 @@\n     <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>\n     <maven-clean-plugin.version>3.4.1</maven-clean-plugin.version>\n     <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>\n-    <maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>\n+    <maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>\n     <license-plugin.version>2.5.0</license-plugin.version>\n     <org-jvnet-localizer-plugin.version>1.31</org-jvnet-localizer-plugin.version>\n   </properties>\n", "test_patch": "diff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex 0ce2986de..df4d291c1 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -16,14 +16,14 @@\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"14.0.3\",\n+        \"cypress\": \"14.1.0\",\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n         \"eslint\": \"^9.21.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n-        \"eslint-config-prettier\": \"^10.0.1\",\n+        \"eslint-config-prettier\": \"^10.0.2\",\n         \"eslint-plugin-cypress\": \"^4.1.0\",\n-        \"prettier\": \"3.5.2\"\n+        \"prettier\": \"3.5.3\"\n     }\n }\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 924c79ed7..cd1d6ef17 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -364,10 +364,10 @@ check-more-types@^2.24.0:\n   resolved \"https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz\"\n   integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=\n \n-ci-info@^4.0.0:\n-  version \"4.0.0\"\n-  resolved \"https://registry.yarnpkg.com/ci-info/-/ci-info-4.0.0.tgz#65466f8b280fc019b9f50a5388115d17a63a44f2\"\n-  integrity sha512-TdHqgGf9odd8SXNuxtUBVx8Nv+qZOejE6qyqiy5NtbYYQOeFa6zmHkxlPzmaLxWWHsU6nJmB7AETdVPi+2NBUg==\n+ci-info@^4.1.0:\n+  version \"4.1.0\"\n+  resolved \"https://registry.yarnpkg.com/ci-info/-/ci-info-4.1.0.tgz#92319d2fa29d2620180ea5afed31f589bc98cf83\"\n+  integrity sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==\n \n clean-stack@^2.0.0:\n   version \"2.2.0\"\n@@ -461,10 +461,10 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress@14.0.3:\n-  version \"14.0.3\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-14.0.3.tgz#7873d21f61d0559edb9c041316d450cf7ef9d5fa\"\n-  integrity sha512-yIdvobANw3kS+KF/t5vwjjPNufBA8ux7iQHaWxPTkUw2yCKI72m9mKM24eOwE84Wk4ALPsSvEcGbDrwgmhr4RA==\n+cypress@14.1.0:\n+  version \"14.1.0\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-14.1.0.tgz#b2dbe7bbc529dc0c93ffd4e0e9fa59763afba0b8\"\n+  integrity sha512-pPPj8Uu9NwjaaiXAEcjYZZmgsq6v9Zs1Nw6a+zRF+ANgYSNhH4S32SjFRsvMcuOHR/8dp4GBJhBPqIPSs+TxaA==\n   dependencies:\n     \"@cypress/request\" \"^3.0.7\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n@@ -477,7 +477,7 @@ cypress@14.0.3:\n     cachedir \"^2.3.0\"\n     chalk \"^4.1.0\"\n     check-more-types \"^2.24.0\"\n-    ci-info \"^4.0.0\"\n+    ci-info \"^4.1.0\"\n     cli-cursor \"^3.1.0\"\n     cli-table3 \"~0.6.1\"\n     commander \"^6.2.1\"\n@@ -609,10 +609,10 @@ eslint-config-google@^0.14.0:\n   resolved \"https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz\"\n   integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==\n \n-eslint-config-prettier@^10.0.1:\n-  version \"10.0.1\"\n-  resolved \"https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.0.1.tgz#fbb03bfc8db0651df9ce4e8b7150d11c5fe3addf\"\n-  integrity sha512-lZBts941cyJyeaooiKxAtzoPHTN+GbQTJFAIdQbRhA4/8whaAraEh47Whw/ZFfrjNSnlAxqfm9i0XVAEkULjCw==\n+eslint-config-prettier@^10.0.2:\n+  version \"10.0.2\"\n+  resolved \"https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-10.0.2.tgz#47444de8aa104ce82c2f91ad2a5e96b62c01e20d\"\n+  integrity sha512-1105/17ZIMjmCOJOPNfVdbXafLCLj3hPmkmB7dLgt7XsQ/zkxSuDerE/xgO3RxoHysR1N1whmquY0lSn2O0VLg==\n \n eslint-plugin-cypress@^4.1.0:\n   version \"4.1.0\"\n@@ -1325,10 +1325,10 @@ prelude-ls@^1.2.1:\n   resolved \"https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz\"\n   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==\n \n-prettier@3.5.2:\n-  version \"3.5.2\"\n-  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.5.2.tgz#d066c6053200da0234bf8fa1ef45168abed8b914\"\n-  integrity sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==\n+prettier@3.5.3:\n+  version \"3.5.3\"\n+  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.5.3.tgz#4fc2ce0d657e7a02e602549f053b239cb7dfe1b5\"\n+  integrity sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==\n \n pretty-bytes@^5.6.0:\n   version \"5.6.0\"\ndiff --git a/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java b/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java\nindex a0fd572af..f5bb2140d 100644\n--- a/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/cell/KeyValueColumnizeTests.java\n@@ -39,6 +39,7 @@ import static org.testng.Assert.assertThrows;\n import java.io.File;\n import java.io.IOException;\n import java.io.Serializable;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -140,6 +141,38 @@ public class KeyValueColumnizeTests extends RefineTest {\n         assertEquals(new KeyValueColumnizeOperation(\"foo\", \"baz\", null).getColumnDependencies().get(), Set.of(\"foo\", \"baz\"));\n     }\n \n+    @Test\n+    public void testRename() {\n+        KeyValueColumnizeOperation SUT = new KeyValueColumnizeOperation(\"foo\", \"baz\", null);\n+\n+        KeyValueColumnizeOperation renamed = SUT.renameColumns(Map.of(\"foo\", \"foo2\", \"bar\", \"bar2\"));\n+\n+        TestUtils.isSerializedTo(renamed, \"{\\n\"\n+                + \"   \\\"description\\\" : \" + new TextNode(OperationDescription.cell_key_value_columnize_brief(\"foo2\", \"baz\")).toString()\n+                + \",\\n\"\n+                + \"   \\\"keyColumnName\\\" : \\\"foo2\\\",\\n\"\n+                + \"   \\\"noteColumnName\\\" : null,\\n\"\n+                + \"   \\\"op\\\" : \\\"core/key-value-columnize\\\",\\n\"\n+                + \"   \\\"valueColumnName\\\" : \\\"baz\\\"\\n\"\n+                + \"}\");\n+    }\n+\n+    @Test\n+    public void testRenameNoNotesColumn() {\n+        KeyValueColumnizeOperation SUT = new KeyValueColumnizeOperation(\"foo\", \"baz\", \"bar\");\n+\n+        KeyValueColumnizeOperation renamed = SUT.renameColumns(Map.of(\"foo\", \"foo2\", \"bar\", \"bar2\"));\n+\n+        TestUtils.isSerializedTo(renamed, \"{\\n\"\n+                + \"   \\\"description\\\" : \"\n+                + new TextNode(OperationDescription.cell_key_value_columnize_note_column_brief(\"foo2\", \"baz\", \"bar2\")).toString() + \",\\n\"\n+                + \"   \\\"keyColumnName\\\" : \\\"foo2\\\",\\n\"\n+                + \"   \\\"noteColumnName\\\" : \\\"bar2\\\",\\n\"\n+                + \"   \\\"op\\\" : \\\"core/key-value-columnize\\\",\\n\"\n+                + \"   \\\"valueColumnName\\\" : \\\"baz\\\"\\n\"\n+                + \"}\");\n+    }\n+\n     /**\n      * Test in the case where an ID is available in the first column.\n      * \ndiff --git a/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellJoinOperationTests.java b/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellJoinOperationTests.java\nindex f5f047184..8a080f030 100644\n--- a/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellJoinOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellJoinOperationTests.java\n@@ -37,6 +37,7 @@ import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n+import java.util.Map;\n import java.util.Set;\n \n import com.fasterxml.jackson.databind.node.TextNode;\n@@ -120,6 +121,20 @@ public class MultiValuedCellJoinOperationTests extends RefineTest {\n         assertEquals(new MultiValuedCellJoinOperation(\"value\", \"key\", \"sep\").getColumnDependencies().get(), Set.of(\"value\", \"key\"));\n     }\n \n+    @Test\n+    public void testRename() {\n+        var SUT = new MultiValuedCellJoinOperation(\"value\", \"key\", \"sep\");\n+\n+        MultiValuedCellJoinOperation renamed = SUT.renameColumns(Map.of(\"value\", \"value2\", \"key\", \"key2\", \"sep\", \"sep2\"));\n+\n+        String expectedJson = \"{\\\"op\\\":\\\"core/multivalued-cell-join\\\",\"\n+                + \"\\\"description\\\":\" + new TextNode(OperationDescription.cell_multivalued_cell_join_brief(\"value2\")).toString() + \",\"\n+                + \"\\\"columnName\\\":\\\"value2\\\",\"\n+                + \"\\\"keyColumnName\\\":\\\"key2\\\",\"\n+                + \"\\\"separator\\\":\\\"sep\\\"}\";\n+        TestUtils.isSerializedTo(renamed, expectedJson);\n+    }\n+\n     /*\n      * Test to demonstrate the intended behaviour of the function\n      */\ndiff --git a/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellSplitOperationTests.java b/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellSplitOperationTests.java\nindex 4ac3fa1fe..ed1adeb1a 100644\n--- a/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellSplitOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellSplitOperationTests.java\n@@ -37,6 +37,7 @@ import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n+import java.util.Map;\n import java.util.Set;\n \n import com.fasterxml.jackson.core.JsonProcessingException;\n@@ -184,6 +185,28 @@ public class MultiValuedCellSplitOperationTests extends RefineTest {\n                 false).getColumnDependencies().get(), Set.of(\"Value\", \"Key\"));\n     }\n \n+    @Test\n+    public void testRename() {\n+        var SUT = new MultiValuedCellSplitOperation(\n+                \"Value\",\n+                \"Key\",\n+                \":\",\n+                false);\n+\n+        MultiValuedCellSplitOperation renamed = SUT.renameColumns(Map.of(\"Value\", \"value2\", \"key\", \"Key2\"));\n+\n+        String expectedJson = \"{\\n\"\n+                + \"  \\\"columnName\\\" : \\\"value2\\\",\\n\"\n+                + \"  \\\"description\\\" : \" + new TextNode(OperationDescription.cell_multivalued_cell_split_brief(\"value2\")).toString() + \",\\n\"\n+                + \"  \\\"keyColumnName\\\" : \\\"Key\\\",\\n\"\n+                + \"  \\\"mode\\\" : \\\"separator\\\",\\n\"\n+                + \"  \\\"op\\\" : \\\"core/multivalued-cell-split\\\",\\n\"\n+                + \"  \\\"regex\\\" : false,\\n\"\n+                + \"  \\\"separator\\\" : \\\":\\\"\\n\"\n+                + \"}\";\n+        TestUtils.isSerializedTo(renamed, expectedJson);\n+    }\n+\n     /**\n      * Test to demonstrate the intended behaviour of the function, for issue #1268\n      * https://github.com/OpenRefine/OpenRefine/issues/1268\ndiff --git a/main/tests/server/src/com/google/refine/operations/cell/TextTransformOperationTests.java b/main/tests/server/src/com/google/refine/operations/cell/TextTransformOperationTests.java\nindex 27aea691c..ccf0bcba0 100644\n--- a/main/tests/server/src/com/google/refine/operations/cell/TextTransformOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/cell/TextTransformOperationTests.java\n@@ -5,6 +5,7 @@ import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n+import java.util.Map;\n import java.util.Set;\n \n import com.fasterxml.jackson.databind.node.TextNode;\n@@ -117,6 +118,31 @@ public class TextTransformOperationTests extends RefineTest {\n                 false, 0).getColumnDependencies().get(), Set.of(\"foo\", \"bar\", \"facet_1\"));\n     }\n \n+    @Test\n+    public void testRename() {\n+        var SUT = new TextTransformOperation(\n+                engineConfigWithColumnDeps,\n+                \"bar\",\n+                \"grel:cells[\\\"foo\\\"].value+'_'+value\",\n+                OnError.SetToBlank,\n+                false, 0);\n+\n+        TextTransformOperation renamed = SUT.renameColumns(Map.of(\"foo\", \"foo2\", \"bar\", \"bar2\"));\n+        String description = OperationDescription.cell_text_transform_brief(\"bar2\",\n+                \"grel:cells.get(\\\"foo2\\\").value + '_' + value\");\n+        String expectedJson = \"{\\n\"\n+                + \"  \\\"columnName\\\" : \\\"bar2\\\",\\n\"\n+                + \"  \\\"description\\\" : \" + new TextNode(description).toString() + \",\\n\"\n+                + \"  \\\"engineConfig\\\" : null,\\n\"\n+                + \"  \\\"expression\\\" : \\\"grel:cells.get(\\\\\\\"foo2\\\\\\\").value + '_' + value\\\",\\n\"\n+                + \"  \\\"onError\\\" : \\\"set-to-blank\\\",\\n\"\n+                + \"  \\\"op\\\" : \\\"core/text-transform\\\",\\n\"\n+                + \"  \\\"repeat\\\" : false,\\n\"\n+                + \"  \\\"repeatCount\\\" : 0\\n\"\n+                + \"}\";\n+        TestUtils.isSerializedTo(renamed, expectedJson);\n+    }\n+\n     @Test\n     public void testTransformColumnInRowsMode() throws Exception {\n         TextTransformOperation operation = new TextTransformOperation(\ndiff --git a/main/tests/server/src/com/google/refine/operations/cell/TransposeColumnsIntoRowsOperationTest.java b/main/tests/server/src/com/google/refine/operations/cell/TransposeColumnsIntoRowsOperationTest.java\nindex f26b458d4..5c66ea29a 100644\n--- a/main/tests/server/src/com/google/refine/operations/cell/TransposeColumnsIntoRowsOperationTest.java\n+++ b/main/tests/server/src/com/google/refine/operations/cell/TransposeColumnsIntoRowsOperationTest.java\n@@ -5,6 +5,7 @@ import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n+import java.util.Map;\n import java.util.Optional;\n \n import com.fasterxml.jackson.databind.node.TextNode;\n@@ -66,6 +67,50 @@ public class TransposeColumnsIntoRowsOperationTest extends RefineTest {\n                 Optional.empty());\n     }\n \n+    @Test\n+    public void testRename() {\n+        var SUT = new TransposeColumnsIntoRowsOperation(\"num1\", -1, true, false, \"a\", true, \":\");\n+\n+        TransposeColumnsIntoRowsOperation renamed = SUT.renameColumns(Map.of(\"num1\", \"num2\", \"a\", \"a2\"));\n+\n+        TestUtils.isSerializedTo(renamed, \"{\\n\"\n+                + \"  \\\"columnCount\\\" : -1,\\n\"\n+                + \"  \\\"combinedColumnName\\\" : \\\"a2\\\",\\n\"\n+                + \"  \\\"description\\\" : \"\n+                + new TextNode(OperationDescription.cell_transpose_columns_into_rows_combined_neg_brief(\"num2\", \"a2\")).toString() + \",\\n\"\n+                + \"  \\\"fillDown\\\" : false,\\n\"\n+                + \"  \\\"ignoreBlankCells\\\" : true,\\n\"\n+                + \"  \\\"keyColumnName\\\" : null,\\n\"\n+                + \"  \\\"op\\\" : \\\"core/transpose-columns-into-rows\\\",\\n\"\n+                + \"  \\\"prependColumnName\\\" : true,\\n\"\n+                + \"  \\\"separator\\\" : \\\":\\\",\\n\"\n+                + \"  \\\"startColumnName\\\" : \\\"num2\\\",\\n\"\n+                + \"  \\\"valueColumnName\\\" : null\\n\"\n+                + \"}\");\n+    }\n+\n+    @Test\n+    public void testRename2() {\n+        var SUT = new TransposeColumnsIntoRowsOperation(\n+                \"b 1\", 2, true, false, \"key\", \"value\");\n+\n+        TransposeColumnsIntoRowsOperation renamed = SUT.renameColumns(Map.of(\"b 1\", \"b\", \"key\", \"key2\"));\n+\n+        TestUtils.isSerializedTo(renamed, \"{\\n\"\n+                + \"  \\\"columnCount\\\" : 2,\\n\"\n+                + \"  \\\"description\\\" : \" + new TextNode(OperationDescription.cell_transpose_columns_into_rows_not_combined_pos_brief(2, \"b\",\n+                        \"key2\", \"value\")).toString()\n+                + \",\\n\"\n+                + \"  \\\"fillDown\\\" : false,\\n\"\n+                + \"  \\\"ignoreBlankCells\\\" : true,\\n\"\n+                + \"  \\\"keyColumnName\\\" : \\\"key2\\\",\\n\"\n+                + \"  \\\"op\\\" : \\\"core/transpose-columns-into-rows\\\",\\n\"\n+                + \"  \\\"separator\\\" : null,\\n\"\n+                + \"  \\\"startColumnName\\\" : \\\"b\\\",\\n\"\n+                + \"  \\\"valueColumnName\\\" : \\\"value\\\"\\n\"\n+                + \"}\");\n+    }\n+\n     @Test\n     public void testCreateHistoryEntry_transposeIntoOneColumn_removeRowForNullOrEmptyCell() throws Exception {\n         Project project = createProject(\ndiff --git a/main/tests/server/src/com/google/refine/operations/cell/TransposeRowsIntoColumnsOperationTests.java b/main/tests/server/src/com/google/refine/operations/cell/TransposeRowsIntoColumnsOperationTests.java\nindex 767ec9e3c..ff00739cf 100644\n--- a/main/tests/server/src/com/google/refine/operations/cell/TransposeRowsIntoColumnsOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/cell/TransposeRowsIntoColumnsOperationTests.java\n@@ -37,6 +37,7 @@ import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -101,6 +102,21 @@ public class TransposeRowsIntoColumnsOperationTests extends RefineTest {\n         assertEquals(new TransposeRowsIntoColumnsOperation(\"b\", 2).getColumnDependencies(), Optional.of(Set.of(\"b\")));\n     }\n \n+    @Test\n+    public void testRename() {\n+        var SUT = new TransposeRowsIntoColumnsOperation(\"b\", 2);\n+\n+        TransposeRowsIntoColumnsOperation renamed = SUT.renameColumns(Map.of(\"b\", \"c\"));\n+\n+        TestUtils.isSerializedTo(renamed, \"{\\n\"\n+                + \"  \\\"columnName\\\" : \\\"c\\\",\\n\"\n+                + \"  \\\"description\\\" : \" + new TextNode(OperationDescription.cell_transpose_rows_into_columns_brief(2, \"c\")).toString()\n+                + \",\\n\"\n+                + \"  \\\"op\\\" : \\\"core/transpose-rows-into-columns\\\",\\n\"\n+                + \"  \\\"rowCount\\\" : 2\\n\"\n+                + \"}\");\n+    }\n+\n     @Test\n     public void testTransposeRowsIntoColumns() throws Exception {\n         TransposeRowsIntoColumnsOperation operation = new TransposeRowsIntoColumnsOperation(\"b\", 2);\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java\nindex e02b55b44..c4020c791 100644\n--- a/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnAdditionByFetchingURLsOperationTests.java\n@@ -40,6 +40,7 @@ import static org.testng.Assert.assertTrue;\n import java.io.IOException;\n import java.util.ArrayList;\n import java.util.List;\n+import java.util.Map;\n import java.util.Properties;\n import java.util.Random;\n import java.util.Set;\n@@ -193,6 +194,25 @@ public class ColumnAdditionByFetchingURLsOperationTests extends RefineTest {\n         assertThrows(IllegalArgumentException.class, () -> missingExpression.validate());\n     }\n \n+    @Test\n+    public void testRename() {\n+        ColumnAdditionByFetchingURLsOperation SUT = new ColumnAdditionByFetchingURLsOperation(engine_config,\n+                \"fruits\",\n+                \"grel:\\\"https://example.com/api?city=\\\"+value\",\n+                OnError.StoreError,\n+                \"results\",\n+                1,\n+                5,\n+                true,\n+                null);\n+\n+        ColumnAdditionByFetchingURLsOperation renamed = SUT.renameColumns(Map.of(\"fruits\", \"vegetables\", \"results\", \"json\"));\n+\n+        assertEquals(renamed._baseColumnName, \"vegetables\");\n+        assertEquals(renamed._newColumnName, \"json\");\n+        assertEquals(renamed._urlExpression, \"grel:\\\"https://example.com/api?city=\\\" + value\");\n+    }\n+\n     /**\n      * Test for caching\n      */\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java\nindex 6d22be750..93127e85f 100644\n--- a/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveOperationTests.java\n@@ -31,6 +31,7 @@ import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n+import java.util.Map;\n import java.util.Set;\n \n import com.fasterxml.jackson.databind.node.TextNode;\n@@ -149,4 +150,13 @@ public class ColumnMoveOperationTests extends RefineTest {\n         assertProjectEquals(project, expected);\n     }\n \n+    @Test\n+    public void testRename() {\n+        ColumnMoveOperation SUT = new ColumnMoveOperation(\"hello\", 1);\n+\n+        ColumnMoveOperation renamed = SUT.renameColumns(Map.of(\"hello\", \"world\"));\n+\n+        assertEquals(renamed._columnName, \"world\");\n+    }\n+\n }\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java\nindex 8e9cba6c3..be9fa7721 100644\n--- a/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnRemovalOperationTests.java\n@@ -31,6 +31,7 @@ import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n+import java.util.Map;\n import java.util.Set;\n \n import com.fasterxml.jackson.databind.node.TextNode;\n@@ -103,4 +104,13 @@ public class ColumnRemovalOperationTests extends RefineTest {\n                 });\n         assertProjectEquals(project, expected);\n     }\n+\n+    @Test\n+    public void testRename() {\n+        ColumnRemovalOperation SUT = new ColumnRemovalOperation(\"foo\");\n+\n+        ColumnRemovalOperation renamed = SUT.renameColumns(Map.of(\"foo\", \"bar\"));\n+\n+        assertEquals(renamed._columnName, \"bar\");\n+    }\n }\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java\nindex 0b0d73acc..f81175128 100644\n--- a/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnRenameOperationTests.java\n@@ -31,6 +31,7 @@ import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n+import java.util.Map;\n import java.util.Set;\n \n import com.fasterxml.jackson.databind.node.TextNode;\n@@ -108,4 +109,14 @@ public class ColumnRenameOperationTests extends RefineTest {\n                 });\n         assertProjectEquals(project, expected);\n     }\n+\n+    @Test\n+    public void testRenameDependencies() throws Exception {\n+        ColumnRenameOperation SUT = new ColumnRenameOperation(\"foo\", \"newfoo\");\n+\n+        ColumnRenameOperation renamed = SUT.renameColumns(Map.of(\"foo\", \"foo2\", \"newfoo\", \"newfoo2\"));\n+\n+        assertEquals(renamed._oldColumnName, \"foo2\");\n+        assertEquals(renamed._newColumnName, \"newfoo2\");\n+    }\n }\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java\nindex ad4752669..c5b1480d7 100644\n--- a/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnReorderOperationTests.java\n@@ -32,6 +32,8 @@ import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n import java.util.Arrays;\n+import java.util.List;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -125,4 +127,13 @@ public class ColumnReorderOperationTests extends RefineTest {\n                 });\n         assertProjectEquals(project, expected);\n     }\n+\n+    @Test\n+    public void testRename() {\n+        ColumnReorderOperation SUT = new ColumnReorderOperation(Arrays.asList(\"c\", \"b\"));\n+\n+        ColumnReorderOperation renamed = SUT.renameColumns(Map.of(\"a\", \"a2\", \"b\", \"b2\"));\n+\n+        assertEquals(renamed._columnNames, List.of(\"c\", \"b2\"));\n+    }\n }\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java\nindex b2cc93592..125049c09 100644\n--- a/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnSplitOperationTests.java\n@@ -32,6 +32,7 @@ import static org.testng.Assert.assertThrows;\n \n import java.io.Serializable;\n import java.util.Collections;\n+import java.util.Map;\n import java.util.Optional;\n import java.util.Set;\n \n@@ -258,4 +259,48 @@ public class ColumnSplitOperationTests extends RefineTest {\n                 });\n         assertProjectEquals(project, expected);\n     }\n+\n+    @Test\n+    public void testRenameLengths() {\n+        ColumnSplitOperation SUT = new ColumnSplitOperation(EngineConfig.defaultRowBased(), \"hello\", false,\n+                false, new int[] { 1, 2 });\n+\n+        ColumnSplitOperation renamed = SUT.renameColumns(Map.of(\"hello\", \"world\"));\n+        TestUtils.isSerializedTo(renamed, \"{\\n\"\n+                + \"       \\\"columnName\\\" : \\\"world\\\",\\n\"\n+                + \"       \\\"description\\\" : \" + new TextNode(OperationDescription.column_split_brief(\"world\")).toString() + \",\\n\"\n+                + \"       \\\"engineConfig\\\" : {\\n\"\n+                + \"         \\\"facets\\\" : [ ],\\n\"\n+                + \"         \\\"mode\\\" : \\\"row-based\\\"\\n\"\n+                + \"       },\\n\"\n+                + \"       \\\"fieldLengths\\\" : [ 1, 2 ],\\n\"\n+                + \"       \\\"guessCellType\\\" : false,\\n\"\n+                + \"       \\\"mode\\\" : \\\"lengths\\\",\\n\"\n+                + \"       \\\"op\\\" : \\\"core/column-split\\\",\\n\"\n+                + \"       \\\"removeOriginalColumn\\\" : false\\n\"\n+                + \"     }\");\n+    }\n+\n+    @Test\n+    public void testRenameSeparator() {\n+        ColumnSplitOperation SUT = new ColumnSplitOperation(EngineConfig.defaultRowBased(), \"foo\", true, true, \",\",\n+                false, 2);\n+\n+        ColumnSplitOperation renamed = SUT.renameColumns(Map.of(\"foo\", \"bar\"));\n+        TestUtils.isSerializedTo(renamed, \"{\\n\"\n+                + \"       \\\"columnName\\\" : \\\"bar\\\",\\n\"\n+                + \"       \\\"description\\\" : \" + new TextNode(OperationDescription.column_split_separator_brief(\"bar\")).toString() + \",\\n\"\n+                + \"       \\\"engineConfig\\\" : {\\n\"\n+                + \"         \\\"facets\\\" : [ ],\\n\"\n+                + \"         \\\"mode\\\" : \\\"row-based\\\"\\n\"\n+                + \"       },\\n\"\n+                + \"       \\\"guessCellType\\\" : true,\\n\"\n+                + \"       \\\"maxColumns\\\": 2,\\n\"\n+                + \"       \\\"regex\\\": false,\\n\"\n+                + \"       \\\"mode\\\" : \\\"separator\\\",\\n\"\n+                + \"       \\\"separator\\\": \\\",\\\",\\n\"\n+                + \"       \\\"op\\\" : \\\"core/column-split\\\",\\n\"\n+                + \"       \\\"removeOriginalColumn\\\" : true\\n\"\n+                + \"     }\");\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6498\r\n\r\nChanges proposed in this pull request:\r\n- remove the `width` attribute in the wikidata importer settings HTML to move the labels closer to the check boxes\r\n\r\nAlthough the issue mentions a preference for moving away from using `table` to format the settings, I decided to leave the existing HTML as it's more consistent with the other settings HTML snippets. I think it makes more sense to track the migration of these snippets to more modern styles in a follow-up task.\r\n\r\nI've attached a screenshot of the new settings. Given that `Disable auto preview` is below the `Update preview` button, I felt it made sense to leave the indentation for the final checkbox as-is, but I'd be happy to align the button and checkbox with the rest of the settings if others feel that is more appropriate.\r\n\r\n![Screenshot from 2025-02-11 10-54-41](https://github.com/user-attachments/assets/e7819ff3-14c0-4747-9435-30a40f6bf87d)\r\n", "PR_Title": "fix: weird layout for wikitext importer", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-7176_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 7176, "issue_title": "fix: weird layout for wikitext importer", "issue_body": "Fixes #6498\r\n\r\nChanges proposed in this pull request:\r\n- remove the `width` attribute in the wikidata importer settings HTML to move the labels closer to the check boxes\r\n\r\nAlthough the issue mentions a preference for moving away from using `table` to format the settings, I decided to leave the existing HTML as it's more consistent with the other settings HTML snippets. I think it makes more sense to track the migration of these snippets to more modern styles in a follow-up task.\r\n\r\nI've attached a screenshot of the new settings. Given that `Disable auto preview` is below the `Update preview` button, I felt it made sense to leave the indentation for the final checkbox as-is, but I'd be happy to align the button and checkbox with the rest of the settings if others feel that is more appropriate.\r\n\r\n![Screenshot from 2025-02-11 10-54-41](https://github.com/user-attachments/assets/e7819ff3-14c0-4747-9435-30a40f6bf87d)\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-7174", "base_commit": "ced412aca3422d7d46f26913b33217d0af20e71c", "patch": "diff --git a/main/resources/com/google/refine/operations/OperationDescription.properties b/main/resources/com/google/refine/operations/OperationDescription.properties\nindex 182ae9efc..e1e39b3ea 100644\n--- a/main/resources/com/google/refine/operations/OperationDescription.properties\n+++ b/main/resources/com/google/refine/operations/OperationDescription.properties\n@@ -18,6 +18,10 @@ cell_transpose_rows_into_columns_brief=Transpose every {0} cells in column {1} i\n column_addition_by_fetching_urls_brief=Create column {0} at index {1} by fetching URLs based on column {2} using expression {3}\n column_addition_brief=Create column {0} at index {1} based on column {2} using expression {3}\n column_move_brief=Move column {0} to position {1}\n+column_move_left_brief=Move column {0} to the left\n+column_move_right_brief=Move column {0} to the right\n+column_move_first_brief=Move column {0} to the beginning\n+column_move_last_brief=Move column {0} to the end\n column_removal_brief=Remove column {0}\n column_rename_brief=Rename column {0} to {1}\n column_reorder_brief=Reorder columns\ndiff --git a/main/src/com/google/refine/operations/cell/MultiValuedCellJoinOperation.java b/main/src/com/google/refine/operations/cell/MultiValuedCellJoinOperation.java\nindex 9730538f4..ed65d5b4b 100644\n--- a/main/src/com/google/refine/operations/cell/MultiValuedCellJoinOperation.java\n+++ b/main/src/com/google/refine/operations/cell/MultiValuedCellJoinOperation.java\n@@ -94,7 +94,7 @@ public class MultiValuedCellJoinOperation extends AbstractOperation {\n \n     @Override\n     public Optional<Set<String>> getColumnDependencies() {\n-        return Optional.of(Set.of(_columnName, _keyColumnName));\n+        return Optional.of(_columnName.equals(_keyColumnName) ? Set.of(_columnName) : Set.of(_columnName, _keyColumnName));\n     }\n \n     @Override\ndiff --git a/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java b/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\nindex cfba9de77..d1d9b6ed1 100644\n--- a/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\n+++ b/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\n@@ -181,7 +181,7 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n \n     @Override\n     public Optional<Set<String>> getColumnDependencies() {\n-        return Optional.of(Set.of(_columnName, _keyColumnName));\n+        return Optional.of(_columnName.equals(_keyColumnName) ? Set.of(_columnName) : Set.of(_columnName, _keyColumnName));\n     }\n \n     @Override\ndiff --git a/main/src/com/google/refine/operations/column/AbstractColumnMoveOperation.java b/main/src/com/google/refine/operations/column/AbstractColumnMoveOperation.java\nnew file mode 100644\nindex 000000000..368f49c0d\n--- /dev/null\n+++ b/main/src/com/google/refine/operations/column/AbstractColumnMoveOperation.java\n@@ -0,0 +1,63 @@\n+\n+package com.google.refine.operations.column;\n+\n+import java.util.Optional;\n+import java.util.Set;\n+\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+import org.apache.commons.lang.Validate;\n+\n+import com.google.refine.history.Change;\n+import com.google.refine.history.HistoryEntry;\n+import com.google.refine.model.AbstractOperation;\n+import com.google.refine.model.ColumnsDiff;\n+import com.google.refine.model.Project;\n+import com.google.refine.model.changes.ColumnMoveChange;\n+\n+/**\n+ * Base class for operations moving a single column to a new position.\n+ */\n+abstract class AbstractColumnMoveOperation extends AbstractOperation {\n+\n+    final protected String _columnName;\n+\n+    public AbstractColumnMoveOperation(\n+            String columnName) {\n+        _columnName = columnName;\n+    }\n+\n+    @Override\n+    public void validate() {\n+        Validate.notNull(_columnName, \"Missing column name\");\n+    }\n+\n+    @JsonProperty(\"columnName\")\n+    public String getColumnName() {\n+        return _columnName;\n+    }\n+\n+    protected abstract int getNewColumnIndex(int currentIndex, Project project);\n+\n+    @Override\n+    protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n+        int index = project.columnModel.getColumnIndexByName(_columnName);\n+        if (index == -1) {\n+            throw new Exception(\"No column named \" + _columnName);\n+        }\n+        int newIndex = getNewColumnIndex(index, project);\n+\n+        Change change = new ColumnMoveChange(_columnName, newIndex);\n+\n+        return new HistoryEntry(historyEntryID, project, getBriefDescription(null), this, change);\n+    }\n+\n+    @Override\n+    public Optional<Set<String>> getColumnDependencies() {\n+        return Optional.of(Set.of(_columnName));\n+    }\n+\n+    @Override\n+    public Optional<ColumnsDiff> getColumnsDiff() {\n+        return Optional.of(ColumnsDiff.empty());\n+    }\n+}\ndiff --git a/main/src/com/google/refine/operations/column/ColumnMoveFirstOperation.java b/main/src/com/google/refine/operations/column/ColumnMoveFirstOperation.java\nnew file mode 100644\nindex 000000000..b9ed53829\n--- /dev/null\n+++ b/main/src/com/google/refine/operations/column/ColumnMoveFirstOperation.java\n@@ -0,0 +1,37 @@\n+\n+package com.google.refine.operations.column;\n+\n+import java.util.Map;\n+\n+import com.fasterxml.jackson.annotation.JsonCreator;\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+\n+import com.google.refine.model.Project;\n+import com.google.refine.operations.OperationDescription;\n+\n+/**\n+ * Moves one column to the left-most position (first column of the project)\n+ */\n+public class ColumnMoveFirstOperation extends AbstractColumnMoveOperation {\n+\n+    @JsonCreator\n+    public ColumnMoveFirstOperation(\n+            @JsonProperty(\"columnName\") String columnName) {\n+        super(columnName);\n+    }\n+\n+    @Override\n+    protected String getBriefDescription(Project project) {\n+        return OperationDescription.column_move_first_brief(_columnName);\n+    }\n+\n+    @Override\n+    protected int getNewColumnIndex(int currentIndex, Project project) {\n+        return 0;\n+    }\n+\n+    @Override\n+    public ColumnMoveFirstOperation renameColumns(Map<String, String> renames) {\n+        return new ColumnMoveFirstOperation(renames.getOrDefault(_columnName, _columnName));\n+    }\n+}\ndiff --git a/main/src/com/google/refine/operations/column/ColumnMoveLastOperation.java b/main/src/com/google/refine/operations/column/ColumnMoveLastOperation.java\nnew file mode 100644\nindex 000000000..1bb4bbf60\n--- /dev/null\n+++ b/main/src/com/google/refine/operations/column/ColumnMoveLastOperation.java\n@@ -0,0 +1,37 @@\n+\n+package com.google.refine.operations.column;\n+\n+import java.util.Map;\n+\n+import com.fasterxml.jackson.annotation.JsonCreator;\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+\n+import com.google.refine.model.Project;\n+import com.google.refine.operations.OperationDescription;\n+\n+/**\n+ * Moves a column to the end (last column of the project).\n+ */\n+public class ColumnMoveLastOperation extends AbstractColumnMoveOperation {\n+\n+    @JsonCreator\n+    public ColumnMoveLastOperation(\n+            @JsonProperty(\"columnName\") String columnName) {\n+        super(columnName);\n+    }\n+\n+    @Override\n+    protected String getBriefDescription(Project project) {\n+        return OperationDescription.column_move_last_brief(_columnName);\n+    }\n+\n+    @Override\n+    protected int getNewColumnIndex(int currentIndex, Project project) {\n+        return project.columnModel.columns.size() - 1;\n+    }\n+\n+    @Override\n+    public ColumnMoveLastOperation renameColumns(Map<String, String> renames) {\n+        return new ColumnMoveLastOperation(renames.getOrDefault(_columnName, _columnName));\n+    }\n+}\ndiff --git a/main/src/com/google/refine/operations/column/ColumnMoveLeftOperation.java b/main/src/com/google/refine/operations/column/ColumnMoveLeftOperation.java\nnew file mode 100644\nindex 000000000..864c1ff82\n--- /dev/null\n+++ b/main/src/com/google/refine/operations/column/ColumnMoveLeftOperation.java\n@@ -0,0 +1,37 @@\n+\n+package com.google.refine.operations.column;\n+\n+import java.util.Map;\n+\n+import com.fasterxml.jackson.annotation.JsonCreator;\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+\n+import com.google.refine.model.Project;\n+import com.google.refine.operations.OperationDescription;\n+\n+/**\n+ * Moves one column to the left.\n+ */\n+public class ColumnMoveLeftOperation extends AbstractColumnMoveOperation {\n+\n+    @JsonCreator\n+    public ColumnMoveLeftOperation(\n+            @JsonProperty(\"columnName\") String columnName) {\n+        super(columnName);\n+    }\n+\n+    @Override\n+    protected String getBriefDescription(Project project) {\n+        return OperationDescription.column_move_left_brief(_columnName);\n+    }\n+\n+    @Override\n+    protected int getNewColumnIndex(int currentIndex, Project project) {\n+        return Math.max(0, currentIndex - 1);\n+    }\n+\n+    @Override\n+    public ColumnMoveLeftOperation renameColumns(Map<String, String> renames) {\n+        return new ColumnMoveLeftOperation(renames.getOrDefault(_columnName, _columnName));\n+    }\n+}\ndiff --git a/main/src/com/google/refine/operations/column/ColumnMoveOperation.java b/main/src/com/google/refine/operations/column/ColumnMoveOperation.java\nindex 0ba909930..567cf59d4 100644\n--- a/main/src/com/google/refine/operations/column/ColumnMoveOperation.java\n+++ b/main/src/com/google/refine/operations/column/ColumnMoveOperation.java\n@@ -34,77 +34,48 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n package com.google.refine.operations.column;\n \n import java.util.Map;\n-import java.util.Optional;\n-import java.util.Set;\n \n import com.fasterxml.jackson.annotation.JsonCreator;\n import com.fasterxml.jackson.annotation.JsonProperty;\n import org.apache.commons.lang.Validate;\n \n-import com.google.refine.history.Change;\n-import com.google.refine.history.HistoryEntry;\n-import com.google.refine.model.AbstractOperation;\n-import com.google.refine.model.ColumnsDiff;\n import com.google.refine.model.Project;\n-import com.google.refine.model.changes.ColumnMoveChange;\n import com.google.refine.operations.OperationDescription;\n \n-public class ColumnMoveOperation extends AbstractOperation {\n+public class ColumnMoveOperation extends AbstractColumnMoveOperation {\n \n-    final protected String _columnName;\n     final protected int _index;\n \n     @JsonCreator\n     public ColumnMoveOperation(\n             @JsonProperty(\"columnName\") String columnName,\n             @JsonProperty(\"index\") int index) {\n-        _columnName = columnName;\n+        super(columnName);\n         _index = index;\n     }\n \n     @Override\n     public void validate() {\n-        Validate.notNull(_columnName, \"Missing column name\");\n+        super.validate();\n         Validate.isTrue(_index >= 0, \"Invalid column index\");\n     }\n \n-    @JsonProperty(\"columnName\")\n-    public String getColumnName() {\n-        return _columnName;\n-    }\n-\n     @JsonProperty(\"index\")\n     public int getIndex() {\n         return _index;\n     }\n \n     @Override\n-    protected String getBriefDescription(Project project) {\n-        return OperationDescription.column_move_brief(_columnName, _index);\n-    }\n-\n-    @Override\n-    protected HistoryEntry createHistoryEntry(Project project, long historyEntryID) throws Exception {\n-        if (project.columnModel.getColumnByName(_columnName) == null) {\n-            throw new Exception(\"No column named \" + _columnName);\n-        }\n+    protected int getNewColumnIndex(int currentIndex, Project project) {\n         if (_index < 0 || _index >= project.columnModel.columns.size()) {\n-            throw new Exception(\"New column index out of range \" + _index);\n+            throw new IllegalArgumentException(\"New column index out of range \" + _index);\n         }\n-\n-        Change change = new ColumnMoveChange(_columnName, _index);\n-\n-        return new HistoryEntry(historyEntryID, project, getBriefDescription(null), ColumnMoveOperation.this, change);\n-    }\n-\n-    @Override\n-    public Optional<Set<String>> getColumnDependencies() {\n-        return Optional.of(Set.of(_columnName));\n+        return _index;\n     }\n \n     @Override\n-    public Optional<ColumnsDiff> getColumnsDiff() {\n-        return Optional.of(ColumnsDiff.empty());\n+    protected String getBriefDescription(Project project) {\n+        return OperationDescription.column_move_brief(_columnName, _index);\n     }\n \n     @Override\ndiff --git a/main/src/com/google/refine/operations/column/ColumnMoveRightOperation.java b/main/src/com/google/refine/operations/column/ColumnMoveRightOperation.java\nnew file mode 100644\nindex 000000000..ce58659f8\n--- /dev/null\n+++ b/main/src/com/google/refine/operations/column/ColumnMoveRightOperation.java\n@@ -0,0 +1,37 @@\n+\n+package com.google.refine.operations.column;\n+\n+import java.util.Map;\n+\n+import com.fasterxml.jackson.annotation.JsonCreator;\n+import com.fasterxml.jackson.annotation.JsonProperty;\n+\n+import com.google.refine.model.Project;\n+import com.google.refine.operations.OperationDescription;\n+\n+/**\n+ * Moves one column to the right.\n+ */\n+public class ColumnMoveRightOperation extends AbstractColumnMoveOperation {\n+\n+    @JsonCreator\n+    public ColumnMoveRightOperation(\n+            @JsonProperty(\"columnName\") String columnName) {\n+        super(columnName);\n+    }\n+\n+    @Override\n+    protected String getBriefDescription(Project project) {\n+        return OperationDescription.column_move_right_brief(_columnName);\n+    }\n+\n+    @Override\n+    protected int getNewColumnIndex(int currentIndex, Project project) {\n+        return Math.min(project.columnModel.columns.size() - 1, currentIndex + 1);\n+    }\n+\n+    @Override\n+    public ColumnMoveRightOperation renameColumns(Map<String, String> renames) {\n+        return new ColumnMoveRightOperation(renames.getOrDefault(_columnName, _columnName));\n+    }\n+}\ndiff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js\nindex c35f1cc37..49ed9f6c3 100644\n--- a/main/webapp/modules/core/MOD-INF/controller.js\n+++ b/main/webapp/modules/core/MOD-INF/controller.js\n@@ -172,6 +172,10 @@ function registerOperations() {\n   OR.registerOperation(module, \"column-removal\", Packages.com.google.refine.operations.column.ColumnRemovalOperation);\n   OR.registerOperation(module, \"column-rename\", Packages.com.google.refine.operations.column.ColumnRenameOperation);\n   OR.registerOperation(module, \"column-move\", Packages.com.google.refine.operations.column.ColumnMoveOperation);\n+  OR.registerOperation(module, \"column-move-left\", Packages.com.google.refine.operations.column.ColumnMoveLeftOperation);\n+  OR.registerOperation(module, \"column-move-right\", Packages.com.google.refine.operations.column.ColumnMoveRightOperation);\n+  OR.registerOperation(module, \"column-move-first\", Packages.com.google.refine.operations.column.ColumnMoveFirstOperation);\n+  OR.registerOperation(module, \"column-move-last\", Packages.com.google.refine.operations.column.ColumnMoveLastOperation);\n   OR.registerOperation(module, \"column-split\", Packages.com.google.refine.operations.column.ColumnSplitOperation);\n   OR.registerOperation(module, \"column-addition-by-fetching-urls\", Packages.com.google.refine.operations.column.ColumnAdditionByFetchingURLsOperation);\n   OR.registerOperation(module, \"column-reorder\", Packages.com.google.refine.operations.column.ColumnReorderOperation);\ndiff --git a/main/webapp/modules/core/scripts/project/operation-icons.js b/main/webapp/modules/core/scripts/project/operation-icons.js\nindex 0e46b489f..5414a256f 100644\n--- a/main/webapp/modules/core/scripts/project/operation-icons.js\n+++ b/main/webapp/modules/core/scripts/project/operation-icons.js\n@@ -31,6 +31,10 @@ OperationIconRegistry.setIcon('core/column-addition', 'images/operations/add.svg\n OperationIconRegistry.setIcon('core/column-removal', 'images/operations/delete.svg');\n OperationIconRegistry.setIcon('core/column-rename', 'images/operations/rename.svg');\n OperationIconRegistry.setIcon('core/column-move', 'images/operations/column-move.svg');\n+OperationIconRegistry.setIcon('core/column-move-left', 'images/operations/move-left.svg');\n+OperationIconRegistry.setIcon('core/column-move-right', 'images/operations/move-right.svg');\n+OperationIconRegistry.setIcon('core/column-move-first', 'images/operations/move-first.svg');\n+OperationIconRegistry.setIcon('core/column-move-last', 'images/operations/move-last.svg');\n OperationIconRegistry.setIcon('core/column-split', 'images/operations/split-columns.svg');\n OperationIconRegistry.setIcon('core/column-addition-by-fetching-urls', 'images/operations/fetch-urls.svg');\n OperationIconRegistry.setIcon('core/column-reorder', 'images/operations/column-reorder.svg');\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js b/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js\nindex 5cd17b9ea..16a884faa 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js\n@@ -214,33 +214,20 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n     );\n   };\n \n-  var doMoveColumnTo = function(index) {\n+  var doMoveColumnTo = function(direction) {\n     Refine.postCoreProcess(\n-      \"move-column\", \n-      {\n-        columnName: column.name,\n-        index: index\n-      },\n-      null,\n+      \"apply-operations\",\n+      {},\n+      { operations: JSON.stringify([\n+        {\n+           op: 'core/column-move-' + direction,\n+           columnName: column.name\n+        }\n+      ]) },\n       { modelsChanged: true, rowIdsPreserved: true }\n     );\n   };\n \n-  var doMoveColumnBy = function(change) {\n-    var newidx = Refine.columnNameToColumnIndex(column.name) + change;\n-    if (newidx >= 0) {\n-      Refine.postCoreProcess(\n-          \"move-column\", \n-          {\n-            columnName: column.name,\n-            index: newidx\n-          },\n-          null,\n-          { modelsChanged: true, rowIdsPreserved: true }\n-      );\n-    }\n-  };\n-\n   var doSplitColumn = function() {\n     var frame = $(DOM.loadHTML(\"core\", \"scripts/views/data-table/split-column-dialog.html\"));\n     var elmts = DOM.bind(frame);\n@@ -566,25 +553,25 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n         id: \"core/move-column-to-beginning\",\n         label: $.i18n('core-views/move-to-beg'),\n         icon: 'images/operations/move-first.svg',\n-        click: function() { doMoveColumnTo(0); }\n+        click: function() { doMoveColumnTo('first'); }\n       },\n       {\n         id: \"core/move-column-to-end\",\n         label: $.i18n('core-views/move-to-end'),\n         icon: 'images/operations/move-last.svg',\n-        click: function() { doMoveColumnTo(theProject.columnModel.columns.length - 1); }\n+        click: function() { doMoveColumnTo('last'); }\n       },\n       {\n         id: \"core/move-column-to-left\",\n         label: $.i18n('core-views/move-to-left'),\n         icon: 'images/operations/move-left.svg',\n-        click: function() { doMoveColumnBy(-1);}\n+        click: function() { doMoveColumnTo('left');}\n       },\n       {\n         id: \"core/move-column-to-right\",\n         label: $.i18n('core-views/move-to-right'),\n         icon: 'images/operations/move-right.svg',\n-        click: function() { doMoveColumnBy(1); }\n+        click: function() { doMoveColumnTo('right'); }\n       }\n     ]\n   );\n", "test_patch": "diff --git a/main/tests/cypress/cypress/e2e/project/grid/column/edit-column/reposition_column.cy.js b/main/tests/cypress/cypress/e2e/project/grid/column/edit-column/reposition_column.cy.js\nindex 805ca5753..031c6c5c9 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/column/edit-column/reposition_column.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/column/edit-column/reposition_column.cy.js\n@@ -7,7 +7,7 @@ describe(__filename, function () {\n       'Move column to beginning',\n     ]);\n \n-    cy.assertNotificationContainingText('Move column Shrt_Desc to position 0');\n+    cy.assertNotificationContainingText('Move column Shrt_Desc to the beginning');\n \n     cy.get('.data-table-header th:nth-child(2)').should(\n       'to.contain',\n@@ -19,7 +19,7 @@ describe(__filename, function () {\n \n     cy.columnActionClick('Shrt_Desc', ['Edit column', 'Move column to end']);\n \n-    cy.assertNotificationContainingText('Move column Shrt_Desc to position 3');\n+    cy.assertNotificationContainingText('Move column Shrt_Desc to the end');\n \n     cy.get('.data-table-header th:nth-child(5)').should(\n       'to.contain',\n@@ -31,7 +31,7 @@ describe(__filename, function () {\n \n     cy.columnActionClick('Shrt_Desc', ['Edit column', 'Move column left']);\n \n-    cy.assertNotificationContainingText('Move column Shrt_Desc to position 0');\n+    cy.assertNotificationContainingText('Move column Shrt_Desc to the left');\n \n     cy.get('.data-table-header th:nth-child(2)').should(\n       'to.contain',\n@@ -43,7 +43,7 @@ describe(__filename, function () {\n \n     cy.columnActionClick('Shrt_Desc', ['Edit column', 'Move column right']);\n \n-    cy.assertNotificationContainingText('Move column Shrt_Desc to position 2');\n+    cy.assertNotificationContainingText('Move column Shrt_Desc to the right');\n \n     cy.get('.data-table-header th:nth-child(4)').should(\n       'to.contain',\ndiff --git a/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellJoinOperationTests.java b/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellJoinOperationTests.java\nindex 8a080f030..bf4de400d 100644\n--- a/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellJoinOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellJoinOperationTests.java\n@@ -121,6 +121,11 @@ public class MultiValuedCellJoinOperationTests extends RefineTest {\n         assertEquals(new MultiValuedCellJoinOperation(\"value\", \"key\", \"sep\").getColumnDependencies().get(), Set.of(\"value\", \"key\"));\n     }\n \n+    @Test\n+    public void testColumnsDependenciesWithIdenticalColumns() {\n+        assertEquals(new MultiValuedCellJoinOperation(\"key\", \"key\", \"sep\").getColumnDependencies().get(), Set.of(\"key\"));\n+    }\n+\n     @Test\n     public void testRename() {\n         var SUT = new MultiValuedCellJoinOperation(\"value\", \"key\", \"sep\");\ndiff --git a/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellSplitOperationTests.java b/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellSplitOperationTests.java\nindex ed1adeb1a..d3f7da64b 100644\n--- a/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellSplitOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/cell/MultiValuedCellSplitOperationTests.java\n@@ -185,6 +185,15 @@ public class MultiValuedCellSplitOperationTests extends RefineTest {\n                 false).getColumnDependencies().get(), Set.of(\"Value\", \"Key\"));\n     }\n \n+    @Test\n+    public void testColumnsDependenciesWithIdenticalColumns() {\n+        assertEquals(new MultiValuedCellSplitOperation(\n+                \"Key\",\n+                \"Key\",\n+                \":\",\n+                false).getColumnDependencies().get(), Set.of(\"Key\"));\n+    }\n+\n     @Test\n     public void testRename() {\n         var SUT = new MultiValuedCellSplitOperation(\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnMoveFirstOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveFirstOperationTests.java\nnew file mode 100644\nindex 000000000..cbaa3f905\n--- /dev/null\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveFirstOperationTests.java\n@@ -0,0 +1,111 @@\n+\n+package com.google.refine.operations.column;\n+\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertThrows;\n+\n+import java.io.Serializable;\n+import java.util.Map;\n+import java.util.Set;\n+\n+import com.fasterxml.jackson.databind.node.TextNode;\n+import org.testng.annotations.BeforeMethod;\n+import org.testng.annotations.BeforeSuite;\n+import org.testng.annotations.Test;\n+\n+import com.google.refine.RefineTest;\n+import com.google.refine.expr.EvalError;\n+import com.google.refine.model.AbstractOperation;\n+import com.google.refine.model.ColumnsDiff;\n+import com.google.refine.model.Project;\n+import com.google.refine.operations.OperationDescription;\n+import com.google.refine.operations.OperationRegistry;\n+import com.google.refine.util.ParsingUtilities;\n+import com.google.refine.util.TestUtils;\n+\n+public class ColumnMoveFirstOperationTests extends RefineTest {\n+\n+    protected Project project;\n+\n+    @BeforeMethod\n+    public void setUpInitialState() {\n+        project = createProject(new String[] { \"foo\", \"bar\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"v1\", \"a\", \"d\" },\n+                        { \"v3\", \"a\", \"f\" },\n+                        { \"\", \"a\", \"g\" },\n+                        { \"\", \"b\", \"h\" },\n+                        { new EvalError(\"error\"), \"a\", \"i\" },\n+                        { \"v1\", \"b\", \"j\" }\n+                });\n+    }\n+\n+    @BeforeSuite\n+    public void setUp() {\n+        OperationRegistry.registerOperation(getCoreModule(), \"column-move-first\", ColumnMoveFirstOperation.class);\n+    }\n+\n+    @Test\n+    public void serializeColumnMoveFirstOperation() throws Exception {\n+        String json = \"{\\\"op\\\":\\\"core/column-move-first\\\",\"\n+                + \"\\\"description\\\":\" + new TextNode(OperationDescription.column_move_first_brief(\"my column\")).toString() + \",\"\n+                + \"\\\"columnName\\\":\\\"my column\\\"}\";\n+        TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ColumnMoveFirstOperation.class), json);\n+    }\n+\n+    @Test\n+    public void testValidate() {\n+        AbstractOperation missingColumnName = new ColumnMoveFirstOperation(null);\n+        assertThrows(IllegalArgumentException.class, () -> missingColumnName.validate());\n+    }\n+\n+    @Test\n+    public void testMove() throws Exception {\n+        ColumnMoveFirstOperation operation = new ColumnMoveFirstOperation(\"hello\");\n+        assertEquals(operation.getColumnDependencies().get(), Set.of(\"hello\"));\n+        assertEquals(operation.getColumnsDiff().get(), ColumnsDiff.empty());\n+\n+        runOperation(operation, project);\n+\n+        Project expected = createProject(new String[] { \"hello\", \"foo\", \"bar\" },\n+                new Serializable[][] {\n+                        { \"d\", \"v1\", \"a\" },\n+                        { \"f\", \"v3\", \"a\" },\n+                        { \"g\", \"\", \"a\" },\n+                        { \"h\", \"\", \"b\" },\n+                        { \"i\", new EvalError(\"error\"), \"a\" },\n+                        { \"j\", \"v1\", \"b\" }\n+                });\n+        assertProjectEquals(project, expected);\n+    }\n+\n+    @Test\n+    public void testSamePosition() throws Exception {\n+        AbstractOperation SUT = new ColumnMoveFirstOperation(\"foo\");\n+        assertEquals(SUT.getColumnDependencies().get(), Set.of(\"foo\"));\n+        assertEquals(SUT.getColumnsDiff().get(), ColumnsDiff.empty());\n+\n+        runOperation(SUT, project);\n+\n+        Project expected = createProject(\n+                new String[] { \"foo\", \"bar\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"v1\", \"a\", \"d\" },\n+                        { \"v3\", \"a\", \"f\" },\n+                        { \"\", \"a\", \"g\" },\n+                        { \"\", \"b\", \"h\" },\n+                        { new EvalError(\"error\"), \"a\", \"i\" },\n+                        { \"v1\", \"b\", \"j\" },\n+                });\n+        assertProjectEquals(project, expected);\n+    }\n+\n+    @Test\n+    public void testRename() {\n+        ColumnMoveFirstOperation SUT = new ColumnMoveFirstOperation(\"hello\");\n+\n+        ColumnMoveFirstOperation renamed = SUT.renameColumns(Map.of(\"hello\", \"world\"));\n+\n+        assertEquals(renamed._columnName, \"world\");\n+    }\n+}\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnMoveLastOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveLastOperationTests.java\nnew file mode 100644\nindex 000000000..318011c01\n--- /dev/null\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveLastOperationTests.java\n@@ -0,0 +1,111 @@\n+\n+package com.google.refine.operations.column;\n+\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertThrows;\n+\n+import java.io.Serializable;\n+import java.util.Map;\n+import java.util.Set;\n+\n+import com.fasterxml.jackson.databind.node.TextNode;\n+import org.testng.annotations.BeforeMethod;\n+import org.testng.annotations.BeforeSuite;\n+import org.testng.annotations.Test;\n+\n+import com.google.refine.RefineTest;\n+import com.google.refine.expr.EvalError;\n+import com.google.refine.model.AbstractOperation;\n+import com.google.refine.model.ColumnsDiff;\n+import com.google.refine.model.Project;\n+import com.google.refine.operations.OperationDescription;\n+import com.google.refine.operations.OperationRegistry;\n+import com.google.refine.util.ParsingUtilities;\n+import com.google.refine.util.TestUtils;\n+\n+public class ColumnMoveLastOperationTests extends RefineTest {\n+\n+    protected Project project;\n+\n+    @BeforeMethod\n+    public void setUpInitialState() {\n+        project = createProject(new String[] { \"foo\", \"bar\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"v1\", \"a\", \"d\" },\n+                        { \"v3\", \"a\", \"f\" },\n+                        { \"\", \"a\", \"g\" },\n+                        { \"\", \"b\", \"h\" },\n+                        { new EvalError(\"error\"), \"a\", \"i\" },\n+                        { \"v1\", \"b\", \"j\" }\n+                });\n+    }\n+\n+    @BeforeSuite\n+    public void setUp() {\n+        OperationRegistry.registerOperation(getCoreModule(), \"column-move-last\", ColumnMoveLastOperation.class);\n+    }\n+\n+    @Test\n+    public void serializeColumnMoveLastOperation() throws Exception {\n+        String json = \"{\\\"op\\\":\\\"core/column-move-last\\\",\"\n+                + \"\\\"description\\\":\" + new TextNode(OperationDescription.column_move_last_brief(\"my column\")).toString() + \",\"\n+                + \"\\\"columnName\\\":\\\"my column\\\"}\";\n+        TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ColumnMoveLastOperation.class), json);\n+    }\n+\n+    @Test\n+    public void testValidate() {\n+        AbstractOperation missingColumnName = new ColumnMoveLastOperation(null);\n+        assertThrows(IllegalArgumentException.class, () -> missingColumnName.validate());\n+    }\n+\n+    @Test\n+    public void testMove() throws Exception {\n+        ColumnMoveLastOperation operation = new ColumnMoveLastOperation(\"foo\");\n+        assertEquals(operation.getColumnDependencies().get(), Set.of(\"foo\"));\n+        assertEquals(operation.getColumnsDiff().get(), ColumnsDiff.empty());\n+\n+        runOperation(operation, project);\n+\n+        Project expected = createProject(new String[] { \"bar\", \"hello\", \"foo\" },\n+                new Serializable[][] {\n+                        { \"a\", \"d\", \"v1\" },\n+                        { \"a\", \"f\", \"v3\" },\n+                        { \"a\", \"g\", \"\" },\n+                        { \"b\", \"h\", \"\" },\n+                        { \"a\", \"i\", new EvalError(\"error\") },\n+                        { \"b\", \"j\", \"v1\" }\n+                });\n+        assertProjectEquals(project, expected);\n+    }\n+\n+    @Test\n+    public void testSamePosition() throws Exception {\n+        AbstractOperation SUT = new ColumnMoveRightOperation(\"hello\");\n+        assertEquals(SUT.getColumnDependencies().get(), Set.of(\"hello\"));\n+        assertEquals(SUT.getColumnsDiff().get(), ColumnsDiff.empty());\n+\n+        runOperation(SUT, project);\n+\n+        Project expected = createProject(\n+                new String[] { \"foo\", \"bar\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"v1\", \"a\", \"d\" },\n+                        { \"v3\", \"a\", \"f\" },\n+                        { \"\", \"a\", \"g\" },\n+                        { \"\", \"b\", \"h\" },\n+                        { new EvalError(\"error\"), \"a\", \"i\" },\n+                        { \"v1\", \"b\", \"j\" },\n+                });\n+        assertProjectEquals(project, expected);\n+    }\n+\n+    @Test\n+    public void testRename() {\n+        ColumnMoveLastOperation SUT = new ColumnMoveLastOperation(\"hello\");\n+\n+        ColumnMoveLastOperation renamed = SUT.renameColumns(Map.of(\"hello\", \"world\"));\n+\n+        assertEquals(renamed._columnName, \"world\");\n+    }\n+}\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnMoveLeftOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveLeftOperationTests.java\nnew file mode 100644\nindex 000000000..5c531a11c\n--- /dev/null\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveLeftOperationTests.java\n@@ -0,0 +1,112 @@\n+\n+package com.google.refine.operations.column;\n+\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertThrows;\n+\n+import java.io.Serializable;\n+import java.util.Map;\n+import java.util.Set;\n+\n+import com.fasterxml.jackson.databind.node.TextNode;\n+import org.testng.annotations.BeforeMethod;\n+import org.testng.annotations.BeforeSuite;\n+import org.testng.annotations.Test;\n+\n+import com.google.refine.RefineTest;\n+import com.google.refine.expr.EvalError;\n+import com.google.refine.model.AbstractOperation;\n+import com.google.refine.model.ColumnsDiff;\n+import com.google.refine.model.Project;\n+import com.google.refine.operations.OperationDescription;\n+import com.google.refine.operations.OperationRegistry;\n+import com.google.refine.util.ParsingUtilities;\n+import com.google.refine.util.TestUtils;\n+\n+public class ColumnMoveLeftOperationTests extends RefineTest {\n+\n+    protected Project project;\n+\n+    @BeforeMethod\n+    public void setUpInitialState() {\n+        project = createProject(new String[] { \"foo\", \"bar\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"v1\", \"a\", \"d\" },\n+                        { \"v3\", \"a\", \"f\" },\n+                        { \"\", \"a\", \"g\" },\n+                        { \"\", \"b\", \"h\" },\n+                        { new EvalError(\"error\"), \"a\", \"i\" },\n+                        { \"v1\", \"b\", \"j\" }\n+                });\n+    }\n+\n+    @BeforeSuite\n+    public void setUp() {\n+        OperationRegistry.registerOperation(getCoreModule(), \"column-move-left\", ColumnMoveLeftOperation.class);\n+    }\n+\n+    @Test\n+    public void serializeColumnMoveLeftOperation() throws Exception {\n+        String json = \"{\\\"op\\\":\\\"core/column-move-left\\\",\"\n+                + \"\\\"description\\\":\" + new TextNode(OperationDescription.column_move_left_brief(\"my column\")).toString() + \",\"\n+                + \"\\\"columnName\\\":\\\"my column\\\"}\";\n+        TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ColumnMoveLeftOperation.class), json);\n+    }\n+\n+    @Test\n+    public void testValidate() {\n+        AbstractOperation missingColumnName = new ColumnMoveLeftOperation(null);\n+        assertThrows(IllegalArgumentException.class, () -> missingColumnName.validate());\n+    }\n+\n+    @Test\n+    public void testMove() throws Exception {\n+        ColumnMoveLeftOperation operation = new ColumnMoveLeftOperation(\"bar\");\n+        assertEquals(operation.getColumnDependencies().get(), Set.of(\"bar\"));\n+        assertEquals(operation.getColumnsDiff().get(), ColumnsDiff.empty());\n+\n+        runOperation(operation, project);\n+\n+        Project expected = createProject(\n+                new String[] { \"bar\", \"foo\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"a\", \"v1\", \"d\" },\n+                        { \"a\", \"v3\", \"f\" },\n+                        { \"a\", \"\", \"g\" },\n+                        { \"b\", \"\", \"h\" },\n+                        { \"a\", new EvalError(\"error\"), \"i\" },\n+                        { \"b\", \"v1\", \"j\" },\n+                });\n+        assertProjectEquals(project, expected);\n+    }\n+\n+    @Test\n+    public void testSamePosition() throws Exception {\n+        AbstractOperation SUT = new ColumnMoveLeftOperation(\"foo\");\n+        assertEquals(SUT.getColumnDependencies().get(), Set.of(\"foo\"));\n+        assertEquals(SUT.getColumnsDiff().get(), ColumnsDiff.empty());\n+\n+        runOperation(SUT, project);\n+\n+        Project expected = createProject(\n+                new String[] { \"foo\", \"bar\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"v1\", \"a\", \"d\" },\n+                        { \"v3\", \"a\", \"f\" },\n+                        { \"\", \"a\", \"g\" },\n+                        { \"\", \"b\", \"h\" },\n+                        { new EvalError(\"error\"), \"a\", \"i\" },\n+                        { \"v1\", \"b\", \"j\" },\n+                });\n+        assertProjectEquals(project, expected);\n+    }\n+\n+    @Test\n+    public void testRename() {\n+        ColumnMoveLeftOperation SUT = new ColumnMoveLeftOperation(\"hello\");\n+\n+        ColumnMoveLeftOperation renamed = SUT.renameColumns(Map.of(\"hello\", \"world\"));\n+\n+        assertEquals(renamed._columnName, \"world\");\n+    }\n+}\ndiff --git a/main/tests/server/src/com/google/refine/operations/column/ColumnMoveRightOperationTests.java b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveRightOperationTests.java\nnew file mode 100644\nindex 000000000..0fe64d7bf\n--- /dev/null\n+++ b/main/tests/server/src/com/google/refine/operations/column/ColumnMoveRightOperationTests.java\n@@ -0,0 +1,112 @@\n+\n+package com.google.refine.operations.column;\n+\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertThrows;\n+\n+import java.io.Serializable;\n+import java.util.Map;\n+import java.util.Set;\n+\n+import com.fasterxml.jackson.databind.node.TextNode;\n+import org.testng.annotations.BeforeMethod;\n+import org.testng.annotations.BeforeSuite;\n+import org.testng.annotations.Test;\n+\n+import com.google.refine.RefineTest;\n+import com.google.refine.expr.EvalError;\n+import com.google.refine.model.AbstractOperation;\n+import com.google.refine.model.ColumnsDiff;\n+import com.google.refine.model.Project;\n+import com.google.refine.operations.OperationDescription;\n+import com.google.refine.operations.OperationRegistry;\n+import com.google.refine.util.ParsingUtilities;\n+import com.google.refine.util.TestUtils;\n+\n+public class ColumnMoveRightOperationTests extends RefineTest {\n+\n+    protected Project project;\n+\n+    @BeforeMethod\n+    public void setUpInitialState() {\n+        project = createProject(new String[] { \"foo\", \"bar\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"v1\", \"a\", \"d\" },\n+                        { \"v3\", \"a\", \"f\" },\n+                        { \"\", \"a\", \"g\" },\n+                        { \"\", \"b\", \"h\" },\n+                        { new EvalError(\"error\"), \"a\", \"i\" },\n+                        { \"v1\", \"b\", \"j\" }\n+                });\n+    }\n+\n+    @BeforeSuite\n+    public void setUp() {\n+        OperationRegistry.registerOperation(getCoreModule(), \"column-move-right\", ColumnMoveRightOperation.class);\n+    }\n+\n+    @Test\n+    public void serializeColumnMoveRightOperation() throws Exception {\n+        String json = \"{\\\"op\\\":\\\"core/column-move-right\\\",\"\n+                + \"\\\"description\\\":\" + new TextNode(OperationDescription.column_move_right_brief(\"my column\")).toString() + \",\"\n+                + \"\\\"columnName\\\":\\\"my column\\\"}\";\n+        TestUtils.isSerializedTo(ParsingUtilities.mapper.readValue(json, ColumnMoveRightOperation.class), json);\n+    }\n+\n+    @Test\n+    public void testValidate() {\n+        AbstractOperation missingColumnName = new ColumnMoveRightOperation(null);\n+        assertThrows(IllegalArgumentException.class, () -> missingColumnName.validate());\n+    }\n+\n+    @Test\n+    public void testMove() throws Exception {\n+        ColumnMoveRightOperation operation = new ColumnMoveRightOperation(\"foo\");\n+        assertEquals(operation.getColumnDependencies().get(), Set.of(\"foo\"));\n+        assertEquals(operation.getColumnsDiff().get(), ColumnsDiff.empty());\n+\n+        runOperation(operation, project);\n+\n+        Project expected = createProject(\n+                new String[] { \"bar\", \"foo\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"a\", \"v1\", \"d\" },\n+                        { \"a\", \"v3\", \"f\" },\n+                        { \"a\", \"\", \"g\" },\n+                        { \"b\", \"\", \"h\" },\n+                        { \"a\", new EvalError(\"error\"), \"i\" },\n+                        { \"b\", \"v1\", \"j\" },\n+                });\n+        assertProjectEquals(project, expected);\n+    }\n+\n+    @Test\n+    public void testSamePosition() throws Exception {\n+        AbstractOperation SUT = new ColumnMoveRightOperation(\"hello\");\n+        assertEquals(SUT.getColumnDependencies().get(), Set.of(\"hello\"));\n+        assertEquals(SUT.getColumnsDiff().get(), ColumnsDiff.empty());\n+\n+        runOperation(SUT, project);\n+\n+        Project expected = createProject(\n+                new String[] { \"foo\", \"bar\", \"hello\" },\n+                new Serializable[][] {\n+                        { \"v1\", \"a\", \"d\" },\n+                        { \"v3\", \"a\", \"f\" },\n+                        { \"\", \"a\", \"g\" },\n+                        { \"\", \"b\", \"h\" },\n+                        { new EvalError(\"error\"), \"a\", \"i\" },\n+                        { \"v1\", \"b\", \"j\" },\n+                });\n+        assertProjectEquals(project, expected);\n+    }\n+\n+    @Test\n+    public void testRename() {\n+        ColumnMoveRightOperation SUT = new ColumnMoveRightOperation(\"hello\");\n+\n+        ColumnMoveRightOperation renamed = SUT.renameColumns(Map.of(\"hello\", \"world\"));\n+\n+        assertEquals(renamed._columnName, \"world\");\n+    }\n+}\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #7147.\r\n\r\n<s>The Cypress tests will fail because they depend on #7173.</s> This is because I didn't introduce new Command classes for the new operations (as it would mean 4 more commands and 4 more command tests), but instead used the `apply-operations` command. I intend to propose to migrate to using `apply-operations` everywhere and deprecate the operation commands in the future.", "PR_Title": "Improve generalizability of the \"column move\" operation", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-7174_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 7174, "issue_title": "Improve generalizability of the \"column move\" operation", "issue_body": "Fixes #7147.\r\n\r\n<s>The Cypress tests will fail because they depend on #7173.</s> This is because I didn't introduce new Command classes for the new operations (as it would mean 4 more commands and 4 more command tests), but instead used the `apply-operations` command. I intend to propose to migrate to using `apply-operations` everywhere and deprecate the operation commands in the future."}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "TheAlgorithms/Java", "instance_id": "TheAlgorithms__Java-3464", "base_commit": "cce1dbd124de7197de383deb11c936a39a3e5463", "patch": "diff --git a/src/main/java/com/thealgorithms/devutils/searches/MatrixSearchAlgorithm.java b/src/main/java/com/thealgorithms/devutils/searches/MatrixSearchAlgorithm.java\nnew file mode 100644\nindex 00000000..f102bd5c\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/devutils/searches/MatrixSearchAlgorithm.java\n@@ -0,0 +1,16 @@\n+package com.thealgorithms.devutils.searches;\n+\n+/**\n+ * The common interface of most searching algorithms that search in matrixes.\n+ *\n+ * @author Aitor Fidalgo (https://github.com/aitorfi)\n+ */\n+public interface MatrixSearchAlgorithm {\n+    /**\n+     * @param key is an element which should be found\n+     * @param matrix is a matrix where the element should be found\n+     * @param <T> Comparable type\n+     * @return array containing the first found coordinates of the element\n+     */\n+    <T extends Comparable<T>> int[] find(T matrix[][], T key);\n+}\ndiff --git a/src/main/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearch.java b/src/main/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearch.java\nindex e157dff2..3a672d7c 100644\n--- a/src/main/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearch.java\n+++ b/src/main/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearch.java\n@@ -1,37 +1,46 @@\n package com.thealgorithms.searches;\n \n-// The search is for any array which is sorted row and column-wise too. For ex :\n-// int[][] arr = { {10, 20, 30, 40},\n-//                 {15, 25, 35, 45},\n-//                 {18, 28, 38, 48},\n-//                 {21, 31, 41, 51}\n-//                };\n-// This array is sorted in both row and column manner.\n-// In this two pointers are taken, the first points to the 0th row and the second one points to end column, and then the\n-// element corresponding to the pointers placed in the array is compared with the target that either its equal, greater or\n-// smaller than the target. If the element is equal to the target, the co-ordinates of that element is returned i.e. an\n-// array of the two pointers will be returned, else if the target is greater than corresponding element then the pointer\n-// pointing to the 0th row will be incremented by 1, else if the target is lesser than the corresponding element then the\n-// pointer pointing to the end column will be decremented by 1. And if the element doesn't exist in the array, an array\n-// {-1, -1} will be returned.\n+import com.thealgorithms.devutils.searches.MatrixSearchAlgorithm;\n \n-public class RowColumnWiseSorted2dArrayBinarySearch {\n+/**\n+ * The search is for any array which is sorted row and column-wise too. For ex :\n+ * {{10, 20, 30, 40},\n+ *  {15, 25, 35, 45},\n+ *  {18, 28, 38, 48},\n+ *  {21, 31, 41, 51}}\n+ *\n+ * This array is sorted in both row and column manner.\n+ * In this two pointers are taken, the first points to the 0th row and the second one points to end column, and then the\n+ * element corresponding to the pointers placed in the array is compared with the target that either its equal, greater or\n+ * smaller than the target. If the element is equal to the target, the co-ordinates of that element is returned i.e. an\n+ * array of the two pointers will be returned, else if the target is greater than corresponding element then the pointer\n+ * pointing to the 0th row will be incremented by 1, else if the target is lesser than the corresponding element then the\n+ * pointer pointing to the end column will be decremented by 1. And if the element doesn't exist in the array, an array\n+ * {-1, -1} will be returned.\n+ */\n+public class RowColumnWiseSorted2dArrayBinarySearch\n+  implements MatrixSearchAlgorithm {\n \n-    public static int[] search(int[][] matrix, int target) {\n+  @Override\n+  public <T extends Comparable<T>> int[] find(T[][] matrix, T key) {\n+    return search(matrix, key);\n+  }\n \n-        int rowPointer = 0;                 //The pointer at 0th row\n-        int colPointer = matrix.length-1;   //The pointer at end column\n+  public static <T extends Comparable<T>> int[] search(T[][] matrix, T target) {\n+    int rowPointer = 0; //The pointer at 0th row\n+    int colPointer = matrix.length - 1; //The pointer at end column\n \n-        while (rowPointer < matrix.length && colPointer >= 0){\n+    while (rowPointer < matrix.length && colPointer >= 0) {\n+      int comp = target.compareTo(matrix[rowPointer][colPointer]);\n \n-            if (matrix[rowPointer][colPointer] == target)\n-                return new int[] {rowPointer, colPointer};\n-\n-            else if (matrix[rowPointer][colPointer] < target)\n-                rowPointer++;               //Incrementing the row pointer if the target is greater\n-            else\n-                colPointer--;               //Decrementing the column pointer if the target is lesser\n-        }\n-        return new int[] {-1, -1};          //The not found condition\n+      if (comp == 0) {\n+        return new int[] { rowPointer, colPointer };\n+      } else if (comp > 0) {\n+        rowPointer++; //Incrementing the row pointer if the target is greater\n+      } else {\n+        colPointer--; //Decrementing the column pointer if the target is lesser\n+      }\n     }\n+    return new int[] { -1, -1 }; //The not found condition\n+  }\n }\n", "test_patch": "diff --git a/src/test/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearchTest.java b/src/test/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearchTest.java\nindex 3343c1ce..b15b53c3 100644\n--- a/src/test/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearchTest.java\n+++ b/src/test/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearchTest.java\n@@ -1,124 +1,113 @@\n package com.thealgorithms.searches;\n \n-import org.junit.jupiter.api.Test;\n-\n-import java.util.*;\n-\n import static org.junit.jupiter.api.Assertions.assertEquals;\n \n+import org.junit.jupiter.api.Test;\n \n public class RowColumnWiseSorted2dArrayBinarySearchTest {\n \n-    @Test\n-    // valid test case\n-    public void rowColumnSorted2dArrayBinarySearchTestMiddle() {\n-        int[][] arr = { {10, 20, 30, 40},\n-                        {15, 25, 35, 45},\n-                        {18, 28, 38, 48},\n-                        {21, 31, 41, 51}\n-                      };\n-        int target = 35;\n-        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n-        int[] expected = {1,2};\n-        System.out.println(Arrays.toString(ans));\n-        assertEquals(1, ans[0]);\n-        assertEquals(2, ans[1]);\n-    }\n-\n-    @Test\n-    // valid test case\n-    public void rowColumnSorted2dArrayBinarySearchTestSide() {\n-        int[][] arr = { {10, 20, 30, 40},\n-                        {15, 25, 35, 45},\n-                        {18, 28, 38, 48},\n-                        {21, 31, 41, 51}\n-                      };\n-        int target = 48;\n-        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n-        int[] expected = {2,3};\n-        System.out.println(Arrays.toString(ans));\n-        assertEquals(2, ans[0]);\n-        assertEquals(3, ans[1]);\n-    }\n+  @Test\n+  public void rowColumnSorted2dArrayBinarySearchTestMiddle() {\n+    Integer[][] arr = {\n+      { 10, 20, 30, 40 },\n+      { 15, 25, 35, 45 },\n+      { 18, 28, 38, 48 },\n+      { 21, 31, 41, 51 },\n+    };\n+    Integer target = 35;\n+    int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n+    int[] expected = { 1, 2 };\n+    assertEquals(expected[0], ans[0]);\n+    assertEquals(expected[1], ans[1]);\n+  }\n \n-    @Test\n-    // valid test case\n-    public void rowColumnSorted2dArray_BinarySearchTestUpper() {\n-        int[][] arr = { {10, 20, 30, 40},\n-                        {15, 25, 35, 45},\n-                        {18, 28, 38, 48},\n-                        {21, 31, 41, 51}\n-                      };\n-        int target = 20;\n-        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n-        int[] expected = {0,1};\n-        System.out.println(Arrays.toString(ans));\n-        assertEquals(0, ans[0]);\n-        assertEquals(1, ans[1]);\n-    }\n+  @Test\n+  public void rowColumnSorted2dArrayBinarySearchTestSide() {\n+    Integer[][] arr = {\n+      { 10, 20, 30, 40 },\n+      { 15, 25, 35, 45 },\n+      { 18, 28, 38, 48 },\n+      { 21, 31, 41, 51 },\n+    };\n+    Integer target = 48;\n+    int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n+    int[] expected = { 2, 3 };\n+    assertEquals(expected[0], ans[0]);\n+    assertEquals(expected[1], ans[1]);\n+  }\n \n-    @Test\n-    // valid test case\n-    public void rowColumnSorted2dArray_BinarySearchTestUpperSide() {\n-        int[][] arr = { {10, 20, 30, 40},\n-                        {15, 25, 35, 45},\n-                        {18, 28, 38, 48},\n-                        {21, 31, 41, 51}\n-                      };\n-        int target = 40;\n-        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n-        int[] expected = {0,3};\n-        System.out.println(Arrays.toString(ans));\n-        assertEquals(0, ans[0]);\n-        assertEquals(3, ans[1]);\n-    }\n+  @Test\n+  public void rowColumnSorted2dArray_BinarySearchTestUpper() {\n+    Integer[][] arr = {\n+      { 10, 20, 30, 40 },\n+      { 15, 25, 35, 45 },\n+      { 18, 28, 38, 48 },\n+      { 21, 31, 41, 51 },\n+    };\n+    Integer target = 20;\n+    int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n+    int[] expected = { 0, 1 };\n+    assertEquals(expected[0], ans[0]);\n+    assertEquals(expected[1], ans[1]);\n+  }\n \n-    @Test\n-    // valid test case\n-    public void rowColumnSorted2dArray_BinarySearchTestLower() {\n-        int[][] arr = { {10, 20, 30, 40},\n-                        {15, 25, 35, 45},\n-                        {18, 28, 38, 48},\n-                        {21, 31, 41, 51}\n-                      };\n-        int target = 31;\n-        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n-        int[] expected = {3,1};\n-        System.out.println(Arrays.toString(ans));\n-        assertEquals(3, ans[0]);\n-        assertEquals(1, ans[1]);\n-    }\n+  @Test\n+  public void rowColumnSorted2dArray_BinarySearchTestUpperSide() {\n+    Integer[][] arr = {\n+      { 10, 20, 30, 40 },\n+      { 15, 25, 35, 45 },\n+      { 18, 28, 38, 48 },\n+      { 21, 31, 41, 51 },\n+    };\n+    Integer target = 40;\n+    int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n+    int[] expected = { 0, 3 };\n+    assertEquals(expected[0], ans[0]);\n+    assertEquals(expected[1], ans[1]);\n+  }\n \n-    @Test\n-    // valid test case\n-    public void rowColumnSorted2dArray_BinarySearchTestLowerSide() {\n-        int[][] arr = { {10, 20, 30, 40},\n-                        {15, 25, 35, 45},\n-                        {18, 28, 38, 48},\n-                        {21, 31, 41, 51}\n-                      };\n-        int target = 51;\n-        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n-        int[] expected = {3,3};\n-        System.out.println(Arrays.toString(ans));\n-        assertEquals(3, ans[0]);\n-        assertEquals(3, ans[1]);\n-    }\n+  @Test\n+  public void rowColumnSorted2dArray_BinarySearchTestLower() {\n+    Integer[][] arr = {\n+      { 10, 20, 30, 40 },\n+      { 15, 25, 35, 45 },\n+      { 18, 28, 38, 48 },\n+      { 21, 31, 41, 51 },\n+    };\n+    Integer target = 31;\n+    int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n+    int[] expected = { 3, 1 };\n+    assertEquals(expected[0], ans[0]);\n+    assertEquals(expected[1], ans[1]);\n+  }\n \n-    @Test\n-    // valid test case\n-    public void rowColumnSorted2dArray_BinarySearchTestNotFound() {\n-        int[][] arr = { {10, 20, 30, 40},\n-                        {15, 25, 35, 45},\n-                        {18, 28, 38, 48},\n-                        {21, 31, 41, 51}\n-                      };\n-        int target = 101;\n-        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n-        int[] expected = {-1,-1};\n-        System.out.println(Arrays.toString(ans));\n-        assertEquals(-1, ans[0]);\n-        assertEquals(-1, ans[1]);\n-    }\n+  @Test\n+  public void rowColumnSorted2dArray_BinarySearchTestLowerSide() {\n+    Integer[][] arr = {\n+      { 10, 20, 30, 40 },\n+      { 15, 25, 35, 45 },\n+      { 18, 28, 38, 48 },\n+      { 21, 31, 41, 51 },\n+    };\n+    Integer target = 51;\n+    int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n+    int[] expected = { 3, 3 };\n+    assertEquals(expected[0], ans[0]);\n+    assertEquals(expected[1], ans[1]);\n+  }\n \n+  @Test\n+  public void rowColumnSorted2dArray_BinarySearchTestNotFound() {\n+    Integer[][] arr = {\n+      { 10, 20, 30, 40 },\n+      { 15, 25, 35, 45 },\n+      { 18, 28, 38, 48 },\n+      { 21, 31, 41, 51 },\n+    };\n+    Integer target = 101;\n+    int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(arr, target);\n+    int[] expected = { -1, -1 };\n+    assertEquals(expected[0], ans[0]);\n+    assertEquals(expected[1], ans[1]);\n+  }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "### **Describe your change:**\r\nAdded an interface for search algorithms that use matrixes and formatted the classes that implement the interface.\r\n\r\n#### References\r\n<!-- Add any reference to previous pull-request or issue -->\r\nCloses #3461 \r\n\r\n### **Checklist:**\r\n\r\n<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized.\r\n- [x] I know that pull requests will not be merged if they fail the automated tests.\r\n- [x] All filenames are in all uppercase characters with no spaces or dashes.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] If this pull request resolves one or more open issues then the commit message contains `Fixes: #{$ISSUE_NO}`.\r\n", "PR_Title": "Closes #3461 Add an interface for matrix search algorithms", "docker_image": "xinzhou1997/swe_rpg_java:TheAlgorithms__Java-3464_linux", "log_parser": "def parse_java_mvn(log: str) -> dict[str, str]:\n    \"\"\"Parse Maven logs into {identifier: status}.\"\"\"\n    results = {}\n\n    failure_re = re.compile(\n        r\"^\\[ERROR\\]\\s+(?P<class>[A-Za-z0-9_$.]+)\\.(?P<method>[A-Za-z0-9_$.]+?)(?::(?P<line>\\d+))?\\b\"\n    )\n    running_re = re.compile(r\"^(?:\\[INFO\\]\\s+)?Running\\s+([A-Za-z0-9_$.]+)$\")\n    summary_re = re.compile(\n        r\"Tests run:\\s*(\\d+),\\s*Failures:\\s*(\\d+),\\s*Errors:\\s*(\\d+),\\s*Skipped:\\s*(\\d+)\"\n    )\n\n    seen_running = set()\n    current_running = None\n\n    for raw in log.splitlines():\n        line = raw.strip()\n        if not line:\n            continue\n        rm = running_re.match(line)\n        if rm:\n            running_name = rm.group(1)\n            current_running = running_name\n            seen_running.add(running_name)\n            continue\n        fm = failure_re.match(line)\n        if fm:\n            clazz = fm.group(\"class\")\n            method = fm.group(\"method\")\n            test_id = f\"{clazz}.{method}\"\n            results[test_id] = \"FAILED\"\n            results.setdefault(clazz, \"FAILED\")\n            continue\n\n        sm = summary_re.search(line)\n        if sm:\n            _tests_run, failures, errors, skipped = map(int, sm.groups())\n            if failures > 0 or errors > 0:\n                status = \"FAILED\"\n            elif skipped > 0:\n                status = \"SKIPPED\"\n            else:\n                status = \"PASSED\"\n            if current_running:\n                results.setdefault(current_running, status)\n            current_running = None\n\n    if not results and seen_running:\n        for clazz in seen_running:\n            results.setdefault(clazz, \"PASSED\")\n    return results\n", "test_cmds": ["bash -c '{ mvn --batch-mode test ; } > /tmp/test.log 2>&1'"], "rebuild_cmds": ["unset _JAVA_OPTIONS"], "issues": [{"issue_number": 3464, "issue_title": "Closes #3461 Add an interface for matrix search algorithms", "issue_body": "### **Describe your change:**\r\nAdded an interface for search algorithms that use matrixes and formatted the classes that implement the interface.\r\n\r\n#### References\r\n<!-- Add any reference to previous pull-request or issue -->\r\nCloses #3461 \r\n\r\n### **Checklist:**\r\n\r\n<!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized.\r\n- [x] I know that pull requests will not be merged if they fail the automated tests.\r\n- [x] All filenames are in all uppercase characters with no spaces or dashes.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] If this pull request resolves one or more open issues then the commit message contains `Fixes: #{$ISSUE_NO}`.\r\n"}], "print_cmds": ["cat /tmp/test.log"], "working_dir": "/Java"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6653", "base_commit": "d29a6e125d4b938766f2de9e1ca83d0e66fcc888", "patch": "diff --git a/main/pom.xml b/main/pom.xml\nindex 7c94f8575..c96083ed6 100644\n--- a/main/pom.xml\n+++ b/main/pom.xml\n@@ -208,6 +208,11 @@\n       <artifactId>jackson-annotations</artifactId>\n       <version>${jackson.version}</version>\n     </dependency>\n+    <dependency>\n+      <groupId>com.fasterxml.jackson.datatype</groupId>\n+      <artifactId>jackson-datatype-jdk8</artifactId>\n+      <version>${jackson.version}</version>\n+    </dependency>\n     <dependency>\n       <groupId>org.slf4j</groupId>\n       <artifactId>slf4j-api</artifactId>\ndiff --git a/main/src/com/google/refine/importers/WikitextImporter.java b/main/src/com/google/refine/importers/WikitextImporter.java\nindex 87614eba2..09506f8cb 100644\n--- a/main/src/com/google/refine/importers/WikitextImporter.java\n+++ b/main/src/com/google/refine/importers/WikitextImporter.java\n@@ -774,7 +774,6 @@ public class WikitextImporter extends TabularImportingParserBase {\n                 \"\",\n                 \"entity\",\n                 true,\n-                10,\n                 new ArrayList<ColumnDetail>(),\n                 1);\n         return cfg;\ndiff --git a/main/src/com/google/refine/model/recon/DataExtensionReconConfig.java b/main/src/com/google/refine/model/recon/DataExtensionReconConfig.java\nindex f961d0119..da5143b95 100644\n--- a/main/src/com/google/refine/model/recon/DataExtensionReconConfig.java\n+++ b/main/src/com/google/refine/model/recon/DataExtensionReconConfig.java\n@@ -53,7 +53,13 @@ public class DataExtensionReconConfig extends StandardReconConfig {\n             String identifierSpace,\n             String schemaSpace,\n             ReconType type) {\n-        super(service, identifierSpace, schemaSpace, type != null ? type.id : null, type != null ? type.name : null, true, 10,\n+        super(\n+                service,\n+                identifierSpace,\n+                schemaSpace,\n+                type != null ? type.id : null,\n+                type != null ? type.name : null,\n+                true,\n                 new ArrayList<ColumnDetail>());\n         this.type = type;\n     }\n@@ -64,6 +70,11 @@ public class DataExtensionReconConfig extends StandardReconConfig {\n         throw new RuntimeException(WARN);\n     }\n \n+    @Override\n+    public int getBatchSize() {\n+        throw new RuntimeException(WARN);\n+    }\n+\n     @Override\n     public int getBatchSize(int rowCount) {\n         throw new RuntimeException(WARN);\ndiff --git a/main/src/com/google/refine/model/recon/ReconConfig.java b/main/src/com/google/refine/model/recon/ReconConfig.java\nindex 62587efee..4f3c049d1 100644\n--- a/main/src/com/google/refine/model/recon/ReconConfig.java\n+++ b/main/src/com/google/refine/model/recon/ReconConfig.java\n@@ -98,6 +98,10 @@ abstract public class ReconConfig {\n         return ParsingUtilities.mapper.readValue(json, ReconConfig.class);\n     }\n \n+    @Deprecated\n+    @JsonIgnore\n+    public abstract int getBatchSize();\n+\n     @JsonIgnore\n     public abstract int getBatchSize(int rowCount);\n \ndiff --git a/main/src/com/google/refine/model/recon/StandardReconConfig.java b/main/src/com/google/refine/model/recon/StandardReconConfig.java\nindex 2392310b0..77556fc2b 100644\n--- a/main/src/com/google/refine/model/recon/StandardReconConfig.java\n+++ b/main/src/com/google/refine/model/recon/StandardReconConfig.java\n@@ -42,6 +42,7 @@ import java.util.HashMap;\n import java.util.HashSet;\n import java.util.List;\n import java.util.Map;\n+import java.util.Optional;\n import java.util.Set;\n \n import com.fasterxml.jackson.annotation.JsonCreator;\n@@ -49,6 +50,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore;\n import com.fasterxml.jackson.annotation.JsonInclude;\n import com.fasterxml.jackson.annotation.JsonInclude.Include;\n import com.fasterxml.jackson.annotation.JsonProperty;\n+import com.fasterxml.jackson.annotation.JsonSetter;\n+import com.fasterxml.jackson.annotation.Nulls;\n import com.fasterxml.jackson.core.JsonProcessingException;\n import com.fasterxml.jackson.core.type.TypeReference;\n import com.fasterxml.jackson.databind.node.ArrayNode;\n@@ -75,6 +78,7 @@ public class StandardReconConfig extends ReconConfig {\n \n     private static final String DEFAULT_SCHEMA_SPACE = \"http://localhost/schema\";\n     private static final String DEFAULT_IDENTIFIER_SPACE = \"http://localhost/identifier\";\n+    private static final int DEFAULT_BATCH_SIZE = 10;\n \n     static public class ColumnDetail {\n \n@@ -88,6 +92,8 @@ public class StandardReconConfig extends ReconConfig {\n         /**\n          * Unfortunately the format of ColumnDetail is inconsistent in the UI and the backend so we need to support two\n          * deserialization formats. See the tests for that.\n+         *\n+         * FIXME: Clean this up the next time we make breaking changes\n          */\n         @JsonCreator\n         public ColumnDetail(\n@@ -143,8 +149,10 @@ public class StandardReconConfig extends ReconConfig {\n     final public String typeName;\n     @JsonProperty(\"autoMatch\")\n     final public boolean autoMatch;\n+    @JsonInclude(Include.NON_EMPTY)\n+    @JsonSetter(nulls = Nulls.SKIP)\n     @JsonProperty(\"batchSize\")\n-    final public int batchSize;\n+    final public Optional<Integer> batchSize;\n     @JsonProperty(\"columnDetails\")\n     final public List<ColumnDetail> columnDetails;\n     @JsonProperty(\"limit\")\n@@ -160,7 +168,7 @@ public class StandardReconConfig extends ReconConfig {\n             @JsonProperty(\"schemaSpace\") String schemaSpace,\n             @JsonProperty(\"type\") ReconType type,\n             @JsonProperty(\"autoMatch\") boolean autoMatch,\n-            @JsonProperty(\"batchSize\") int batchSize,\n+            @JsonProperty(\"batchSize\") Optional<Integer> batchSize,\n             @JsonProperty(\"columnDetails\") List<ColumnDetail> columnDetails,\n             @JsonProperty(\"limit\") int limit) {\n         this(service, identifierSpace, schemaSpace,\n@@ -173,13 +181,66 @@ public class StandardReconConfig extends ReconConfig {\n             String service,\n             String identifierSpace,\n             String schemaSpace,\n+            ReconType type,\n+            boolean autoMatch,\n+            List<ColumnDetail> columnDetails,\n+            int limit) {\n+        this(service, identifierSpace, schemaSpace,\n+                type != null ? type.id : null,\n+                type != null ? type.name : null,\n+                autoMatch, columnDetails, limit);\n+    }\n \n+    /**\n+     * Recently added by mistake, so slated for removal quickly after a short deprecation period.\n+     * \n+     * @since 3.8.0\n+     * @deprecated for 3.8.3\n+     */\n+    @Deprecated(since = \"3.8.3\")\n+    public StandardReconConfig(\n+            String service,\n+            String identifierSpace,\n+            String schemaSpace,\n+            ReconType type,\n+            boolean autoMatch,\n+            int batchSize,\n+            List<ColumnDetail> columnDetails,\n+            int limit) {\n+        this(service, identifierSpace, schemaSpace,\n+                type != null ? type.id : null,\n+                type != null ? type.name : null,\n+                autoMatch, Optional.of(batchSize), columnDetails, limit);\n+    }\n+\n+    public StandardReconConfig(\n+            String service,\n+            String identifierSpace,\n+            String schemaSpace,\n+            String typeID,\n+            String typeName,\n+            boolean autoMatch,\n+            List<ColumnDetail> columnDetails) {\n+        this(service, identifierSpace, schemaSpace, typeID, typeName, autoMatch, Optional.empty(), columnDetails, 0);\n+    }\n+\n+    /**\n+     * Recently added by mistake, so slated for removal quickly after a short deprecation period.\n+     * \n+     * @since 3.8.0\n+     * @deprecated for 3.8.3\n+     */\n+    @Deprecated(since = \"3.8.3\")\n+    public StandardReconConfig(\n+            String service,\n+            String identifierSpace,\n+            String schemaSpace,\n             String typeID,\n             String typeName,\n             boolean autoMatch,\n             int batchSize,\n             List<ColumnDetail> columnDetails) {\n-        this(service, identifierSpace, schemaSpace, typeID, typeName, autoMatch, batchSize, columnDetails, 0);\n+        this(service, identifierSpace, schemaSpace, typeID, typeName, autoMatch, Optional.of(batchSize), columnDetails, 0);\n     }\n \n     /**\n@@ -200,7 +261,30 @@ public class StandardReconConfig extends ReconConfig {\n             String typeID,\n             String typeName,\n             boolean autoMatch,\n-            int batchSize,\n+            List<ColumnDetail> columnDetails,\n+            int limit) {\n+        this(service, identifierSpace, schemaSpace, typeID, typeName, autoMatch, Optional.empty(), columnDetails, limit);\n+    }\n+\n+    /**\n+     * @param service\n+     * @param identifierSpace\n+     * @param schemaSpace\n+     * @param typeID\n+     * @param typeName\n+     * @param autoMatch\n+     * @param columnDetails\n+     * @param limit\n+     *            maximum number of results to return (0 = default)\n+     */\n+    public StandardReconConfig(\n+            String service,\n+            String identifierSpace,\n+            String schemaSpace,\n+            String typeID,\n+            String typeName,\n+            boolean autoMatch,\n+            Optional<Integer> batchSize,\n             List<ColumnDetail> columnDetails,\n             int limit) {\n         this.service = service;\n@@ -224,10 +308,20 @@ public class StandardReconConfig extends ReconConfig {\n         return null;\n     }\n \n+    @Deprecated\n+    @Override\n+    @JsonIgnore\n+    public int getBatchSize() {\n+        return DEFAULT_BATCH_SIZE;\n+    }\n+\n     @Override\n     @JsonIgnore\n     public int getBatchSize(int rowCount) {\n-        return Math.min(Math.max(rowCount / 10, 10), batchSize);\n+        if (batchSize.isEmpty()) {\n+            return DEFAULT_BATCH_SIZE;\n+        }\n+        return Math.min(Math.max(rowCount / DEFAULT_BATCH_SIZE, DEFAULT_BATCH_SIZE), batchSize.get());\n     }\n \n     @Override\n@@ -348,6 +442,8 @@ public class StandardReconConfig extends ReconConfig {\n         public double score;\n         @JsonProperty(\"match\")\n         public boolean match = false;\n+        // TODO: Do we have a way of testing this for compatibility? Hopefully clients ignore unknown fields\n+        @JsonInclude(Include.NON_NULL)\n         @JsonProperty(\"error\")\n         public ReconCandidate error = null;\n \n@@ -509,6 +605,7 @@ public class StandardReconConfig extends ReconConfig {\n \n         while (recons.size() < jobs.size()) {\n             Recon recon = new Recon(historyEntryID, identifierSpace, schemaSpace);\n+            // TODO: Needs i18n\n             recon.error = \"No. of recon objects was less than no. of jobs\";\n             recon.judgment = Judgment.Error;\n             recons.add(recon);\n@@ -571,6 +668,7 @@ public class StandardReconConfig extends ReconConfig {\n             if (candidate.name != null) {\n                 recon.setFeature(Recon.Feature_nameMatch, text.equalsIgnoreCase(candidate.name));\n                 recon.setFeature(Recon.Feature_nameLevenshtein,\n+                        // TODO: Probably want diacritic folding as well as case folding here for i18n\n                         StringUtils.getLevenshteinDistance(StringUtils.lowerCase(text), StringUtils.lowerCase(candidate.name)));\n                 recon.setFeature(Recon.Feature_nameWordDistance, wordDistance(text, candidate.name));\n             }\n@@ -610,7 +708,7 @@ public class StandardReconConfig extends ReconConfig {\n \n     static final protected Set<String> s_stopWords = new HashSet<String>();\n     static {\n-        // FIXME: This is English specific\n+        // FIXME: This is English specific - needs i18n\n         s_stopWords.add(\"the\");\n         s_stopWords.add(\"a\");\n         s_stopWords.add(\"and\");\n@@ -622,6 +720,7 @@ public class StandardReconConfig extends ReconConfig {\n     }\n \n     static protected Set<String> breakWords(String s) {\n+        // TODO: This needs i18n\n         String[] words = s.toLowerCase().split(\"\\\\s+\");\n \n         Set<String> set = new HashSet<String>(words.length);\ndiff --git a/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java b/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java\nindex 0bcf3654c..7240c3779 100644\n--- a/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java\n+++ b/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java\n@@ -130,7 +130,6 @@ public class ReconMarkNewTopicsOperation extends EngineDependentMassCellOperatio\n                         _schemaSpace,\n                         null,\n                         false,\n-                        10,\n                         Collections.emptyList(),\n                         0);\n     }\ndiff --git a/main/src/com/google/refine/operations/recon/ReconUseValuesAsIdentifiersOperation.java b/main/src/com/google/refine/operations/recon/ReconUseValuesAsIdentifiersOperation.java\nindex 41dbcbc4a..d3df56919 100644\n--- a/main/src/com/google/refine/operations/recon/ReconUseValuesAsIdentifiersOperation.java\n+++ b/main/src/com/google/refine/operations/recon/ReconUseValuesAsIdentifiersOperation.java\n@@ -74,7 +74,7 @@ public class ReconUseValuesAsIdentifiersOperation extends EngineDependentMassCel\n         this.service = service;\n         this.identifierSpace = identifierSpace;\n         this.schemaSpace = schemaSpace;\n-        this.reconConfig = new StandardReconConfig(service, identifierSpace, schemaSpace, null, null, true, 10, Collections.emptyList());\n+        this.reconConfig = new StandardReconConfig(service, identifierSpace, schemaSpace, null, null, true, Collections.emptyList());\n     }\n \n     @Override\ndiff --git a/main/src/com/google/refine/util/ParsingUtilities.java b/main/src/com/google/refine/util/ParsingUtilities.java\nindex f7bfbd392..806ce1a4c 100644\n--- a/main/src/com/google/refine/util/ParsingUtilities.java\n+++ b/main/src/com/google/refine/util/ParsingUtilities.java\n@@ -66,6 +66,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode;\n import com.fasterxml.jackson.databind.node.ObjectNode;\n import com.fasterxml.jackson.databind.ser.FilterProvider;\n import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;\n+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;\n import org.apache.commons.codec.DecoderException;\n import org.apache.commons.codec.net.URLCodec;\n import org.apache.commons.io.IOUtils;\n@@ -90,6 +91,7 @@ public class ParsingUtilities {\n         module.addDeserializer(Instant.class, new SerializationFilters.InstantDeserializer());\n \n         mapper.registerModule(module);\n+        mapper.registerModule(new Jdk8Module()/* .configureAbsentsAsNulls(true) */);\n         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);\n         mapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);\n     }\ndiff --git a/main/webapp/modules/core/about.html b/main/webapp/modules/core/about.html\nindex 50b1cf423..0af5a5a37 100644\n--- a/main/webapp/modules/core/about.html\n+++ b/main/webapp/modules/core/about.html\n@@ -62,7 +62,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n   <body>\n     <div id=\"header\">\n       <a id=\"app-home-button\" href=\"./\">\n-        <img aria-hidden=\"true\" src=\"images/logo-gem-126.png\" width=\"30\" />\n+        <img aria-hidden=\"true\" src=\"images/logo-gem-126.svg\" width=\"30\" />\n         <h1>OpenRefine</h1>\n       </a>\n     </div>\ndiff --git a/main/webapp/modules/core/error.vt b/main/webapp/modules/core/error.vt\nindex effae65d6..6c997645a 100644\n--- a/main/webapp/modules/core/error.vt\n+++ b/main/webapp/modules/core/error.vt\n@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n   <body>\n     <div id=\"header\">\n       <a id=\"app-home-button\" href=\"./\" title=\"Navigate to the home screen\">\n-        <img aria-hidden=\"true\" src=\"images/logo-gem-126.png\" width=\"30\" />\n+        <img aria-hidden=\"true\" src=\"images/logo-gem-126.svg\" width=\"30\" />\n         <h1>OpenRefine</h1>\n       </a>\n     </div>\ndiff --git a/main/webapp/modules/core/images/logo-gem-126.svg b/main/webapp/modules/core/images/logo-gem-126.svg\nnew file mode 100644\nindex 000000000..ae944f61d\n--- /dev/null\n+++ b/main/webapp/modules/core/images/logo-gem-126.svg\n@@ -0,0 +1,13 @@\n+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<svg version=\"1.1\" viewBox=\"-20 -6.5 160 151\" xmlns=\"http://www.w3.org/2000/svg\">\n+ <g transform=\"translate(0 -8.2001)\" fill-rule=\"evenodd\" stroke-linecap=\"round\" stroke-linejoin=\"round\" stroke-width=\"4px\">\n+  <polygon points=\"31.5 31.5 63 31.5 31.5 63\" fill=\"#00dcff\"/>\n+  <polygon points=\"31.5 31.5 0 63 31.5 63\" fill=\"#0ff\"/>\n+  <polygon points=\"94.5 31.5 63 31.5 94.5 63\" fill=\"#00b4ff\"/>\n+  <polygon points=\"63 31.5 94.5 63 31.5 63\" fill=\"#00c8ff\"/>\n+  <polygon points=\"94.5 31.5 126 63 94.5 63\" fill=\"#00a0ff\"/>\n+  <polygon points=\"0 63 63 126 31.5 63\" fill=\"#00c8ff\"/>\n+  <polygon points=\"31.5 63 63 126 94.5 63\" fill=\"#00a0ff\"/>\n+  <polygon points=\"94.5 63 63 126 126 63\" fill=\"#0078ff\"/>\n+ </g>\n+</svg>\ndiff --git a/main/webapp/modules/core/index.vt b/main/webapp/modules/core/index.vt\nindex 327ee612a..ecac2668a 100644\n--- a/main/webapp/modules/core/index.vt\n+++ b/main/webapp/modules/core/index.vt\n@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n </head>\n <body>\n   <div id=\"header\">\n-    <img alt=\"OpenRefine logo\" src=\"images/logo-gem-126.png\" width=\"30\" />\n+    <img alt=\"OpenRefine logo\" src=\"images/logo-gem-126.svg\" width=\"30\" />\n     <h1>OpenRefine</h1>\n     <span id=\"slogan\"></span>\n   </div>\n@@ -55,7 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n     \n     <div id=\"project-links\">\n       <div id=\"logo-container\">\n-        <img alt=\"OpenRefine\" src=\"images/logo-gem-126.png\" height=\"65\" />\n+        <img alt=\"OpenRefine\" src=\"images/logo-gem-126.svg\" height=\"65\" />\n         <div id=\"openrefine-version\"></div>\n       </div>\n       <ul>\ndiff --git a/main/webapp/modules/core/preferences.vt b/main/webapp/modules/core/preferences.vt\nindex e1b7d5372..4bbb16547 100644\n--- a/main/webapp/modules/core/preferences.vt\n+++ b/main/webapp/modules/core/preferences.vt\n@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n <body>\n   <div id=\"header\">\n     <a id=\"app-home-button\" href=\"./\">\n-      <img aria-hidden=\"true\" src=\"images/logo-gem-126.png\" width=\"30\" />\n+      <img aria-hidden=\"true\" src=\"images/logo-gem-126.svg\" width=\"30\" />\n       <h1>OpenRefine</h1>\n     </a>\n   </div>\ndiff --git a/main/webapp/modules/core/project.vt b/main/webapp/modules/core/project.vt\nindex 7c21ea12a..8d4fe782e 100644\n--- a/main/webapp/modules/core/project.vt\n+++ b/main/webapp/modules/core/project.vt\n@@ -49,7 +49,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n   <body>\n     <div id=\"header\">\n       <a id=\"app-home-button\" href=\"./\">\n-        <img aria-hidden=\"true\" src=\"images/logo-gem-126.png\" width=\"30\" />\n+        <img aria-hidden=\"true\" src=\"images/logo-gem-126.svg\" width=\"30\" />\n         <h1>OpenRefine</h1>\n       </a>\n       <div id=\"project-title\">\ndiff --git a/main/webapp/modules/core/styles/project/sidebar.css b/main/webapp/modules/core/styles/project/sidebar.css\nindex 65b5afa9b..b3274079f 100644\n--- a/main/webapp/modules/core/styles/project/sidebar.css\n+++ b/main/webapp/modules/core/styles/project/sidebar.css\n@@ -91,7 +91,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n   padding: 20px 0 0 10px;\n   font-size: 1.15em;\n   font-weight: bold;\n-  background: url(../../images/logo-gem-126.png) no-repeat top right;\n+  background: url(../../images/logo-gem-126.svg) no-repeat top right;\n   background-size: 43px;\n }\n \n", "test_patch": "diff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java\nindex d3c297c60..b25f029fe 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java\n@@ -62,7 +62,7 @@ public class NewEntityLibraryTest extends WikidataRefineTest {\n         Project project = createProject(TestingData.inceptionColumns,\n                 TestingData.inceptionProjectGridWithNewItem);\n         StandardReconConfig config = new StandardReconConfig(\"http://my.endpoint\",\n-                \"http://my.schema\", \"http://my.schema\", \"Q5\", \"human\", true, 10, Collections.emptyList());\n+                \"http://my.schema\", \"http://my.schema\", \"Q5\", \"human\", true, Collections.emptyList());\n         project.columnModel.columns.get(0).setReconConfig(config);\n \n         project.rows.get(0).cells.set(0, TestingData.makeNewItemCell(3289L, \"University of Ljubljana\"));\ndiff --git a/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java b/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java\nindex 6e334149e..8425a4549 100644\n--- a/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java\n+++ b/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java\n@@ -76,7 +76,7 @@ public class ReconJudgeOneCellCommandTest extends RefineTest {\n                 \"http://my.recon.service/rdf/schema\",\n                 \"type3894\",\n                 \"octopus\",\n-                true, 10,\n+                true,\n                 Collections.emptyList(),\n                 5);\n         reconciled.setReconConfig(config);\ndiff --git a/main/tests/server/src/com/google/refine/model/ColumnTests.java b/main/tests/server/src/com/google/refine/model/ColumnTests.java\nindex f367dd415..da6c02902 100644\n--- a/main/tests/server/src/com/google/refine/model/ColumnTests.java\n+++ b/main/tests/server/src/com/google/refine/model/ColumnTests.java\n@@ -54,7 +54,6 @@ public class ColumnTests {\n                 + \"   \\\"schemaSpace\\\":\\\"http://www.wikidata.org/prop/direct/\\\",\"\n                 + \"   \\\"type\\\":{\\\"id\\\":\\\"Q43229\\\",\\\"name\\\":\\\"organization\\\"},\"\n                 + \"   \\\"autoMatch\\\":true,\"\n-                + \"   \\\"batchSize\\\":10,\"\n                 + \"   \\\"columnDetails\\\":[\"\n                 + \"      {\\\"column\\\":\\\"organization_country\\\",\\\"propertyName\\\":\\\"SPARQL: P17/P297\\\",\\\"propertyID\\\":\\\"P17/P297\\\"},\"\n                 + \"      {\\\"column\\\":\\\"organization_id\\\",\\\"propertyName\\\":\\\"SPARQL: P3500|P2427\\\",\\\"propertyID\\\":\\\"P3500|P2427\\\"}\"\ndiff --git a/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java b/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java\nindex 005b92f34..0a69a985e 100644\n--- a/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java\n+++ b/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java\n@@ -77,7 +77,7 @@ public class StandardReconConfigTests extends RefineTest {\n     private class StandardReconConfigStub extends StandardReconConfig {\n \n         public StandardReconConfigStub() {\n-            super(\"\", \"\", \"\", \"\", \"\", false, 10, new ArrayList<ColumnDetail>());\n+            super(\"\", \"\", \"\", \"\", \"\", false, new ArrayList<ColumnDetail>());\n         }\n \n         public double wordDistanceTest(String s1, String s2) {\n@@ -118,7 +118,41 @@ public class StandardReconConfigTests extends RefineTest {\n                 \"                \\\"name\\\": \\\"scientific article\\\"\\n\" +\n                 \"        },\\n\" +\n                 \"        \\\"autoMatch\\\": true,\\n\" +\n-                \"        \\\"batchSize\\\": 10,\\n\" +\n+                \"        \\\"columnDetails\\\": [\\n\" +\n+                \"           {\\n\" +\n+                \"             \\\"column\\\": \\\"organization_country\\\",\\n\" +\n+                \"             \\\"propertyName\\\": \\\"SPARQL: P17/P297\\\",\\n\" +\n+                \"             \\\"propertyID\\\": \\\"P17/P297\\\"\\n\" +\n+                \"           },\\n\" +\n+                \"           {\\n\" +\n+                \"             \\\"column\\\": \\\"organization_id\\\",\\n\" +\n+                \"             \\\"propertyName\\\": \\\"SPARQL: P3500|P2427\\\",\\n\" +\n+                \"             \\\"propertyID\\\": \\\"P3500|P2427\\\"\\n\" +\n+                \"           }\\n\" +\n+                \"        ],\\n\" +\n+                \"        \\\"limit\\\": 0\\n\" +\n+                \" }\";\n+        ReconConfig config = ReconConfig.reconstruct(json);\n+        TestUtils.isSerializedTo(config, json);\n+\n+        // the \"mode\" only appears once in the serialization result\n+        String fullJson = ParsingUtilities.mapper.writeValueAsString(config);\n+        assertEquals(fullJson.indexOf(\"\\\"mode\\\"\", fullJson.indexOf(\"\\\"mode\\\"\") + 1), -1);\n+    }\n+\n+    @Test\n+    public void serializeStandardReconConfigWithBatchSize() throws Exception {\n+        String json = \" {\\n\" +\n+                \"        \\\"mode\\\": \\\"standard-service\\\",\\n\" +\n+                \"        \\\"service\\\": \\\"https://tools.wmflabs.org/openrefine-wikidata/en/api\\\",\\n\" +\n+                \"        \\\"identifierSpace\\\": \\\"http://www.wikidata.org/entity/\\\",\\n\" +\n+                \"        \\\"schemaSpace\\\": \\\"http://www.wikidata.org/prop/direct/\\\",\\n\" +\n+                \"        \\\"type\\\": {\\n\" +\n+                \"                \\\"id\\\": \\\"Q13442814\\\",\\n\" +\n+                \"                \\\"name\\\": \\\"scientific article\\\"\\n\" +\n+                \"        },\\n\" +\n+                \"        \\\"autoMatch\\\": true,\\n\" +\n+                \"        \\\"batchSize\\\": 20,\\n\" +\n                 \"        \\\"columnDetails\\\": [\\n\" +\n                 \"           {\\n\" +\n                 \"             \\\"column\\\": \\\"organization_country\\\",\\n\" +\ndiff --git a/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java\nindex cf18dc1f5..de60cb80d 100644\n--- a/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperationTests.java\n@@ -78,7 +78,6 @@ public class ReconJudgeSimilarCellsOperationTests extends RefineTest {\n                 schemaSpace,\n                 null,\n                 true,\n-                10,\n                 Collections.emptyList(),\n                 5);\n         project = createProject(\n@@ -134,7 +133,8 @@ public class ReconJudgeSimilarCellsOperationTests extends RefineTest {\n                 \"http://my.database/schema/\",\n                 null,\n                 null,\n-                true, 10, Collections.emptyList());\n+                true,\n+                Collections.emptyList());\n         column.setReconConfig(config);\n \n         AbstractOperation op = new ReconJudgeSimilarCellsOperation(\ndiff --git a/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java\nindex dd71428d6..1e4759d17 100644\n--- a/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java\n@@ -113,7 +113,7 @@ public class ReconMarkNewTopicsOperationTests extends RefineTest {\n                 \"http://foo.com/identifierSpace\",\n                 \"http://foo.com/schemaSpace\",\n                 null,\n-                false, 10,\n+                false,\n                 Collections.emptyList(),\n                 0);\n \ndiff --git a/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java\nindex 87fb12401..b03b83e35 100644\n--- a/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java\n@@ -87,7 +87,6 @@ public class ReconOperationTests extends RefineTest {\n             + \"   \\\"schemaSpace\\\":\\\"http://www.wikidata.org/prop/direct/\\\",\"\n             + \"   \\\"type\\\":{\\\"id\\\":\\\"Q5\\\",\\\"name\\\":\\\"human\\\"},\"\n             + \"   \\\"autoMatch\\\":true,\"\n-            + \"   \\\"batchSize\\\":10,\"\n             + \"   \\\"columnDetails\\\":[],\"\n             + \"   \\\"limit\\\":0\"\n             + \"},\"\n@@ -174,6 +173,7 @@ public class ReconOperationTests extends RefineTest {\n         recon3.judgment = Judgment.Matched;\n \n         reconConfig = mock(StandardReconConfig.class, withSettings().serializable());\n+        doReturn(2).when(reconConfig).getBatchSize();\n         doReturn(2).when(reconConfig).getBatchSize(anyInt());\n         // mock identifierSpace, service and schemaSpace\n         when(reconConfig.batchRecon(eq(Arrays.asList(job1, job2)), anyLong())).thenReturn(Arrays.asList(recon1, recon2));\n@@ -236,6 +236,7 @@ public class ReconOperationTests extends RefineTest {\n         List<Recon> reconList = Arrays.asList((Recon) null, (Recon) null, (Recon) null);\n         ReconJob reconJob = mock(ReconJob.class);\n         when(reconConfig.batchRecon(Mockito.any(), Mockito.anyLong())).thenReturn(reconList);\n+        when(reconConfig.getBatchSize()).thenReturn(10);\n         when(reconConfig.getBatchSize(project.rows.size())).thenReturn(10);\n         when(reconConfig.createJob(Mockito.eq(project), Mockito.anyInt(), Mockito.any(), Mockito.any(), Mockito.any()))\n                 .thenReturn(reconJob);\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Draft while I figure out the intricacies of Jackson annotations...\r\n\r\nFixes #6652\r\n\r\nChanges proposed in this pull request:\r\n- Restore deleted public constructors & getters \r\n\r\n", "PR_Title": "Restore public API. Fixes #6652", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6653_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6653, "issue_title": "Restore public API. Fixes #6652", "issue_body": "Draft while I figure out the intricacies of Jackson annotations...\r\n\r\nFixes #6652\r\n\r\nChanges proposed in this pull request:\r\n- Restore deleted public constructors & getters \r\n\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6696", "base_commit": "05978a07fa8cdca0dc356233b178ef85d76c1676", "patch": "diff --git a/main/src/com/google/refine/importers/ImportingParserBase.java b/main/src/com/google/refine/importers/ImportingParserBase.java\nindex 06b09ff37..50eaf78fa 100644\n--- a/main/src/com/google/refine/importers/ImportingParserBase.java\n+++ b/main/src/com/google/refine/importers/ImportingParserBase.java\n@@ -117,6 +117,7 @@ abstract public class ImportingParserBase implements ImportingParser {\n             final MultiFileReadingProgress progress) throws IOException {\n         final File file = ImportingUtilities.getFile(job, fileRecord);\n         final String fileSource = ImportingUtilities.getFileSource(fileRecord);\n+        final String fileName = ImportingUtilities.getFileName(fileRecord);\n         final String archiveFileName = ImportingUtilities.getArchiveFileName(fileRecord);\n         int filenameColumnIndex = -1;\n         int archiveColumnIndex = -1;\n@@ -136,7 +137,7 @@ abstract public class ImportingParserBase implements ImportingParser {\n                 }\n \n                 if (useInputStream) {\n-                    parseOneFile(project, metadata, job, fileSource, inputStream, limit, options, exceptions);\n+                    parseOneFile(project, metadata, job, fileName, inputStream, limit, options, exceptions);\n                 } else {\n                     // Although this is called \"common\" encoding, it may represent the user's override of the encoding\n                     String commonEncoding = JSONUtilities.getString(options, \"encoding\", null);\n@@ -147,7 +148,7 @@ abstract public class ImportingParserBase implements ImportingParser {\n                     Reader reader = ImportingUtilities.getReaderFromStream(\n                             inputStream, fileRecord, commonEncoding);\n \n-                    parseOneFile(project, metadata, job, fileSource, reader, limit, options, exceptions);\n+                    parseOneFile(project, metadata, job, fileName, reader, limit, options, exceptions);\n                 }\n \n                 // Fill in filename and archive name column for all rows added from this file\ndiff --git a/main/src/com/google/refine/importing/ImportingUtilities.java b/main/src/com/google/refine/importing/ImportingUtilities.java\nindex 97882320d..6209f9a7b 100644\n--- a/main/src/com/google/refine/importing/ImportingUtilities.java\n+++ b/main/src/com/google/refine/importing/ImportingUtilities.java\n@@ -597,6 +597,13 @@ public class ImportingUtilities {\n                 JSONUtilities.getString(fileRecord, \"fileName\", \"unknown\"));\n     }\n \n+    static public String getFileName(ObjectNode fileRecord) {\n+        return JSONUtilities.getString(\n+                fileRecord,\n+                \"fileName\",\n+                \"unknown\");\n+    }\n+\n     static public String getArchiveFileName(ObjectNode fileRecord) {\n         return JSONUtilities.getString(\n                 fileRecord,\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/cell-renderers/recon-renderer.js b/main/webapp/modules/core/scripts/views/data-table/cell-renderers/recon-renderer.js\nindex 8735bbb14..87b210369 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/cell-renderers/recon-renderer.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/cell-renderers/recon-renderer.js\n@@ -122,7 +122,7 @@ class ReconCellRenderer {\n               a.attr(\"href\", encodeURI(service.view.url.replace(\"{{id}}\", candidate.id)));\n             }\n \n-            self.previewOnHover(service, candidate, liSpan.parent(), liSpan, true, rowIndex, cellIndex, cell);\n+            self.previewOnHover(service, candidate, liSpan.parent(), liSpan, true, rowIndex, cellIndex, cell, cellUI);\n \n             var score;\n             if (candidate.score < 1) {\n@@ -411,7 +411,7 @@ class ReconCellRenderer {\n       command,\n       params,\n       bodyParams,\n-      { cellsChanged: true, columnStatsChanged: columnStatsChanged },\n+      { columnStatsChanged: columnStatsChanged },\n       {\n         onDone: function(o) {\n           if (o.cell.r) {\ndiff --git a/pom.xml b/pom.xml\nindex b102e5af8..677a8d97d 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -118,7 +118,7 @@\n     <maven-dependency-plugin.version>3.7.1</maven-dependency-plugin.version>\n     <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>\n     <surefire.version>3.3.0</surefire.version>\n-    <maven-jar-plugin.version>3.4.1</maven-jar-plugin.version>\n+    <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>\n     <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>\n     <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>\n     <maven-deploy-plugin.version>3.1.2</maven-deploy-plugin.version>\n", "test_patch": "diff --git a/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/actions/cell-buttons.cy.js b/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/actions/cell-buttons.cy.js\nindex 1ac0b9e1d..7ee8cfef5 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/actions/cell-buttons.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/actions/cell-buttons.cy.js\n@@ -51,6 +51,30 @@ describe('In-cell reconciliation buttons', () => {\n         //confirming the no. of candidates after we click on see less\n         cy.getCell(0, 'species').find('.data-table-recon-candidate:visible').should('have.length', 4);\n     });\n+\n+    it('Matching a single cell preserves pagination', () => {\n+        cy.visitOpenRefine();\n+        cy.navigateTo('Import project');\n+        cy.get('.grid-layout').should('to.contain', 'Locate an existing Refine project file');\n+        cy.get('#project-tar-file-input').attachFile('reconciled-project-no-automatch.zip')\n+        cy.get('#import-project-button').click();\n+\n+        // Set a smaller page number to make sure there are multiple pages\n+        cy.get('.viewPanel-pagingControls-page:nth-of-type(1)').click();\n+        // Go to the next page\n+        cy.get('.viewpanel-paging .action').first().click();\n+        // Check that we have a single row in view (second page)\n+        cy.get('.data-table tbody tr').should('have.length', 1);\n+\n+        // Match the first recon candidate in the cell\n+        cy.get('.data-table-recon-match').first().click();\n+\n+        // Make sure the cell is matched (no recon candidates are visible anymore)\n+        cy.get('.data-table-recon-match').should('not.exist');\n+        // We are still in the second page\n+        cy.get('.data-table tbody tr').should('have.length', 1);\n+    });\n+\n });\n \n \ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex d7f898e78..acbaf6cf8 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -20,7 +20,7 @@\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^9.5.0\",\n+        \"eslint\": \"^9.6.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^9.1.0\",\n         \"eslint-plugin-cypress\": \"^3.3.0\",\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex c494915dd..07014a9b7 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -51,14 +51,14 @@\n   resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8\"\n   integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==\n \n-\"@eslint/config-array@^0.16.0\":\n-  version \"0.16.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.16.0.tgz#bb3364fc39ee84ec3a62abdc4b8d988d99dfd706\"\n-  integrity sha512-/jmuSd74i4Czf1XXn7wGRWZCuyaUZ330NH1Bek0Pplatt4Sy1S5haN21SCLLdbeKslQ+S0wEJ+++v5YibSi+Lg==\n+\"@eslint/config-array@^0.17.0\":\n+  version \"0.17.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.17.0.tgz#ff305e1ee618a00e6e5d0485454c8d92d94a860d\"\n+  integrity sha512-A68TBu6/1mHHuc5YJL0U0VVeGNiklLAL6rRmhTCP2B5XjWLMnrX+HkO+IAXyHvks5cyyY1jjK5ITPQ1HGS2EVA==\n   dependencies:\n     \"@eslint/object-schema\" \"^2.1.4\"\n     debug \"^4.3.1\"\n-    minimatch \"^3.0.5\"\n+    minimatch \"^3.1.2\"\n \n \"@eslint/eslintrc@^3.1.0\":\n   version \"3.1.0\"\n@@ -75,10 +75,10 @@\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@9.5.0\":\n-  version \"9.5.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-9.5.0.tgz#0e9c24a670b8a5c86bff97b40be13d8d8f238045\"\n-  integrity sha512-A7+AOT2ICkodvtsWnxZP4Xxk3NbZ3VMHd8oihydLRGrJgqqdEz1qSeEgXYyT/Cu8h1TWWsQRejIx48mtjZ5y1w==\n+\"@eslint/js@9.6.0\":\n+  version \"9.6.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-9.6.0.tgz#5b0cb058cc13d9c92d4e561d3538807fa5127c95\"\n+  integrity sha512-D9B0/3vNg44ZeWbYMpBoXqNP4j6eQD5vNwIlGAuFRRzK/WtT/jvDQW3Bi9kkf3PMDMlM7Yi+73VLUsn5bJcl8A==\n \n \"@eslint/object-schema@^2.1.4\":\n   version \"2.1.4\"\n@@ -148,10 +148,10 @@ acorn-jsx@^5.3.2:\n   resolved \"https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937\"\n   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==\n \n-acorn@^8.11.3:\n-  version \"8.11.3\"\n-  resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a\"\n-  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==\n+acorn@^8.12.0:\n+  version \"8.12.0\"\n+  resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.12.0.tgz#1627bfa2e058148036133b8d9b51a700663c294c\"\n+  integrity sha512-RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==\n \n aggregate-error@^3.0.0:\n   version \"3.1.0\"\n@@ -592,16 +592,16 @@ eslint-visitor-keys@^4.0.0:\n   resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb\"\n   integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==\n \n-eslint@^9.5.0:\n-  version \"9.5.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-9.5.0.tgz#11856034b94a9e1a02cfcc7e96a9f0956963cd2f\"\n-  integrity sha512-+NAOZFrW/jFTS3dASCGBxX1pkFD0/fsO+hfAkJ4TyYKwgsXZbqzrw+seCYFCcPCYXvnD67tAnglU7GQTz6kcVw==\n+eslint@^9.6.0:\n+  version \"9.6.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-9.6.0.tgz#9f54373afa15e1ba356656a8d96233182027fb49\"\n+  integrity sha512-ElQkdLMEEqQNM9Njff+2Y4q2afHk7JpkPvrd7Xh7xefwgQynqPxwf55J7di9+MEibWUGdNjFF9ITG9Pck5M84w==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n     \"@eslint-community/regexpp\" \"^4.6.1\"\n-    \"@eslint/config-array\" \"^0.16.0\"\n+    \"@eslint/config-array\" \"^0.17.0\"\n     \"@eslint/eslintrc\" \"^3.1.0\"\n-    \"@eslint/js\" \"9.5.0\"\n+    \"@eslint/js\" \"9.6.0\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@humanwhocodes/retry\" \"^0.3.0\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\n@@ -612,7 +612,7 @@ eslint@^9.5.0:\n     escape-string-regexp \"^4.0.0\"\n     eslint-scope \"^8.0.1\"\n     eslint-visitor-keys \"^4.0.0\"\n-    espree \"^10.0.1\"\n+    espree \"^10.1.0\"\n     esquery \"^1.5.0\"\n     esutils \"^2.0.2\"\n     fast-deep-equal \"^3.1.3\"\n@@ -632,12 +632,12 @@ eslint@^9.5.0:\n     strip-ansi \"^6.0.1\"\n     text-table \"^0.2.0\"\n \n-espree@^10.0.1:\n-  version \"10.0.1\"\n-  resolved \"https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f\"\n-  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==\n+espree@^10.0.1, espree@^10.1.0:\n+  version \"10.1.0\"\n+  resolved \"https://registry.yarnpkg.com/espree/-/espree-10.1.0.tgz#8788dae611574c0f070691f522e4116c5a11fc56\"\n+  integrity sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==\n   dependencies:\n-    acorn \"^8.11.3\"\n+    acorn \"^8.12.0\"\n     acorn-jsx \"^5.3.2\"\n     eslint-visitor-keys \"^4.0.0\"\n \n@@ -1186,7 +1186,7 @@ mimic-fn@^2.1.0:\n   resolved \"https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz\"\n   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==\n \n-minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.2:\n+minimatch@^3.0.4, minimatch@^3.1.2:\n   version \"3.1.2\"\n   resolved \"https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b\"\n   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==\ndiff --git a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\nindex 8e6851236..faca5a4a3 100644\n--- a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n+++ b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n@@ -41,6 +41,7 @@ import java.io.IOException;\n import java.io.InputStream;\n import java.io.InputStreamReader;\n import java.net.URISyntaxException;\n+import java.net.URL;\n import java.nio.file.Files;\n import java.nio.file.Path;\n import java.nio.file.Paths;\n@@ -564,4 +565,14 @@ public class ImportingUtilitiesTests extends ImporterTest {\n             }\n         }\n     }\n+\n+    @Test\n+    public void testGetFileName() {\n+        ObjectNode fileRecord = ParsingUtilities.mapper.createObjectNode();\n+        String fileName = \"aFileName\";\n+\n+        JSONUtilities.safePut(fileRecord, \"fileName\", fileName);\n+\n+        assertEquals(fileName, ImportingUtilities.getFileName(fileRecord));\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6695.\r\n\r\nChanges proposed in this pull request:\r\n- revert #6239 which forces the re-fetching and re-rendering of the entire grid\r\n- add missing `cellUI` parameter to enable in-place rendering of the updated cell after a single match action\r\n- add a Cypress regression test\r\n\r\nI would like to backport this to 3.8.", "PR_Title": "Fix preservation of pagination when matching a single cell", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6696_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6696, "issue_title": "Fix preservation of pagination when matching a single cell", "issue_body": "Fixes #6695.\r\n\r\nChanges proposed in this pull request:\r\n- revert #6239 which forces the re-fetching and re-rendering of the entire grid\r\n- add missing `cellUI` parameter to enable in-place rendering of the updated cell after a single match action\r\n- add a Cypress regression test\r\n\r\nI would like to backport this to 3.8."}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6025", "base_commit": "79c51c854d932f4fd5c44fef3090a4e294f2982a", "patch": "diff --git a/main/src/com/google/refine/importers/TextFormatGuesser.java b/main/src/com/google/refine/importers/TextFormatGuesser.java\nindex ca9c6f96b..b9a08a674 100644\n--- a/main/src/com/google/refine/importers/TextFormatGuesser.java\n+++ b/main/src/com/google/refine/importers/TextFormatGuesser.java\n@@ -34,13 +34,13 @@ import java.io.IOException;\n import java.io.InputStream;\n import java.io.InputStreamReader;\n import java.io.UnsupportedEncodingException;\n-import java.util.Arrays;\n \n import org.apache.commons.io.input.BoundedInputStream;\n import org.apache.commons.lang.StringUtils;\n \n import com.google.common.base.CharMatcher;\n import com.google.refine.importing.FormatGuesser;\n+import com.google.refine.importing.ImportingUtilities;\n \n public class TextFormatGuesser implements FormatGuesser {\n \n@@ -51,7 +51,7 @@ public class TextFormatGuesser implements FormatGuesser {\n     @Override\n     public String guess(File file, String encoding, String seedFormat) {\n         try (InputStream fis = new FileInputStream(file)) {\n-            if (isCompressed(file)) {\n+            if (ImportingUtilities.isCompressed(file)) {\n                 return \"binary\";\n             }\n             ;\n@@ -132,19 +132,4 @@ public class TextFormatGuesser implements FormatGuesser {\n         return null;\n     }\n \n-    private boolean isCompressed(File file) throws IOException {\n-        // Check for common compressed file types to protect ourselves from binary data\n-        try (InputStream is = new FileInputStream(file)) {\n-            byte[] magic = new byte[4];\n-            int count = is.read(magic);\n-            if (count == 4 && Arrays.equals(magic, new byte[] { 0x50, 0x4B, 0x03, 0x04 }) || // zip\n-                    Arrays.equals(magic, new byte[] { 0x50, 0x4B, 0x07, 0x08 }) ||\n-                    (magic[0] == 0x1F && magic[1] == (byte) 0x8B) // gzip\n-            ) {\n-                return true;\n-            }\n-        }\n-        return false;\n-    }\n-\n }\ndiff --git a/main/src/com/google/refine/importing/EncodingGuesser.java b/main/src/com/google/refine/importing/EncodingGuesser.java\nindex 605f93c47..797c355f1 100644\n--- a/main/src/com/google/refine/importing/EncodingGuesser.java\n+++ b/main/src/com/google/refine/importing/EncodingGuesser.java\n@@ -1,31 +1,32 @@\n \n package com.google.refine.importing;\n \n-import java.io.BufferedInputStream;\n import java.io.File;\n import java.io.FileInputStream;\n-import java.io.FileNotFoundException;\n import java.io.IOException;\n-import java.io.InputStream;\n import java.util.List;\n \n-import org.apache.commons.lang.StringUtils;\n-import org.mozilla.universalchardet.UniversalDetector;\n import com.fasterxml.jackson.databind.node.ArrayNode;\n import com.fasterxml.jackson.databind.node.ObjectNode;\n+import org.apache.commons.lang.StringUtils;\n+import org.mozilla.universalchardet.UnicodeBOMInputStream;\n+import org.mozilla.universalchardet.UniversalDetector;\n \n import com.google.refine.util.JSONUtilities;\n \n /**\n- * This class tries to find the correct encoding based on the http://site.icu-project.org/ and the icu4j library\n- * http://site.icu-project.org/home/why-use-icu4j.\n+ * This class tries to find the correct encoding based on https://github.com/albfernandez/juniversalchardet which is a\n+ * Java port of Mozilla's universalchardet library\n+ * https://hg.mozilla.org/mozilla-central/file/tip/extensions/universalchardet/\n  * \n  * @author <a href=\"mailto:kontakt@stundzig.de\">Steffen Stundzig</a>\n  */\n public final class EncodingGuesser {\n \n-    public final static void guess(final ImportingJob job)\n-            throws FileNotFoundException, IOException {\n+    public static final String UTF_8_BOM = \"UTF-8-BOM\";\n+\n+    public static void guess(final ImportingJob job)\n+            throws IOException {\n         ObjectNode retrievalRecord = job.getRetrievalRecord();\n         if (retrievalRecord != null) {\n             ArrayNode fileRecords = JSONUtilities.getArray(retrievalRecord, \"files\");\n@@ -38,9 +39,13 @@ public final class EncodingGuesser {\n                     if (StringUtils.isBlank(encoding)) {\n                         String location = JSONUtilities.getString(record, \"location\", null);\n                         if (location != null) {\n-                            try (InputStream is = new BufferedInputStream(\n+                            try (UnicodeBOMInputStream is = new UnicodeBOMInputStream(\n                                     new FileInputStream(new File(job.getRawDataDir(), location)))) {\n                                 String detected = UniversalDetector.detectCharset(is);\n+                                UnicodeBOMInputStream.BOM bom = is.getBOM();\n+                                if (UnicodeBOMInputStream.BOM.UTF_8.equals(bom)) {\n+                                    detected = UTF_8_BOM;\n+                                }\n                                 if (detected != null) {\n                                     JSONUtilities.safePut(record, \"encoding\", detected);\n                                 }\ndiff --git a/main/src/com/google/refine/importing/ImportingUtilities.java b/main/src/com/google/refine/importing/ImportingUtilities.java\nindex 27ff6a5d8..5a2f2d923 100644\n--- a/main/src/com/google/refine/importing/ImportingUtilities.java\n+++ b/main/src/com/google/refine/importing/ImportingUtilities.java\n@@ -33,6 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.importing;\n \n+import static java.nio.charset.StandardCharsets.UTF_8;\n+\n import java.io.File;\n import java.io.FileInputStream;\n import java.io.FileNotFoundException;\n@@ -69,7 +71,6 @@ import javax.servlet.http.HttpServletResponse;\n import org.apache.commons.compress.archivers.tar.TarArchiveEntry;\n import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;\n import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;\n-import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream;\n import org.apache.commons.fileupload.FileItem;\n import org.apache.commons.fileupload.FileUploadException;\n import org.apache.commons.fileupload.ProgressListener;\n@@ -84,6 +85,7 @@ import org.apache.hc.core5.http.ContentType;\n import org.apache.hc.core5.http.HttpEntity;\n import org.apache.hc.core5.http.HttpStatus;\n import org.apache.hc.core5.http.io.HttpClientResponseHandler;\n+import org.mozilla.universalchardet.UnicodeBOMInputStream;\n import org.slf4j.Logger;\n import org.slf4j.LoggerFactory;\n \n@@ -349,7 +351,6 @@ public class ImportingUtilities {\n                         if (httpClient.getResponse(urlString, null, responseHandler) != null) {\n                             archiveCount++;\n                         }\n-                        ;\n                         downloadCount++;\n                     } else {\n                         // Fallback handling for non HTTP connections (only FTP?)\n@@ -435,19 +436,19 @@ public class ImportingUtilities {\n \n         update.totalExpectedSize += length;\n \n-        progress.setProgress(\"Downloading \" + url.toString(),\n+        progress.setProgress(\"Downloading \" + url, // TODO: Localize\n                 calculateProgressPercent(update.totalExpectedSize, update.totalRetrievedSize));\n \n         long actualLength = saveStreamToFile(stream, file, update);\n         JSONUtilities.safePut(fileRecord, \"size\", actualLength);\n         if (actualLength == 0) {\n-            throw new IOException(\"No content found in \" + url.toString());\n+            throw new IOException(\"No content found in \" + url);\n         } else if (length >= 0) {\n             update.totalExpectedSize += (actualLength - length);\n         } else {\n             update.totalExpectedSize += actualLength;\n         }\n-        progress.setProgress(\"Saving \" + url.toString() + \" locally\",\n+        progress.setProgress(\"Saving \" + url + \" locally\", // TODO: Localize\n                 calculateProgressPercent(update.totalExpectedSize, update.totalRetrievedSize));\n         return postProcessRetrievedFile(rawDataDir, file, fileRecord, fileRecords, progress);\n     }\n@@ -528,11 +529,23 @@ public class ImportingUtilities {\n             encoding = commonEncoding;\n         }\n         if (encoding != null) {\n-            try {\n-                return new InputStreamReader(inputStream, encoding);\n-            } catch (UnsupportedEncodingException e) {\n-                // Ignore and fall through\n+\n+            // Special case for UTF-8 with BOM\n+            if (EncodingGuesser.UTF_8_BOM.equals(encoding)) {\n+                try {\n+                    return new InputStreamReader(new UnicodeBOMInputStream(inputStream, true), UTF_8);\n+                } catch (IOException e) {\n+                    throw new RuntimeException(\"Exception from UnicodeBOMInputStream\", e);\n+                }\n+            } else {\n+                try {\n+                    return new InputStreamReader(inputStream, encoding);\n+                } catch (UnsupportedEncodingException e) {\n+                    // This should never happen since they picked from a list of supported encodings\n+                    throw new RuntimeException(\"Unsupported encoding: \" + encoding, e);\n+                }\n             }\n+\n         }\n         return new InputStreamReader(inputStream);\n     }\n@@ -677,7 +690,7 @@ public class ImportingUtilities {\n                     || \"application/x-zip-compressed\".equals(contentType)\n                     || \"application/zip\".equals(contentType)\n                     || \"application/x-compressed\".equals(contentType)\n-                    || \"multipar/x-zip\".equals(contentType)) {\n+                    || \"multipart/x-zip\".equals(contentType)) {\n                 return new ZipInputStream(new FileInputStream(file));\n             } else if (fileName.endsWith(\".kmz\")) {\n                 return new ZipInputStream(new FileInputStream(file));\n@@ -689,13 +702,28 @@ public class ImportingUtilities {\n \n     private static boolean isFileGZipped(File file) {\n         int magic = 0;\n-        try (RandomAccessFile raf = new RandomAccessFile(file, \"r\");) {\n+        try (RandomAccessFile raf = new RandomAccessFile(file, \"r\")) {\n             magic = raf.read() & 0xff | ((raf.read() << 8) & 0xff00);\n         } catch (IOException ignored) {\n         }\n         return magic == GZIPInputStream.GZIP_MAGIC;\n     }\n \n+    public static boolean isCompressed(File file) throws IOException {\n+        // Check for common compressed file types to protect ourselves from binary data\n+        try (InputStream is = new FileInputStream(file)) {\n+            byte[] magic = new byte[4];\n+            int count = is.read(magic);\n+            if (count == 4 && Arrays.equals(magic, new byte[] { 0x50, 0x4B, 0x03, 0x04 }) || // zip\n+                    Arrays.equals(magic, new byte[] { 0x50, 0x4B, 0x07, 0x08 }) ||\n+                    (magic[0] == 0x1F && magic[1] == (byte) 0x8B) // gzip\n+            ) {\n+                return true;\n+            }\n+        }\n+        return false;\n+    }\n+\n     // FIXME: This is wasteful of space and time. We should try to process on the fly\n     static private boolean explodeArchive(\n             File rawDataDir,\n@@ -888,7 +916,7 @@ public class ImportingUtilities {\n                 }\n             }\n \n-            // If nothing matches the best format but we have some files,\n+            // If nothing matches the best format, but we have some files,\n             // then select them all\n             if (fileSelectionIndexes.size() == 0 && count > 0) {\n                 for (int i = 0; i < count; i++) {\ndiff --git a/main/webapp/package-lock.json b/main/webapp/package-lock.json\nindex 824f48858..75ca6ca17 100644\n--- a/main/webapp/package-lock.json\n+++ b/main/webapp/package-lock.json\n@@ -9,7 +9,7 @@\n       \"dependencies\": {\n         \"@wikimedia/jquery.i18n\": \"1.0.9\",\n         \"datejs-coolite\": \"1.0.0\",\n-        \"jquery\": \"3.7.0\",\n+        \"jquery\": \"3.7.1\",\n         \"jquery-migrate\": \"3.4.1\",\n         \"js-cookie\": \"3.0.5\",\n         \"moment\": \"2.29.4\",\n@@ -35,9 +35,9 @@\n       \"integrity\": \"sha512-kppYUwn9R2pzsoChLsDlWLtKTwjf5k9Z3fx8CNKjwvhYfpadKIFoL+16dDJvftiXKwT+ixh2PRslZsfzp+1ZVA==\"\n     },\n     \"node_modules/jquery\": {\n-      \"version\": \"3.7.0\",\n-      \"resolved\": \"https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz\",\n-      \"integrity\": \"sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==\"\n+      \"version\": \"3.7.1\",\n+      \"resolved\": \"https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz\",\n+      \"integrity\": \"sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==\"\n     },\n     \"node_modules/jquery-migrate\": {\n       \"version\": \"3.4.1\",\n@@ -94,9 +94,9 @@\n       \"integrity\": \"sha512-kppYUwn9R2pzsoChLsDlWLtKTwjf5k9Z3fx8CNKjwvhYfpadKIFoL+16dDJvftiXKwT+ixh2PRslZsfzp+1ZVA==\"\n     },\n     \"jquery\": {\n-      \"version\": \"3.7.0\",\n-      \"resolved\": \"https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz\",\n-      \"integrity\": \"sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==\"\n+      \"version\": \"3.7.1\",\n+      \"resolved\": \"https://registry.npmjs.org/jquery/-/jquery-3.7.1.tgz\",\n+      \"integrity\": \"sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==\"\n     },\n     \"jquery-migrate\": {\n       \"version\": \"3.4.1\",\ndiff --git a/main/webapp/package.json b/main/webapp/package.json\nindex 52f8ccdc4..44211bc1b 100644\n--- a/main/webapp/package.json\n+++ b/main/webapp/package.json\n@@ -12,7 +12,7 @@\n   \"dependencies\": {\n     \"@wikimedia/jquery.i18n\": \"1.0.9\",\n     \"datejs-coolite\": \"1.0.0\",\n-    \"jquery\": \"3.7.0\",\n+    \"jquery\": \"3.7.1\",\n     \"jquery-migrate\": \"3.4.1\",\n     \"js-cookie\": \"3.0.5\",\n     \"moment\": \"2.29.4\",\n", "test_patch": "diff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex bb2544479..9e190c38d 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -20,10 +20,10 @@\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.47.0\",\n+        \"eslint\": \"^8.48.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^9.0.0\",\n         \"eslint-plugin-cypress\": \"^2.14.0\",\n-        \"prettier\": \"3.0.2\"\n+        \"prettier\": \"3.0.3\"\n     }\n }\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 74b9f5efc..116e2bbbf 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -66,10 +66,10 @@\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@^8.47.0\":\n-  version \"8.47.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.47.0.tgz#5478fdf443ff8158f9de171c704ae45308696c7d\"\n-  integrity sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==\n+\"@eslint/js@8.48.0\":\n+  version \"8.48.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.48.0.tgz#642633964e217905436033a2bd08bf322849b7fb\"\n+  integrity sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==\n \n \"@humanwhocodes/config-array@^0.11.10\":\n   version \"0.11.10\"\n@@ -590,15 +590,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4\n   resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800\"\n   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==\n \n-eslint@^8.47.0:\n-  version \"8.47.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.47.0.tgz#c95f9b935463fb4fad7005e626c7621052e90806\"\n-  integrity sha512-spUQWrdPt+pRVP1TTJLmfRNJJHHZryFmptzcafwSvHsceV81djHOdnEeDmkdotZyLNjDhrOasNK8nikkoG1O8Q==\n+eslint@^8.48.0:\n+  version \"8.48.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.48.0.tgz#bf9998ba520063907ba7bfe4c480dc8be03c2155\"\n+  integrity sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n     \"@eslint-community/regexpp\" \"^4.6.1\"\n     \"@eslint/eslintrc\" \"^2.1.2\"\n-    \"@eslint/js\" \"^8.47.0\"\n+    \"@eslint/js\" \"8.48.0\"\n     \"@humanwhocodes/config-array\" \"^0.11.10\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\n@@ -1303,10 +1303,10 @@ prelude-ls@^1.2.1:\n   resolved \"https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz\"\n   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==\n \n-prettier@3.0.2:\n-  version \"3.0.2\"\n-  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.0.2.tgz#78fcecd6d870551aa5547437cdae39d4701dca5b\"\n-  integrity sha512-o2YR9qtniXvwEZlOKbveKfDQVyqxbEIWn48Z8m3ZJjBjcCmUy3xZGIv+7AkaeuaTr6yPXJjwv07ZWlsWbEy1rQ==\n+prettier@3.0.3:\n+  version \"3.0.3\"\n+  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.0.3.tgz#432a51f7ba422d1469096c0fdc28e235db8f9643\"\n+  integrity sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==\n \n pretty-bytes@^5.6.0:\n   version \"5.6.0\"\ndiff --git a/main/tests/data/csv-with-bom.csv b/main/tests/data/csv-with-bom.csv\nnew file mode 100644\nindex 000000000..bdb3bcc64\n--- /dev/null\n+++ b/main/tests/data/csv-with-bom.csv\n@@ -0,0 +1,3 @@\n+ColA,ColB\n+A1,B1\n+A2,B2\n\\ No newline at end of file\ndiff --git a/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java b/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java\nindex 73d60f011..d5e1a060a 100644\n--- a/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java\n+++ b/main/tests/server/src/com/google/refine/importing/EncodingGuesserTests.java\n@@ -15,7 +15,7 @@ import com.google.refine.util.ParsingUtilities;\n \n public class EncodingGuesserTests {\n \n-    // Guessing isn't as reliable for single-byte encodings, so we focus on a few multi-byte\n+    // Guessing isn't as reliable for single-byte encodings, so we focus on a few multibyte\n     // non-UTF8 encodings which are still in use (but <1% prevalence on web)\n     static String[] ENCODINGS = {\n             \"big5\",\n@@ -25,7 +25,7 @@ public class EncodingGuesserTests {\n     };\n \n     private static File getTestDir() {\n-        String dir = ClassLoader.getSystemResource(ENCODINGS[0] + \".html\").getPath();\n+        String dir = ClassLoader.getSystemResource(ENCODINGS[0] + \".txt\").getPath();\n         dir = dir.substring(0, dir.lastIndexOf('/'));\n         return new File(dir);\n     }\n@@ -46,21 +46,29 @@ public class EncodingGuesserTests {\n     public void testEncodingGuesser() throws IOException {\n \n         for (String encoding : ENCODINGS) {\n-            ImportingJob job = new ImportingJobStub();\n-            ObjectNode config = job.getOrCreateDefaultConfig();\n-            ObjectNode filesObj = ParsingUtilities.evaluateJsonStringToObjectNode(\n-                    String.format(\"{ \\\"files\\\": [ {\\\"location\\\": \\\"%s.txt\\\"}]}\", encoding));\n-            JSONUtilities.safePut(config, \"retrievalRecord\", filesObj);\n-\n-            EncodingGuesser.guess(job);\n-\n-            ObjectNode retrievalRecord = job.getRetrievalRecord();\n-            assertNotNull(retrievalRecord);\n-            ArrayNode fileRecords = JSONUtilities.getArray(retrievalRecord, \"files\");\n-            assertNotNull(fileRecords);\n-            assertEquals(fileRecords.size(), 1);\n-            ObjectNode record = JSONUtilities.getObjectElement(fileRecords, 0);\n-            assertEquals(JSONUtilities.getString(record, \"encoding\", null).toLowerCase(), encoding);\n+            checkEncoding(encoding + \".txt\", encoding);\n         }\n+\n+        checkEncoding(\"example-latin1.tsv\", \"windows-1252\"); // close enough - these overlap a lot\n+        checkEncoding(\"example-utf8.tsv\", \"utf-8\");\n+        checkEncoding(\"csv-with-bom.csv\", \"utf-8-bom\");\n+    }\n+\n+    private void checkEncoding(String filename, String encoding) throws IOException {\n+        ImportingJob job = new ImportingJobStub();\n+        ObjectNode config = job.getOrCreateDefaultConfig();\n+        ObjectNode filesObj = ParsingUtilities.evaluateJsonStringToObjectNode(\n+                String.format(\"{ \\\"files\\\": [ {\\\"location\\\": \\\"%s\\\"}]}\", filename));\n+        JSONUtilities.safePut(config, \"retrievalRecord\", filesObj);\n+\n+        EncodingGuesser.guess(job);\n+\n+        ObjectNode retrievalRecord = job.getRetrievalRecord();\n+        assertNotNull(retrievalRecord);\n+        ArrayNode fileRecords = JSONUtilities.getArray(retrievalRecord, \"files\");\n+        assertNotNull(fileRecords);\n+        assertEquals(fileRecords.size(), 1);\n+        ObjectNode record = JSONUtilities.getObjectElement(fileRecords, 0);\n+        assertEquals(JSONUtilities.getString(record, \"encoding\", null).toLowerCase(), encoding);\n     }\n }\ndiff --git a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\nindex 19fc71ce8..0de1291b2 100644\n--- a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n+++ b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n@@ -56,7 +56,6 @@ import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;\n import org.apache.hc.client5.http.entity.mime.StringBody;\n import org.apache.hc.core5.http.ContentType;\n import org.apache.hc.core5.http.HttpEntity;\n-import org.checkerframework.checker.units.qual.A;\n import org.testng.Assert;\n import org.testng.annotations.BeforeMethod;\n import org.testng.annotations.Test;\n@@ -110,7 +109,7 @@ public class ImportingUtilitiesTests extends ImporterTest {\n         File dirA = new File(tempDir, \"a\");\n         dirA.mkdir();\n         File conflicting = new File(dirA, \"dummy\");\n-        conflicting.createNewFile();\n+        Assert.assertTrue(conflicting.createNewFile());\n \n         File allocated = ImportingUtilities.allocateFile(dirA, \".././a/dummy\");\n         Assert.assertEquals(allocated, new File(dirA, \"dummy-2\"));\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #1241\r\n\r\n* UTF-8-BOM to the encoding guesser\r\n* Add support for stripping the BOM to the importer\r\n", "PR_Title": "CSV Byte Order Mark (BOM) support. Fixes #1241", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6025_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6025, "issue_title": "CSV Byte Order Mark (BOM) support. Fixes #1241", "issue_body": "Fixes #1241\r\n\r\n* UTF-8-BOM to the encoding guesser\r\n* Add support for stripping the BOM to the importer\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6524", "base_commit": "ef77f348a65ea39e69d3240687eeaaa8090cd4f1", "patch": "diff --git a/.github/workflows/snapshot_release.yml b/.github/workflows/snapshot_release.yml\nindex 21ce82ff3..cdd5fbf84 100644\n--- a/.github/workflows/snapshot_release.yml\n+++ b/.github/workflows/snapshot_release.yml\n@@ -24,7 +24,7 @@ jobs:\n       - name: Setup Node\n         uses: actions/setup-node@v4\n         with:\n-          node-version: '16'\n+          node-version: '20'\n       - id: set-matrix\n         run: npm install --save glob@8.1.0 && node main/tests/cypress/build-test-matrix.js >> $GITHUB_OUTPUT\n         env:\n@@ -60,7 +60,7 @@ jobs:\n       - name: Setup Node\n         uses: actions/setup-node@v4\n         with:\n-          node-version: '16'\n+          node-version: '20'\n \n       - name: Restore Tests dependency cache\n         uses: actions/cache@v4\ndiff --git a/extensions/phonetic/.gitignore b/extensions/phonetic/.gitignore\ndeleted file mode 100644\nindex 17b5c9465..000000000\n--- a/extensions/phonetic/.gitignore\n+++ /dev/null\n@@ -1,1 +0,0 @@\n-module/MOD-INF/classes/\ndiff --git a/extensions/phonetic/module/MOD-INF/controller.js b/extensions/phonetic/module/MOD-INF/controller.js\ndeleted file mode 100644\nindex 6d652f685..000000000\n--- a/extensions/phonetic/module/MOD-INF/controller.js\n+++ /dev/null\n@@ -1,60 +0,0 @@\n-/*\n-\n-Copyright 2010, Google Inc.\n-All rights reserved.\n-\n-Redistribution and use in source and binary forms, with or without\n-modification, are permitted provided that the following conditions are\n-met:\n-\n- * Redistributions of source code must retain the above copyright\n-notice, this list of conditions and the following disclaimer.\n- * Redistributions in binary form must reproduce the above\n-copyright notice, this list of conditions and the following disclaimer\n-in the documentation and/or other materials provided with the\n-distribution.\n- * Neither the name of Google Inc. nor the names of its\n-contributors may be used to endorse or promote products derived from\n-this software without specific prior written permission.\n-\n-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n-\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,           \n-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY           \n-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n-\n- */\n-\n-var html = \"text/html\";\n-var encoding = \"UTF-8\";\n-var ClientSideResourceManager = Packages.com.google.refine.ClientSideResourceManager;\n-\n-/*\n- * Function invoked to initialize the extension.\n- */\n-function init() {\n-  // Register new keyers\n-  Packages.com.google.refine.clustering.binning.KeyerFactory.put(\"daitch-mokotoff\", new Packages.org.openrefine.phonetic.keyers.DaitchMokotoffKeyer());\n-  Packages.com.google.refine.clustering.binning.KeyerFactory.put(\"beider-morse\", new Packages.org.openrefine.phonetic.keyers.BeiderMorseKeyer());\n-\n-  // Similarly, we could register new distances like this:\n-  // Packages.com.google.refine.clustering.knn.DistanceFactory.put(\"my-distance\", new Packages.org.openrefine.mydistances.MyDistance());\n-\n-    /*\n-     * Resources: just some javascript to load the localized strings\n-     */\n-    ClientSideResourceManager.addPaths(\n-      \"project/scripts\",\n-      module,\n-      [\n-        \"scripts/load-language.js\",\n-      ]\n-    );\n-\n-}\ndiff --git a/extensions/phonetic/module/MOD-INF/module.properties b/extensions/phonetic/module/MOD-INF/module.properties\ndeleted file mode 100644\nindex e207201d3..000000000\n--- a/extensions/phonetic/module/MOD-INF/module.properties\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-name = phonetic\n-description = OpenRefine Phonetic Clustering extension\n-templating.macros = macros.vm\n-requires = core\ndiff --git a/extensions/phonetic/module/langs/translation-en.json b/extensions/phonetic/module/langs/translation-en.json\ndeleted file mode 100644\nindex 5cd9e72e6..000000000\n--- a/extensions/phonetic/module/langs/translation-en.json\n+++ /dev/null\n@@ -1,4 +0,0 @@\n-{\n-    \"clustering-keyers/beider-morse\": \"Beider-Morse\",\n-    \"clustering-keyers/daitch-mokotoff\": \"Daitch-Mokotoff\"\n-}\ndiff --git a/extensions/phonetic/module/macros.vm b/extensions/phonetic/module/macros.vm\ndeleted file mode 100644\nindex 18a83bfce..000000000\n--- a/extensions/phonetic/module/macros.vm\n+++ /dev/null\n@@ -1,14 +0,0 @@\n-#*\n-  This file contains common velocity macros used in all .vt files.\n-  For Velocity documentation, see:\n-  \n-  http://velocity.apache.org/engine/releases/velocity-1.5/user-guide.html\n-*#\n-\n-#macro( makeAList $list )\n-  <ul>\n-    #foreach($item in $list)\n-      <li>$item</li>\n-    #end\n-  </ul>\n-#end\n\\ No newline at end of file\ndiff --git a/extensions/phonetic/module/scripts/load-language.js b/extensions/phonetic/module/scripts/load-language.js\ndeleted file mode 100644\nindex 2a05202b4..000000000\n--- a/extensions/phonetic/module/scripts/load-language.js\n+++ /dev/null\n@@ -1,1 +0,0 @@\n-I18NUtil.init(\"phonetic\");\ndiff --git a/extensions/phonetic/pom.xml b/extensions/phonetic/pom.xml\ndeleted file mode 100644\nindex 438072841..000000000\n--- a/extensions/phonetic/pom.xml\n+++ /dev/null\n@@ -1,92 +0,0 @@\n-<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n-\t xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n-  <modelVersion>4.0.0</modelVersion>\n-\n-  <groupId>org.openrefine</groupId>\n-  <artifactId>phonetic</artifactId>\n-  <packaging>jar</packaging>\n-  <version>3.9-SNAPSHOT</version>\n-\n-  <name>OpenRefine - Phonetic clustering extension</name>\n-  <description>Adds a few advanced phonetic clustering methods</description>\n-  <url>http://openrefine.org/</url>\n-  <parent>\n-    <groupId>org.openrefine</groupId>\n-    <artifactId>extensions</artifactId>\n-    <version>3.9-SNAPSHOT</version>\n-  </parent>\n-\n-  <build>\n-    <finalName>openrefine-sample</finalName>\n-    <resources>\n-      <resource>\n-        <directory>src</directory>\n-      </resource>\n-    </resources>\n-    <sourceDirectory>src</sourceDirectory>\n-    <testSourceDirectory>tests/src</testSourceDirectory>\n-    <outputDirectory>module/MOD-INF/classes</outputDirectory>\n-    <plugins>\n-      <plugin>\n-        <groupId>org.apache.maven.plugins</groupId>\n-        <artifactId>maven-surefire-plugin</artifactId>\n-        <version>${surefire.version}</version>\n-        <configuration>\n-          <suiteXmlFiles>\n-            <suiteXmlFile>tests/conf/tests.xml</suiteXmlFile>\n-          </suiteXmlFiles>\n-        </configuration>\n-      </plugin>\n-      <plugin>\n-        <groupId>org.apache.maven.plugins</groupId>\n-        <artifactId>maven-dependency-plugin</artifactId>\n-\t<version>${maven-dependency-plugin.version}</version>\n-        <executions>\n-            <execution>\n-            <phase>compile</phase>\n-            <goals>\n-                <goal>copy-dependencies</goal>\n-            </goals>\n-            <configuration>\n-                <outputDirectory>module/MOD-INF/lib</outputDirectory>\n-                <includeScope>runtime</includeScope>\n-            </configuration>\n-            </execution>\n-        </executions>\n-      </plugin>\n-    </plugins>\n-  </build>\n-\n-  <dependencies>\n-     <dependency>\n-      <groupId>${project.groupId}</groupId>\n-      <artifactId>main</artifactId>\n-      <version>${project.version}</version>\n-      <scope>provided</scope>\n-    </dependency>\n-    <dependency>\n-      <groupId>javax.servlet</groupId>\n-      <artifactId>javax.servlet-api</artifactId>\n-      <version>${servlet-api.version}</version>\n-      <scope>provided</scope>\n-    </dependency>\n-\n-   <!-- test dependencies -->\n-\n-    <dependency>\n-      <groupId>org.testng</groupId>\n-      <artifactId>testng</artifactId>\n-      <version>${testng.version}</version>\n-      <scope>test</scope>\n-    </dependency>\n-    <dependency>\n-      <groupId>org.apache.logging.log4j</groupId>\n-      <artifactId>log4j-slf4j-impl</artifactId>\n-      <version>${log4j.version}</version>\n-      <scope>test</scope>\n-    </dependency>\n-\n-  </dependencies>\n-\n-</project>\n-\ndiff --git a/extensions/pom.xml b/extensions/pom.xml\nindex 4f5cf1566..592a15135 100644\n--- a/extensions/pom.xml\n+++ b/extensions/pom.xml\n@@ -23,7 +23,6 @@\n         <module>database</module>\n         <module>gdata</module>\n         <module>pc-axis</module>\n-        <module>phonetic</module>\n         <!-- Add new extensions here -->\n   </modules>\n \ndiff --git a/extensions/phonetic/src/org/openrefine/phonetic/keyers/BeiderMorseKeyer.java b/main/src/com/google/refine/clustering/binning/BeiderMorseKeyer.java\nsimilarity index 91%\nrename from extensions/phonetic/src/org/openrefine/phonetic/keyers/BeiderMorseKeyer.java\nrename to main/src/com/google/refine/clustering/binning/BeiderMorseKeyer.java\nindex af2759231..eb0ea843a 100644\n--- a/extensions/phonetic/src/org/openrefine/phonetic/keyers/BeiderMorseKeyer.java\n+++ b/main/src/com/google/refine/clustering/binning/BeiderMorseKeyer.java\n@@ -1,11 +1,9 @@\n \n-package org.openrefine.phonetic.keyers;\n+package com.google.refine.clustering.binning;\n \n import org.apache.commons.codec.EncoderException;\n import org.apache.commons.codec.language.bm.BeiderMorseEncoder;\n \n-import com.google.refine.clustering.binning.Keyer;\n-\n public class BeiderMorseKeyer extends Keyer {\n \n     protected BeiderMorseEncoder encoder = new BeiderMorseEncoder();\ndiff --git a/extensions/phonetic/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyer.java b/main/src/com/google/refine/clustering/binning/DaitchMokotoffKeyer.java\nsimilarity index 77%\nrename from extensions/phonetic/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyer.java\nrename to main/src/com/google/refine/clustering/binning/DaitchMokotoffKeyer.java\nindex 8d7b1879e..96ba20b6c 100644\n--- a/extensions/phonetic/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyer.java\n+++ b/main/src/com/google/refine/clustering/binning/DaitchMokotoffKeyer.java\n@@ -1,10 +1,8 @@\n \n-package org.openrefine.phonetic.keyers;\n+package com.google.refine.clustering.binning;\n \n import org.apache.commons.codec.language.DaitchMokotoffSoundex;\n \n-import com.google.refine.clustering.binning.Keyer;\n-\n public class DaitchMokotoffKeyer extends Keyer {\n \n     protected DaitchMokotoffSoundex encoder = new DaitchMokotoffSoundex();\ndiff --git a/main/src/com/google/refine/exporters/ExporterRegistry.java b/main/src/com/google/refine/exporters/ExporterRegistry.java\nindex 00c4e3092..10c777aa2 100644\n--- a/main/src/com/google/refine/exporters/ExporterRegistry.java\n+++ b/main/src/com/google/refine/exporters/ExporterRegistry.java\n@@ -36,29 +36,10 @@ package com.google.refine.exporters;\n import java.util.HashMap;\n import java.util.Map;\n \n-import com.google.refine.exporters.sql.SqlExporter;\n-\n-abstract public class ExporterRegistry {\n+public class ExporterRegistry {\n \n     static final private Map<String, Exporter> s_formatToExporter = new HashMap<String, Exporter>();\n \n-    static {\n-        s_formatToExporter.put(\"csv\", new CsvExporter());\n-        s_formatToExporter.put(\"tsv\", new CsvExporter('\\t'));\n-        s_formatToExporter.put(\"*sv\", new CsvExporter());\n-\n-        s_formatToExporter.put(\"xls\", new XlsExporter(false));\n-        s_formatToExporter.put(\"xlsx\", new XlsExporter(true));\n-\n-        s_formatToExporter.put(\"ods\", new OdsExporter());\n-\n-        s_formatToExporter.put(\"html\", new HtmlTableExporter());\n-\n-        s_formatToExporter.put(\"template\", new TemplatingExporter());\n-\n-        s_formatToExporter.put(\"sql\", new SqlExporter());\n-    }\n-\n     static public void registerExporter(String format, Exporter exporter) {\n         s_formatToExporter.put(format.toLowerCase(), exporter);\n     }\ndiff --git a/main/src/com/google/refine/importers/SeparatorBasedImporter.java b/main/src/com/google/refine/importers/SeparatorBasedImporter.java\nindex e3ccd2acb..b2f6596f6 100644\n--- a/main/src/com/google/refine/importers/SeparatorBasedImporter.java\n+++ b/main/src/com/google/refine/importers/SeparatorBasedImporter.java\n@@ -70,6 +70,7 @@ import com.google.refine.util.JSONUtilities;\n \n public class SeparatorBasedImporter extends TabularImportingParserBase {\n \n+    public static final int GUESSER_LINE_COUNT = 100;\n     char DEFAULT_QUOTE_CHAR = new CsvParserSettings().getFormat().getQuote();\n \n     public SeparatorBasedImporter() {\n@@ -207,13 +208,12 @@ public class SeparatorBasedImporter extends TabularImportingParserBase {\n                 CsvFormat format = guessFormat(file, encoding);\n                 if (format != null) {\n                     if (separator != null) {\n-                        if (format.getDelimiter() == separator.separator) {\n-                            // They both agree - yay!\n-                            return StringEscapeUtils.escapeJava(Character.toString(separator.separator));\n-                        } else {\n-                            logger.warn(\"Delimiter guesses disagree - uniVocity: {} - internal: {}\", format.getDelimiter(),\n+                        if (format.getDelimiter() != separator.separator) {\n+                            logger.warn(\"Delimiter guesses disagree - uniVocity: '{}' - internal: '{}'\", format.getDelimiter(),\n                                     separator.separator);\n                         }\n+                        // Even if they disagree, use our guess for backward compatibility\n+                        return StringEscapeUtils.escapeJava(Character.toString(separator.separator));\n                     } else {\n                         // We got a guess from CsvParser, but not ours, so let's use that\n                         return StringEscapeUtils.escapeJava(format.getDelimiterString());\n@@ -224,7 +224,6 @@ public class SeparatorBasedImporter extends TabularImportingParserBase {\n                         return StringEscapeUtils.escapeJava(Character.toString(separator.separator));\n                     }\n                 }\n-\n             }\n         }\n         return null;\n@@ -246,15 +245,12 @@ public class SeparatorBasedImporter extends TabularImportingParserBase {\n                 Reader reader = encoding != null ? new InputStreamReader(is, encoding) : new InputStreamReader(is);\n                 LineNumberReader lineNumberReader = new LineNumberReader(reader)) {\n             CsvParserSettings settings = new CsvParserSettings();\n+            // We could provide a set of delimiters to consider below if we wanted to restrict this\n             settings.detectFormatAutomatically();\n-            settings.setFormatDetectorRowSampleCount(100);\n+            settings.setFormatDetectorRowSampleCount(GUESSER_LINE_COUNT); // default is 20, but let's match our guesser\n             CsvParser parser = new CsvParser(settings);\n             parser.beginParsing(lineNumberReader);\n-            for (int i = 0; i < 20; i++) {\n-                if (parser.parseNext() == null) {\n-                    break;\n-                }\n-            }\n+            // Format guesser result is available as soon as beginParsing() completes\n             return parser.getDetectedFormat();\n         } catch (IOException e) {\n             e.printStackTrace();\n@@ -280,7 +276,7 @@ public class SeparatorBasedImporter extends TabularImportingParserBase {\n                 boolean inQuote = false;\n                 String s;\n                 while (totalChars < 64 * 1024 &&\n-                        lineCount < 100 &&\n+                        lineCount < GUESSER_LINE_COUNT &&\n                         (s = lineNumberReader.readLine()) != null) {\n \n                     totalChars += s.length() + 1; // count the new line character\ndiff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js\nindex 2bf658289..344b1dfa4 100644\n--- a/main/webapp/modules/core/MOD-INF/controller.js\n+++ b/main/webapp/modules/core/MOD-INF/controller.js\n@@ -319,6 +319,19 @@ function registerImporting() {\n   );\n }\n \n+function registerExporters() {\n+   var ER = Packages.com.google.refine.exporters.ExporterRegistry;\n+   ER.registerExporter(\"csv\", new Packages.com.google.refine.exporters.CsvExporter());\n+   ER.registerExporter(\"tsv\", new Packages.com.google.refine.exporters.CsvExporter('\\t'.charAt(0)));\n+   ER.registerExporter(\"*sv\", new Packages.com.google.refine.exporters.CsvExporter());\n+   ER.registerExporter(\"xls\", new Packages.com.google.refine.exporters.XlsExporter(false));\n+   ER.registerExporter(\"xlsx\", new Packages.com.google.refine.exporters.XlsExporter(true));\n+   ER.registerExporter(\"ods\", new Packages.com.google.refine.exporters.OdsExporter());\n+   ER.registerExporter(\"html\", new Packages.com.google.refine.exporters.HtmlTableExporter());\n+   ER.registerExporter(\"template\", new Packages.com.google.refine.exporters.TemplatingExporter());\n+   ER.registerExporter(\"sql\", new Packages.com.google.refine.exporters.sql.SqlExporter());\n+}\n+\n function registerDistances() {\n    var DF = Packages.com.google.refine.clustering.knn.DistanceFactory;\n    var VicinoDistance = Packages.com.google.refine.clustering.knn.VicinoDistance;\n@@ -332,6 +345,8 @@ function registerKeyers() {\n    KF.put(\"ngram-fingerprint\", new Packages.com.google.refine.clustering.binning.NGramFingerprintKeyer());\n    KF.put(\"metaphone3\", new Packages.com.google.refine.clustering.binning.Metaphone3Keyer());\n    KF.put(\"cologne-phonetic\", new Packages.com.google.refine.clustering.binning.ColognePhoneticKeyer());\n+   KF.put(\"daitch-mokotoff\", new Packages.com.google.refine.clustering.binning.DaitchMokotoffKeyer());\n+   KF.put(\"beider-morse\", new Packages.com.google.refine.clustering.binning.BeiderMorseKeyer());\n }\n \n /*\n@@ -343,6 +358,7 @@ function init() {\n   registerCommands();\n   registerOperations();\n   registerImporting();\n+  registerExporters();\n   registerDistances();\n   registerKeyers();\n \ndiff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json\nindex fec7180b5..c636782c8 100644\n--- a/main/webapp/modules/core/langs/translation-en.json\n+++ b/main/webapp/modules/core/langs/translation-en.json\n@@ -218,6 +218,8 @@\n     \"clustering-keyers/ngram-fingerprint\": \"n-Gram fingerprint\",\n     \"clustering-keyers/metaphone3\": \"Metaphone3\",\n     \"clustering-keyers/cologne-phonetic\": \"Cologne phonetic\",\n+    \"clustering-keyers/beider-morse\": \"Beider-Morse\",\n+    \"clustering-keyers/daitch-mokotoff\": \"Daitch-Mokotoff\",\n     \"core-dialogs/distance-fun\": \"Distance function\",\n     \"clustering-distances/levenshtein\": \"Levenshtein\",\n     \"clustering-distances/ppm\": \"PPM\",\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/cell-ui.js b/main/webapp/modules/core/scripts/views/data-table/cell-ui.js\nindex 3d1ac1c74..c1a8d56c1 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/cell-ui.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/cell-ui.js\n@@ -85,7 +85,11 @@ DataTableCellUI.prototype._render = function() {\n \n   var renderedCell = undefined;\n   for (let record of CellRendererRegistry.renderers) {\n-    renderedCell = record.renderer.render(this._rowIndex, this._cellIndex, cell, this);\n+    try {\n+      renderedCell = record.renderer.render(this._rowIndex, this._cellIndex, cell, this);\n+    } catch (e) {\n+      continue;\n+    }\n     if (renderedCell) {\n       break;\n     }\ndiff --git a/pom.xml b/pom.xml\nindex 37270df0c..542db8eb2 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -104,7 +104,7 @@\n     <guava.version>33.1.0-jre</guava.version>\n     <jaxb-api.version>2.3.1</jaxb-api.version>\n     <juniversalchardet.version>2.4.0</juniversalchardet.version>\n-    <testng.version>7.10.0</testng.version>\n+    <testng.version>7.10.1</testng.version>\n     <httpmime.version>4.5.14</httpmime.version>\n     <owasp-encoder.version>1.2.3</owasp-encoder.version>\n     <jasypt.version>1.9.3</jasypt.version>\n", "test_patch": "diff --git a/.github/workflows/pull_request_e2e.yml b/.github/workflows/pull_request_e2e.yml\nindex dca92d736..fb09561a5 100644\n--- a/.github/workflows/pull_request_e2e.yml\n+++ b/.github/workflows/pull_request_e2e.yml\n@@ -26,7 +26,7 @@ jobs:\n       - name: Setup Node\n         uses: actions/setup-node@v4\n         with:\n-          node-version: '16'\n+          node-version: '20'\n       - id: set-matrix\n         run: npm install --save glob@8.1.0 && node main/tests/cypress/build-test-matrix.js >> $GITHUB_OUTPUT\n         env:\n@@ -58,7 +58,7 @@ jobs:\n       - name: Setup Node\n         uses: actions/setup-node@v4\n         with:\n-          node-version: '16'\n+          node-version: '20'\n \n       - name: Restore Tests dependency cache\n         uses: actions/cache@v4\ndiff --git a/extensions/phonetic/tests/conf/tests.xml b/extensions/phonetic/tests/conf/tests.xml\ndeleted file mode 100644\nindex 7ad8efc22..000000000\n--- a/extensions/phonetic/tests/conf/tests.xml\n+++ /dev/null\n@@ -1,14 +0,0 @@\n-<!DOCTYPE suite SYSTEM \"https://testng.org/testng-1.0.dtd\" >\n- \n-<suite name=\"Wikidata extension\">\n-  <test name=\"tests\">\n-    <groups>\n-      <run>\n-        <exclude name=\"broken\" />\n-      </run>\n-    </groups>\n-    <packages>\n-      <package name=\"org.openrefine.phonetic.*\" />\n-    </packages>\n-  </test>\n-</suite>\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex 47a9901ab..800370113 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -6,7 +6,7 @@\n     \"author\": \"OpenRefine\",\n     \"private\": true,\n     \"engines\": {\n-        \"node\": \">=16.0.0\",\n+        \"node\": \">=20.0.0\",\n         \"npm\":  \">=8.11.0\",\n         \"yarn\": \">=1.22.15\"\n     },\n@@ -20,7 +20,7 @@\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.57.0\",\n+        \"eslint\": \"^9.0.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^9.1.0\",\n         \"eslint-plugin-cypress\": \"^2.15.1\",\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 436ed0265..17be768c5 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -51,32 +51,32 @@\n   resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8\"\n   integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==\n \n-\"@eslint/eslintrc@^2.1.4\":\n-  version \"2.1.4\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad\"\n-  integrity sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==\n+\"@eslint/eslintrc@^3.0.2\":\n+  version \"3.0.2\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.0.2.tgz#36180f8e85bf34d2fe3ccc2261e8e204a411ab4e\"\n+  integrity sha512-wV19ZEGEMAC1eHgrS7UQPqsdEiCIbTKTasEfcXAigzoXICcqZSjBZEHlZwNVvKg6UBCjSlos84XiLqsRJnIcIg==\n   dependencies:\n     ajv \"^6.12.4\"\n     debug \"^4.3.2\"\n-    espree \"^9.6.0\"\n-    globals \"^13.19.0\"\n+    espree \"^10.0.1\"\n+    globals \"^14.0.0\"\n     ignore \"^5.2.0\"\n     import-fresh \"^3.2.1\"\n     js-yaml \"^4.1.0\"\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@8.57.0\":\n-  version \"8.57.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f\"\n-  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==\n+\"@eslint/js@9.0.0\":\n+  version \"9.0.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-9.0.0.tgz#1a9e4b4c96d8c7886e0110ed310a0135144a1691\"\n+  integrity sha512-RThY/MnKrhubF6+s1JflwUjPEsnCEmYCWwqa/aRISKWNXGZ9epUwft4bUMM35SdKF9xvBrLydAM1RDHd1Z//ZQ==\n \n-\"@humanwhocodes/config-array@^0.11.14\":\n-  version \"0.11.14\"\n-  resolved \"https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b\"\n-  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==\n+\"@humanwhocodes/config-array@^0.12.3\":\n+  version \"0.12.3\"\n+  resolved \"https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.12.3.tgz#a6216d90f81a30bedd1d4b5d799b47241f318072\"\n+  integrity sha512-jsNnTBlMWuTpDkeE3on7+dWJi0D6fdDfeANj/w7MpS8ztROCoLvIO2nG0CcFj+E4k8j4QrSTh4Oryi3i2G669g==\n   dependencies:\n-    \"@humanwhocodes/object-schema\" \"^2.0.2\"\n+    \"@humanwhocodes/object-schema\" \"^2.0.3\"\n     debug \"^4.3.1\"\n     minimatch \"^3.0.5\"\n \n@@ -85,10 +85,10 @@\n   resolved \"https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c\"\n   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==\n \n-\"@humanwhocodes/object-schema@^2.0.2\":\n-  version \"2.0.2\"\n-  resolved \"https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz#d9fae00a2d5cb40f92cfe64b47ad749fbc38f917\"\n-  integrity sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==\n+\"@humanwhocodes/object-schema@^2.0.3\":\n+  version \"2.0.3\"\n+  resolved \"https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3\"\n+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==\n \n \"@nodelib/fs.scandir@2.1.5\":\n   version \"2.1.5\"\n@@ -138,20 +138,15 @@\n   dependencies:\n     \"@types/node\" \"*\"\n \n-\"@ungap/structured-clone@^1.2.0\":\n-  version \"1.2.0\"\n-  resolved \"https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406\"\n-  integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==\n-\n acorn-jsx@^5.3.2:\n   version \"5.3.2\"\n   resolved \"https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937\"\n   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==\n \n-acorn@^8.9.0:\n-  version \"8.9.0\"\n-  resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.9.0.tgz#78a16e3b2bcc198c10822786fa6679e245db5b59\"\n-  integrity sha512-jaVNAFBHNLXspO543WnNNPZFRtavh3skAkITqD0/2aeMkKZTN+254PyhwxFYrk3vQ1xfY+2wbesJMs/JC8/PwQ==\n+acorn@^8.11.3:\n+  version \"8.11.3\"\n+  resolved \"https://registry.yarnpkg.com/acorn/-/acorn-8.11.3.tgz#71e0b14e13a4ec160724b38fb7b0f233b1b81d7a\"\n+  integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==\n \n aggregate-error@^3.0.0:\n   version \"3.1.0\"\n@@ -520,13 +515,6 @@ delayed-stream@~1.0.0:\n   resolved \"https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz\"\n   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=\n \n-doctrine@^3.0.0:\n-  version \"3.0.0\"\n-  resolved \"https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz\"\n-  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==\n-  dependencies:\n-    esutils \"^2.0.2\"\n-\n ecc-jsbn@~0.1.1:\n   version \"0.1.2\"\n   resolved \"https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz\"\n@@ -581,54 +569,55 @@ eslint-plugin-cypress@^2.15.1:\n   dependencies:\n     globals \"^13.20.0\"\n \n-eslint-scope@^7.2.2:\n-  version \"7.2.2\"\n-  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f\"\n-  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==\n+eslint-scope@^8.0.1:\n+  version \"8.0.1\"\n+  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.1.tgz#a9601e4b81a0b9171657c343fb13111688963cfc\"\n+  integrity sha512-pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==\n   dependencies:\n     esrecurse \"^4.3.0\"\n     estraverse \"^5.2.0\"\n \n-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:\n+eslint-visitor-keys@^3.3.0:\n   version \"3.4.3\"\n   resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800\"\n   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==\n \n-eslint@^8.57.0:\n-  version \"8.57.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668\"\n-  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==\n+eslint-visitor-keys@^4.0.0:\n+  version \"4.0.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb\"\n+  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==\n+\n+eslint@^9.0.0:\n+  version \"9.0.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-9.0.0.tgz#6270548758e390343f78c8afd030566d86927d40\"\n+  integrity sha512-IMryZ5SudxzQvuod6rUdIUz29qFItWx281VhtFVc2Psy/ZhlCeD/5DT6lBIJ4H3G+iamGJoTln1v+QSuPw0p7Q==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n     \"@eslint-community/regexpp\" \"^4.6.1\"\n-    \"@eslint/eslintrc\" \"^2.1.4\"\n-    \"@eslint/js\" \"8.57.0\"\n-    \"@humanwhocodes/config-array\" \"^0.11.14\"\n+    \"@eslint/eslintrc\" \"^3.0.2\"\n+    \"@eslint/js\" \"9.0.0\"\n+    \"@humanwhocodes/config-array\" \"^0.12.3\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\n-    \"@ungap/structured-clone\" \"^1.2.0\"\n     ajv \"^6.12.4\"\n     chalk \"^4.0.0\"\n     cross-spawn \"^7.0.2\"\n     debug \"^4.3.2\"\n-    doctrine \"^3.0.0\"\n     escape-string-regexp \"^4.0.0\"\n-    eslint-scope \"^7.2.2\"\n-    eslint-visitor-keys \"^3.4.3\"\n-    espree \"^9.6.1\"\n+    eslint-scope \"^8.0.1\"\n+    eslint-visitor-keys \"^4.0.0\"\n+    espree \"^10.0.1\"\n     esquery \"^1.4.2\"\n     esutils \"^2.0.2\"\n     fast-deep-equal \"^3.1.3\"\n-    file-entry-cache \"^6.0.1\"\n+    file-entry-cache \"^8.0.0\"\n     find-up \"^5.0.0\"\n     glob-parent \"^6.0.2\"\n-    globals \"^13.19.0\"\n     graphemer \"^1.4.0\"\n     ignore \"^5.2.0\"\n     imurmurhash \"^0.1.4\"\n     is-glob \"^4.0.0\"\n     is-path-inside \"^3.0.3\"\n-    js-yaml \"^4.1.0\"\n     json-stable-stringify-without-jsonify \"^1.0.1\"\n     levn \"^0.4.1\"\n     lodash.merge \"^4.6.2\"\n@@ -638,14 +627,14 @@ eslint@^8.57.0:\n     strip-ansi \"^6.0.1\"\n     text-table \"^0.2.0\"\n \n-espree@^9.6.0, espree@^9.6.1:\n-  version \"9.6.1\"\n-  resolved \"https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f\"\n-  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==\n+espree@^10.0.1:\n+  version \"10.0.1\"\n+  resolved \"https://registry.yarnpkg.com/espree/-/espree-10.0.1.tgz#600e60404157412751ba4a6f3a2ee1a42433139f\"\n+  integrity sha512-MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==\n   dependencies:\n-    acorn \"^8.9.0\"\n+    acorn \"^8.11.3\"\n     acorn-jsx \"^5.3.2\"\n-    eslint-visitor-keys \"^3.4.1\"\n+    eslint-visitor-keys \"^4.0.0\"\n \n esquery@^1.4.2:\n   version \"1.4.2\"\n@@ -760,12 +749,12 @@ figures@^3.2.0:\n   dependencies:\n     escape-string-regexp \"^1.0.5\"\n \n-file-entry-cache@^6.0.1:\n-  version \"6.0.1\"\n-  resolved \"https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027\"\n-  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==\n+file-entry-cache@^8.0.0:\n+  version \"8.0.0\"\n+  resolved \"https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-8.0.0.tgz#7787bddcf1131bffb92636c69457bbc0edd6d81f\"\n+  integrity sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==\n   dependencies:\n-    flat-cache \"^3.0.4\"\n+    flat-cache \"^4.0.0\"\n \n find-up@^5.0.0:\n   version \"5.0.0\"\n@@ -775,18 +764,18 @@ find-up@^5.0.0:\n     locate-path \"^6.0.0\"\n     path-exists \"^4.0.0\"\n \n-flat-cache@^3.0.4:\n-  version \"3.0.4\"\n-  resolved \"https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz\"\n-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==\n+flat-cache@^4.0.0:\n+  version \"4.0.1\"\n+  resolved \"https://registry.yarnpkg.com/flat-cache/-/flat-cache-4.0.1.tgz#0ece39fcb14ee012f4b0410bd33dd9c1f011127c\"\n+  integrity sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==\n   dependencies:\n-    flatted \"^3.1.0\"\n-    rimraf \"^3.0.2\"\n+    flatted \"^3.2.9\"\n+    keyv \"^4.5.4\"\n \n-flatted@^3.1.0:\n-  version \"3.1.1\"\n-  resolved \"https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz\"\n-  integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==\n+flatted@^3.2.9:\n+  version \"3.3.1\"\n+  resolved \"https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a\"\n+  integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==\n \n forever-agent@~0.6.1:\n   version \"0.6.1\"\n@@ -879,13 +868,18 @@ global-dirs@^3.0.0:\n   dependencies:\n     ini \"2.0.0\"\n \n-globals@^13.19.0, globals@^13.20.0:\n+globals@^13.20.0:\n   version \"13.20.0\"\n   resolved \"https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82\"\n   integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==\n   dependencies:\n     type-fest \"^0.20.2\"\n \n+globals@^14.0.0:\n+  version \"14.0.0\"\n+  resolved \"https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e\"\n+  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==\n+\n graceful-fs@^4.1.6, graceful-fs@^4.2.0:\n   version \"4.2.6\"\n   resolved \"https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee\"\n@@ -1047,6 +1041,11 @@ jsbn@~0.1.0:\n   resolved \"https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz\"\n   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=\n \n+json-buffer@3.0.1:\n+  version \"3.0.1\"\n+  resolved \"https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13\"\n+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==\n+\n json-schema-traverse@^0.4.1:\n   version \"0.4.1\"\n   resolved \"https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz\"\n@@ -1086,6 +1085,13 @@ jsprim@^2.0.2:\n     json-schema \"0.4.0\"\n     verror \"1.10.0\"\n \n+keyv@^4.5.4:\n+  version \"4.5.4\"\n+  resolved \"https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93\"\n+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==\n+  dependencies:\n+    json-buffer \"3.0.1\"\n+\n lazy-ass@^1.6.0:\n   version \"1.6.0\"\n   resolved \"https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz\"\n@@ -1393,7 +1399,7 @@ reusify@^1.0.4:\n   resolved \"https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76\"\n   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==\n \n-rimraf@^3.0.0, rimraf@^3.0.2:\n+rimraf@^3.0.0:\n   version \"3.0.2\"\n   resolved \"https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz\"\n   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==\ndiff --git a/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java b/main/tests/server/src/com/google/refine/clustering/binning/BeiderMorseKeyerTest.java\nsimilarity index 83%\nrename from extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java\nrename to main/tests/server/src/com/google/refine/clustering/binning/BeiderMorseKeyerTest.java\nindex adca635f8..85b5b4666 100644\n--- a/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/BeiderMorseKeyerTest.java\n+++ b/main/tests/server/src/com/google/refine/clustering/binning/BeiderMorseKeyerTest.java\n@@ -1,12 +1,10 @@\n \n-package org.openrefine.phonetic.keyers;\n+package com.google.refine.clustering.binning;\n \n import static org.testng.Assert.assertEquals;\n \n import org.testng.annotations.Test;\n \n-import com.google.refine.clustering.binning.Keyer;\n-\n public class BeiderMorseKeyerTest {\n \n     Keyer keyer = new BeiderMorseKeyer();\ndiff --git a/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java b/main/tests/server/src/com/google/refine/clustering/binning/DaitchMokotoffKeyerTest.java\nsimilarity index 84%\nrename from extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java\nrename to main/tests/server/src/com/google/refine/clustering/binning/DaitchMokotoffKeyerTest.java\nindex 50129ff1b..c699803e3 100644\n--- a/extensions/phonetic/tests/src/org/openrefine/phonetic/keyers/DaitchMokotoffKeyerTest.java\n+++ b/main/tests/server/src/com/google/refine/clustering/binning/DaitchMokotoffKeyerTest.java\n@@ -1,12 +1,10 @@\n \n-package org.openrefine.phonetic.keyers;\n+package com.google.refine.clustering.binning;\n \n import static org.testng.Assert.assertEquals;\n \n import org.testng.annotations.Test;\n \n-import com.google.refine.clustering.binning.Keyer;\n-\n public class DaitchMokotoffKeyerTest {\n \n     protected Keyer keyer = new DaitchMokotoffKeyer();\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6516\r\n\r\n* In cases where the Univocity guesser and our guesser disagree, return our separator guess rather than just punting.\r\n* Also remove magic numbers and simplify.\r\n\r\n", "PR_Title": "Try harder to return separator guess. Fixes #6516", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6524_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6524, "issue_title": "Try harder to return separator guess. Fixes #6516", "issue_body": "Fixes #6516\r\n\r\n* In cases where the Univocity guesser and our guesser disagree, return our separator guess rather than just punting.\r\n* Also remove magic numbers and simplify.\r\n\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6788", "base_commit": "0d2c3e2b8df01783b2c4831355c7743eab0d75ce", "patch": "diff --git a/main/src/com/google/refine/importers/LineBasedFormatGuesser.java b/main/src/com/google/refine/importers/LineBasedFormatGuesser.java\nindex cff54e771..8987b8b71 100644\n--- a/main/src/com/google/refine/importers/LineBasedFormatGuesser.java\n+++ b/main/src/com/google/refine/importers/LineBasedFormatGuesser.java\n@@ -35,7 +35,7 @@ public class LineBasedFormatGuesser implements FormatGuesser {\n \n     @Override\n     public String guess(File file, String encoding, String seedFormat) {\n-        SeparatorBasedImporter.Separator sep = SeparatorBasedImporter.guessSeparator(file, encoding);\n+        SeparatorBasedImporter.Separator sep = SeparatorBasedImporter.guessSeparator(file, encoding, true);\n         if (sep != null) {\n             return \"text/line-based/*sv\";\n         }\ndiff --git a/main/src/com/google/refine/importing/ImportingUtilities.java b/main/src/com/google/refine/importing/ImportingUtilities.java\nindex 6209f9a7b..0e4898964 100644\n--- a/main/src/com/google/refine/importing/ImportingUtilities.java\n+++ b/main/src/com/google/refine/importing/ImportingUtilities.java\n@@ -439,6 +439,7 @@ public class ImportingUtilities {\n                             calculateProgressPercent(update.totalExpectedSize, update.totalRetrievedSize));\n \n                     JSONUtilities.safePut(fileRecord, \"size\", saveStreamToFile(stream, file, null));\n+                    JSONUtilities.safePut(fileRecord, \"format\", guessBetterFormat(file, request.getCharacterEncoding(), \"text\"));\n                     // TODO: This needs to be refactored to be able to test import from archives\n                     if (postProcessRetrievedFile(rawDataDir, file, fileRecord, fileRecords, progress)) {\n                         archiveCount++;\n@@ -1015,27 +1016,34 @@ public class ImportingUtilities {\n \n             if (location != null) {\n                 File file = new File(job.getRawDataDir(), location);\n+                bestFormat = guessBetterFormat(file, encoding, bestFormat);\n+            }\n+        }\n+        return bestFormat;\n+    }\n \n-                while (true) {\n-                    String betterFormat = null;\n-\n-                    List<FormatGuesser> guessers = ImportingManager.formatToGuessers.get(bestFormat);\n-                    if (guessers != null) {\n-                        for (FormatGuesser guesser : guessers) {\n-                            betterFormat = guesser.guess(file, encoding, bestFormat);\n-                            if (betterFormat != null) {\n-                                break;\n-                            }\n+    static String guessBetterFormat(File file, String fileEncoding, String bestFormat) {\n+        if (bestFormat != null && file != null) {\n+            while (true) {\n+                String betterFormat = null;\n+\n+                List<FormatGuesser> guessers = ImportingManager.formatToGuessers.get(bestFormat);\n+                if (guessers != null) {\n+                    for (FormatGuesser guesser : guessers) {\n+                        betterFormat = guesser.guess(file, fileEncoding, bestFormat);\n+                        if (betterFormat != null) {\n+                            break;\n                         }\n                     }\n+                }\n \n-                    if (betterFormat != null && !betterFormat.equals(bestFormat)) {\n-                        bestFormat = betterFormat;\n-                    } else {\n-                        break;\n-                    }\n+                if (betterFormat != null && !betterFormat.equals(bestFormat)) {\n+                    bestFormat = betterFormat;\n+                } else {\n+                    break;\n                 }\n             }\n+\n         }\n         return bestFormat;\n     }\n", "test_patch": "diff --git a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\nindex 1d1a65f37..aa75b61c8 100644\n--- a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n+++ b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n@@ -41,7 +41,6 @@ import java.io.IOException;\n import java.io.InputStream;\n import java.io.InputStreamReader;\n import java.net.URISyntaxException;\n-import java.net.URL;\n import java.nio.file.Files;\n import java.nio.file.Path;\n import java.nio.file.Paths;\n@@ -69,6 +68,7 @@ import org.apache.commons.fileupload.FileUploadException;\n import org.apache.commons.io.FileSystem;\n import org.apache.commons.io.FileUtils;\n import org.apache.hc.client5.http.ClientProtocolException;\n+import org.apache.hc.client5.http.entity.mime.FileBody;\n import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder;\n import org.apache.hc.client5.http.entity.mime.StringBody;\n import org.apache.hc.core5.http.ContentType;\n@@ -80,7 +80,9 @@ import org.testng.annotations.Test;\n import com.google.refine.ProjectMetadata;\n import com.google.refine.importers.ImporterTest;\n import com.google.refine.importers.ImportingParserBase;\n+import com.google.refine.importers.LineBasedFormatGuesser;\n import com.google.refine.importers.SeparatorBasedImporter;\n+import com.google.refine.importers.TextFormatGuesser;\n import com.google.refine.importing.ImportingUtilities.Progress;\n import com.google.refine.util.JSONUtilities;\n import com.google.refine.util.ParsingUtilities;\n@@ -92,6 +94,8 @@ public class ImportingUtilitiesTests extends ImporterTest {\n     @BeforeMethod\n     public void setUp() {\n         super.setUp();\n+        ImportingManager.registerFormatGuesser(\"text\", new TextFormatGuesser());\n+        ImportingManager.registerFormatGuesser(\"text/line-based\", new LineBasedFormatGuesser());\n     }\n \n     @Test\n@@ -576,4 +580,90 @@ public class ImportingUtilitiesTests extends ImporterTest {\n \n         assertEquals(fileName, ImportingUtilities.getFileName(fileRecord));\n     }\n+\n+    @Test\n+    public void testFormatForMultipleCSVFiles() throws IOException, FileUploadException {\n+        testMultipleFiles(\"birds\", \"food.small\", \".csv\", ContentType.create(\"text/csv\"), \"text/line-based/*sv\");\n+    }\n+\n+    @Test\n+    public void testFormatForMultipleTSVFiles() throws IOException, FileUploadException {\n+        testMultipleFiles(\"movies\", \"presidents\", \".tsv\", ContentType.create(\"text/tsv\"), \"text/line-based/*sv\");\n+    }\n+\n+    @Test\n+    public void testFormatForMultipleExcelFiles() throws IOException, FileUploadException {\n+        testMultipleFiles(\"dates\", \"excel95\", \".xls\",\n+                ContentType.create(\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"), \"binary\");\n+    }\n+\n+    @Test\n+    public void testFormatForMultipleJSONFiles() throws IOException, FileUploadException {\n+        testMultipleFiles(\"grid_small\", \"grid_small\", \".json\", ContentType.create(\"text/json\"), \"text/json\");\n+    }\n+\n+    private void testMultipleFiles(String file1, String file2, String fileSuffix, ContentType contentType, String expectedFormat)\n+            throws IOException, FileUploadException {\n+\n+        String filepath1 = ClassLoader.getSystemResource(file1 + fileSuffix).getPath();\n+        String filepath2 = ClassLoader.getSystemResource(file2 + fileSuffix).getPath();\n+\n+        File tmp1 = File.createTempFile(\"openrefine-test-\" + file1, fileSuffix, job.getRawDataDir());\n+        tmp1.deleteOnExit();\n+\n+        FileUtils.copyFile(new File(filepath1), tmp1);\n+\n+        File tmp2 = File.createTempFile(\"openrefine-test-\" + file2, fileSuffix, job.getRawDataDir());\n+        tmp2.deleteOnExit();\n+\n+        FileUtils.copyFile(new File(filepath2), tmp2);\n+\n+        MultipartEntityBuilder builder = MultipartEntityBuilder.create();\n+        FileBody fileBody1 = new FileBody(tmp1, contentType);\n+        FileBody fileBody2 = new FileBody(tmp2, contentType);\n+        builder = builder.addPart(\"upload\", fileBody1);\n+        builder = builder.addPart(\"upload\", fileBody2);\n+\n+        HttpEntity entity = builder.build();\n+\n+        ByteArrayOutputStream os = new ByteArrayOutputStream();\n+        entity.writeTo(os);\n+        ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());\n+\n+        HttpServletRequest req = mock(HttpServletRequest.class);\n+        when(req.getContentType()).thenReturn(entity.getContentType());\n+        when(req.getMethod()).thenReturn(\"POST\");\n+        when(req.getContentLength()).thenReturn((int) entity.getContentLength());\n+        when(req.getInputStream()).thenReturn(new MockServletInputStream(is));\n+\n+        ImportingJob job = ImportingManager.createJob();\n+        Map<String, String> parameters = ParsingUtilities.parseParameters(req);\n+        ObjectNode config = ParsingUtilities.mapper.createObjectNode();\n+        ObjectNode retrievalRecord = ParsingUtilities.mapper.createObjectNode();\n+        JSONUtilities.safePut(config, \"retrievalRecord\", retrievalRecord);\n+        JSONUtilities.safePut(config, \"state\", \"loading-raw-data\");\n+\n+        final ObjectNode progress = ParsingUtilities.mapper.createObjectNode();\n+        JSONUtilities.safePut(config, \"progress\", progress);\n+\n+        ImportingUtilities.retrieveContentFromPostRequest(req, parameters, job.getRawDataDir(), retrievalRecord,\n+                new ImportingUtilities.Progress() {\n+\n+                    @Override\n+                    public void setProgress(String message, int percent) {\n+                        if (message != null) {\n+                            JSONUtilities.safePut(progress, \"message\", message);\n+                        }\n+                        JSONUtilities.safePut(progress, \"percent\", percent);\n+                    }\n+\n+                    @Override\n+                    public boolean isCanceled() {\n+                        return job.canceled;\n+                    }\n+                });\n+\n+        assertEquals(expectedFormat, JSONUtilities.getArray(retrievalRecord, \"files\").get(0).get(\"format\").asText());\n+        assertEquals(expectedFormat, JSONUtilities.getArray(retrievalRecord, \"files\").get(1).get(\"format\").asText());\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "File format info was not getting set when multiple files are uploaded.\r\n\r\nFixes #6772 \r\n\r\nChanges proposed in this pull request:\r\n- Set format in the import flow for multiple files\r\n- Identify format based on the file, added guessBetterFormat() method\r\n- Tested with multiple file types the format is getting set correctly \r\n", "PR_Title": "File type detection fails when multiple files are imported at once", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6788_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6788, "issue_title": "File type detection fails when multiple files are imported at once", "issue_body": "File format info was not getting set when multiple files are uploaded.\r\n\r\nFixes #6772 \r\n\r\nChanges proposed in this pull request:\r\n- Set format in the import flow for multiple files\r\n- Identify format based on the file, added guessBetterFormat() method\r\n- Tested with multiple file types the format is getting set correctly \r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6757", "base_commit": "3519f46fcd46a0b41a8ddb72bc3f0381250edbe5", "patch": "diff --git a/extensions/database/pom.xml b/extensions/database/pom.xml\nindex 1403e93f5..f79fa6797 100644\n--- a/extensions/database/pom.xml\n+++ b/extensions/database/pom.xml\n@@ -104,7 +104,7 @@\n     <dependency>\n       <groupId>org.xerial</groupId>\n       <artifactId>sqlite-jdbc</artifactId>\n-      <version>3.46.0.0</version>\n+      <version>3.46.0.1</version>\n     </dependency>\n     <dependency>\n       <groupId>com.fasterxml.jackson.core</groupId>\ndiff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml\nindex 1dee209aa..3842e9f18 100644\n--- a/extensions/gdata/pom.xml\n+++ b/extensions/gdata/pom.xml\n@@ -83,7 +83,7 @@\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-drive</artifactId>\n-      <version>v3-rev20240628-2.0.0</version>\n+      <version>v3-rev20240722-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.google.apis</groupId>\ndiff --git a/main/src/com/google/refine/importers/SeparatorBasedImporter.java b/main/src/com/google/refine/importers/SeparatorBasedImporter.java\nindex 9cf332947..56a3614b3 100644\n--- a/main/src/com/google/refine/importers/SeparatorBasedImporter.java\n+++ b/main/src/com/google/refine/importers/SeparatorBasedImporter.java\n@@ -69,6 +69,10 @@ import com.google.refine.util.JSONUtilities;\n \n public class SeparatorBasedImporter extends TabularImportingParserBase {\n \n+    // Excel limits: 1M rows x 16K columns, 32K characters max per cell\n+    public static final int MAX_COLUMNS = 16 * 1024; // default 512\n+    // TODO: Perhaps use a lower default and make user configurable?\n+    public static final int MAX_CHARACTERS_PER_CELL = 32 * 1024; // default 4096\n     public static final int GUESSER_LINE_COUNT = 100;\n     char DEFAULT_QUOTE_CHAR = new CsvParserSettings().getFormat().getQuote();\n \n@@ -145,7 +149,8 @@ public class SeparatorBasedImporter extends TabularImportingParserBase {\n         AbstractParser parser;\n         if (tsv) {\n             TsvParserSettings settings = new TsvParserSettings();\n-            settings.setMaxCharsPerColumn(256 * 1024); // TODO: Perhaps use a lower default and make user configurable?\n+            settings.setMaxCharsPerColumn(MAX_CHARACTERS_PER_CELL);\n+            settings.setMaxColumns(MAX_COLUMNS);\n             settings.setIgnoreLeadingWhitespaces(false);\n             settings.setIgnoreTrailingWhitespaces(false);\n             parser = new TsvParser(settings);\n@@ -161,7 +166,8 @@ public class SeparatorBasedImporter extends TabularImportingParserBase {\n                 settings.setUnescapedQuoteHandling(UnescapedQuoteHandling.RAISE_ERROR);\n             }\n             settings.setKeepQuotes(!processQuotes);\n-            settings.setMaxCharsPerColumn(256 * 1024); // TODO: Perhaps use a lower default and make user configurable?\n+            settings.setMaxCharsPerColumn(MAX_CHARACTERS_PER_CELL);\n+            settings.setMaxColumns(MAX_COLUMNS);\n             parser = new CsvParser(settings);\n         }\n         try (final LineNumberReader lnReader = new LineNumberReader(reader);) {\ndiff --git a/pom.xml b/pom.xml\nindex cb9da7068..d7d4d5ad3 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -98,7 +98,7 @@\n     <jsoup.version>1.18.1</jsoup.version>\n     <odfdom-java.version>0.12.0</odfdom-java.version> <!-- do not update to 0.10.0, see issue #4397 -->\n     <vicino.version>1.2.1</vicino.version>\n-    <clojure.version>1.11.3</clojure.version>\n+    <clojure.version>1.11.4</clojure.version>\n     <httpclient5.version>5.3.1</httpclient5.version>\n     <httpcore.version>4.4.16</httpcore.version>\n     <univocity-csv.version>2.9.1</univocity-csv.version>\n@@ -109,7 +109,7 @@\n     <juniversalchardet.version>2.5.0</juniversalchardet.version>\n     <testng.version>7.10.2</testng.version>\n     <httpmime.version>4.5.14</httpmime.version>\n-    <owasp-encoder.version>1.2.3</owasp-encoder.version>\n+    <owasp-encoder.version>1.3.0</owasp-encoder.version>\n     <jasypt.version>1.9.3</jasypt.version>\n     <mockito.version>5.12.0</mockito.version>\n \n", "test_patch": "diff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex cb6f849df..5f0cb8503 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -16,7 +16,7 @@\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"13.13.1\",\n+        \"cypress\": \"13.13.2\",\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 65866a6b7..f7ed19f18 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -7,10 +7,10 @@\n   resolved \"https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf\"\n   integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==\n \n-\"@cypress/request@^3.0.0\":\n-  version \"3.0.0\"\n-  resolved \"https://registry.yarnpkg.com/@cypress/request/-/request-3.0.0.tgz#7f58dfda087615ed4e6aab1b25fffe7630d6dd85\"\n-  integrity sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==\n+\"@cypress/request@^3.0.1\":\n+  version \"3.0.1\"\n+  resolved \"https://registry.yarnpkg.com/@cypress/request/-/request-3.0.1.tgz#72d7d5425236a2413bd3d8bb66d02d9dc3168960\"\n+  integrity sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==\n   dependencies:\n     aws-sign2 \"~0.7.0\"\n     aws4 \"^1.8.0\"\n@@ -25,7 +25,7 @@\n     json-stringify-safe \"~5.0.1\"\n     mime-types \"~2.1.19\"\n     performance-now \"^2.1.0\"\n-    qs \"~6.10.3\"\n+    qs \"6.10.4\"\n     safe-buffer \"^5.1.2\"\n     tough-cookie \"^4.1.3\"\n     tunnel-agent \"^0.6.0\"\n@@ -436,12 +436,12 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress@13.13.1:\n-  version \"13.13.1\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.13.1.tgz#860c1142a6e58ea412a764f0ce6ad07567721129\"\n-  integrity sha512-8F9UjL5MDUdgC/S5hr8CGLHbS5gGht5UOV184qc2pFny43fnkoaKxlzH/U6//zmGu/xRTaKimNfjknLT8+UDFg==\n+cypress@13.13.2:\n+  version \"13.13.2\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.13.2.tgz#c71f8d92056c430b1b879e5313f6de25ccce0eda\"\n+  integrity sha512-PvJQU33933NvS1StfzEb8/mu2kMy4dABwCF+yd5Bi7Qly1HOVf+Bufrygee/tlmty/6j5lX+KIi8j9Q3JUMbhA==\n   dependencies:\n-    \"@cypress/request\" \"^3.0.0\"\n+    \"@cypress/request\" \"^3.0.1\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n     \"@types/sinonjs__fake-timers\" \"8.1.1\"\n     \"@types/sizzle\" \"^2.3.2\"\n@@ -1317,10 +1317,10 @@ punycode@^2.1.0, punycode@^2.1.1:\n   resolved \"https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz\"\n   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==\n \n-qs@~6.10.3:\n-  version \"6.10.5\"\n-  resolved \"https://registry.yarnpkg.com/qs/-/qs-6.10.5.tgz#974715920a80ff6a262264acd2c7e6c2a53282b4\"\n-  integrity sha512-O5RlPh0VFtR78y79rgcgKK4wbAI0C5zGVLztOIdpWX6ep368q5Hv6XRxDvXuZ9q3C6v+e3n8UfZZJw7IIG27eQ==\n+qs@6.10.4:\n+  version \"6.10.4\"\n+  resolved \"https://registry.yarnpkg.com/qs/-/qs-6.10.4.tgz#6a3003755add91c0ec9eacdc5f878b034e73f9e7\"\n+  integrity sha512-OQiU+C+Ds5qiH91qh/mg0w+8nwQuLjM4F4M/PbmhDOoYehPh+Fb0bDjtR1sOvy7YKxvj28Y/M0PhP5uVX0kB+g==\n   dependencies:\n     side-channel \"^1.0.4\"\n \ndiff --git a/main/tests/server/src/com/google/refine/importers/ImporterTest.java b/main/tests/server/src/com/google/refine/importers/ImporterTest.java\nindex ec6649714..75e5cdac4 100644\n--- a/main/tests/server/src/com/google/refine/importers/ImporterTest.java\n+++ b/main/tests/server/src/com/google/refine/importers/ImporterTest.java\n@@ -96,7 +96,7 @@ public abstract class ImporterTest extends RefineTest {\n                 -1,\n                 options,\n                 exceptions);\n-        assertEquals(exceptions.size(), 0);\n+        assertEquals(exceptions.size(), 0, \"Unexpected exception(s) thrown: \" + exceptions);\n         project.update();\n     }\n \n@@ -111,7 +111,7 @@ public abstract class ImporterTest extends RefineTest {\n                 -1,\n                 options,\n                 exceptions);\n-        assertEquals(exceptions.size(), 0);\n+        assertEquals(exceptions.size(), 0, \"Unexpected exception(s) thrown: \" + exceptions);\n         project.update();\n     }\n \n@@ -143,7 +143,7 @@ public abstract class ImporterTest extends RefineTest {\n                 -1,\n                 options,\n                 exceptions);\n-        assertEquals(exceptions.size(), 0);\n+        assertEquals(exceptions.size(), 0, \"Unexpected exception(s) thrown: \" + exceptions);\n         XmlImportUtilities.createColumnsFromImport(project, rootColumnGroup);\n         project.columnModel.update();\n     }\ndiff --git a/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java b/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java\nindex 92357de95..4f59715c0 100644\n--- a/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java\n+++ b/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java\n@@ -46,6 +46,7 @@ import java.util.List;\n \n import com.fasterxml.jackson.databind.node.ObjectNode;\n import org.apache.commons.io.FileUtils;\n+import org.apache.commons.io.input.CharSequenceReader;\n import org.slf4j.LoggerFactory;\n import org.testng.Assert;\n import org.testng.annotations.AfterMethod;\n@@ -298,6 +299,39 @@ public class SeparatorBasedImporterTests extends ImporterTest {\n         assertProjectEquals(project, expectedProject);\n     }\n \n+    @Test(dataProvider = \"CSV-TSV-AutoDetermine\")\n+    public void readManyColumns(String sep) {\n+        // create input\n+        int width = 16 * 1024; // Excel supports 16K columns max, so let's test that\n+        String inputSeparator = sep == null ? \"\\t\" : sep;\n+        StringBuilder input = new StringBuilder();\n+        String[] colNames = new String[width];\n+        for (int i = 0; i < width; i++) {\n+            String name = \"col\" + (i + 1);\n+            input.append(name + inputSeparator);\n+            colNames[i] = name;\n+        }\n+        input = input.deleteCharAt(input.length() - 1); // we don't need the last separator\n+        input.append('\\n');\n+        String[] data = new String[width];\n+        for (int i = 0; i < width; i++) {\n+            String value = \"data\" + (i + 1);\n+            input.append(value + inputSeparator);\n+            data[i] = value;\n+        }\n+        input = input.deleteCharAt(input.length() - 1); // we don't need the last separator\n+\n+        prepareOptions(sep, -1, 0, 0, 1, false, false);\n+        parseOneFile(SUT, new CharSequenceReader(input));\n+\n+        Project expectedProject = createProject(\n+                colNames,\n+                new Serializable[][] {\n+                        data,\n+                });\n+        assertProjectEquals(project, expectedProject);\n+    }\n+\n     @Test(groups = {}, dataProvider = \"CSV-TSV-AutoDetermine\")\n     public void readQuotedData(String sep) {\n         // create input\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6723 \r\n\r\nChanges proposed in this pull request:\r\n- Increase TSV/CSV column limit to 32K (from 512)\r\n- Make cryptic test assertion failures easier to understand\r\n\r\n", "PR_Title": "Increase TSV/CSV column limit to 32K (from 512). Fixes #6723", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6757_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6757, "issue_title": "Increase TSV/CSV column limit to 32K (from 512). Fixes #6723", "issue_body": "Fixes #6723 \r\n\r\nChanges proposed in this pull request:\r\n- Increase TSV/CSV column limit to 32K (from 512)\r\n- Make cryptic test assertion failures easier to understand\r\n\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "TheAlgorithms/Java", "instance_id": "TheAlgorithms__Java-4359", "base_commit": "81f38174a6399769a787c38c62fc2db8719540de", "patch": "diff --git a/src/main/java/com/thealgorithms/backtracking/FloodFill.java b/src/main/java/com/thealgorithms/backtracking/FloodFill.java\nindex 01b26916..eb4939b3 100644\n--- a/src/main/java/com/thealgorithms/backtracking/FloodFill.java\n+++ b/src/main/java/com/thealgorithms/backtracking/FloodFill.java\n@@ -39,6 +39,7 @@ public class FloodFill {\n      * @param oldColor The old color which is to be replaced in the image\n      */\n     public static void floodFill(int[][] image, int x, int y, int newColor, int oldColor) {\n+        if (newColor == oldColor) return;\n         if (x < 0 || x >= image.length) return;\n         if (y < 0 || y >= image[x].length) return;\n         if (getPixel(image, x, y) != oldColor) return;\n", "test_patch": "diff --git a/src/test/java/com/thealgorithms/backtracking/FloodFillTest.java b/src/test/java/com/thealgorithms/backtracking/FloodFillTest.java\nindex 7a59b210..8b860b5b 100644\n--- a/src/test/java/com/thealgorithms/backtracking/FloodFillTest.java\n+++ b/src/test/java/com/thealgorithms/backtracking/FloodFillTest.java\n@@ -93,4 +93,14 @@ class FloodFillTest {\n         FloodFill.floodFill(image, 0, 1, 4, 1);\n         assertArrayEquals(expected, image);\n     }\n+\n+    @Test\n+    void testForSameNewAndOldColor() {\n+        int[][] image = {{1, 1, 2}, {1, 0, 0}, {1, 1, 1}};\n+\n+        int[][] expected = {{1, 1, 2}, {1, 0, 0}, {1, 1, 1}};\n+\n+        FloodFill.floodFill(image, 0, 1, 1, 1);\n+        assertArrayEquals(expected, image);\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [ ] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n\r\nFixed #4358 \r\nFixed case when both newColor and oldColor is passed as same integer causing infinite recursion by adding extra base condition.\r\nAlso added testcase for same and after that ran all testcase, which resulted as all passed.\r\n\r\n<img width=\"1511\" alt=\"Screenshot 2023-09-09 at 6 04 36 PM\" src=\"https://github.com/TheAlgorithms/Java/assets/76104205/b046b071-d9c3-443b-83c4-16075332724c\">\r\n\r\n", "PR_Title": "#4358 Fix : Floodfill infinite recursion due to same color", "docker_image": "xinzhou1997/swe_rpg_java:TheAlgorithms__Java-4359_linux", "log_parser": "def parse_java_mvn(log: str) -> dict[str, str]:\n    \"\"\"Parse Maven logs into {identifier: status}.\"\"\"\n    results = {}\n\n    failure_re = re.compile(\n        r\"^\\[ERROR\\]\\s+(?P<class>[A-Za-z0-9_$.]+)\\.(?P<method>[A-Za-z0-9_$.]+?)(?::(?P<line>\\d+))?\\b\"\n    )\n    running_re = re.compile(r\"^(?:\\[INFO\\]\\s+)?Running\\s+([A-Za-z0-9_$.]+)$\")\n    summary_re = re.compile(\n        r\"Tests run:\\s*(\\d+),\\s*Failures:\\s*(\\d+),\\s*Errors:\\s*(\\d+),\\s*Skipped:\\s*(\\d+)\"\n    )\n\n    seen_running = set()\n    current_running = None\n\n    for raw in log.splitlines():\n        line = raw.strip()\n        if not line:\n            continue\n        rm = running_re.match(line)\n        if rm:\n            running_name = rm.group(1)\n            current_running = running_name\n            seen_running.add(running_name)\n            continue\n        fm = failure_re.match(line)\n        if fm:\n            clazz = fm.group(\"class\")\n            method = fm.group(\"method\")\n            test_id = f\"{clazz}.{method}\"\n            results[test_id] = \"FAILED\"\n            results.setdefault(clazz, \"FAILED\")\n            continue\n\n        sm = summary_re.search(line)\n        if sm:\n            _tests_run, failures, errors, skipped = map(int, sm.groups())\n            if failures > 0 or errors > 0:\n                status = \"FAILED\"\n            elif skipped > 0:\n                status = \"SKIPPED\"\n            else:\n                status = \"PASSED\"\n            if current_running:\n                results.setdefault(current_running, status)\n            current_running = None\n\n    if not results and seen_running:\n        for clazz in seen_running:\n            results.setdefault(clazz, \"PASSED\")\n    return results\n", "test_cmds": ["bash -c '{ mvn --batch-mode test ; } > /tmp/test.log 2>&1'"], "rebuild_cmds": ["unset _JAVA_OPTIONS"], "issues": [{"issue_number": 4359, "issue_title": "#4358 Fix : Floodfill infinite recursion due to same color", "issue_body": "<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [ ] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n\r\nFixed #4358 \r\nFixed case when both newColor and oldColor is passed as same integer causing infinite recursion by adding extra base condition.\r\nAlso added testcase for same and after that ran all testcase, which resulted as all passed.\r\n\r\n<img width=\"1511\" alt=\"Screenshot 2023-09-09 at 6 04 36 PM\" src=\"https://github.com/TheAlgorithms/Java/assets/76104205/b046b071-d9c3-443b-83c4-16075332724c\">\r\n\r\n"}], "print_cmds": ["cat /tmp/test.log"], "working_dir": "/Java"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6946", "base_commit": "bf47ddf070ee7b14f810ab60ba520df3eb1cc9b9", "patch": "diff --git a/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js b/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js\nindex 83310818b..dfd0fe056 100644\n--- a/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js\n+++ b/main/webapp/modules/core/scripts/dialogs/column-reordering-dialog.js\n@@ -86,6 +86,7 @@ ColumnReorderingDialog.prototype._dismiss = function() {\n };\n \n ColumnReorderingDialog.prototype._commit = function() {\n+    var self = this;\n     var columnNames = this._elmts.columnContainer.find('div').map(function() { return this.getAttribute(\"column\"); }).get();\n     \n     Refine.postCoreProcess(\n@@ -93,8 +94,9 @@ ColumnReorderingDialog.prototype._commit = function() {\n         null,\n         { \"columnNames\" : JSON.stringify(columnNames) }, \n         { modelsChanged: true, rowIdsPreserved: true }, // TODO could add recordIdsPreserved: true if the record key column did not change\n-        { includeEngine: false }\n+        { \n+          includeEngine: false,\n+          onDone: function() { self._dismiss(); }\n+        }\n     );\n-    \n-    this._dismiss();\n };\ndiff --git a/main/webapp/modules/core/scripts/dialogs/common-transform-dialog.js b/main/webapp/modules/core/scripts/dialogs/common-transform-dialog.js\nindex 1632078c7..d66f60632 100644\n--- a/main/webapp/modules/core/scripts/dialogs/common-transform-dialog.js\n+++ b/main/webapp/modules/core/scripts/dialogs/common-transform-dialog.js\n@@ -106,29 +106,32 @@ commonTransformDialog.prototype._dismiss = function() {\n \n \n commonTransformDialog.prototype._commit = function(expression) {\n-      var doTextTransform = function(columnName, expression, onError, repeat, repeatCount) {\n+  var self = this;\n+  var columnNames = [];\n+  this._elmts.columnContainer.find('div').each(function() {\n+    if ($(this).find('input[type=\"checkbox\"]')[0].checked) {\n+      var name = this.getAttribute('column');\n+      columnNames.push(name);\n+    }\n+  });\n+  var doTextTransform = function(index, expression, onError, repeat, repeatCount) {\n+    if (index < columnNames.length) {\n       Refine.postCoreProcess(\n         \"text-transform\",\n         {\n-          columnName: columnName, \n+          columnName: columnNames[index], \n           expression: expression, \n           onError: onError,\n           repeat: repeat,\n           repeatCount: repeatCount\n         },\n         null,\n-        { cellsChanged: true, rowIdsPreserved: true }\n+        { cellsChanged: true, rowIdsPreserved: true },\n+        { onDone: function() { doTextTransform(index + 1, expression, onError, repeat, repeatCount) } }\n       );\n-  };\n-\n-\tthis._elmts.columnContainer.find('div').each(function() {\n-    if ($(this).find('input[type=\"checkbox\"]')[0].checked) {\n-      var name = this.getAttribute('column');\n-\t    doTextTransform(name,expression, \"keep-original\", false, \"\");\n+    } else {\n+      self._dismiss();\n     }\n-  });\n-  \n-    \n-    this._dismiss();\n-    \n+  };\n+  doTextTransform(0, expression, \"keep-original\", false, \"\");\n };\ndiff --git a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js\nindex ca2334e71..55f64b02c 100644\n--- a/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js\n+++ b/main/webapp/modules/core/scripts/dialogs/expression-column-dialog.js\n@@ -1,5 +1,5 @@\n \n-var doTextTransform = function(columnName, expression, onError, repeat, repeatCount) {\n+var doTextTransform = function(columnName, expression, onError, repeat, repeatCount, onDone) {\n     Refine.postCoreProcess(\n       \"text-transform\",\n       {\n@@ -10,7 +10,8 @@ var doTextTransform = function(columnName, expression, onError, repeat, repeatCo\n         repeatCount: repeatCount\n       },\n       null,\n-      { cellsChanged: true, rowIdsPreserved: true }\n+      { cellsChanged: true, rowIdsPreserved: true },\n+      { onDone }\n     );\n };\n \n@@ -87,7 +88,6 @@ ExpressionColumnDialog.prototype._dismiss = function() {\n \n ExpressionColumnDialog.prototype._transform = function() {\n   this._postSelect();\n-  this._dismiss();\n };\n \n ExpressionColumnDialog.prototype._postSelect = function() {\n@@ -96,7 +96,7 @@ ExpressionColumnDialog.prototype._postSelect = function() {\n     if ($(this).find('input[type=\"checkbox\"]')[0].checked) {\n       var name = this.getAttribute('column');\n       // alert(\"doTextTransform on: \" + name + \"; expression: \" + self._expression);\n-\t  doTextTransform(name, self._expression, self._onError, self._repeat, self._repeatCount)\n+\t  doTextTransform(name, self._expression, self._onError, self._repeat, self._repeatCount, self._dismiss)\n     }\n   });\n   \ndiff --git a/main/webapp/modules/core/scripts/facets/list-facet.js b/main/webapp/modules/core/scripts/facets/list-facet.js\nindex ffcc6e1fd..7fe7567e7 100644\n--- a/main/webapp/modules/core/scripts/facets/list-facet.js\n+++ b/main/webapp/modules/core/scripts/facets/list-facet.js\n@@ -583,8 +583,6 @@ class ListFacet extends Facet {\n     var commit = function() {\n       var text = elmts.textarea[0].value;\n \n-      MenuSystem.dismissAll();\n-\n       var edit = { to : text };\n       if (choice === self._blankChoice) {\n         edit.fromBlank = true;\n@@ -609,6 +607,7 @@ class ListFacet extends Facet {\n         },\n         {\n           onDone: function(o) {\n+            MenuSystem.dismissAll();\n             var selection = [];\n             var gotSelection = false;\n             for (var i = 0; i < self._selection.length; i++) {\ndiff --git a/main/webapp/modules/core/scripts/util/csrf.js b/main/webapp/modules/core/scripts/util/csrf.js\nindex d156916d6..a904a523f 100644\n--- a/main/webapp/modules/core/scripts/util/csrf.js\n+++ b/main/webapp/modules/core/scripts/util/csrf.js\n@@ -20,11 +20,7 @@ CSRFUtil.postCSRF = function(url, data, success, dataType, failCallback) {\n     return CSRFUtil.wrapCSRF(function(token) {\n         var fullData = data || {};\n         if (typeof fullData == 'string') {\n-            if (fullData.includes('?')) {\n-              fullData = fullData + \"&\" + $.param({csrf_token: token});\n-            } else {\n-              fullData = fullData + \"?\" + $.param({csrf_token: token});\n-            }\n+            fullData = fullData + \"&\" + $.param({csrf_token: token});\n         } else {\n             fullData['csrf_token'] = token;\n         }\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js\nindex f2b7978b5..584d81d42 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js\n@@ -32,7 +32,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n  */\n \n DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n-  var doTextTransform = function(expression, onError, repeat, repeatCount) {\n+  var doTextTransform = function(expression, onError, repeat, repeatCount, onDone) {\n     Refine.postCoreProcess(\n       \"text-transform\",\n       {\n@@ -42,7 +42,8 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n         repeatCount: repeatCount\n       },\n       { expression: expression },\n-      { cellsChanged: true }\n+      { cellsChanged: true },\n+      { onDone },\n     );\n   };\n \n@@ -72,9 +73,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n         previewWidget.getExpression(true),\n         $('input[name=\"text-transform-dialog-onerror-choice\"]:checked')[0].value,\n         elmts.repeatCheckbox[0].checked,\n-        elmts.repeatCountInput[0].value\n+        elmts.repeatCountInput[0].value,\n+        dismiss\n       );\n-      dismiss();\n     });\n \n     var o = DataTableView.sampleVisibleRows(column);\n@@ -285,8 +286,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n         text_to_find = '\"'+text_to_find+'\"';\n       }\n       expression = 'value.replace('+text_to_find+',\"'+replacement_text+'\")';\n-      doTextTransform(expression, \"keep-original\", false, \"\");\n-      dismiss();\n+      doTextTransform(expression, \"keep-original\", false, \"\", dismiss);\n     });\n   };\n \n@@ -383,10 +383,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n         \"split-multi-value-cells\",\n         config,\n         null,\n-        { rowsChanged: true }\n+        { rowsChanged: true },\n+        { onDone: dismiss }\n       );\n-\n-      dismiss();\n     });\n   };\n \n@@ -701,9 +700,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n         \"key-value-columnize\",\n         config,\n         null,\n-        { modelsChanged: true }\n+        { modelsChanged: true },\n+        { onDone: dismiss }\n       );\n-      dismiss();\n     });\n \n     var valueColumnIndex = -1;\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js b/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js\nindex 9c9dec8fa..a27988a18 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/menu-edit-column.js\n@@ -166,9 +166,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n           httpHeaders: JSON.stringify(elmts.setHttpHeadersContainer.find(\"input\").serializeArray())\n         },\n         null,\n-        { modelsChanged: true, rowIdsPreserved: true, recordIdsPreserved: true }\n+        { modelsChanged: true, rowIdsPreserved: true, recordIdsPreserved: true },\n+        { onDone: dismiss }\n       );\n-      dismiss();\n     });\n   };\n \n@@ -358,9 +358,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n         \"split-column\", \n         config,\n         null,\n-        { modelsChanged: true }\n+        { modelsChanged: true },\n+        { onDone: dismiss }\n       );\n-      dismiss();\n     });\n   }; \n   \n@@ -399,7 +399,6 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n       // function called in a callback\n       var deleteColumns = function() {\n         if (deleteJoinedColumns) {\n-          console.log (theProject);\n           var columnsToKeep = theProject.columnModel.columns\n           .map (function (col) {return col.name;})\n           .filter (function(colName) {\n@@ -466,7 +465,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n           },\n           { expression: expression },\n           { modelsChanged: true, rowIdsPreserved: true, recordIdsPreserved: true },\n-          { onFinallyDone: deleteColumns}\n+          { onDone: dismiss, onFinallyDone: deleteColumns}\n         );\n       } \n       else {\n@@ -476,7 +475,7 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n             onError,\n             repeat,\n             repeatCount,\n-            { onFinallyDone: deleteColumns});\n+            { onDone: dismiss, onFinallyDone: deleteColumns});\n       }\n     };\n     // core of doJoinColumn\n@@ -549,7 +548,6 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n       });\n     elmts.okButton.on('click',function() {\n       transform();\n-      dismiss();\n     });\n     elmts.cancelButton.on('click',function() {\n       dismiss();\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js b/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js\nindex 54f649774..9b5d0cd1f 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js\n@@ -221,10 +221,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n             schemaSpace: service.schemaSpace\n         },\n         null,\n-        { cellsChanged: true, columnStatsChanged: true, rowIdsPreserved: true, recordIdsPreserved: true }\n+        { cellsChanged: true, columnStatsChanged: true, rowIdsPreserved: true, recordIdsPreserved: true },\n+        { onDone: function() { DialogSystem.dismissUntil(level - 1); } }\n         );\n-\n-        DialogSystem.dismissUntil(level - 1);\n     });\n \n     $('<button class=\"button\"></button>').text($.i18n('core-buttons/cancel')).on('click',function() {\n@@ -395,9 +394,9 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n           \"recon-copy-across-columns\", \n           null,\n           config,\n-          { rowsChanged: true, rowIdsPreserved: true, recordIdsPreserved: true }\n+          { rowsChanged: true, rowIdsPreserved: true, recordIdsPreserved: true },\n+          { onDone: dismiss }\n         );\n-        dismiss();\n       }\n     });\n   };\ndiff --git a/modules/grel/src/main/java/com/google/refine/expr/functions/ToString.java b/modules/grel/src/main/java/com/google/refine/expr/functions/ToString.java\nindex f4b11b037..bac23d0c1 100644\n--- a/modules/grel/src/main/java/com/google/refine/expr/functions/ToString.java\n+++ b/modules/grel/src/main/java/com/google/refine/expr/functions/ToString.java\n@@ -35,8 +35,8 @@ package com.google.refine.expr.functions;\n \n import java.time.OffsetDateTime;\n import java.time.format.DateTimeFormatter;\n+import java.util.IllegalFormatException;\n import java.util.Properties;\n-import java.util.UnknownFormatConversionException;\n \n import com.google.refine.expr.EvalError;\n import com.google.refine.grel.ControlFunctionRegistry;\n@@ -59,7 +59,7 @@ public class ToString implements Function {\n                 } else if (o1 instanceof Number) {\n                     try {\n                         return String.format((String) o2, o1);\n-                    } catch (UnknownFormatConversionException e) {\n+                    } catch (IllegalFormatException e) {\n                         return new EvalError(EvalErrorMessage.unknown_format_conversion(e.getMessage()));\n                     }\n                 }\n", "test_patch": "diff --git a/main/tests/cypress/cypress/e2e/project/undo_redo/warn_for_history_deletion.cy.js b/main/tests/cypress/cypress/e2e/project/undo_redo/warn_for_history_deletion.cy.js\nindex 6c61ebdf9..8faa02bd5 100644\n--- a/main/tests/cypress/cypress/e2e/project/undo_redo/warn_for_history_deletion.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/undo_redo/warn_for_history_deletion.cy.js\n@@ -83,4 +83,50 @@ describe(__filename, function () {\n     // There are no future changes anymore, since they have been deleted\n     cy.get('.history-panel-body .history-future a').should('not.exist');\n   });\n+\n+  it('Apply a text transform after undoing some changes', function () {\n+    cy.loadAndVisitProject('food.mini');\n+\n+    // delete NDB_No\n+    cy.deleteColumn('NDB_No');\n+    cy.get('#or-proj-undoRedo').should('to.contain', '1 / 1');\n+    cy.get('.history-panel-body .history-now').should(\n+      'to.contain',\n+      'Remove column NDB_No'\n+    );\n+\n+    // Open the Undo/Redo panel\n+    cy.get('#or-proj-undoRedo').click();\n+\n+    // undo the change\n+    cy.get(\n+      '.history-panel-body .history-past a.history-entry:first-of-type'\n+    ).click();\n+    cy.get('.history-panel-body .history-now').should(\n+      'to.contain',\n+      'Create project'\n+    );\n+    cy.get('.history-panel-body .history-future').should(\n+      'to.contain',\n+      'Remove column NDB_No'\n+    );\n+\n+    cy.columnActionClick('Shrt_Desc', ['Edit cells', 'Transform']);\n+\n+    cy.typeExpression('value.replace(\"E\",\"e\")');\n+    cy.get('.dialog-footer .button-primary').click();\n+\n+    // ensure we get a dialog warning us for deletion of changes\n+    cy.get('.dialog-header').should('to.contain', 'Confirm deletion of project history');\n+    // confirm the dialog   \n+    cy.get('.dialog-footer .button-primary').contains('Apply anyway').click();\n+\n+    // ensure value has been changed in the grid\n+    cy.get('.menu-container.data-table-cell-editor').should('not.exist');\n+    cy.assertCellEquals(1, 'Shrt_Desc', 'BUTTeR,WHIPPeD,WITH SALT');\n+\n+    // There are no future changes anymore, since they have been deleted\n+    cy.get('.history-panel-body .history-future a').should('not.exist');\n+  });\n+\n });\ndiff --git a/modules/grel/src/test/java/com/google/refine/expr/functions/ToStringTests.java b/modules/grel/src/test/java/com/google/refine/expr/functions/ToStringTests.java\nindex 1b7974011..a38b7549b 100644\n--- a/modules/grel/src/test/java/com/google/refine/expr/functions/ToStringTests.java\n+++ b/modules/grel/src/test/java/com/google/refine/expr/functions/ToStringTests.java\n@@ -59,6 +59,7 @@ public class ToStringTests extends GrelTestBase {\n         assertTrue(invoke(\"toString\", 100L, \"%\") instanceof EvalError);\n         assertTrue(invoke(\"toString\", 100L, \"%.\") instanceof EvalError);\n         assertTrue(invoke(\"toString\", 100L, \"%0\") instanceof EvalError);\n+        assertTrue(invoke(\"toString\", 12L, \"%2.2f\") instanceof EvalError);\n \n         // test with large number\n         assertEquals(invoke(\"toString\", 1000000000000000000L, \"%d\"), \"1000000000000000000\");\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6943\r\n\r\nChanges proposed in this pull request:\r\n- Broaden illegal format exception caught. ", "PR_Title": "Broaden illegal format exception caught. Fixes #6943", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6946_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6946, "issue_title": "Broaden illegal format exception caught. Fixes #6943", "issue_body": "Fixes #6943\r\n\r\nChanges proposed in this pull request:\r\n- Broaden illegal format exception caught. "}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6862", "base_commit": "58d3e4470ebcc49d63cd9d10f5d883f9c78a396e", "patch": "diff --git a/.gitattributes b/.gitattributes\nindex 7057ad030..412eeda78 100644\n--- a/.gitattributes\n+++ b/.gitattributes\n@@ -1,5 +1,5 @@\n # Auto detect text files and perform LF normalization\n-* text=off\n+* text=auto\n \n # Custom for Visual Studio\n *.cs     diff=csharp\ndiff --git a/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java b/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java\nindex e240320f4..bcccb4028 100644\n--- a/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java\n+++ b/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java\n@@ -34,8 +34,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n package com.google.refine.jython;\n \n import java.io.File;\n+import java.sql.Timestamp;\n+import java.time.OffsetDateTime;\n+import java.time.ZoneOffset;\n import java.util.ArrayList;\n-import java.util.Iterator;\n import java.util.List;\n import java.util.Properties;\n \n@@ -128,10 +130,19 @@ public class JythonEvaluable implements Evaluable {\n     @Override\n     public Object evaluate(Properties bindings) {\n         try {\n+            Object value = bindings.get(\"value\");\n+            PyObject pyValue;\n+            if (value instanceof OffsetDateTime) {\n+                // We know the OffsetDateTime is always at UTC, but just in case it ever changes, do the UTC change\n+                pyValue = Py.newDatetime(Timestamp.valueOf(((OffsetDateTime) value).atZoneSameInstant(ZoneOffset.UTC).toLocalDateTime()));\n+            } else {\n+                pyValue = Py.java2py(value);\n+            }\n             // call the temporary PyFunction directly\n             Object result = ((PyFunction) _engine.get(s_functionName)).__call__(\n+\n                     new PyObject[] {\n-                            Py.java2py(bindings.get(\"value\")),\n+                            pyValue,\n                             new JythonHasFieldsWrapper((HasFields) bindings.get(\"cell\"), bindings),\n                             new JythonHasFieldsWrapper((HasFields) bindings.get(\"cells\"), bindings),\n                             new JythonHasFieldsWrapper((HasFields) bindings.get(\"row\"), bindings),\n@@ -169,16 +180,23 @@ public class JythonEvaluable implements Evaluable {\n     protected Object unwrap(PyObject po) {\n         if (po instanceof PyNone) {\n             return null;\n+        } else if (\"datetime\".equals(po.getType().getName())) {\n+            return OffsetDateTime.of(\n+                    po.__getattr__(\"year\").asInt(),\n+                    po.__getattr__(\"month\").asInt(),\n+                    po.__getattr__(\"day\").asInt(),\n+                    po.__getattr__(\"hour\").asInt(),\n+                    po.__getattr__(\"minute\").asInt(),\n+                    po.__getattr__(\"second\").asInt(),\n+                    po.__getattr__(\"microsecond\").asInt() * 1000, // scale to nanoseconds\n+                    ZoneOffset.UTC);\n         } else if (po.isNumberType()) {\n             return po.asDouble();\n         } else if (po.isSequenceType()) {\n-            Iterator<PyObject> i = po.asIterable().iterator();\n-\n-            List<Object> list = new ArrayList<Object>();\n-            while (i.hasNext()) {\n-                list.add(unwrap((Object) i.next()));\n+            List<Object> list = new ArrayList<>();\n+            for (Object o : po.asIterable()) {\n+                list.add(unwrap(o));\n             }\n-\n             return list.toArray();\n         } else {\n             return po;\n", "test_patch": "diff --git a/extensions/jython/tests/src/com/google/refine/jython/JythonEvaluableTest.java b/extensions/jython/tests/src/com/google/refine/jython/JythonEvaluableTest.java\nindex f97903336..733a232cd 100644\n--- a/extensions/jython/tests/src/com/google/refine/jython/JythonEvaluableTest.java\n+++ b/extensions/jython/tests/src/com/google/refine/jython/JythonEvaluableTest.java\n@@ -1,6 +1,8 @@\n \n package com.google.refine.jython;\n \n+import java.time.OffsetDateTime;\n+import java.time.ZoneOffset;\n import java.util.Properties;\n \n import org.python.core.PyObject;\n@@ -18,26 +20,29 @@ import com.google.refine.model.Row;\n  */\n public class JythonEvaluableTest {\n \n-    // Reproduces the situation when result is a PyObject\n-    // Version with a test case which only calls the existing evaluate method\n-    @Test\n-    public void unwrapPyObjectTest() {\n-        Properties props = new Properties();\n+    private Properties createBindings() {\n         Project project = new Project();\n-\n         Row row = new Row(2);\n         row.setCell(0, new Cell(\"one\", null));\n         row.setCell(0, new Cell(\"1\", null));\n+        Properties bindings = new Properties();\n+        bindings.put(\"columnName\", \"number\");\n+        bindings.put(\"true\", \"true\");\n+        bindings.put(\"false\", \"false\");\n+        bindings.put(\"rowIndex\", \"0\");\n+        bindings.put(\"value\", 1);\n+        bindings.put(\"project\", project);\n+        bindings.put(\"call\", \"number\");\n+        bindings.put(\"PI\", \"3.141592654\");\n+        bindings.put(\"cells\", new CellTuple(project, row));\n+        return bindings;\n+    }\n \n-        props.put(\"columnName\", \"number\");\n-        props.put(\"true\", \"true\");\n-        props.put(\"false\", \"false\");\n-        props.put(\"rowIndex\", \"0\");\n-        props.put(\"value\", 1);\n-        props.put(\"project\", project);\n-        props.put(\"call\", \"number\");\n-        props.put(\"PI\", \"3.141592654\");\n-        props.put(\"cells\", new CellTuple(project, row));\n+    // Reproduces the situation when result is a PyObject\n+    // Version with a test case which only calls the existing evaluate method\n+    @Test\n+    public void unwrapPyObjectTest() {\n+        Properties props = createBindings();\n         String funcExpression = \"class Foo(object):\\n\" +\n                 \"    bar = 1\\n\" +\n                 \"\\n\" +\n@@ -49,22 +54,7 @@ public class JythonEvaluableTest {\n \n     @Test\n     public void testJythonConcurrent() {\n-        Properties props = new Properties();\n-        Project project = new Project();\n-\n-        Row row = new Row(2);\n-        row.setCell(0, new Cell(\"one\", null));\n-        row.setCell(0, new Cell(\"1\", null));\n-\n-        props.put(\"columnName\", \"number\");\n-        props.put(\"true\", \"true\");\n-        props.put(\"false\", \"false\");\n-        props.put(\"rowIndex\", \"0\");\n-        props.put(\"value\", 1);\n-        props.put(\"project\", project);\n-        props.put(\"call\", \"number\");\n-        props.put(\"PI\", \"3.141592654\");\n-        props.put(\"cells\", new CellTuple(project, row));\n+        Properties props = createBindings();\n \n         Evaluable eval1 = new JythonEvaluable(\"a = value\\nreturn a * 2\");\n         Long value1 = (Long) eval1.evaluate(props);\n@@ -76,4 +66,71 @@ public class JythonEvaluableTest {\n         Long value2 = (Long) eval1.evaluate(props);\n         Assert.assertEquals(value1, value2);\n     }\n+\n+    @Test\n+    public void testJythonDate() {\n+        Properties bindings = createBindings();\n+        OffsetDateTime expectedDate = OffsetDateTime.of(2024, 10, 2, 12, 30, 30, 0, ZoneOffset.UTC);\n+\n+        // Test passing a date out from Python (wow, Python 2.7 timezone handling is primitive!)\n+        Evaluable evaluable = new JythonEvaluable(\"from datetime import datetime,timedelta,tzinfo\\n\" +\n+                \"\\n\" +\n+                \"ZERO = timedelta(0)\\n\" +\n+                \"\\n\" +\n+                \"class UTC(tzinfo):\\n\" +\n+                \"    \\\"\\\"\\\"UTC\\\"\\\"\\\"\\n\" +\n+                \"\\n\" +\n+                \"    def utcoffset(self, dt):\\n\" +\n+                \"        return ZERO\\n\" +\n+                \"\\n\" +\n+                \"    def tzname(self, dt):\\n\" +\n+                \"        return \\\"UTC\\\"\\n\" +\n+                \"\\n\" +\n+                \"    def dst(self, dt):\\n\" +\n+                \"        return ZERO\\n\" +\n+                \"\\n\" +\n+                \"utc = UTC()\" +\n+                \"\\n\" +\n+                \"return datetime(2024, 10, 2, 12, 30, 30, tzinfo=utc)\");\n+        Object result = evaluable.evaluate(bindings);\n+        Assert.assertEquals(result, expectedDate);\n+\n+        // Test passing a date in\n+        bindings.put(\"value\", expectedDate);\n+        evaluable = new JythonEvaluable(\"import datetime\\n\" +\n+                \"return isinstance(value,datetime.datetime)\");\n+        result = evaluable.evaluate(bindings);\n+        Assert.assertEquals(result, 1L); // Python's version of true\n+\n+        evaluable = new JythonEvaluable(\"import datetime\\n\" +\n+                \"return str(value)\");\n+        result = evaluable.evaluate(bindings);\n+        Assert.assertEquals(result, \"2024-10-02 12:30:30\");\n+    }\n+\n+    @Test\n+    public void testJythonDataTypes() {\n+        Properties bindings = new Properties(); // tests are self-contained, so no bindings needed\n+\n+        // Test sequences\n+        Evaluable evaluable = new JythonEvaluable(\"return (1,2)\");\n+        Object result = evaluable.evaluate(bindings);\n+        Assert.assertEquals(result, new Long[] { 1L, 2L });\n+\n+        // Test floats\n+        evaluable = new JythonEvaluable(\"return 1.2\");\n+        result = evaluable.evaluate(bindings);\n+        Assert.assertEquals(result, 1.2);\n+\n+        // Test integers\n+        evaluable = new JythonEvaluable(\"return 1\");\n+        result = evaluable.evaluate(bindings);\n+        Assert.assertEquals(result, 1L);\n+\n+        // Test strings\n+        evaluable = new JythonEvaluable(\"return 'foo'\");\n+        result = evaluable.evaluate(bindings);\n+        Assert.assertEquals(result, \"foo\");\n+\n+    }\n }\ndiff --git a/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.numeric.cy.js b/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.numeric.cy.js\nindex 00d058978..839417216 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.numeric.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.numeric.cy.js\n@@ -38,23 +38,31 @@ describe(__filename, function () {\n     cy.get('.slider-widget-bracket').eq(1)\n     .trigger('mousedown',{ force: true })\n     .trigger('mousemove',-130,0,{ force: true })\n-    .trigger('mouseup',{ force: true })\n+    .trigger('mouseup',{ force: true });\n+    cy.get('.facet-range-status').contains('0 — 45');\n     cy.get('#summary-bar').contains('72 matching rows');\n \n-    //sliding the middle portion in numeric facet\n+    // wait for the numeric facet to be refreshed before next mouse events\n+    cy.get('.browsing-panel-indicator').should(\"not.be.visible\");\n+\n+    // sliding entire selection by the body (middle)\n     cy.get('.slider-widget-draggable').eq(0)\n-      // FIXME: These are the last two uses of the hated waitForOrOperation\n-    .trigger('mousedown',{ force: true }).waitForOrOperation()\n+    .trigger('mousedown',{ force: true })\n     .trigger('mousemove',130,0,{ force: true })\n-    .trigger('mouseup',{ force: true }).waitForOrOperation();\n-    cy.get('#summary-bar').contains('70 matching rows');\n+    .trigger('mouseup',{ force: true });\n+    cy.get('.facet-range-status').contains('23 — 68');\n+    cy.get('#summary-bar').contains('74 matching rows');\n+\n+    // wait for the numeric facet to be refreshed before next mouse events\n+    cy.get('.browsing-panel-indicator').should(\"not.be.visible\");\n \n     //sliding the left slider\n     cy.get('.slider-widget-bracket').eq(0)\n     .trigger('mousedown',{ force: true })\n     .trigger('mousemove',130,0,{ force: true })\n-    .trigger('mouseup',{ force: true })\n-    cy.get('#summary-bar').contains('4 matching rows');\n+    .trigger('mouseup',{ force: true });\n+    cy.get('.facet-range-status').contains('66 — 68');\n+    cy.get('#summary-bar').contains('3 matching rows');\n   });\n \n   it('Test for checkboxes and reset button', function () {\ndiff --git a/main/tests/cypress/cypress/support/commands.js b/main/tests/cypress/cypress/support/commands.js\nindex 306132747..72ccf187a 100644\n--- a/main/tests/cypress/cypress/support/commands.js\n+++ b/main/tests/cypress/cypress/support/commands.js\n@@ -189,21 +189,6 @@ Cypress.Commands.add('navigateTo', (target) => {\n   cy.get('#action-area-tabs li').contains(target).click();\n });\n \n-/**\n- * Wait for OpenRefine to finish an Ajax load\n- *\n- * @deprecated\n- *\n- * NOTE: This command is unreliable because if you call it after starting an operation e.g. with a click(), the loading\n- * indicator may have come and gone already by the time waitForOrOperation() is called, causing the cypress test to\n- * wait forever on ajax_in_progress=true until it fails due to timeout.\n- *\n- */\n-Cypress.Commands.add('waitForOrOperation', () => {\n-  cy.get('body[ajax_in_progress=\"true\"]');\n-  cy.get('body[ajax_in_progress=\"false\"]');\n-});\n-\n /**\n  * Utility method to fill something into the expression input\n  */\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #692 \r\n\r\nChanges proposed in this pull request:\r\n- adds support for passing dates into and out of Jython\r\n- includes tests for passing dates both directions\r\n- simplifies sequence unwrapping\r\n- add tests for sequences, ints, floats, strings\r\n", "PR_Title": "Add date handling to Jython.  Fixes #692", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6862_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6862, "issue_title": "Add date handling to Jython.  Fixes #692", "issue_body": "Fixes #692 \r\n\r\nChanges proposed in this pull request:\r\n- adds support for passing dates into and out of Jython\r\n- includes tests for passing dates both directions\r\n- simplifies sequence unwrapping\r\n- add tests for sequences, ints, floats, strings\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-5976", "base_commit": "9042ff708e37291ec2072c837cc82ceea7c5fa60", "patch": "diff --git a/.gitignore b/.gitignore\nindex 08f43909a..459392486 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -69,6 +69,10 @@ node_modules/\n # Ignore the node_modules folder as they are dependencies to be installed by end-user\n main/webapp/node_modules\n \n+# Yarn internal files\n+**/.yarn\n+**/.yarnrc.yml\n+\n # Ignore .gitignore among extensions as it can be used to ignore custom extensions\n \n extensions/.gitignore\ndiff --git a/extensions/wikibase/module/scripts/dialogs/schema-list-item.html b/extensions/wikibase/module/scripts/dialogs/schema-list-item.html\nindex 8ce783b1e..334f625b5 100644\n--- a/extensions/wikibase/module/scripts/dialogs/schema-list-item.html\n+++ b/extensions/wikibase/module/scripts/dialogs/schema-list-item.html\n@@ -2,7 +2,7 @@\n     <div class=\"wikibase-template-info\">\n         <span class=\"wikibase-name\" bind=\"templateName\"></span>\n     </div>\n-    <div class=\"wikibase-template-actions\">\n+    <div class=\"wikibase-template-actions\" style=\"float: right;\">\n         <a bind=\"renameTemplate\"></a> | \n         <a bind=\"downloadTemplate\"></a> |\n         <a bind=\"deleteTemplate\"></a>\ndiff --git a/extensions/wikibase/module/styles/dialogs/schema-management-dialog.css b/extensions/wikibase/module/styles/dialogs/schema-management-dialog.css\nindex 01f4618e0..890e3fec2 100644\n--- a/extensions/wikibase/module/styles/dialogs/schema-management-dialog.css\n+++ b/extensions/wikibase/module/styles/dialogs/schema-management-dialog.css\n@@ -1,5 +1,6 @@\n .schema-template-list {\n-  list-style: none;\n+  list-style: decimal;\n+  list-style-position: inside;\n   max-height: 450px;\n   overflow-y: auto;\n }\n@@ -10,8 +11,7 @@\n \n .schema-template-list li {\n   padding: .5em;\n-  display: flex;\n-  justify-content: space-between;\n+  display: list-item;\n }\n \n .schema-template-list li:nth-child(odd) {\ndiff --git a/main/src/com/google/refine/expr/functions/Length.java b/main/src/com/google/refine/expr/functions/Length.java\nindex d7fde5db9..6ca73c740 100644\n--- a/main/src/com/google/refine/expr/functions/Length.java\n+++ b/main/src/com/google/refine/expr/functions/Length.java\n@@ -37,6 +37,8 @@ import java.util.Collection;\n import java.util.Properties;\n \n import com.fasterxml.jackson.databind.node.ArrayNode;\n+import com.fasterxml.jackson.databind.node.ObjectNode;\n+\n import com.google.refine.expr.EvalError;\n import com.google.refine.expr.HasFieldsList;\n import com.google.refine.grel.ControlFunctionRegistry;\n@@ -61,6 +63,8 @@ public class Length implements Function {\n                     return ((HasFieldsList) v).length();\n                 } else if (v instanceof ArrayNode) {\n                     return ((ArrayNode) v).size();\n+                } else if (v instanceof ObjectNode) {\n+                    return ((ObjectNode) v).size();\n                 } else {\n                     String s = (v instanceof String ? (String) v : v.toString());\n                     return s.length();\ndiff --git a/main/src/com/google/refine/model/Row.java b/main/src/com/google/refine/model/Row.java\nindex b1d2f295f..9eaf291a1 100644\n--- a/main/src/com/google/refine/model/Row.java\n+++ b/main/src/com/google/refine/model/Row.java\n@@ -80,7 +80,7 @@ public class Row implements HasFields {\n \n     /**\n      * Copy a row and return the copy. Note that this is a shallow copy, so if the contents of cells are changed in the\n-     * original, they will be be changed in the duplicate.\n+     * original, they will be changed in the duplicate.\n      * \n      * @return the duplicated row\n      */\ndiff --git a/main/src/com/google/refine/model/changes/MassRowChange.java b/main/src/com/google/refine/model/changes/MassRowChange.java\nindex 860495485..d79ac1f0e 100644\n--- a/main/src/com/google/refine/model/changes/MassRowChange.java\n+++ b/main/src/com/google/refine/model/changes/MassRowChange.java\n@@ -46,6 +46,8 @@ import com.google.refine.model.Project;\n import com.google.refine.model.Row;\n import com.google.refine.util.Pool;\n \n+// TODO: This replaces all rows in the project with a new set of rows, but if only a small percentage of the rows\n+// are being changed, it'd be much more efficient to apply a change list of new/modified rows.\n public class MassRowChange implements Change {\n \n     final protected List<Row> _newRows;\ndiff --git a/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java b/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\nindex da0d93cb3..f80d9bec8 100644\n--- a/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\n+++ b/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\n@@ -1,6 +1,6 @@\n /*\n \n-Copyright 2010, Google Inc.\n+Copyright 2010, 2023 Google Inc. & OpenRefine contributors\n All rights reserved.\n \n Redistribution and use in source and binary forms, with or without\n@@ -59,6 +59,7 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n     final protected String _mode;\n     final protected String _separator;\n     final protected Boolean _regex;\n+    private final Pattern _pattern;\n \n     final protected int[] _fieldLengths;\n \n@@ -94,6 +95,11 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n         _separator = separator;\n         _mode = \"separator\";\n         _regex = regex;\n+        if (_regex) {\n+            _pattern = Pattern.compile(_separator, Pattern.UNICODE_CHARACTER_CLASS);\n+        } else {\n+            _pattern = null;\n+        }\n \n         _fieldLengths = null;\n     }\n@@ -108,7 +114,14 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n         _mode = \"lengths\";\n         _separator = null;\n         _regex = null;\n+        _pattern = null;\n \n+        // Make sure all of our lengths are non-negative\n+        for (int i = 0; i < fieldLengths.length; i++) {\n+            if (fieldLengths[i] < 0) {\n+                fieldLengths[i] = 0;\n+            }\n+        }\n         _fieldLengths = fieldLengths;\n     }\n \n@@ -176,45 +189,39 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n \n             Object value = oldRow.getCellValue(cellIndex);\n             String s = value instanceof String ? ((String) value) : value.toString();\n-            String[] values = null;\n+            String[] values;\n             if (\"lengths\".equals(_mode)) {\n                 if (_fieldLengths.length > 0 && _fieldLengths[0] > 0) {\n                     values = new String[_fieldLengths.length];\n \n-                    int lastIndex = 0;\n-\n+                    int from = 0;\n+                    int end = s.length();\n                     for (int i = 0; i < _fieldLengths.length; i++) {\n-                        int thisIndex = lastIndex;\n-\n-                        Object o = _fieldLengths[i];\n-                        if (o instanceof Number) {\n-                            thisIndex = Math.min(s.length(), lastIndex + Math.max(0, ((Number) o).intValue()));\n-                        }\n-\n-                        values[i] = s.substring(lastIndex, thisIndex);\n-                        lastIndex = thisIndex;\n+                        int to = Math.min(end, from + _fieldLengths[i]);\n+                        values[i] = s.substring(from, to);\n+                        from = to;\n                     }\n+                } else {\n+                    values = new String[] { s };\n                 }\n             } else if (_regex) {\n-                Pattern pattern = Pattern.compile(_separator, Pattern.UNICODE_CHARACTER_CLASS);\n-                values = pattern.split(s);\n+                values = _pattern.split(s);\n             } else {\n                 values = StringUtils.splitByWholeSeparatorPreserveAllTokens(s, _separator);\n             }\n \n+            // Split didn't change anything. Just copy the row\n             if (values.length < 2) {\n                 newRows.add(oldRow.dup());\n                 continue;\n             }\n \n-            // First value goes into the same row\n-            {\n-                Row firstNewRow = oldRow.dup();\n-                firstNewRow.setCell(cellIndex, new Cell(values[0], null));\n-\n-                newRows.add(firstNewRow);\n-            }\n+            // First newly split value goes into the original cell in the existing row\n+            Row firstNewRow = oldRow.dup();\n+            firstNewRow.setCell(cellIndex, new Cell(values[0], null));\n+            newRows.add(firstNewRow);\n \n+            // For remaining values, use an empty cell, if one exists in the row, otherwise allocate a new row\n             int r2 = r + 1;\n             for (int v = 1; v < values.length; v++) {\n                 Cell newCell = new Cell(values[v], null);\n@@ -222,6 +229,7 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n                 if (r2 < project.rows.size()) {\n                     Row oldRow2 = project.rows.get(r2);\n                     if (oldRow2.isCellBlank(cellIndex) &&\n+                    // key cell not blank means we are on next record\n                             oldRow2.isCellBlank(keyCellIndex)) {\n \n                         Row newRow = oldRow2.dup();\n@@ -234,6 +242,7 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n                     }\n                 }\n \n+                // We need a new (empty) row\n                 Row newRow = new Row(cellIndex + 1);\n                 newRow.setCell(cellIndex, newCell);\n \ndiff --git a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js\nindex f2c2625ce..087b0922a 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js\n@@ -362,14 +362,14 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n           return;\n         }\n       } else if (mode === \"cases\") {\n-        if(elmts.reversTranistionCases[0].checked) {\n+        if(elmts.reverseTransitionCases[0].checked) {\n           config.separator = \"(?<=\\\\p{Upper}|[\\\\p{Upper}][\\\\s])(?=\\\\p{Lower})\";\n         } else {\n           config.separator = \"(?<=\\\\p{Lower}|[\\\\p{Lower}][\\\\s])(?=\\\\p{Upper})\";\n         }\n         config.regex = true;\n       } else if (mode === \"number\") {\n-        if(elmts.reversTranistionNumbers[0].checked) {\n+        if(elmts.reverseTransitionNumbers[0].checked) {\n           config.separator = \"(?<=\\\\p{L}|[\\\\p{L}][\\\\s])(?=\\\\p{Digit})\";\n         } else {\n           config.separator = \"(?<=\\\\p{Digit}|[\\\\p{Digit}][\\\\s])(?=\\\\p{L})\";\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html b/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html\nindex 72942f18a..f544d3bd5 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html\n@@ -31,7 +31,7 @@\n             <tr>\n               <td width=\"1%\"><input type=\"radio\" name=\"split-by-mode\" value=\"cases\" id=\"$split-multi-valued-cells-by-case\" /></td>\n               <td colspan=\"2\"><label for=\"$split-multi-valued-cells-by-case\" bind=\"or_views_byCase\"></label></td>\n-              <td><input type=\"checkbox\" bind=\"reversTranistionCases\" id=\"$split-cell-transition-order-case\" />\n+              <td><input type=\"checkbox\" bind=\"reverseTransitionCases\" id=\"$split-cell-transition-order-case\" />\n               <label for=\"$split-cell-transition-order-case\" bind=\"or_views_revCase\"></label></td>\n             </tr>\n             <tr>\n@@ -42,7 +42,7 @@\n             <tr>\n               <td width=\"1%\"><input type=\"radio\" name=\"split-by-mode\" value=\"number\" id=\"$split-multi-valued-cells-by-number\" /></td>\n               <td colspan=\"2\"><label for=\"$split-multi-valued-cells-by-number\" bind=\"or_views_byNumber\"></label></td>\n-              <td><input type=\"checkbox\" bind=\"reversTranistionNumbers\" id=\"$split-cell-transition-order-number\" />\n+              <td><input type=\"checkbox\" bind=\"reverseTransitionNumbers\" id=\"$split-cell-transition-order-number\" />\n               <label for=\"$split-cell-transition-order-number\" bind=\"or_views_revNum\"></label></td>\n             </tr>\n             <tr>\n@@ -59,4 +59,4 @@\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\n-</div>\n\\ No newline at end of file\n+</div>\ndiff --git a/packaging/pom.xml b/packaging/pom.xml\nindex a07206e70..27c94caba 100644\n--- a/packaging/pom.xml\n+++ b/packaging/pom.xml\n@@ -574,7 +574,7 @@\n                    https://stackoverflow.com/questions/53696439/appbundle-maven-plugin-fails-on-mac-osx-with-java-10 -->\n               <groupId>org.codehaus.plexus</groupId>\n               <artifactId>plexus-archiver</artifactId>\n-              <version>4.7.1</version>\n+              <version>4.8.0</version>\n             </dependency>\n             <dependency>\n               <groupId>org.apache.velocity</groupId>\ndiff --git a/pom.xml b/pom.xml\nindex 7522c027c..4f5ef1c2d 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -81,7 +81,7 @@\n     <okhttp.version>4.10.0</okhttp.version>\n     <jena.version>4.8.0</jena.version>\n     <poi.version>5.2.3</poi.version>\n-    <commons-lang3.version>3.12.0</commons-lang3.version>\n+    <commons-lang3.version>3.13.0</commons-lang3.version>\n     <commons-fileupload.version>1.5</commons-fileupload.version>\n     <commons-collections.version>3.2.2</commons-collections.version>\n     <commons-text.version>1.10.0</commons-text.version>\n", "test_patch": "diff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex c9b25e828..e480e5008 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -16,13 +16,13 @@\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"12.17.1\",\n+        \"cypress\": \"12.17.2\",\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.45.0\",\n+        \"eslint\": \"^8.46.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n-        \"eslint-config-prettier\": \"^8.8.0\",\n+        \"eslint-config-prettier\": \"^8.9.0\",\n         \"eslint-plugin-cypress\": \"^2.13.3\",\n         \"prettier\": \"3.0.0\"\n     }\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 066e8d958..135b33a3e 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -46,15 +46,15 @@\n   dependencies:\n     eslint-visitor-keys \"^3.3.0\"\n \n-\"@eslint-community/regexpp@^4.4.0\":\n-  version \"4.4.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.0.tgz#3e61c564fcd6b921cb789838631c5ee44df09403\"\n-  integrity sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==\n+\"@eslint-community/regexpp@^4.6.1\":\n+  version \"4.6.2\"\n+  resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8\"\n+  integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==\n \n-\"@eslint/eslintrc@^2.1.0\":\n-  version \"2.1.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d\"\n-  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==\n+\"@eslint/eslintrc@^2.1.1\":\n+  version \"2.1.1\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.1.tgz#18d635e24ad35f7276e8a49d135c7d3ca6a46f93\"\n+  integrity sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==\n   dependencies:\n     ajv \"^6.12.4\"\n     debug \"^4.3.2\"\n@@ -66,10 +66,10 @@\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@8.44.0\":\n-  version \"8.44.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af\"\n-  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==\n+\"@eslint/js@^8.46.0\":\n+  version \"8.46.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.46.0.tgz#3f7802972e8b6fe3f88ed1aabc74ec596c456db6\"\n+  integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==\n \n \"@humanwhocodes/config-array@^0.11.10\":\n   version \"0.11.10\"\n@@ -161,7 +161,7 @@ aggregate-error@^3.0.0:\n     clean-stack \"^2.0.0\"\n     indent-string \"^4.0.0\"\n \n-ajv@^6.10.0, ajv@^6.12.4:\n+ajv@^6.12.4:\n   version \"6.12.6\"\n   resolved \"https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz\"\n   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==\n@@ -436,10 +436,10 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress@12.17.1:\n-  version \"12.17.1\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-12.17.1.tgz#777fdcceec4ecd642fc90795f5994853b6ea03f8\"\n-  integrity sha512-eKfBgO6t8waEyhegL4gxD7tcI6uTCGttu+ZU7y9Hq8BlpMztd7iLeIF4AJFAnbZH1xjX+wwgg4cRKFNSvv3VWQ==\n+cypress@12.17.2:\n+  version \"12.17.2\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-12.17.2.tgz#040ac55de1e811f6e037d231a2869d5ab8c29c85\"\n+  integrity sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==\n   dependencies:\n     \"@cypress/request\" \"^2.88.11\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n@@ -569,10 +569,10 @@ eslint-config-google@^0.14.0:\n   resolved \"https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz\"\n   integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==\n \n-eslint-config-prettier@^8.8.0:\n-  version \"8.8.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348\"\n-  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==\n+eslint-config-prettier@^8.9.0:\n+  version \"8.9.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz#094b6254b2804b0544f7cee535f802b6d29ee10b\"\n+  integrity sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==\n \n eslint-plugin-cypress@^2.13.3:\n   version \"2.13.3\"\n@@ -581,40 +581,40 @@ eslint-plugin-cypress@^2.13.3:\n   dependencies:\n     globals \"^11.12.0\"\n \n-eslint-scope@^7.2.0:\n-  version \"7.2.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b\"\n-  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==\n+eslint-scope@^7.2.2:\n+  version \"7.2.2\"\n+  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f\"\n+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==\n   dependencies:\n     esrecurse \"^4.3.0\"\n     estraverse \"^5.2.0\"\n \n-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:\n-  version \"3.4.1\"\n-  resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994\"\n-  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==\n+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2:\n+  version \"3.4.2\"\n+  resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f\"\n+  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==\n \n-eslint@^8.45.0:\n-  version \"8.45.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78\"\n-  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==\n+eslint@^8.46.0:\n+  version \"8.46.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.46.0.tgz#a06a0ff6974e53e643acc42d1dcf2e7f797b3552\"\n+  integrity sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n-    \"@eslint-community/regexpp\" \"^4.4.0\"\n-    \"@eslint/eslintrc\" \"^2.1.0\"\n-    \"@eslint/js\" \"8.44.0\"\n+    \"@eslint-community/regexpp\" \"^4.6.1\"\n+    \"@eslint/eslintrc\" \"^2.1.1\"\n+    \"@eslint/js\" \"^8.46.0\"\n     \"@humanwhocodes/config-array\" \"^0.11.10\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\n-    ajv \"^6.10.0\"\n+    ajv \"^6.12.4\"\n     chalk \"^4.0.0\"\n     cross-spawn \"^7.0.2\"\n     debug \"^4.3.2\"\n     doctrine \"^3.0.0\"\n     escape-string-regexp \"^4.0.0\"\n-    eslint-scope \"^7.2.0\"\n-    eslint-visitor-keys \"^3.4.1\"\n-    espree \"^9.6.0\"\n+    eslint-scope \"^7.2.2\"\n+    eslint-visitor-keys \"^3.4.2\"\n+    espree \"^9.6.1\"\n     esquery \"^1.4.2\"\n     esutils \"^2.0.2\"\n     fast-deep-equal \"^3.1.3\"\n@@ -637,10 +637,10 @@ eslint@^8.45.0:\n     strip-ansi \"^6.0.1\"\n     text-table \"^0.2.0\"\n \n-espree@^9.6.0:\n-  version \"9.6.0\"\n-  resolved \"https://registry.yarnpkg.com/espree/-/espree-9.6.0.tgz#80869754b1c6560f32e3b6929194a3fe07c5b82f\"\n-  integrity sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==\n+espree@^9.6.0, espree@^9.6.1:\n+  version \"9.6.1\"\n+  resolved \"https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f\"\n+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==\n   dependencies:\n     acorn \"^8.9.0\"\n     acorn-jsx \"^5.3.2\"\ndiff --git a/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java b/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java\nindex 3e04d14d6..14bc957bd 100644\n--- a/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java\n+++ b/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java\n@@ -27,9 +27,35 @@\n \n package com.google.refine.expr.functions;\n \n+import static org.testng.Assert.assertEquals;\n+\n+import java.util.Properties;\n+\n import org.testng.annotations.Test;\n \n-import com.google.refine.util.TestUtils;\n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.databind.node.ArrayNode;\n+import com.fasterxml.jackson.databind.node.ObjectNode;\n+\n+import com.google.refine.RefineTest;\n+import com.google.refine.grel.Function;\n+import com.google.refine.util.ParsingUtilities;\n+\n+public class LengthTests extends RefineTest {\n+\n+    static Properties bindings = new Properties();\n+\n+    @Test\n+    public void testLength() throws JsonProcessingException {\n+        Function f = new Length();\n+        assertEquals(f.call(bindings, new Object[] { Long.valueOf(123) }), 3);\n+        assertEquals(f.call(bindings, new Object[] { Double.valueOf(123.1) }), 5);\n+        assertEquals(f.call(bindings, new Object[] { \"12345\" }), 5);\n+\n+        ArrayNode array = (ArrayNode) ParsingUtilities.mapper.readTree(\"[1,2,3]\");\n+        assertEquals(f.call(bindings, new Object[] { array }), 3);\n \n-public class LengthTests {\n+        ObjectNode dict = (ObjectNode) ParsingUtilities.mapper.readTree(\"{\\\"a\\\": \\\"b\\\", \\\"c\\\": \\\"d\\\"}\");\n+        assertEquals(f.call(bindings, new Object[] { dict }), 2);\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #5893\r\n\r\nChanges proposed in this pull request:\r\n- JavaScript code was edited to append a number to the schema name.\r\n- The change should be purely visual. The schema name variables are not edited.\r\n", "PR_Title": "Add numbering to the list of Wikibase schemas", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-5976_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 5976, "issue_title": "Add numbering to the list of Wikibase schemas", "issue_body": "Fixes #5893\r\n\r\nChanges proposed in this pull request:\r\n- JavaScript code was edited to append a number to the schema name.\r\n- The change should be purely visual. The schema name variables are not edited.\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-7090", "base_commit": "7074d1c43135bbc3a2749c308d3ac4c0ca74f6f4", "patch": "diff --git a/extensions/wikibase/src/org/openrefine/wikibase/qa/EditInspector.java b/extensions/wikibase/src/org/openrefine/wikibase/qa/EditInspector.java\nindex 6567a5844..6256e54b6 100644\n--- a/extensions/wikibase/src/org/openrefine/wikibase/qa/EditInspector.java\n+++ b/extensions/wikibase/src/org/openrefine/wikibase/qa/EditInspector.java\n@@ -68,6 +68,7 @@ import org.openrefine.wikibase.qa.scrutinizers.UnsourcedScrutinizer;\n import org.openrefine.wikibase.qa.scrutinizers.UseAsQualifierScrutinizer;\n import org.openrefine.wikibase.qa.scrutinizers.WhitespaceScrutinizer;\n import org.openrefine.wikibase.schema.WikibaseSchema;\n+import org.openrefine.wikibase.schema.entityvalues.ReconEntityIdValue;\n import org.openrefine.wikibase.schema.entityvalues.SuggestedEntityIdValue;\n import org.openrefine.wikibase.schema.entityvalues.SuggestedItemIdValue;\n import org.openrefine.wikibase.schema.entityvalues.SuggestedPropertyIdValue;\n@@ -217,17 +218,23 @@ public class EditInspector {\n         }\n     }\n \n-    private void resolveWarningPropertyLabels() throws ExecutionException {\n+    protected void resolveWarningPropertyLabels() throws ExecutionException {\n         if (entityCache != null) {\n             List<EntityIdValue> propertyIdValues = warningStore.getWarnings().stream()\n                     .flatMap(warning -> warning.getProperties().entrySet().stream()\n-                            .filter(entry -> entry.getValue() instanceof EntityIdValue)\n                             .filter(entry -> {\n-                                if (entry instanceof SuggestedEntityIdValue) {\n-                                    String label = ((SuggestedEntityIdValue) entry.getValue()).getLabel();\n+                                Object value = entry.getValue();\n+                                if (!(value instanceof PropertyIdValue || value instanceof ItemIdValue)) {\n+                                    return false;\n+                                }\n+                                if (value instanceof SuggestedEntityIdValue) {\n+                                    String label = ((SuggestedEntityIdValue) value).getLabel();\n                                     return label == null || label.isEmpty();\n+                                } else if (value instanceof ReconEntityIdValue) {\n+                                    return false; // already contains labels via the recon object\n+                                } else {\n+                                    return true; // no label associated with the value, so we fetch it\n                                 }\n-                                return true;\n                             })\n                             .map(entry -> (EntityIdValue) entry.getValue()))\n                     .collect(Collectors.toList());\n@@ -237,7 +244,7 @@ public class EditInspector {\n             warningStore.getWarnings().stream()\n                     .forEach(warning -> {\n                         warning.getProperties().forEach((key, value) -> {\n-                            if (value instanceof PropertyIdValue || value instanceof ItemIdValue) {\n+                            if (value instanceof EntityIdValue && propertyIdValues.contains(value)) {\n                                 EntityIdValue entityIdValue = (EntityIdValue) value;\n                                 String label = \"\";\n \n", "test_patch": "diff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/EditInspectorTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/EditInspectorTest.java\nindex b952607fa..2d8fd1ac3 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/EditInspectorTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/EditInspectorTest.java\n@@ -1,12 +1,17 @@\n \n package org.openrefine.wikibase.qa;\n \n+import static org.mockito.Mockito.mock;\n import static org.testng.Assert.assertEquals;\n \n import org.testng.annotations.Test;\n \n+import com.google.refine.model.Recon;\n+\n import org.openrefine.wikibase.manifests.Manifest;\n import org.openrefine.wikibase.manifests.ManifestParser;\n+import org.openrefine.wikibase.qa.QAWarning.Severity;\n+import org.openrefine.wikibase.schema.entityvalues.ReconItemIdValue;\n import org.openrefine.wikibase.testing.TestingData;\n \n public class EditInspectorTest {\n@@ -37,4 +42,24 @@ public class EditInspectorTest {\n         EditInspector editInspector = new EditInspector(new QAWarningStore(), manifest, false);\n         assertEquals(editInspector.scrutinizers.size(), scrutinizerNotDependingOnPropertyConstraintCount);\n     }\n+\n+    @Test\n+    public void testLabelFetchingIgnoresReconciledEntityIds() throws Exception {\n+        // regression test for https://github.com/OpenRefine/OpenRefine/issues/7089\n+        String manifestJson = TestingData.jsonFromFile(\"manifest/wikidata-manifest-v1.0.json\");\n+        Manifest manifest = ManifestParser.parse(manifestJson);\n+        QAWarningStore qaWarningStore = new QAWarningStore();\n+        QAWarning qaWarning1 = new QAWarning(\"my-warning\", \"my-warning\", Severity.WARNING, 1);\n+        Recon recon = mock(Recon.class);\n+        recon.judgment = Recon.Judgment.New;\n+        ReconItemIdValue reconItemIdValue = new ReconItemIdValue(recon, \"cell value\");\n+        qaWarning1.setProperty(\"example_entity\", reconItemIdValue);\n+        qaWarning1.setProperty(\"some_string\", \"foo\");\n+        qaWarningStore.addWarning(qaWarning1);\n+\n+        EditInspector editInspector = new EditInspector(qaWarningStore, manifest, false);\n+        editInspector.resolveWarningPropertyLabels();\n+\n+        assertEquals(qaWarning1.getProperties().get(\"example_entity\"), reconItemIdValue);\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Closes #7089.\r\n\r\nThis clarifies the filtering logic to select which entity ids should be fetched to get their labels, to avoid fetching them for entity ids generated via reconciliation. Those already have associated labels (existing label for existing entities, cell values for new entities).", "PR_Title": "wikibase: Fix label fetching in QA issues for new entities", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-7090_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 7090, "issue_title": "wikibase: Fix label fetching in QA issues for new entities", "issue_body": "Closes #7089.\r\n\r\nThis clarifies the filtering logic to select which entity ids should be fetched to get their labels, to avoid fetching them for entity ids generated via reconciliation. Those already have associated labels (existing label for existing entities, cell values for new entities)."}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "TheAlgorithms/Java", "instance_id": "TheAlgorithms__Java-4959", "base_commit": "b1efd4e34bb18a618ab205c9c2a62802f151c70d", "patch": "diff --git a/src/main/java/com/thealgorithms/dynamicprogramming/Tribonacci.java b/src/main/java/com/thealgorithms/dynamicprogramming/Tribonacci.java\nnew file mode 100644\nindex 00000000..99f90290\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/dynamicprogramming/Tribonacci.java\n@@ -0,0 +1,30 @@\n+package com.thealgorithms.dynamicprogramming;\n+\n+/**\n+ * The {@code Tribonacci} class provides a method to compute the n-th number in the Tribonacci sequence.\n+ * N-th Tribonacci Number - https://leetcode.com/problems/n-th-tribonacci-number/description/\n+ */\n+public class Tribonacci {\n+\n+    /**\n+     * Computes the n-th Tribonacci number.\n+     *\n+     * @param n the index of the Tribonacci number to compute\n+     * @return the n-th Tribonacci number\n+     */\n+    public static int compute(int n) {\n+        if (n == 0) return 0;\n+        if (n == 1 || n == 2) return 1;\n+\n+        int first = 0, second = 1, third = 1;\n+\n+        for (int i = 3; i <= n; i++) {\n+            int next = first + second + third;\n+            first = second;\n+            second = third;\n+            third = next;\n+        }\n+\n+        return third;\n+    }\n+}\n", "test_patch": "diff --git a/src/test/java/com/thealgorithms/dynamicprogramming/TribonacciTest.java b/src/test/java/com/thealgorithms/dynamicprogramming/TribonacciTest.java\nnew file mode 100644\nindex 00000000..434a1825\n--- /dev/null\n+++ b/src/test/java/com/thealgorithms/dynamicprogramming/TribonacciTest.java\n@@ -0,0 +1,24 @@\n+package com.thealgorithms.dynamicprogramming;\n+\n+import static org.junit.jupiter.api.Assertions.assertEquals;\n+\n+import org.junit.jupiter.api.Test;\n+\n+/**\n+ * Test class for {@code Tribonacci}.\n+ */\n+public class TribonacciTest {\n+\n+    /**\n+     * Tests the Tribonacci computation for a set of known values.\n+     */\n+    @Test\n+    public void testKnownValues() {\n+        assertEquals(0, Tribonacci.compute(0), \"The 0th Tribonacci should be 0.\");\n+        assertEquals(1, Tribonacci.compute(1), \"The 1st Tribonacci should be 1.\");\n+        assertEquals(1, Tribonacci.compute(2), \"The 2nd Tribonacci should be 1.\");\n+        assertEquals(2, Tribonacci.compute(3), \"The 3rd Tribonacci should be 2.\");\n+        assertEquals(4, Tribonacci.compute(4), \"The 4th Tribonacci should be 4.\");\n+        assertEquals(7, Tribonacci.compute(5), \"The 5th Tribonacci should be 7.\");\n+    }\n+}\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "This PR introduces the `Tribonacci` class to the `dynamicprogramming` package. It implements an efficient method to compute the N-th number in the Tribonacci sequence as defined by the problem statement on LeetCode: https://leetcode.com/problems/n-th-tribonacci-number/description/.\r\n\r\nResolves #4646\r\n\r\n## Changes Made\r\n\r\n- Added `Tribonacci.java` with a static `compute` method.\r\n- Included tests in `TribonacciTest.java`.\r\n\r\nThe `compute` method calculates the N-th Tribonacci number using an iterative approach with O(n) time complexity and O(1) space complexity, which is optimal for the constraints given.\r\n\r\n<!--\r\nThank you for your contribution!\r\nIn order to reduce the number of notifications sent to the maintainers, please:\r\n- create your PR as draft, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests,\r\n- make sure that all of the CI checks pass,\r\n- mark your PR as ready for review, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review\r\n-->\r\n\r\n<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n- [x] All new code is formatted with `clang-format -i --style=file path/to/your/file.java`", "PR_Title": "Tribonacci - #4646", "docker_image": "xinzhou1997/swe_rpg_java:TheAlgorithms__Java-4959_linux", "log_parser": "def parse_java_mvn(log: str) -> dict[str, str]:\n    \"\"\"Parse Maven logs into {identifier: status}.\"\"\"\n    results = {}\n\n    failure_re = re.compile(\n        r\"^\\[ERROR\\]\\s+(?P<class>[A-Za-z0-9_$.]+)\\.(?P<method>[A-Za-z0-9_$.]+?)(?::(?P<line>\\d+))?\\b\"\n    )\n    running_re = re.compile(r\"^(?:\\[INFO\\]\\s+)?Running\\s+([A-Za-z0-9_$.]+)$\")\n    summary_re = re.compile(\n        r\"Tests run:\\s*(\\d+),\\s*Failures:\\s*(\\d+),\\s*Errors:\\s*(\\d+),\\s*Skipped:\\s*(\\d+)\"\n    )\n\n    seen_running = set()\n    current_running = None\n\n    for raw in log.splitlines():\n        line = raw.strip()\n        if not line:\n            continue\n        rm = running_re.match(line)\n        if rm:\n            running_name = rm.group(1)\n            current_running = running_name\n            seen_running.add(running_name)\n            continue\n        fm = failure_re.match(line)\n        if fm:\n            clazz = fm.group(\"class\")\n            method = fm.group(\"method\")\n            test_id = f\"{clazz}.{method}\"\n            results[test_id] = \"FAILED\"\n            results.setdefault(clazz, \"FAILED\")\n            continue\n\n        sm = summary_re.search(line)\n        if sm:\n            _tests_run, failures, errors, skipped = map(int, sm.groups())\n            if failures > 0 or errors > 0:\n                status = \"FAILED\"\n            elif skipped > 0:\n                status = \"SKIPPED\"\n            else:\n                status = \"PASSED\"\n            if current_running:\n                results.setdefault(current_running, status)\n            current_running = None\n\n    if not results and seen_running:\n        for clazz in seen_running:\n            results.setdefault(clazz, \"PASSED\")\n    return results\n", "test_cmds": ["bash -c '{ mvn --batch-mode test ; } > /tmp/test.log 2>&1'"], "rebuild_cmds": ["unset _JAVA_OPTIONS"], "issues": [{"issue_number": 4959, "issue_title": "Tribonacci - #4646", "issue_body": "This PR introduces the `Tribonacci` class to the `dynamicprogramming` package. It implements an efficient method to compute the N-th number in the Tribonacci sequence as defined by the problem statement on LeetCode: https://leetcode.com/problems/n-th-tribonacci-number/description/.\r\n\r\nResolves #4646\r\n\r\n## Changes Made\r\n\r\n- Added `Tribonacci.java` with a static `compute` method.\r\n- Included tests in `TribonacciTest.java`.\r\n\r\nThe `compute` method calculates the N-th Tribonacci number using an iterative approach with O(n) time complexity and O(1) space complexity, which is optimal for the constraints given.\r\n\r\n<!--\r\nThank you for your contribution!\r\nIn order to reduce the number of notifications sent to the maintainers, please:\r\n- create your PR as draft, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests,\r\n- make sure that all of the CI checks pass,\r\n- mark your PR as ready for review, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review\r\n-->\r\n\r\n<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n- [x] All new code is formatted with `clang-format -i --style=file path/to/your/file.java`"}], "print_cmds": ["cat /tmp/test.log"], "working_dir": "/Java"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6684", "base_commit": "bb753deed0b149843ea61c6256a1006b4581ebcf", "patch": "diff --git a/main/src/com/google/refine/expr/functions/arrays/Join.java b/main/src/com/google/refine/expr/functions/arrays/Join.java\nindex e40e25e0f..917684407 100644\n--- a/main/src/com/google/refine/expr/functions/arrays/Join.java\n+++ b/main/src/com/google/refine/expr/functions/arrays/Join.java\n@@ -76,15 +76,18 @@ public class Join implements Function {\n                         int l = a.size();\n \n                         for (int i = 0; i < l; i++) {\n-                            if (!isFirst) {\n-                                sb.append(separator);\n+                            Object o = JsonValueConverter.convert(a.get(i));\n+                            if (o != null) {\n+                                if (!isFirst) {\n+                                    sb.append(separator);\n+                                }\n+                                sb.append(o).toString();\n+                                isFirst = false;\n                             }\n-                            // FIXME: This throws NPE for arrays containing nulls\n-                            sb.append(JsonValueConverter.convert(a.get(i)).toString());\n-                            isFirst = false;\n                         }\n                     } else {\n                         for (Object o : ExpressionUtils.toObjectList(v)) {\n+                            // TODO: Another instance of null being treated differently than empty string\n                             if (o != null) {\n                                 if (!isFirst) {\n                                     sb.append(separator);\n", "test_patch": "diff --git a/main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java b/main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java\nindex 8453cf7da..08ca4ddae 100644\n--- a/main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java\n+++ b/main/tests/server/src/com/google/refine/expr/functions/arrays/JoinTests.java\n@@ -59,9 +59,9 @@ public class JoinTests extends GrelTestBase {\n         parseEval(bindings, new String[] { \"['','',''].join('|')\", \"||\" });\n \n         // Tests for JSON array\n-        // Both of the following tests throw NPEs. First is desired behavior, second is current array behavior\n+        // First test below is desired behavior, second is current array behavior\n //        parseEval(bindings, new String[] { \"'[null,null,null]'.parseJson().join('|')\", \"||\" } );\n-//        parseEval(bindings, new String[] { \"'[null,null,null]'.parseJson().join('|')\", \"\" } );\n+        parseEval(bindings, new String[] { \"'[null,null,null]'.parseJson().join('|')\", \"\" });\n         parseEval(bindings, new String[] { \"'[\\\"\\\",2,3]'.parseJson().join('|')\", \"|2|3\" });\n         parseEval(bindings, new String[] { \"'[1,2,\\\"\\\"]'.parseJson().join('|')\", \"1|2|\" });\n         parseEval(bindings, new String[] { \"'[\\\"\\\",\\\"\\\",\\\"\\\"]'.parseJson().join('|')\", \"||\" });\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6683\r\n\r\nChanges proposed in this pull request:\r\n- Fix join() of arrays containing nulls\r\n\r\n", "PR_Title": "Fix join() of arrays containing nulls. Fixes #6683", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6684_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6684, "issue_title": "Fix join() of arrays containing nulls. Fixes #6683", "issue_body": "Fixes #6683\r\n\r\nChanges proposed in this pull request:\r\n- Fix join() of arrays containing nulls\r\n\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "TheAlgorithms/Java", "instance_id": "TheAlgorithms__Java-4392", "base_commit": "8803b1ead59716617b221a8ef92a90cc0ec067c2", "patch": "diff --git a/src/main/java/com/thealgorithms/misc/MedianOfRunningArray.java b/src/main/java/com/thealgorithms/misc/MedianOfRunningArray.java\nindex 61fbfa82..62013ee3 100644\n--- a/src/main/java/com/thealgorithms/misc/MedianOfRunningArray.java\n+++ b/src/main/java/com/thealgorithms/misc/MedianOfRunningArray.java\n@@ -6,10 +6,10 @@ import java.util.PriorityQueue;\n /**\n  * @author shrutisheoran\n  */\n-public class MedianOfRunningArray {\n+public abstract class MedianOfRunningArray<T extends Number & Comparable<T>> {\n \n-    private PriorityQueue<Integer> maxHeap;\n-    private PriorityQueue<Integer> minHeap;\n+    private PriorityQueue<T> maxHeap;\n+    private PriorityQueue<T> minHeap;\n \n     // Constructor\n     public MedianOfRunningArray() {\n@@ -21,8 +21,8 @@ public class MedianOfRunningArray {\n       Inserting lower half of array to max Heap\n       and upper half to min heap\n      */\n-    public void insert(Integer e) {\n-        if (!minHeap.isEmpty() && e < minHeap.peek()) {\n+    public void insert(final T e) {\n+        if (!minHeap.isEmpty() && e.compareTo(minHeap.peek()) < 0) {\n             maxHeap.offer(e);\n             if (maxHeap.size() > minHeap.size() + 1) {\n                 minHeap.offer(maxHeap.poll());\n@@ -38,14 +38,16 @@ public class MedianOfRunningArray {\n     /*\n       Returns median at any given point\n      */\n-    public double median() {\n+    public T median() {\n         if (maxHeap.isEmpty() && minHeap.isEmpty()) {\n             throw new IllegalArgumentException(\"Enter at least 1 element, Median of empty list is not defined!\");\n+        } else if (maxHeap.size() == minHeap.size()) {\n+            T maxHeapTop = maxHeap.peek();\n+            T minHeapTop = minHeap.peek();\n+            return calculateAverage(maxHeapTop, minHeapTop);\n         }\n-\n-        if (maxHeap.size() == minHeap.size()) {\n-            return (maxHeap.peek() + minHeap.peek()) / 2.0;\n-        }\n-        return maxHeap.size() > minHeap.size() ? maxHeap.peek() * 1.0 : minHeap.peek() * 1.0;\n+        return maxHeap.size() > minHeap.size() ? maxHeap.peek() : minHeap.peek();\n     }\n+\n+    public abstract T calculateAverage(T a, T b);\n }\ndiff --git a/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayByte.java b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayByte.java\nnew file mode 100644\nindex 00000000..668f651e\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayByte.java\n@@ -0,0 +1,8 @@\n+package com.thealgorithms.misc;\n+\n+public final class MedianOfRunningArrayByte extends MedianOfRunningArray<Byte> {\n+    @Override\n+    public Byte calculateAverage(final Byte a, final Byte b) {\n+        return (byte) ((a + b) / 2);\n+    }\n+}\ndiff --git a/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayDouble.java b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayDouble.java\nnew file mode 100644\nindex 00000000..9d743de5\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayDouble.java\n@@ -0,0 +1,8 @@\n+package com.thealgorithms.misc;\n+\n+public final class MedianOfRunningArrayDouble extends MedianOfRunningArray<Double> {\n+    @Override\n+    public Double calculateAverage(final Double a, final Double b) {\n+        return (a + b) / 2.0d;\n+    }\n+}\ndiff --git a/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayFloat.java b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayFloat.java\nnew file mode 100644\nindex 00000000..a667abf6\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayFloat.java\n@@ -0,0 +1,8 @@\n+package com.thealgorithms.misc;\n+\n+public final class MedianOfRunningArrayFloat extends MedianOfRunningArray<Float> {\n+    @Override\n+    public Float calculateAverage(final Float a, final Float b) {\n+        return (a + b) / 2.0f;\n+    }\n+}\ndiff --git a/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayInteger.java b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayInteger.java\nnew file mode 100644\nindex 00000000..7154ba07\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayInteger.java\n@@ -0,0 +1,8 @@\n+package com.thealgorithms.misc;\n+\n+public final class MedianOfRunningArrayInteger extends MedianOfRunningArray<Integer> {\n+    @Override\n+    public Integer calculateAverage(final Integer a, final Integer b) {\n+        return (a + b) / 2;\n+    }\n+}\ndiff --git a/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayLong.java b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayLong.java\nnew file mode 100644\nindex 00000000..1f138c63\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/misc/MedianOfRunningArrayLong.java\n@@ -0,0 +1,8 @@\n+package com.thealgorithms.misc;\n+\n+public final class MedianOfRunningArrayLong extends MedianOfRunningArray<Long> {\n+    @Override\n+    public Long calculateAverage(final Long a, final Long b) {\n+        return (a + b) / 2L;\n+    }\n+}\n", "test_patch": "diff --git a/src/test/java/com/thealgorithms/misc/MedianOfRunningArrayTest.java b/src/test/java/com/thealgorithms/misc/MedianOfRunningArrayTest.java\nindex 96cdc77e..90910d51 100644\n--- a/src/test/java/com/thealgorithms/misc/MedianOfRunningArrayTest.java\n+++ b/src/test/java/com/thealgorithms/misc/MedianOfRunningArrayTest.java\n@@ -1,15 +1,13 @@\n package com.thealgorithms.misc;\n \n import static org.junit.jupiter.api.Assertions.assertEquals;\n-import static org.junit.jupiter.api.Assertions.assertFalse;\n import static org.junit.jupiter.api.Assertions.assertThrows;\n \n-import org.apache.commons.lang3.tuple.Pair;\n import org.junit.jupiter.api.Test;\n \n /**\n- * Test case for Two sum Problem.\n- * @author Bama Charan Chhandogi (https://github.com/BamaCharanChhandogi)\n+ * Test case for Median Of Running Array Problem.\n+ * @author Ansh Shah (https://github.com/govardhanshah456)\n  */\n \n public class MedianOfRunningArrayTest {\n@@ -17,71 +15,71 @@ public class MedianOfRunningArrayTest {\n \n     @Test\n     public void testWhenInvalidInoutProvidedShouldThrowException() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> stream.median());\n         assertEquals(exception.getMessage(), EXCEPTION_MESSAGE);\n     }\n \n     @Test\n     public void testWithNegativeValues() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(-1);\n         assertEquals(-1, stream.median());\n         stream.insert(-2);\n-        assertEquals(-1.5, stream.median());\n+        assertEquals(-1, stream.median());\n         stream.insert(-3);\n         assertEquals(-2, stream.median());\n     }\n \n     @Test\n     public void testWithSingleValues() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(-1);\n         assertEquals(-1, stream.median());\n     }\n \n     @Test\n     public void testWithRandomValues() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(10);\n-        assertEquals(10.0, stream.median());\n+        assertEquals(10, stream.median());\n \n         stream.insert(5);\n-        assertEquals(7.5, stream.median());\n+        assertEquals(7, stream.median());\n \n         stream.insert(20);\n-        assertEquals(10.0, stream.median());\n+        assertEquals(10, stream.median());\n \n         stream.insert(15);\n-        assertEquals(12.5, stream.median());\n+        assertEquals(12, stream.median());\n \n         stream.insert(25);\n-        assertEquals(15.0, stream.median());\n+        assertEquals(15, stream.median());\n \n         stream.insert(30);\n-        assertEquals(17.5, stream.median());\n+        assertEquals(17, stream.median());\n \n         stream.insert(35);\n-        assertEquals(20.0, stream.median());\n+        assertEquals(20, stream.median());\n \n         stream.insert(1);\n-        assertEquals(17.5, stream.median());\n+        assertEquals(17, stream.median());\n     }\n \n     @Test\n     public void testWithNegativeAndPositiveValues() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(-1);\n         assertEquals(-1, stream.median());\n         stream.insert(2);\n-        assertEquals(0.5, stream.median());\n+        assertEquals(0, stream.median());\n         stream.insert(-3);\n         assertEquals(-1, stream.median());\n     }\n \n     @Test\n     public void testWithDuplicateValues() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(-1);\n         assertEquals(-1, stream.median());\n         stream.insert(-1);\n@@ -92,7 +90,7 @@ public class MedianOfRunningArrayTest {\n \n     @Test\n     public void testWithDuplicateValuesB() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(10);\n         stream.insert(20);\n         stream.insert(10);\n@@ -105,7 +103,7 @@ public class MedianOfRunningArrayTest {\n \n     @Test\n     public void testWithLargeValues() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(1000000);\n         assertEquals(1000000, stream.median());\n         stream.insert(12000);\n@@ -113,49 +111,89 @@ public class MedianOfRunningArrayTest {\n         stream.insert(15000000);\n         assertEquals(1000000, stream.median());\n         stream.insert(2300000);\n-        assertEquals(1650000.00, stream.median());\n+        assertEquals(1650000, stream.median());\n     }\n \n     @Test\n     public void testWithLargeCountOfValues() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         for (int i = 1; i <= 1000; i++) stream.insert(i);\n-        assertEquals(500.5, stream.median());\n+        assertEquals(500, stream.median());\n     }\n \n     @Test\n     public void testWithThreeValuesInDescendingOrder() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(30);\n         stream.insert(20);\n         stream.insert(10);\n-        assertEquals(20.0, stream.median());\n+        assertEquals(20, stream.median());\n     }\n \n     @Test\n     public void testWithThreeValuesInOrder() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(10);\n         stream.insert(20);\n         stream.insert(30);\n-        assertEquals(20.0, stream.median());\n+        assertEquals(20, stream.median());\n     }\n \n     @Test\n     public void testWithThreeValuesNotInOrderA() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(30);\n         stream.insert(10);\n         stream.insert(20);\n-        assertEquals(20.0, stream.median());\n+        assertEquals(20, stream.median());\n     }\n \n     @Test\n     public void testWithThreeValuesNotInOrderB() {\n-        MedianOfRunningArray stream = new MedianOfRunningArray();\n+        var stream = new MedianOfRunningArrayInteger();\n         stream.insert(20);\n         stream.insert(10);\n         stream.insert(30);\n-        assertEquals(20.0, stream.median());\n+        assertEquals(20, stream.median());\n+    }\n+\n+    @Test\n+    public void testWithFloatValues() {\n+        var stream = new MedianOfRunningArrayFloat();\n+        stream.insert(20.0f);\n+        assertEquals(20.0f, stream.median());\n+        stream.insert(10.5f);\n+        assertEquals(15.25f, stream.median());\n+        stream.insert(30.0f);\n+        assertEquals(20.0f, stream.median());\n+    }\n+\n+    @Test\n+    public void testWithByteValues() {\n+        var stream = new MedianOfRunningArrayByte();\n+        stream.insert((byte) 120);\n+        assertEquals((byte) 120, stream.median());\n+        stream.insert((byte) -120);\n+        assertEquals((byte) 0, stream.median());\n+        stream.insert((byte) 127);\n+        assertEquals((byte) 120, stream.median());\n+    }\n+\n+    @Test\n+    public void testWithLongValues() {\n+        var stream = new MedianOfRunningArrayLong();\n+        stream.insert(120000000L);\n+        assertEquals(120000000L, stream.median());\n+        stream.insert(92233720368547757L);\n+        assertEquals(46116860244273878L, stream.median());\n+    }\n+\n+    @Test\n+    public void testWithDoubleValues() {\n+        var stream = new MedianOfRunningArrayDouble();\n+        stream.insert(12345.67891);\n+        assertEquals(12345.67891, stream.median());\n+        stream.insert(23456789.98);\n+        assertEquals(Double.valueOf(11734567.83), stream.median(), .01);\n     }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Closes #4390", "PR_Title": "Make `MedianOfRunningArray` Generic", "docker_image": "xinzhou1997/swe_rpg_java:TheAlgorithms__Java-4392_linux", "log_parser": "def parse_java_mvn(log: str) -> dict[str, str]:\n    \"\"\"Parse Maven logs into {identifier: status}.\"\"\"\n    results = {}\n\n    failure_re = re.compile(\n        r\"^\\[ERROR\\]\\s+(?P<class>[A-Za-z0-9_$.]+)\\.(?P<method>[A-Za-z0-9_$.]+?)(?::(?P<line>\\d+))?\\b\"\n    )\n    running_re = re.compile(r\"^(?:\\[INFO\\]\\s+)?Running\\s+([A-Za-z0-9_$.]+)$\")\n    summary_re = re.compile(\n        r\"Tests run:\\s*(\\d+),\\s*Failures:\\s*(\\d+),\\s*Errors:\\s*(\\d+),\\s*Skipped:\\s*(\\d+)\"\n    )\n\n    seen_running = set()\n    current_running = None\n\n    for raw in log.splitlines():\n        line = raw.strip()\n        if not line:\n            continue\n        rm = running_re.match(line)\n        if rm:\n            running_name = rm.group(1)\n            current_running = running_name\n            seen_running.add(running_name)\n            continue\n        fm = failure_re.match(line)\n        if fm:\n            clazz = fm.group(\"class\")\n            method = fm.group(\"method\")\n            test_id = f\"{clazz}.{method}\"\n            results[test_id] = \"FAILED\"\n            results.setdefault(clazz, \"FAILED\")\n            continue\n\n        sm = summary_re.search(line)\n        if sm:\n            _tests_run, failures, errors, skipped = map(int, sm.groups())\n            if failures > 0 or errors > 0:\n                status = \"FAILED\"\n            elif skipped > 0:\n                status = \"SKIPPED\"\n            else:\n                status = \"PASSED\"\n            if current_running:\n                results.setdefault(current_running, status)\n            current_running = None\n\n    if not results and seen_running:\n        for clazz in seen_running:\n            results.setdefault(clazz, \"PASSED\")\n    return results\n", "test_cmds": ["bash -c '{ mvn --batch-mode test ; } > /tmp/test.log 2>&1'"], "rebuild_cmds": ["unset _JAVA_OPTIONS"], "issues": [{"issue_number": 4392, "issue_title": "Make `MedianOfRunningArray` Generic", "issue_body": "Closes #4390"}], "print_cmds": ["cat /tmp/test.log"], "working_dir": "/Java"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6161", "base_commit": "307d8bf9147c1fb41b8013efb5fe14d9cb490277", "patch": "diff --git a/main/pom.xml b/main/pom.xml\nindex 9a9e2c4e8..033738f26 100644\n--- a/main/pom.xml\n+++ b/main/pom.xml\n@@ -228,8 +228,8 @@\n       <version>${commons-validator.version}</version>\n     </dependency>\n     <dependency>\n-      <groupId>velocity</groupId>\n-      <artifactId>velocity</artifactId>\n+      <groupId>org.apache.velocity</groupId>\n+      <artifactId>velocity-engine-core</artifactId>\n       <version>${velocity.version}</version>\n     </dependency>\n     <dependency>\ndiff --git a/main/src/com/google/refine/ProjectManager.java b/main/src/com/google/refine/ProjectManager.java\nindex 40530adbc..4ce487239 100644\n--- a/main/src/com/google/refine/ProjectManager.java\n+++ b/main/src/com/google/refine/ProjectManager.java\n@@ -38,6 +38,7 @@ import java.io.InputStream;\n import java.time.Duration;\n import java.time.Instant;\n import java.util.ArrayList;\n+import java.util.Collections;\n import java.util.HashMap;\n import java.util.List;\n import java.util.Map;\n@@ -76,7 +77,10 @@ public abstract class ProjectManager {\n     static protected final Duration QUICK_SAVE_MAX_TIME = Duration.ofSeconds(30);\n \n     protected Map<Long, ProjectMetadata> _projectsMetadata;\n-    protected Map<String, Integer> _projectsTags;// TagName, number of projects having that tag\n+    /**\n+     * Count of projects which have the given tag\n+     */\n+    private Map<String, Integer> _projectsTags;\n     protected PreferenceStore _preferenceStore;\n \n     final Logger logger = LoggerFactory.getLogger(this.getClass());\n@@ -104,7 +108,7 @@ public abstract class ProjectManager {\n         _projectsMetadata = new HashMap<Long, ProjectMetadata>();\n         _preferenceStore = new PreferenceStore();\n         _projects = new HashMap<Long, Project>();\n-        _projectsTags = new HashMap<String, Integer>();\n+        _projectsTags = new HashMap<>();\n \n         preparePreferenceStore(_preferenceStore);\n     }\n@@ -134,18 +138,7 @@ public abstract class ProjectManager {\n             projectMetadata.setRowCount(project.rows.size());\n             _projects.put(project.id, project);\n             _projectsMetadata.put(project.id, projectMetadata);\n-            if (_projectsTags == null)\n-                _projectsTags = new HashMap<>();\n-            String[] tags = projectMetadata.getTags();\n-            if (tags != null) {\n-                for (String tag : tags) {\n-                    if (_projectsTags.containsKey(tag)) {\n-                        _projectsTags.put(tag, _projectsTags.get(tag) + 1);\n-                    } else {\n-                        _projectsTags.put(tag, 1);\n-                    }\n-                }\n-            }\n+            addProjectTags(projectMetadata.getTags());\n         }\n     }\n \n@@ -348,7 +341,7 @@ public abstract class ProjectManager {\n     }\n \n     /**\n-     * Gets the project metadata from memory Requires that the metadata has already been loaded from the data store\n+     * Gets the project metadata from memory. Requires that the metadata has already been loaded from the data store\n      * \n      * @param id\n      * @return\n@@ -358,7 +351,7 @@ public abstract class ProjectManager {\n     }\n \n     /**\n-     * Gets the project metadata from memory Requires that the metadata has already been loaded from the data store\n+     * Gets the project metadata from memory. Requires that the metadata has already been loaded from the data store\n      * \n      * @param name\n      * @return\n@@ -488,11 +481,59 @@ public abstract class ProjectManager {\n         return _projectsMetadata;\n     }\n \n+    /**\n+     * Increment usage count for all tags in the list.\n+     *\n+     * @param tags\n+     *            String[] array containing all tag names to be updated\n+     */\n+    public void addProjectTags(String[] tags) {\n+        if (tags != null) {\n+            for (String tag : tags) {\n+                if (_projectsTags.containsKey(tag)) {\n+                    _projectsTags.put(tag, _projectsTags.get(tag) + 1);\n+                } else {\n+                    _projectsTags.put(tag, 1);\n+                }\n+            }\n+        }\n+    }\n+\n+    /**\n+     * Decrement usage count for all tags in the list and remove any which are no longer used at all.\n+     *\n+     * @param tags\n+     *            String[] array containing all tag names to be updated\n+     */\n+    public void removeProjectTags(String[] tags) {\n+        for (String tag : tags) {\n+            if (_projectsTags.containsKey(tag)) {\n+                int occurrence = _projectsTags.get(tag);\n+                if (occurrence <= 1)\n+                    _projectsTags.remove(tag);\n+                else {\n+                    _projectsTags.put(tag, occurrence - 1);\n+                }\n+            }\n+        }\n+    }\n+\n+    /**\n+     * Get tag names and usage counts for all projects\n+     *\n+     * @return unmodifiable map keyed by tag name with usage counts as the values\n+     */\n+    @JsonIgnore\n+    public Map<String, Integer> getAllProjectsTags() {\n+        return Collections.unmodifiableMap(_projectsTags);\n+    }\n+\n     /**\n      * Gets all the project tags currently held in memory\n-     * \n-     * @return\n+     *\n+     * @deprecated Deprecated for v3.8. Use {@link #getAllProjectsTags()}\n      */\n+    @Deprecated\n     @JsonIgnore\n     public Map<String, Integer> getAllProjectTags() {\n         return _projectsTags;\ndiff --git a/main/src/com/google/refine/commands/project/DeleteProjectCommand.java b/main/src/com/google/refine/commands/project/DeleteProjectCommand.java\nindex efc502625..85293fff7 100644\n--- a/main/src/com/google/refine/commands/project/DeleteProjectCommand.java\n+++ b/main/src/com/google/refine/commands/project/DeleteProjectCommand.java\n@@ -34,14 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n package com.google.refine.commands.project;\n \n import java.io.IOException;\n-import java.util.Map;\n \n import javax.servlet.ServletException;\n import javax.servlet.http.HttpServletRequest;\n import javax.servlet.http.HttpServletResponse;\n \n import com.google.refine.ProjectManager;\n-import com.google.refine.ProjectMetadata;\n import com.google.refine.commands.Command;\n \n public class DeleteProjectCommand extends Command {\n@@ -58,21 +56,6 @@ public class DeleteProjectCommand extends Command {\n         try {\n             long projectID = Long.parseLong(request.getParameter(\"project\"));\n \n-            // Remove the project tags from the general map\n-            Map<String, Integer> allProjectTags = ProjectManager.singleton.getAllProjectTags();\n-            ProjectMetadata metadata = ProjectManager.singleton.getProjectMetadata(projectID);\n-            for (String tag : metadata.getTags()) {\n-                if (allProjectTags.containsKey(tag)) {\n-                    int occurrence = allProjectTags.get(tag);\n-\n-                    if (occurrence == 1)\n-                        allProjectTags.remove(tag);\n-                    else {\n-                        allProjectTags.put(tag, occurrence - 1);\n-                    }\n-                }\n-            }\n-\n             ProjectManager.singleton.deleteProject(projectID);\n \n             respond(response, \"{ \\\"code\\\" : \\\"ok\\\" }\");\n@@ -81,4 +64,5 @@ public class DeleteProjectCommand extends Command {\n             respondException(response, e);\n         }\n     }\n+\n }\ndiff --git a/main/src/com/google/refine/commands/project/RenameProjectCommand.java b/main/src/com/google/refine/commands/project/RenameProjectCommand.java\nindex 4dad20473..a0fe53c70 100644\n--- a/main/src/com/google/refine/commands/project/RenameProjectCommand.java\n+++ b/main/src/com/google/refine/commands/project/RenameProjectCommand.java\n@@ -58,7 +58,7 @@ public class RenameProjectCommand extends Command {\n \n             pm.setName(name);\n \n-            respond(response, \"{ \\\"code\\\" : \\\"ok\\\" }\");\n+            respond(response, \"{\\\"code\\\":\\\"ok\\\"}\");\n         } catch (Exception e) {\n             respondException(response, e);\n         }\ndiff --git a/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java b/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java\nindex 09205950f..3cf45c486 100644\n--- a/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java\n+++ b/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java\n@@ -54,7 +54,7 @@ public class SetProjectMetadataCommand extends Command {\n         ProjectMetadata meta = null;\n \n         if (project == null) {\n-            respond(response, \"{ \\\"code\\\" : \\\"error\\\", \\\"message\\\" : \\\"Project cannot be found\\\" }\");\n+            respond(response, \"{\\\"code\\\":\\\"error\\\",\\\"message\\\":\\\"Project cannot be found\\\"}\");\n             return;\n         }\n \ndiff --git a/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java b/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java\nindex 923ce2faf..5e726659c 100644\n--- a/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java\n+++ b/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java\n@@ -26,16 +26,12 @@\n package com.google.refine.commands.project;\n \n import java.io.IOException;\n-import java.util.ArrayList;\n-import java.util.List;\n-import java.util.Map;\n+import java.util.stream.Stream;\n \n import javax.servlet.ServletException;\n import javax.servlet.http.HttpServletRequest;\n import javax.servlet.http.HttpServletResponse;\n \n-import com.google.common.base.CharMatcher;\n-\n import com.google.refine.ProjectManager;\n import com.google.refine.ProjectMetadata;\n import com.google.refine.commands.Command;\n@@ -66,43 +62,16 @@ public class SetProjectTagsCommand extends Command {\n         String oldT = request.getParameter(\"old\");\n         String newT = request.getParameter(\"new\");\n \n-        Map<String, Integer> allProjectTags = ProjectManager.singleton.getAllProjectTags();\n-\n-        // Lets remove the old tags from the general map\n-        String[] oldTags = oldT.split(\",\");\n-        for (String tag : oldTags) {\n-            if (allProjectTags != null && allProjectTags.containsKey(tag)) {\n-                int occurrence = allProjectTags.get(tag);\n+        String[] oldTags = oldT == null ? new String[0] : oldT.split(\",\");\n+        ProjectManager.singleton.removeProjectTags(oldTags);\n \n-                if (occurrence == 1) {\n-                    allProjectTags.remove(tag);\n-                } else {\n-                    allProjectTags.put(tag, occurrence - 1);\n-                }\n-            }\n-        }\n+        String[] newTags = newT == null ? new String[0]\n+                : Stream.of(newT.split(\" |\\\\,\")).map(String::trim).filter(t -> !t.isEmpty()).toArray(String[]::new);\n+        ProjectManager.singleton.addProjectTags(newTags);\n \n-        // Lets add the new tags to the general map\n-        String[] newTags = newT.split(\" |\\\\,\");\n-        List<String> polishedTags = new ArrayList<String>(newTags.length);\n-        for (String tag : newTags) {\n-            tag = CharMatcher.whitespace().trimFrom(tag);\n+        metadata.setTags(newTags);\n \n-            if (!tag.isEmpty()) {\n-                if (allProjectTags != null) {\n-                    if (allProjectTags.containsKey(tag)) {\n-                        allProjectTags.put(tag, allProjectTags.get(tag) + 1);\n-                    } else {\n-                        allProjectTags.put(tag, 1);\n-                    }\n-                }\n-                polishedTags.add(tag);\n-            }\n-        }\n-\n-        // Let's update the project tags\n-        metadata.setTags(polishedTags.toArray(new String[polishedTags.size()]));\n-\n-        respond(response, \"{ \\\"code\\\" : \\\"ok\\\" }\");\n+        respond(response, \"{\\\"code\\\":\\\"ok\\\"}\");\n     }\n+\n }\ndiff --git a/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java b/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java\nindex 44000c74e..0fdd801b3 100644\n--- a/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java\n+++ b/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java\n@@ -55,7 +55,7 @@ public class GetAllProjectTagsCommand extends Command {\n     public void doGet(HttpServletRequest request, HttpServletResponse response)\n             throws ServletException, IOException {\n \n-        Map<String, Integer> tagMap = ProjectManager.singleton.getAllProjectTags();\n+        Map<String, Integer> tagMap = ProjectManager.singleton.getAllProjectsTags();\n         Set<String> tags = tagMap == null ? Collections.emptySet() : tagMap.keySet();\n         respondJSON(response, new AllProjectsTags(tags));\n     }\ndiff --git a/main/src/com/google/refine/io/FileProjectManager.java b/main/src/com/google/refine/io/FileProjectManager.java\nindex d950766a4..09d175538 100644\n--- a/main/src/com/google/refine/io/FileProjectManager.java\n+++ b/main/src/com/google/refine/io/FileProjectManager.java\n@@ -39,7 +39,6 @@ import java.io.FileOutputStream;\n import java.io.IOException;\n import java.io.InputStream;\n import java.io.OutputStream;\n-import java.util.HashMap;\n import java.util.List;\n import java.util.Map.Entry;\n import java.util.Set;\n@@ -130,19 +129,7 @@ public class FileProjectManager extends ProjectManager {\n \n             if (metadata != null) {\n                 _projectsMetadata.put(projectID, metadata);\n-                if (_projectsTags == null) {\n-                    _projectsTags = new HashMap<String, Integer>();\n-                }\n-\n-                if (metadata != null && metadata.getTags() != null) {\n-                    for (String tag : metadata.getTags()) {\n-                        if (_projectsTags.containsKey(tag)) {\n-                            _projectsTags.put(tag, _projectsTags.get(tag) + 1);\n-                        } else {\n-                            _projectsTags.put(tag, 1);\n-                        }\n-                    }\n-                }\n+                addProjectTags(metadata.getTags());\n                 return true;\n             } else {\n                 return false;\n@@ -341,6 +328,16 @@ public class FileProjectManager extends ProjectManager {\n     @Override\n     public void deleteProject(long projectID) {\n         synchronized (this) {\n+\n+            // Remove this project's tags from the overall map\n+            ProjectMetadata metadata = getProjectMetadata(projectID);\n+            if (metadata != null) {\n+                String[] tags = metadata.getTags();\n+                if (tags != null) { // should only ever happen during tests with mocked ProjectMetadata\n+                    removeProjectTags(tags);\n+                }\n+            }\n+\n             removeProject(projectID);\n \n             File dir = getProjectDir(projectID);\n@@ -470,14 +467,8 @@ public class FileProjectManager extends ProjectManager {\n \n             _projectsMetadata.put(id, metadata);\n \n-            if (metadata != null && metadata.getTags() != null) {\n-                for (String tag : metadata.getTags()) {\n-                    if (_projectsTags.containsKey(tag)) {\n-                        _projectsTags.put(tag, _projectsTags.get(tag) + 1);\n-                    } else {\n-                        _projectsTags.put(tag, 1);\n-                    }\n-                }\n+            if (metadata != null) {\n+                addProjectTags(metadata.getTags());\n             }\n         }\n     }\ndiff --git a/main/webapp/WEB-INF/velocity.properties b/main/webapp/WEB-INF/velocity.properties\nindex 5e78fcb88..8e9747099 100644\n--- a/main/webapp/WEB-INF/velocity.properties\n+++ b/main/webapp/WEB-INF/velocity.properties\n@@ -7,5 +7,11 @@ velocimacro.context.localscope=false\n velocimacro.library.autoreload=false\n velocimacro.permissions.allow.inline.local.scope=true\n \n+# UTF-8 is the default encoding for 2.x, so these might be superfluous\n input.encoding=UTF-8\n output.encoding=UTF-8\n+\n+# Settings to maximize backward compatibility with 1.x\n+runtime.conversion.handler = none\n+space.gobbling = bc\n+directive.if.emptycheck = false\ndiff --git a/pom.xml b/pom.xml\nindex 62e6629ad..0e4098cc3 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -80,7 +80,7 @@\n     <jetty.version>10.0.16</jetty.version>\n     <okhttp.version>4.10.0</okhttp.version>\n     <jena.version>4.10.0</jena.version>\n-    <poi.version>5.2.4</poi.version>\n+    <poi.version>5.2.5</poi.version>\n     <commons-lang3.version>3.14.0</commons-lang3.version>\n     <commons-fileupload.version>1.5</commons-fileupload.version>\n     <commons-collections.version>3.2.2</commons-collections.version>\n@@ -90,7 +90,7 @@\n     <!-- v1.15 of commons-codec is needed for Jena 3.14+ - copied from org.apache.jena:jena:pom -->\n     <commons-codec.version>1.16.0</commons-codec.version>\n     <commons-compress.version>1.25.0</commons-compress.version>\n-    <velocity.version>1.5</velocity.version>\n+    <velocity.version>2.3</velocity.version>\n     <marc4j.version>2.9.5</marc4j.version>\n     <jsoup.version>1.15.3</jsoup.version>\n     <odfdom-java.version>0.9.0</odfdom-java.version> <!-- do not update to 0.10.0, see issue #4397 -->\n", "test_patch": "diff --git a/main/tests/server/src/com/google/refine/ProjectManagerTests.java b/main/tests/server/src/com/google/refine/ProjectManagerTests.java\nindex 740ab7e91..3204fd76c 100644\n--- a/main/tests/server/src/com/google/refine/ProjectManagerTests.java\n+++ b/main/tests/server/src/com/google/refine/ProjectManagerTests.java\n@@ -41,10 +41,12 @@ import static org.mockito.Mockito.times;\n import static org.mockito.Mockito.verify;\n import static org.mockito.Mockito.verifyNoMoreInteractions;\n import static org.mockito.Mockito.when;\n+import static org.testng.AssertJUnit.assertEquals;\n \n import java.lang.reflect.Field;\n import java.time.Instant;\n import java.util.ArrayList;\n+import java.util.Set;\n \n import org.mockito.Mockito;\n import org.slf4j.LoggerFactory;\n@@ -63,6 +65,7 @@ public class ProjectManagerTests extends RefineTest {\n \n     private static final Instant BASE_DATE = Instant.parse(\"1970-01-02T00:30:00Z\");\n     private static final int ROW_COUNT = 3;\n+    private static final String[] TAGS = { \"testtag1\", \"testtag2\" };\n     ProjectManagerStub pm;\n     ProjectManagerStub SUT;\n     Project project;\n@@ -88,6 +91,7 @@ public class ProjectManagerTests extends RefineTest {\n         addRows(project);\n \n         metadata = mock(ProjectMetadata.class);\n+        when(metadata.getTags()).thenReturn(TAGS);\n         procmgr = mock(ProcessManager.class);\n         when(project.getProcessManager()).thenReturn(procmgr);\n         when(procmgr.hasPending()).thenReturn(false); // always false for now, but should test separately\n@@ -118,6 +122,7 @@ public class ProjectManagerTests extends RefineTest {\n \n         verifyNoMoreInteractions(project);\n         verifyNoMoreInteractions(metadata);\n+        assertEquals(SUT.getAllProjectsTags().keySet(), Set.of(TAGS));\n     }\n \n     // TODO test registerProject in race condition\ndiff --git a/main/tests/server/src/com/google/refine/commands/CommandTestBase.java b/main/tests/server/src/com/google/refine/commands/CommandTestBase.java\nindex 7c90339c1..8ee589834 100644\n--- a/main/tests/server/src/com/google/refine/commands/CommandTestBase.java\n+++ b/main/tests/server/src/com/google/refine/commands/CommandTestBase.java\n@@ -3,6 +3,8 @@ package com.google.refine.commands;\n \n import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.when;\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertFalse;\n \n import java.io.IOException;\n import java.io.PrintWriter;\n@@ -11,11 +13,15 @@ import java.io.StringWriter;\n import javax.servlet.http.HttpServletRequest;\n import javax.servlet.http.HttpServletResponse;\n \n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.databind.JsonNode;\n import org.testng.annotations.BeforeMethod;\n \n+import com.google.refine.RefineTest;\n+import com.google.refine.util.ParsingUtilities;\n import com.google.refine.util.TestUtils;\n \n-public class CommandTestBase {\n+public class CommandTestBase extends RefineTest {\n \n     protected HttpServletRequest request = null;\n     protected HttpServletResponse response = null;\n@@ -40,4 +46,14 @@ public class CommandTestBase {\n     protected void assertCSRFCheckFailed() {\n         TestUtils.assertEqualsAsJson(writer.toString(), \"{\\\"code\\\":\\\"error\\\",\\\"message\\\":\\\"Missing or invalid csrf_token parameter\\\"}\");\n     }\n+\n+    /**\n+     * Convenience method to check that CSRF protection was NOT triggered\n+     */\n+    protected void assertErrorNotCSRF() throws JsonProcessingException {\n+        String response = writer.toString();\n+        JsonNode node = ParsingUtilities.mapper.readValue(response, JsonNode.class);\n+        assertEquals(node.get(\"code\").toString(), \"\\\"error\\\"\");\n+        assertFalse(response.contains(\"Missing or invalid csrf_token parameter\"));\n+    }\n }\ndiff --git a/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java b/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java\nindex 4dbaa3c56..5b583ff23 100644\n--- a/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java\n+++ b/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java\n@@ -1,6 +1,8 @@\n \n package com.google.refine.commands.project;\n \n+import static org.mockito.Mockito.when;\n+\n import java.io.IOException;\n \n import javax.servlet.ServletException;\n@@ -8,6 +10,7 @@ import javax.servlet.ServletException;\n import org.testng.annotations.BeforeMethod;\n import org.testng.annotations.Test;\n \n+import com.google.refine.commands.Command;\n import com.google.refine.commands.CommandTestBase;\n \n public class RenameProjectCommandTests extends CommandTestBase {\n@@ -22,4 +25,12 @@ public class RenameProjectCommandTests extends CommandTestBase {\n         command.doPost(request, response);\n         assertCSRFCheckFailed();\n     }\n+\n+    @Test\n+    public void testNoProjectId() throws ServletException, IOException {\n+        when(request.getParameter(\"csrf_token\")).thenReturn(Command.csrfFactory.getFreshToken());\n+        command.doPost(request, response);\n+        assertErrorNotCSRF();\n+    }\n+\n }\ndiff --git a/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java b/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java\nindex ccfb38f05..aae52672b 100644\n--- a/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java\n+++ b/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java\n@@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.commands.project;\n \n+import static com.google.refine.util.TestUtils.assertEqualsAsJson;\n import static org.mockito.ArgumentMatchers.anyLong;\n import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.times;\n@@ -41,6 +42,7 @@ import static org.mockito.Mockito.when;\n \n import java.io.IOException;\n import java.io.PrintWriter;\n+import java.io.StringWriter;\n import java.util.List;\n import java.util.Map;\n \n@@ -59,12 +61,12 @@ import org.testng.annotations.Test;\n \n import com.google.refine.ProjectManager;\n import com.google.refine.ProjectMetadata;\n-import com.google.refine.RefineTest;\n import com.google.refine.commands.Command;\n+import com.google.refine.commands.CommandTestBase;\n import com.google.refine.model.Project;\n import com.google.refine.util.ParsingUtilities;\n \n-public class SetProjectMetadataCommandTests extends RefineTest {\n+public class SetProjectMetadataCommandTests extends CommandTestBase {\n \n     @Override\n     @BeforeTest\n@@ -77,22 +79,19 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n \n     // variables\n     long PROJECT_ID_LONG = 1234;\n-    String PROJECT_ID = \"1234\";\n+    String PROJECT_ID = Long.toString(PROJECT_ID_LONG);\n     String SUBJECT = \"subject for project\";\n \n     // mocks\n-    HttpServletRequest request = null;\n-    HttpServletResponse response = null;\n     ProjectManager projMan = null;\n     Project proj = null;\n-    PrintWriter pw = null;\n \n     @BeforeMethod\n     public void SetUp() throws IOException {\n         projMan = mock(ProjectManager.class);\n         ProjectManager.singleton = projMan;\n         proj = mock(Project.class);\n-        pw = mock(PrintWriter.class);\n+        writer = new StringWriter();\n \n         request = mock(HttpServletRequest.class);\n         response = mock(HttpServletResponse.class);\n@@ -108,7 +107,7 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         when(proj.getMetadata()).thenReturn(metadata);\n \n         try {\n-            when(response.getWriter()).thenReturn(pw);\n+            when(response.getWriter()).thenReturn(new PrintWriter(writer));\n         } catch (IOException e1) {\n             Assert.fail();\n         }\n@@ -121,7 +120,7 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         projMan = null;\n         ProjectManager.singleton = null;\n         proj = null;\n-        pw = null;\n+        writer = null;\n         request = null;\n         response = null;\n     }\n@@ -155,15 +154,13 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         } catch (IOException e) {\n             Assert.fail();\n         }\n-        verify(pw, times(1)).write(\"{ \\\"code\\\" : \\\"ok\\\" }\");\n+        assertEqualsAsJson(writer.toString(), \"{\\\"code\\\":\\\"ok\\\"}\");\n \n         Assert.assertEquals(proj.getMetadata().getSubject(), SUBJECT);\n     }\n \n     /**\n      * set a user defined metadata field\n-     * \n-     * @throws JSONException\n      */\n     @Test\n     public void setUserMetadataFieldTest() {\n@@ -191,7 +188,7 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         } catch (IOException e) {\n             Assert.fail();\n         }\n-        verify(pw, times(1)).write(\"{ \\\"code\\\" : \\\"ok\\\" }\");\n+        assertEqualsAsJson(writer.toString(), \"{\\\"code\\\":\\\"ok\\\"}\");\n \n         ObjectNode obj = (ObjectNode) proj.getMetadata().getUserMetadata().get(0);\n         Assert.assertEquals(obj.get(\"name\").asText(), \"clientID\");\n@@ -235,6 +232,20 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         Assert.assertThrows(() -> meta.setAnyField(\"customMetadata\", customMetadata));\n     }\n \n+    @Test\n+    public void testCSRFProtection() throws ServletException, IOException {\n+        when(request.getParameter(\"csrf_token\")).thenReturn(\"\");\n+        SUT.doPost(request, response);\n+        assertCSRFCheckFailed();\n+    }\n+\n+    @Test\n+    public void testNoProjectId() throws ServletException, IOException {\n+        when(request.getParameter(\"project\")).thenReturn(null);\n+        SUT.doPost(request, response);\n+        assertErrorNotCSRF();\n+    }\n+\n     private String getValidCustomMetadata() {\n         return \"{\\n\" + //\n                 \"  \\\"name\\\":\\\"test\\\",\\n\" + //\ndiff --git a/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java b/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java\nindex bd2027755..3d72db5a4 100644\n--- a/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java\n+++ b/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java\n@@ -1,24 +1,114 @@\n \n package com.google.refine.commands.project;\n \n+import static com.google.refine.util.TestUtils.assertEqualsAsJson;\n+import static org.mockito.Mockito.times;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n+import static org.testng.Assert.assertEquals;\n+\n import java.io.IOException;\n+import java.io.PrintWriter;\n+import java.util.Arrays;\n+import java.util.Map;\n \n import javax.servlet.ServletException;\n \n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.databind.node.ArrayNode;\n+import org.testng.Assert;\n import org.testng.annotations.BeforeMethod;\n import org.testng.annotations.Test;\n \n+import com.google.refine.ProjectManager;\n+import com.google.refine.ProjectManagerStub;\n+import com.google.refine.ProjectMetadata;\n+import com.google.refine.commands.Command;\n import com.google.refine.commands.CommandTestBase;\n+import com.google.refine.model.Project;\n+import com.google.refine.model.ProjectStub;\n+import com.google.refine.util.ParsingUtilities;\n \n public class SetProjectTagsCommandTests extends CommandTestBase {\n \n+    private static long PROJECT_ID = 1234;\n+    private String[] TAGS = new String[] { \"tag1\", \"tag2\" };\n+    ProjectManager projectManager = null;\n+    Project project = null;\n+    PrintWriter pw = null;\n+\n     @BeforeMethod\n-    public void setUpCommand() {\n+    public void setUpCommand() throws JsonProcessingException {\n         command = new SetProjectTagsCommand();\n+\n+        pw = new PrintWriter(writer);\n+\n+        ProjectMetadata metadata = new ProjectMetadata();\n+        metadata.setUserMetadata((ArrayNode) ParsingUtilities.mapper.readTree(\"[ {name: \\\"clientID\\\", display: true} ]\"));\n+        metadata.setTags(TAGS);\n+\n+        projectManager = new ProjectManagerStub();\n+        ProjectManager.singleton = projectManager;\n+        project = new ProjectStub(PROJECT_ID);\n+        ProjectManager.singleton.registerProject(project, metadata);\n+\n+        // mock dependencies\n+        when(request.getParameter(\"project\")).thenReturn(Long.toString(PROJECT_ID));\n+        when(request.getParameter(\"csrf_token\")).thenReturn(Command.csrfFactory.getFreshToken());\n+\n+        try {\n+            when(response.getWriter()).thenReturn(pw);\n+        } catch (IOException e1) {\n+            Assert.fail();\n+        }\n+    }\n+\n+    @Test\n+    public void setProjectTagsTest() {\n+        // Check that our tags got set up correctly at project registration time.\n+        assertEquals(ProjectManager.singleton.getAllProjectsTags().keySet().stream().sorted().toArray(String[]::new), TAGS);\n+\n+        when(request.getParameter(\"old\")).thenReturn(String.join(\",\", TAGS));\n+        when(request.getParameter(\"new\")).thenReturn(\"a b c\");\n+        // run\n+        try {\n+            command.doPost(request, response);\n+        } catch (ServletException e) {\n+            Assert.fail();\n+        } catch (IOException e) {\n+            Assert.fail();\n+        }\n+\n+        // verify\n+        verify(request, times(1)).getParameter(\"csrf_token\");\n+        verify(request, times(1)).getParameter(\"project\");\n+\n+        verify(response, times(1))\n+                .setHeader(\"Content-Type\", \"application/json\");\n+        try {\n+            verify(response, times(1)).getWriter();\n+        } catch (IOException e) {\n+            Assert.fail();\n+        }\n+        assertEqualsAsJson(writer.toString(), \"{\\\"code\\\":\\\"ok\\\"}\");\n+\n+        String[] tags = project.getMetadata().getTags();\n+        assertEquals(tags.length, 3);\n+        Arrays.sort(tags);\n+        assertEquals(tags[1], \"b\");\n+\n+        Map<String, Integer> tagCounts = ProjectManager.singleton.getAllProjectsTags();\n+        assertEquals(tagCounts.size(), 3);\n+        assertEquals(ProjectManager.singleton.getAllProjectsTags().keySet().stream().sorted().toArray(String[]::new)[1], \"b\");\n+\n+        projectManager.deleteProject(PROJECT_ID);\n+        // TODO: ProjectManagerStub doesn't manage tags on project delete, so this fails\n+//        assertEquals(ProjectManager.singleton.getAllProjectsTags().size(), 0);\n     }\n \n     @Test\n     public void testCSRFProtection() throws ServletException, IOException {\n+        when(request.getParameter(\"csrf_token\")).thenReturn(null);\n         command.doPost(request, response);\n         assertCSRFCheckFailed();\n     }\ndiff --git a/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java b/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java\nindex a03583dba..dce133832 100644\n--- a/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java\n+++ b/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java\n@@ -66,7 +66,6 @@ public class FileProjectManagerTests {\n         protected FileProjectManagerStub(File dir) {\n             super(dir);\n             _projectsMetadata.put(5555L, mock(ProjectMetadata.class));\n-\n         }\n     }\n \n@@ -115,6 +114,7 @@ public class FileProjectManagerTests {\n     public void deleteProjectAndSaveWorkspace() throws IOException {\n         FileProjectManager manager = new FileProjectManagerStub(workspaceDir);\n         manager.saveWorkspace();\n+        // TODO: Test tag updating on project deletion\n         manager.deleteProject(5555);\n         manager.saveWorkspace();\n \n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #3479 \r\n\r\n- refactor & DRY up tag management code\r\n- add some tests for project related commands\r\n- add tests for tag commands\r\n", "PR_Title": "Fix DeleteProject NPE during e2e tests. Fixes #3479.", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6161_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6161, "issue_title": "Fix DeleteProject NPE during e2e tests. Fixes #3479.", "issue_body": "Fixes #3479 \r\n\r\n- refactor & DRY up tag management code\r\n- add some tests for project related commands\r\n- add tests for tag commands\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-5992", "base_commit": "6dffe684ab0075c0569f040418d4bb145f94a825", "patch": "diff --git a/.github/workflows/snapshot_release.yml b/.github/workflows/snapshot_release.yml\nindex 91a0fccbc..739af93f8 100644\n--- a/.github/workflows/snapshot_release.yml\n+++ b/.github/workflows/snapshot_release.yml\n@@ -21,7 +21,7 @@ jobs:\n           ref: ${{ github.event.pull_request.head.ref }}\n           repository: ${{ github.event.pull_request.head.repo.full_name }}\n       - name: Setup Node\n-        uses: actions/setup-node@v3.6.0\n+        uses: actions/setup-node@v3.7.0\n         with:\n           node-version: '14'\n       - id: set-matrix\n@@ -56,7 +56,7 @@ jobs:\n         run: ./refine build\n \n       - name: Setup Node\n-        uses: actions/setup-node@v3.6.0\n+        uses: actions/setup-node@v3.7.0\n         with:\n           node-version: '14'\n \n@@ -254,7 +254,7 @@ jobs:\n     - name: Upload release asset for Windows (without Java)\n       id: upload-release-asset-win\n       if: github.event_name == 'release'\n-      uses: shogo82148/actions-upload-release-asset@v1.6.4\n+      uses: shogo82148/actions-upload-release-asset@v1.6.5\n       with:\n         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}\n         asset_path: ./packaging/target/openrefine-win-${{ steps.version_string_variable.outputs.output_value }}.zip\n@@ -271,7 +271,7 @@ jobs:\n     - name: Upload release asset for Windows (with Java)\n       id: upload-release-asset-win-with-java\n       if: github.event_name == 'release'\n-      uses: shogo82148/actions-upload-release-asset@v1.6.4\n+      uses: shogo82148/actions-upload-release-asset@v1.6.5\n       with:\n         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}\n         asset_path: ./packaging/target/openrefine-win-with-java-${{ steps.version_string_variable.outputs.output_value }}.zip\n@@ -299,7 +299,7 @@ jobs:\n     - name: Upload Release Asset Linux\n       id: upload-release-asset-linux\n       if: github.event_name == 'release'\n-      uses: shogo82148/actions-upload-release-asset@v1.6.4\n+      uses: shogo82148/actions-upload-release-asset@v1.6.5\n       with:\n         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}\n         asset_path: ./packaging/target/openrefine-linux-${{ steps.version_string_variable.outputs.output_value }}.tar.gz\n@@ -316,7 +316,7 @@ jobs:\n     - name: Upload Release Asset Mac\n       id: upload-release-asset-mac\n       if: github.event_name == 'release'\n-      uses: shogo82148/actions-upload-release-asset@v1.6.4\n+      uses: shogo82148/actions-upload-release-asset@v1.6.5\n       with:\n         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}\n         asset_path: ./packaging/target/openrefine-mac-${{ steps.version_string_variable.outputs.output_value }}.dmg\n@@ -403,7 +403,7 @@ jobs:\n     - name: Upload release asset for Windows (with Java)\n       id: upload-release-asset-win-with-java-installer\n       if: github.event_name == 'release'\n-      uses: shogo82148/actions-upload-release-asset@v1.6.4\n+      uses: shogo82148/actions-upload-release-asset@v1.6.5\n       with:\n         upload_url: ${{ steps.get_release_upload_url.outputs.upload_url }}\n         asset_path: ./packaging/target/openrefine-win-with-java-installer-${{ needs.mac_test_and_deploy.outputs.version_number_string }}.exe\ndiff --git a/benchmark/pom.xml b/benchmark/pom.xml\nindex c9f3cd13d..f2515e161 100644\n--- a/benchmark/pom.xml\n+++ b/benchmark/pom.xml\n@@ -48,7 +48,7 @@\n \n   <properties>\n     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\n-    <jmh.version>1.36</jmh.version>\n+    <jmh.version>1.37</jmh.version>\n     <javac.target>${java.minversion}</javac.target>\n     <uberjar.name>openrefine-benchmarks</uberjar.name>\n   </properties>\ndiff --git a/extensions/wikibase/module/scripts/dialogs/schema-list-item.html b/extensions/wikibase/module/scripts/dialogs/schema-list-item.html\nindex 8ce783b1e..334f625b5 100644\n--- a/extensions/wikibase/module/scripts/dialogs/schema-list-item.html\n+++ b/extensions/wikibase/module/scripts/dialogs/schema-list-item.html\n@@ -2,7 +2,7 @@\n     <div class=\"wikibase-template-info\">\n         <span class=\"wikibase-name\" bind=\"templateName\"></span>\n     </div>\n-    <div class=\"wikibase-template-actions\">\n+    <div class=\"wikibase-template-actions\" style=\"float: right;\">\n         <a bind=\"renameTemplate\"></a> | \n         <a bind=\"downloadTemplate\"></a> |\n         <a bind=\"deleteTemplate\"></a>\ndiff --git a/extensions/wikibase/module/styles/dialogs/schema-management-dialog.css b/extensions/wikibase/module/styles/dialogs/schema-management-dialog.css\nindex 01f4618e0..890e3fec2 100644\n--- a/extensions/wikibase/module/styles/dialogs/schema-management-dialog.css\n+++ b/extensions/wikibase/module/styles/dialogs/schema-management-dialog.css\n@@ -1,5 +1,6 @@\n .schema-template-list {\n-  list-style: none;\n+  list-style: decimal;\n+  list-style-position: inside;\n   max-height: 450px;\n   overflow-y: auto;\n }\n@@ -10,8 +11,7 @@\n \n .schema-template-list li {\n   padding: .5em;\n-  display: flex;\n-  justify-content: space-between;\n+  display: list-item;\n }\n \n .schema-template-list li:nth-child(odd) {\ndiff --git a/main/src/com/google/refine/expr/functions/Length.java b/main/src/com/google/refine/expr/functions/Length.java\nindex d7fde5db9..6ca73c740 100644\n--- a/main/src/com/google/refine/expr/functions/Length.java\n+++ b/main/src/com/google/refine/expr/functions/Length.java\n@@ -37,6 +37,8 @@ import java.util.Collection;\n import java.util.Properties;\n \n import com.fasterxml.jackson.databind.node.ArrayNode;\n+import com.fasterxml.jackson.databind.node.ObjectNode;\n+\n import com.google.refine.expr.EvalError;\n import com.google.refine.expr.HasFieldsList;\n import com.google.refine.grel.ControlFunctionRegistry;\n@@ -61,6 +63,8 @@ public class Length implements Function {\n                     return ((HasFieldsList) v).length();\n                 } else if (v instanceof ArrayNode) {\n                     return ((ArrayNode) v).size();\n+                } else if (v instanceof ObjectNode) {\n+                    return ((ObjectNode) v).size();\n                 } else {\n                     String s = (v instanceof String ? (String) v : v.toString());\n                     return s.length();\ndiff --git a/main/src/com/google/refine/importers/WikitextImporter.java b/main/src/com/google/refine/importers/WikitextImporter.java\nindex c230d796a..f87d95dcd 100644\n--- a/main/src/com/google/refine/importers/WikitextImporter.java\n+++ b/main/src/com/google/refine/importers/WikitextImporter.java\n@@ -775,6 +775,7 @@ public class WikitextImporter extends TabularImportingParserBase {\n                 \"\",\n                 \"entity\",\n                 true,\n+                10,\n                 new ArrayList<ColumnDetail>(),\n                 1);\n         return cfg;\ndiff --git a/main/src/com/google/refine/model/Row.java b/main/src/com/google/refine/model/Row.java\nindex b1d2f295f..9eaf291a1 100644\n--- a/main/src/com/google/refine/model/Row.java\n+++ b/main/src/com/google/refine/model/Row.java\n@@ -80,7 +80,7 @@ public class Row implements HasFields {\n \n     /**\n      * Copy a row and return the copy. Note that this is a shallow copy, so if the contents of cells are changed in the\n-     * original, they will be be changed in the duplicate.\n+     * original, they will be changed in the duplicate.\n      * \n      * @return the duplicated row\n      */\ndiff --git a/main/src/com/google/refine/model/changes/MassRowChange.java b/main/src/com/google/refine/model/changes/MassRowChange.java\nindex 860495485..d79ac1f0e 100644\n--- a/main/src/com/google/refine/model/changes/MassRowChange.java\n+++ b/main/src/com/google/refine/model/changes/MassRowChange.java\n@@ -46,6 +46,8 @@ import com.google.refine.model.Project;\n import com.google.refine.model.Row;\n import com.google.refine.util.Pool;\n \n+// TODO: This replaces all rows in the project with a new set of rows, but if only a small percentage of the rows\n+// are being changed, it'd be much more efficient to apply a change list of new/modified rows.\n public class MassRowChange implements Change {\n \n     final protected List<Row> _newRows;\ndiff --git a/main/src/com/google/refine/model/recon/DataExtensionReconConfig.java b/main/src/com/google/refine/model/recon/DataExtensionReconConfig.java\nindex da68bc946..f961d0119 100644\n--- a/main/src/com/google/refine/model/recon/DataExtensionReconConfig.java\n+++ b/main/src/com/google/refine/model/recon/DataExtensionReconConfig.java\n@@ -53,13 +53,7 @@ public class DataExtensionReconConfig extends StandardReconConfig {\n             String identifierSpace,\n             String schemaSpace,\n             ReconType type) {\n-        super(\n-                service,\n-                identifierSpace,\n-                schemaSpace,\n-                type != null ? type.id : null,\n-                type != null ? type.name : null,\n-                true,\n+        super(service, identifierSpace, schemaSpace, type != null ? type.id : null, type != null ? type.name : null, true, 10,\n                 new ArrayList<ColumnDetail>());\n         this.type = type;\n     }\n@@ -71,7 +65,7 @@ public class DataExtensionReconConfig extends StandardReconConfig {\n     }\n \n     @Override\n-    public int getBatchSize() {\n+    public int getBatchSize(int rowCount) {\n         throw new RuntimeException(WARN);\n     }\n \ndiff --git a/main/src/com/google/refine/model/recon/ReconConfig.java b/main/src/com/google/refine/model/recon/ReconConfig.java\nindex 2d14fde3a..0bc18dd4b 100644\n--- a/main/src/com/google/refine/model/recon/ReconConfig.java\n+++ b/main/src/com/google/refine/model/recon/ReconConfig.java\n@@ -99,7 +99,8 @@ abstract public class ReconConfig {\n         return ParsingUtilities.mapper.readValue(json, ReconConfig.class);\n     }\n \n-    abstract public int getBatchSize();\n+    @JsonIgnore\n+    public abstract int getBatchSize(int rowCount);\n \n     abstract public String getBriefDescription(Project project, String columnName);\n \ndiff --git a/main/src/com/google/refine/model/recon/StandardReconConfig.java b/main/src/com/google/refine/model/recon/StandardReconConfig.java\nindex 35cd7c4c5..88354f623 100644\n--- a/main/src/com/google/refine/model/recon/StandardReconConfig.java\n+++ b/main/src/com/google/refine/model/recon/StandardReconConfig.java\n@@ -143,6 +143,8 @@ public class StandardReconConfig extends ReconConfig {\n     final public String typeName;\n     @JsonProperty(\"autoMatch\")\n     final public boolean autoMatch;\n+    @JsonProperty(\"batchSize\")\n+    final public int batchSize;\n     @JsonProperty(\"columnDetails\")\n     final public List<ColumnDetail> columnDetails;\n     @JsonProperty(\"limit\")\n@@ -158,12 +160,13 @@ public class StandardReconConfig extends ReconConfig {\n             @JsonProperty(\"schemaSpace\") String schemaSpace,\n             @JsonProperty(\"type\") ReconType type,\n             @JsonProperty(\"autoMatch\") boolean autoMatch,\n+            @JsonProperty(\"batchSize\") int batchSize,\n             @JsonProperty(\"columnDetails\") List<ColumnDetail> columnDetails,\n             @JsonProperty(\"limit\") int limit) {\n         this(service, identifierSpace, schemaSpace,\n                 type != null ? type.id : null,\n                 type != null ? type.name : null,\n-                autoMatch, columnDetails, limit);\n+                autoMatch, batchSize, columnDetails, limit);\n     }\n \n     public StandardReconConfig(\n@@ -174,8 +177,9 @@ public class StandardReconConfig extends ReconConfig {\n             String typeID,\n             String typeName,\n             boolean autoMatch,\n+            int batchSize,\n             List<ColumnDetail> columnDetails) {\n-        this(service, identifierSpace, schemaSpace, typeID, typeName, autoMatch, columnDetails, 0);\n+        this(service, identifierSpace, schemaSpace, typeID, typeName, autoMatch, batchSize, columnDetails, 0);\n     }\n \n     /**\n@@ -196,6 +200,7 @@ public class StandardReconConfig extends ReconConfig {\n             String typeID,\n             String typeName,\n             boolean autoMatch,\n+            int batchSize,\n             List<ColumnDetail> columnDetails,\n             int limit) {\n         this.service = service;\n@@ -205,6 +210,7 @@ public class StandardReconConfig extends ReconConfig {\n         this.typeID = typeID;\n         this.typeName = typeName;\n         this.autoMatch = autoMatch;\n+        this.batchSize = batchSize;\n         this.columnDetails = columnDetails;\n         this.limit = limit;\n     }\n@@ -220,8 +226,8 @@ public class StandardReconConfig extends ReconConfig {\n \n     @Override\n     @JsonIgnore\n-    public int getBatchSize() {\n-        return 10;\n+    public int getBatchSize(int rowCount) {\n+        return Math.min(Math.max(rowCount / 10, 10), batchSize);\n     }\n \n     @Override\ndiff --git a/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java b/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\nindex da0d93cb3..f80d9bec8 100644\n--- a/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\n+++ b/main/src/com/google/refine/operations/cell/MultiValuedCellSplitOperation.java\n@@ -1,6 +1,6 @@\n /*\n \n-Copyright 2010, Google Inc.\n+Copyright 2010, 2023 Google Inc. & OpenRefine contributors\n All rights reserved.\n \n Redistribution and use in source and binary forms, with or without\n@@ -59,6 +59,7 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n     final protected String _mode;\n     final protected String _separator;\n     final protected Boolean _regex;\n+    private final Pattern _pattern;\n \n     final protected int[] _fieldLengths;\n \n@@ -94,6 +95,11 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n         _separator = separator;\n         _mode = \"separator\";\n         _regex = regex;\n+        if (_regex) {\n+            _pattern = Pattern.compile(_separator, Pattern.UNICODE_CHARACTER_CLASS);\n+        } else {\n+            _pattern = null;\n+        }\n \n         _fieldLengths = null;\n     }\n@@ -108,7 +114,14 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n         _mode = \"lengths\";\n         _separator = null;\n         _regex = null;\n+        _pattern = null;\n \n+        // Make sure all of our lengths are non-negative\n+        for (int i = 0; i < fieldLengths.length; i++) {\n+            if (fieldLengths[i] < 0) {\n+                fieldLengths[i] = 0;\n+            }\n+        }\n         _fieldLengths = fieldLengths;\n     }\n \n@@ -176,45 +189,39 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n \n             Object value = oldRow.getCellValue(cellIndex);\n             String s = value instanceof String ? ((String) value) : value.toString();\n-            String[] values = null;\n+            String[] values;\n             if (\"lengths\".equals(_mode)) {\n                 if (_fieldLengths.length > 0 && _fieldLengths[0] > 0) {\n                     values = new String[_fieldLengths.length];\n \n-                    int lastIndex = 0;\n-\n+                    int from = 0;\n+                    int end = s.length();\n                     for (int i = 0; i < _fieldLengths.length; i++) {\n-                        int thisIndex = lastIndex;\n-\n-                        Object o = _fieldLengths[i];\n-                        if (o instanceof Number) {\n-                            thisIndex = Math.min(s.length(), lastIndex + Math.max(0, ((Number) o).intValue()));\n-                        }\n-\n-                        values[i] = s.substring(lastIndex, thisIndex);\n-                        lastIndex = thisIndex;\n+                        int to = Math.min(end, from + _fieldLengths[i]);\n+                        values[i] = s.substring(from, to);\n+                        from = to;\n                     }\n+                } else {\n+                    values = new String[] { s };\n                 }\n             } else if (_regex) {\n-                Pattern pattern = Pattern.compile(_separator, Pattern.UNICODE_CHARACTER_CLASS);\n-                values = pattern.split(s);\n+                values = _pattern.split(s);\n             } else {\n                 values = StringUtils.splitByWholeSeparatorPreserveAllTokens(s, _separator);\n             }\n \n+            // Split didn't change anything. Just copy the row\n             if (values.length < 2) {\n                 newRows.add(oldRow.dup());\n                 continue;\n             }\n \n-            // First value goes into the same row\n-            {\n-                Row firstNewRow = oldRow.dup();\n-                firstNewRow.setCell(cellIndex, new Cell(values[0], null));\n-\n-                newRows.add(firstNewRow);\n-            }\n+            // First newly split value goes into the original cell in the existing row\n+            Row firstNewRow = oldRow.dup();\n+            firstNewRow.setCell(cellIndex, new Cell(values[0], null));\n+            newRows.add(firstNewRow);\n \n+            // For remaining values, use an empty cell, if one exists in the row, otherwise allocate a new row\n             int r2 = r + 1;\n             for (int v = 1; v < values.length; v++) {\n                 Cell newCell = new Cell(values[v], null);\n@@ -222,6 +229,7 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n                 if (r2 < project.rows.size()) {\n                     Row oldRow2 = project.rows.get(r2);\n                     if (oldRow2.isCellBlank(cellIndex) &&\n+                    // key cell not blank means we are on next record\n                             oldRow2.isCellBlank(keyCellIndex)) {\n \n                         Row newRow = oldRow2.dup();\n@@ -234,6 +242,7 @@ public class MultiValuedCellSplitOperation extends AbstractOperation {\n                     }\n                 }\n \n+                // We need a new (empty) row\n                 Row newRow = new Row(cellIndex + 1);\n                 newRow.setCell(cellIndex, newCell);\n \ndiff --git a/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java b/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java\nindex f6c434c3c..3b22766ba 100644\n--- a/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java\n+++ b/main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java\n@@ -129,6 +129,7 @@ public class ReconMarkNewTopicsOperation extends EngineDependentMassCellOperatio\n                         _schemaSpace,\n                         null,\n                         false,\n+                        10,\n                         Collections.emptyList(),\n                         0);\n     }\ndiff --git a/main/src/com/google/refine/operations/recon/ReconOperation.java b/main/src/com/google/refine/operations/recon/ReconOperation.java\nindex 6214c741a..023682588 100644\n--- a/main/src/com/google/refine/operations/recon/ReconOperation.java\n+++ b/main/src/com/google/refine/operations/recon/ReconOperation.java\n@@ -261,7 +261,7 @@ public class ReconOperation extends EngineDependentOperation {\n                 group.entries.add(entry);\n             }\n \n-            int batchSize = _reconConfig.getBatchSize();\n+            int batchSize = _reconConfig.getBatchSize(_project.rows.size());\n             int done = 0;\n \n             List<CellChange> cellChanges = new ArrayList<CellChange>(_entries.size());\ndiff --git a/main/src/com/google/refine/operations/recon/ReconUseValuesAsIdentifiersOperation.java b/main/src/com/google/refine/operations/recon/ReconUseValuesAsIdentifiersOperation.java\nindex 2471351e2..46051d74e 100644\n--- a/main/src/com/google/refine/operations/recon/ReconUseValuesAsIdentifiersOperation.java\n+++ b/main/src/com/google/refine/operations/recon/ReconUseValuesAsIdentifiersOperation.java\n@@ -73,7 +73,7 @@ public class ReconUseValuesAsIdentifiersOperation extends EngineDependentMassCel\n         this.service = service;\n         this.identifierSpace = identifierSpace;\n         this.schemaSpace = schemaSpace;\n-        this.reconConfig = new StandardReconConfig(service, identifierSpace, schemaSpace, null, null, true, Collections.emptyList());\n+        this.reconConfig = new StandardReconConfig(service, identifierSpace, schemaSpace, null, null, true, 10, Collections.emptyList());\n     }\n \n     @Override\ndiff --git a/main/webapp/modules/core/scripts/reconciliation/standard-service-panel.js b/main/webapp/modules/core/scripts/reconciliation/standard-service-panel.js\nindex 0ea4d6d42..d26a9ec16 100644\n--- a/main/webapp/modules/core/scripts/reconciliation/standard-service-panel.js\n+++ b/main/webapp/modules/core/scripts/reconciliation/standard-service-panel.js\n@@ -345,6 +345,7 @@ ReconStandardServicePanel.prototype.start = function() {\n         schemaSpace: this._service.schemaSpace,\n         type: (type) ? { id: type.id, name: type.name } : null,\n         autoMatch: this._elmts.automatchCheck[0].checked,\n+        batchSize: (Number.isInteger(this._service.batchSize) && this._service.batchSize > 0) ? this._service.batchSize : 10,\n         columnDetails: columnDetails,\n         limit: parseInt(this._elmts.maxCandidates[0].value) || 0\n       })\n@@ -362,4 +363,4 @@ ReconStandardServicePanel.prototype.showBusyReconciling = function(message) {\n   return function() {\n     $(body).remove()\n   };\n-};\n\\ No newline at end of file\n+};\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js\nindex f2c2625ce..087b0922a 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/menu-edit-cells.js\n@@ -362,14 +362,14 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n           return;\n         }\n       } else if (mode === \"cases\") {\n-        if(elmts.reversTranistionCases[0].checked) {\n+        if(elmts.reverseTransitionCases[0].checked) {\n           config.separator = \"(?<=\\\\p{Upper}|[\\\\p{Upper}][\\\\s])(?=\\\\p{Lower})\";\n         } else {\n           config.separator = \"(?<=\\\\p{Lower}|[\\\\p{Lower}][\\\\s])(?=\\\\p{Upper})\";\n         }\n         config.regex = true;\n       } else if (mode === \"number\") {\n-        if(elmts.reversTranistionNumbers[0].checked) {\n+        if(elmts.reverseTransitionNumbers[0].checked) {\n           config.separator = \"(?<=\\\\p{L}|[\\\\p{L}][\\\\s])(?=\\\\p{Digit})\";\n         } else {\n           config.separator = \"(?<=\\\\p{Digit}|[\\\\p{Digit}][\\\\s])(?=\\\\p{L})\";\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html b/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html\nindex 72942f18a..f544d3bd5 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html\n+++ b/main/webapp/modules/core/scripts/views/data-table/split-multi-valued-cells-dialog.html\n@@ -31,7 +31,7 @@\n             <tr>\n               <td width=\"1%\"><input type=\"radio\" name=\"split-by-mode\" value=\"cases\" id=\"$split-multi-valued-cells-by-case\" /></td>\n               <td colspan=\"2\"><label for=\"$split-multi-valued-cells-by-case\" bind=\"or_views_byCase\"></label></td>\n-              <td><input type=\"checkbox\" bind=\"reversTranistionCases\" id=\"$split-cell-transition-order-case\" />\n+              <td><input type=\"checkbox\" bind=\"reverseTransitionCases\" id=\"$split-cell-transition-order-case\" />\n               <label for=\"$split-cell-transition-order-case\" bind=\"or_views_revCase\"></label></td>\n             </tr>\n             <tr>\n@@ -42,7 +42,7 @@\n             <tr>\n               <td width=\"1%\"><input type=\"radio\" name=\"split-by-mode\" value=\"number\" id=\"$split-multi-valued-cells-by-number\" /></td>\n               <td colspan=\"2\"><label for=\"$split-multi-valued-cells-by-number\" bind=\"or_views_byNumber\"></label></td>\n-              <td><input type=\"checkbox\" bind=\"reversTranistionNumbers\" id=\"$split-cell-transition-order-number\" />\n+              <td><input type=\"checkbox\" bind=\"reverseTransitionNumbers\" id=\"$split-cell-transition-order-number\" />\n               <label for=\"$split-cell-transition-order-number\" bind=\"or_views_revNum\"></label></td>\n             </tr>\n             <tr>\n@@ -59,4 +59,4 @@\n       <button class=\"button\" bind=\"cancelButton\"></button>\n     </div>\n   </div>\n-</div>\n\\ No newline at end of file\n+</div>\ndiff --git a/pom.xml b/pom.xml\nindex 7522c027c..4f5ef1c2d 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -81,7 +81,7 @@\n     <okhttp.version>4.10.0</okhttp.version>\n     <jena.version>4.8.0</jena.version>\n     <poi.version>5.2.3</poi.version>\n-    <commons-lang3.version>3.12.0</commons-lang3.version>\n+    <commons-lang3.version>3.13.0</commons-lang3.version>\n     <commons-fileupload.version>1.5</commons-fileupload.version>\n     <commons-collections.version>3.2.2</commons-collections.version>\n     <commons-text.version>1.10.0</commons-text.version>\n", "test_patch": "diff --git a/.github/workflows/pull_request_e2e.yml b/.github/workflows/pull_request_e2e.yml\nindex 3ef38c771..1a466cc41 100644\n--- a/.github/workflows/pull_request_e2e.yml\n+++ b/.github/workflows/pull_request_e2e.yml\n@@ -24,7 +24,7 @@ jobs:\n     steps:\n       - uses: actions/checkout@v3\n       - name: Setup Node\n-        uses: actions/setup-node@v3.6.0\n+        uses: actions/setup-node@v3.7.0\n         with:\n           node-version: '14'\n       - id: set-matrix\n@@ -56,7 +56,7 @@ jobs:\n         run: ./refine build\n \n       - name: Setup Node\n-        uses: actions/setup-node@v3.6.0\n+        uses: actions/setup-node@v3.7.0\n         with:\n           node-version: '14'\n \ndiff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java\nindex 00d61004d..debf7e35a 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/editing/NewEntityLibraryTest.java\n@@ -60,7 +60,7 @@ public class NewEntityLibraryTest extends WikidataRefineTest {\n     public void testUpdateReconciledCells() {\n         Project project = createCSVProject(TestingData.inceptionWithNewCsv);\n         StandardReconConfig config = new StandardReconConfig(\"http://my.endpoint\",\n-                \"http://my.schema\", \"http://my.schema\", \"Q5\", \"human\", true, Collections.emptyList());\n+                \"http://my.schema\", \"http://my.schema\", \"Q5\", \"human\", true, 10, Collections.emptyList());\n         project.columnModel.columns.get(0).setReconConfig(config);\n \n         project.rows.get(0).cells.set(0, TestingData.makeNewItemCell(3289L, \"University of Ljubljana\"));\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex c7c278064..4894ef37c 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -16,14 +16,14 @@\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"12.17.2\",\n+        \"cypress\": \"12.17.3\",\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.45.0\",\n+        \"eslint\": \"^8.46.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n-        \"eslint-config-prettier\": \"^8.8.0\",\n+        \"eslint-config-prettier\": \"^8.10.0\",\n         \"eslint-plugin-cypress\": \"^2.13.3\",\n-        \"prettier\": \"3.0.0\"\n+        \"prettier\": \"3.0.1\"\n     }\n }\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 41d013ac6..3e5967306 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -46,15 +46,15 @@\n   dependencies:\n     eslint-visitor-keys \"^3.3.0\"\n \n-\"@eslint-community/regexpp@^4.4.0\":\n-  version \"4.4.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.4.0.tgz#3e61c564fcd6b921cb789838631c5ee44df09403\"\n-  integrity sha512-A9983Q0LnDGdLPjxyXQ00sbV+K+O+ko2Dr+CZigbHWtX9pNfxlaBkMR8X1CztI73zuEyEBXTVjx7CE+/VSwDiQ==\n+\"@eslint-community/regexpp@^4.6.1\":\n+  version \"4.6.2\"\n+  resolved \"https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.6.2.tgz#1816b5f6948029c5eaacb0703b850ee0cb37d8f8\"\n+  integrity sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==\n \n-\"@eslint/eslintrc@^2.1.0\":\n-  version \"2.1.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.0.tgz#82256f164cc9e0b59669efc19d57f8092706841d\"\n-  integrity sha512-Lj7DECXqIVCqnqjjHMPna4vn6GJcMgul/wuS0je9OZ9gsL0zzDpKPVtcG1HaDVc+9y+qgXneTeUMbCqXJNpH1A==\n+\"@eslint/eslintrc@^2.1.1\":\n+  version \"2.1.1\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.1.tgz#18d635e24ad35f7276e8a49d135c7d3ca6a46f93\"\n+  integrity sha512-9t7ZA7NGGK8ckelF0PQCfcxIUzs1Md5rrO6U/c+FIQNanea5UZC0wqKXH4vHBccmu4ZJgZ2idtPeW7+Q2npOEA==\n   dependencies:\n     ajv \"^6.12.4\"\n     debug \"^4.3.2\"\n@@ -66,10 +66,10 @@\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@8.44.0\":\n-  version \"8.44.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.44.0.tgz#961a5903c74139390478bdc808bcde3fc45ab7af\"\n-  integrity sha512-Ag+9YM4ocKQx9AarydN0KY2j0ErMHNIocPDrVo8zAE44xLTjEtz81OdR68/cydGtk6m6jDb5Za3r2useMzYmSw==\n+\"@eslint/js@^8.46.0\":\n+  version \"8.46.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.46.0.tgz#3f7802972e8b6fe3f88ed1aabc74ec596c456db6\"\n+  integrity sha512-a8TLtmPi8xzPkCbp/OGFUo5yhRkHM2Ko9kOWP4znJr0WAhWyThaw3PnwX4vOTWOAMsV2uRt32PPDcEz63esSaA==\n \n \"@humanwhocodes/config-array@^0.11.10\":\n   version \"0.11.10\"\n@@ -116,15 +116,10 @@\n   resolved \"https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz\"\n   integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==\n \n-\"@types/node@*\":\n-  version \"15.12.4\"\n-  resolved \"https://registry.yarnpkg.com/@types/node/-/node-15.12.4.tgz#e1cf817d70a1e118e81922c4ff6683ce9d422e26\"\n-  integrity sha512-zrNj1+yqYF4WskCMOHwN+w9iuD12+dGm0rQ35HLl9/Ouuq52cEtd0CH9qMgrdNmi5ejC1/V7vKEXYubB+65DkA==\n-\n-\"@types/node@^14.14.31\":\n-  version \"14.14.37\"\n-  resolved \"https://registry.yarnpkg.com/@types/node/-/node-14.14.37.tgz#a3dd8da4eb84a996c36e331df98d82abd76b516e\"\n-  integrity sha512-XYmBiy+ohOR4Lh5jE379fV2IU+6Jn4g5qASinhitfyO71b/sCo6MKsMLF5tc7Zf2CE8hViVQyYSobJNke8OvUw==\n+\"@types/node@*\", \"@types/node@^16.18.39\":\n+  version \"16.18.39\"\n+  resolved \"https://registry.yarnpkg.com/@types/node/-/node-16.18.39.tgz#aa39a1a87a40ef6098ee69689a1acb0c1b034832\"\n+  integrity sha512-8q9ZexmdYYyc5/cfujaXb4YOucpQxAV4RMG0himLyDUOEr8Mr79VrqsFI+cQ2M2h89YIuy95lbxuYjxT4Hk4kQ==\n \n \"@types/sinonjs__fake-timers@8.1.1\":\n   version \"8.1.1\"\n@@ -161,7 +156,7 @@ aggregate-error@^3.0.0:\n     clean-stack \"^2.0.0\"\n     indent-string \"^4.0.0\"\n \n-ajv@^6.10.0, ajv@^6.12.4:\n+ajv@^6.12.4:\n   version \"6.12.6\"\n   resolved \"https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz\"\n   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==\n@@ -436,14 +431,14 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress@12.17.2:\n-  version \"12.17.2\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-12.17.2.tgz#040ac55de1e811f6e037d231a2869d5ab8c29c85\"\n-  integrity sha512-hxWAaWbqQBzzMuadSGSuQg5PDvIGOovm6xm0hIfpCVcORsCAj/gF2p0EvfnJ4f+jK2PCiDgP6D2eeE9/FK4Mjg==\n+cypress@12.17.3:\n+  version \"12.17.3\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-12.17.3.tgz#1e2b19037236fc60e4a4b3a14f0846be17a1fc0e\"\n+  integrity sha512-/R4+xdIDjUSLYkiQfwJd630S81KIgicmQOLXotFxVXkl+eTeVO+3bHXxdi5KBh/OgC33HWN33kHX+0tQR/ZWpg==\n   dependencies:\n     \"@cypress/request\" \"^2.88.11\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n-    \"@types/node\" \"^14.14.31\"\n+    \"@types/node\" \"^16.18.39\"\n     \"@types/sinonjs__fake-timers\" \"8.1.1\"\n     \"@types/sizzle\" \"^2.3.2\"\n     arch \"^2.2.0\"\n@@ -569,10 +564,10 @@ eslint-config-google@^0.14.0:\n   resolved \"https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz\"\n   integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==\n \n-eslint-config-prettier@^8.8.0:\n-  version \"8.8.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.8.0.tgz#bfda738d412adc917fd7b038857110efe98c9348\"\n-  integrity sha512-wLbQiFre3tdGgpDv67NQKnJuTlcUVYHas3k+DZCc2U2BadthoEY4B7hLPvAxaqdyOGCzuLfii2fqGph10va7oA==\n+eslint-config-prettier@^8.10.0:\n+  version \"8.10.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11\"\n+  integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==\n \n eslint-plugin-cypress@^2.13.3:\n   version \"2.13.3\"\n@@ -581,40 +576,40 @@ eslint-plugin-cypress@^2.13.3:\n   dependencies:\n     globals \"^11.12.0\"\n \n-eslint-scope@^7.2.0:\n-  version \"7.2.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b\"\n-  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==\n+eslint-scope@^7.2.2:\n+  version \"7.2.2\"\n+  resolved \"https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f\"\n+  integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==\n   dependencies:\n     esrecurse \"^4.3.0\"\n     estraverse \"^5.2.0\"\n \n-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:\n-  version \"3.4.1\"\n-  resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994\"\n-  integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==\n+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.2:\n+  version \"3.4.2\"\n+  resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f\"\n+  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==\n \n-eslint@^8.45.0:\n-  version \"8.45.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78\"\n-  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==\n+eslint@^8.46.0:\n+  version \"8.46.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.46.0.tgz#a06a0ff6974e53e643acc42d1dcf2e7f797b3552\"\n+  integrity sha512-cIO74PvbW0qU8e0mIvk5IV3ToWdCq5FYG6gWPHHkx6gNdjlbAYvtfHmlCMXxjcoVaIdwy/IAt3+mDkZkfvb2Dg==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n-    \"@eslint-community/regexpp\" \"^4.4.0\"\n-    \"@eslint/eslintrc\" \"^2.1.0\"\n-    \"@eslint/js\" \"8.44.0\"\n+    \"@eslint-community/regexpp\" \"^4.6.1\"\n+    \"@eslint/eslintrc\" \"^2.1.1\"\n+    \"@eslint/js\" \"^8.46.0\"\n     \"@humanwhocodes/config-array\" \"^0.11.10\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\n-    ajv \"^6.10.0\"\n+    ajv \"^6.12.4\"\n     chalk \"^4.0.0\"\n     cross-spawn \"^7.0.2\"\n     debug \"^4.3.2\"\n     doctrine \"^3.0.0\"\n     escape-string-regexp \"^4.0.0\"\n-    eslint-scope \"^7.2.0\"\n-    eslint-visitor-keys \"^3.4.1\"\n-    espree \"^9.6.0\"\n+    eslint-scope \"^7.2.2\"\n+    eslint-visitor-keys \"^3.4.2\"\n+    espree \"^9.6.1\"\n     esquery \"^1.4.2\"\n     esutils \"^2.0.2\"\n     fast-deep-equal \"^3.1.3\"\n@@ -637,10 +632,10 @@ eslint@^8.45.0:\n     strip-ansi \"^6.0.1\"\n     text-table \"^0.2.0\"\n \n-espree@^9.6.0:\n-  version \"9.6.0\"\n-  resolved \"https://registry.yarnpkg.com/espree/-/espree-9.6.0.tgz#80869754b1c6560f32e3b6929194a3fe07c5b82f\"\n-  integrity sha512-1FH/IiruXZ84tpUlm0aCUEwMl2Ho5ilqVh0VvQXw+byAz/4SAciyHLlfmL5WYqsvD38oymdUwBss0LtK8m4s/A==\n+espree@^9.6.0, espree@^9.6.1:\n+  version \"9.6.1\"\n+  resolved \"https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f\"\n+  integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==\n   dependencies:\n     acorn \"^8.9.0\"\n     acorn-jsx \"^5.3.2\"\n@@ -1312,10 +1307,10 @@ prelude-ls@^1.2.1:\n   resolved \"https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz\"\n   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==\n \n-prettier@3.0.0:\n-  version \"3.0.0\"\n-  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.0.0.tgz#e7b19f691245a21d618c68bc54dc06122f6105ae\"\n-  integrity sha512-zBf5eHpwHOGPC47h0zrPyNn+eAEIdEzfywMoYn2XPi0P44Zp0tSq64rq0xAREh4auw2cJZHo9QUob+NqCQky4g==\n+prettier@3.0.1:\n+  version \"3.0.1\"\n+  resolved \"https://registry.yarnpkg.com/prettier/-/prettier-3.0.1.tgz#65271fc9320ce4913c57747a70ce635b30beaa40\"\n+  integrity sha512-fcOWSnnpCrovBsmFZIGIy9UqK2FaI7Hqax+DIO0A9UxeVoY4iweyaFjS5TavZN97Hfehph0nhsZnjlVKzEQSrQ==\n \n pretty-bytes@^5.6.0:\n   version \"5.6.0\"\ndiff --git a/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java b/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java\nindex 0504d922d..722dd1897 100644\n--- a/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java\n+++ b/main/tests/server/src/com/google/refine/commands/recon/ReconJudgeOneCellCommandTest.java\n@@ -74,7 +74,7 @@ public class ReconJudgeOneCellCommandTest extends RefineTest {\n                 \"http://my.recon.service/rdf/schema\",\n                 \"type3894\",\n                 \"octopus\",\n-                true,\n+                true, 10,\n                 Collections.emptyList(),\n                 5);\n         reconciled.setReconConfig(config);\ndiff --git a/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java b/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java\nindex 3e04d14d6..14bc957bd 100644\n--- a/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java\n+++ b/main/tests/server/src/com/google/refine/expr/functions/LengthTests.java\n@@ -27,9 +27,35 @@\n \n package com.google.refine.expr.functions;\n \n+import static org.testng.Assert.assertEquals;\n+\n+import java.util.Properties;\n+\n import org.testng.annotations.Test;\n \n-import com.google.refine.util.TestUtils;\n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.databind.node.ArrayNode;\n+import com.fasterxml.jackson.databind.node.ObjectNode;\n+\n+import com.google.refine.RefineTest;\n+import com.google.refine.grel.Function;\n+import com.google.refine.util.ParsingUtilities;\n+\n+public class LengthTests extends RefineTest {\n+\n+    static Properties bindings = new Properties();\n+\n+    @Test\n+    public void testLength() throws JsonProcessingException {\n+        Function f = new Length();\n+        assertEquals(f.call(bindings, new Object[] { Long.valueOf(123) }), 3);\n+        assertEquals(f.call(bindings, new Object[] { Double.valueOf(123.1) }), 5);\n+        assertEquals(f.call(bindings, new Object[] { \"12345\" }), 5);\n+\n+        ArrayNode array = (ArrayNode) ParsingUtilities.mapper.readTree(\"[1,2,3]\");\n+        assertEquals(f.call(bindings, new Object[] { array }), 3);\n \n-public class LengthTests {\n+        ObjectNode dict = (ObjectNode) ParsingUtilities.mapper.readTree(\"{\\\"a\\\": \\\"b\\\", \\\"c\\\": \\\"d\\\"}\");\n+        assertEquals(f.call(bindings, new Object[] { dict }), 2);\n+    }\n }\ndiff --git a/main/tests/server/src/com/google/refine/model/ColumnTests.java b/main/tests/server/src/com/google/refine/model/ColumnTests.java\nindex 624c592c6..f4a134cbe 100644\n--- a/main/tests/server/src/com/google/refine/model/ColumnTests.java\n+++ b/main/tests/server/src/com/google/refine/model/ColumnTests.java\n@@ -55,6 +55,7 @@ public class ColumnTests {\n                 + \"   \\\"schemaSpace\\\":\\\"http://www.wikidata.org/prop/direct/\\\",\"\n                 + \"   \\\"type\\\":{\\\"id\\\":\\\"Q43229\\\",\\\"name\\\":\\\"organization\\\"},\"\n                 + \"   \\\"autoMatch\\\":true,\"\n+                + \"   \\\"batchSize\\\":10,\"\n                 + \"   \\\"columnDetails\\\":[\"\n                 + \"      {\\\"column\\\":\\\"organization_country\\\",\\\"propertyName\\\":\\\"SPARQL: P17/P297\\\",\\\"propertyID\\\":\\\"P17/P297\\\"},\"\n                 + \"      {\\\"column\\\":\\\"organization_id\\\",\\\"propertyName\\\":\\\"SPARQL: P3500|P2427\\\",\\\"propertyID\\\":\\\"P3500|P2427\\\"}\"\ndiff --git a/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java b/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java\nindex 3c5ec9973..41fd3843c 100644\n--- a/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java\n+++ b/main/tests/server/src/com/google/refine/model/recon/StandardReconConfigTests.java\n@@ -83,7 +83,7 @@ public class StandardReconConfigTests extends RefineTest {\n     private class StandardReconConfigStub extends StandardReconConfig {\n \n         public StandardReconConfigStub() {\n-            super(\"\", \"\", \"\", \"\", \"\", false, new ArrayList<ColumnDetail>());\n+            super(\"\", \"\", \"\", \"\", \"\", false, 10, new ArrayList<ColumnDetail>());\n         }\n \n         public double wordDistanceTest(String s1, String s2) {\n@@ -124,6 +124,7 @@ public class StandardReconConfigTests extends RefineTest {\n                 \"                \\\"name\\\": \\\"scientific article\\\"\\n\" +\n                 \"        },\\n\" +\n                 \"        \\\"autoMatch\\\": true,\\n\" +\n+                \"        \\\"batchSize\\\": 10,\\n\" +\n                 \"        \\\"columnDetails\\\": [\\n\" +\n                 \"           {\\n\" +\n                 \"             \\\"column\\\": \\\"organization_country\\\",\\n\" +\n@@ -164,6 +165,28 @@ public class StandardReconConfigTests extends RefineTest {\n         assertNull(config.typeName);\n     }\n \n+    @Test\n+    public void testGetBatchSize() throws IOException {\n+\n+        String json = \"{\\\"mode\\\":\\\"standard-service\\\",\"\n+                + \"\\\"service\\\":\\\"https://tools.wmflabs.org/openrefine-wikidata/en/api\\\",\"\n+                + \"\\\"identifierSpace\\\":\\\"http://www.wikidata.org/entity/\\\",\"\n+                + \"\\\"schemaSpace\\\":\\\"http://www.wikidata.org/prop/direct/\\\",\"\n+                + \"\\\"type\\\":null,\"\n+                + \"\\\"autoMatch\\\":true,\"\n+                + \"\\\"batchSize\\\":50,\"\n+                + \"\\\"columnDetails\\\":[\"\n+                + \"    {\\\"column\\\":\\\"_ - id\\\",\"\n+                + \"     \\\"property\\\":{\\\"id\\\":\\\"P3153\\\",\\\"name\\\":\\\"Crossref funder ID\\\"}}\"\n+                + \"],\"\n+                + \"\\\"limit\\\":0}\";\n+        StandardReconConfig c = StandardReconConfig.reconstruct(json);\n+        assertEquals(c.getBatchSize(10), 10);\n+        assertEquals(c.getBatchSize(120), 12);\n+        assertEquals(c.getBatchSize(1200), 50);\n+        assertEquals(c.getBatchSize(10000), 50);\n+    }\n+\n     @Test\n     public void testReconstructNoIdentifierSchemaSpaces() throws IOException {\n         String json = \"{\\\"mode\\\":\\\"standard-service\\\",\"\n@@ -243,6 +266,7 @@ public class StandardReconConfigTests extends RefineTest {\n                     \"                \\\"name\\\": \\\"film\\\"\\n\" +\n                     \"        },\\n\" +\n                     \"        \\\"autoMatch\\\": true,\\n\" +\n+                    \"        \\\"batchSize\\\": 10,\\n\" +\n                     \"        \\\"columnDetails\\\": [\\n\" +\n                     \"           {\\n\" +\n                     \"             \\\"column\\\": \\\"director\\\",\\n\" +\n@@ -349,6 +373,7 @@ public class StandardReconConfigTests extends RefineTest {\n                     \"                \\\"name\\\": \\\"film\\\"\\n\" +\n                     \"        },\\n\" +\n                     \"        \\\"autoMatch\\\": true,\\n\" +\n+                    \"        \\\"batchSize\\\": 10,\\n\" +\n                     \"        \\\"columnDetails\\\": [\\n\" +\n                     \"           {\\n\" +\n                     \"             \\\"column\\\": \\\"director\\\",\\n\" +\ndiff --git a/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java\nindex b651c8938..4177c016c 100644\n--- a/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsTests.java\n@@ -104,7 +104,7 @@ public class ReconJudgeSimilarCellsTests extends RefineTest {\n                 \"http://my.database/schema/\",\n                 null,\n                 null,\n-                true, Collections.emptyList());\n+                true, 10, Collections.emptyList());\n         column.setReconConfig(config);\n \n         AbstractOperation op = new ReconJudgeSimilarCellsOperation(\ndiff --git a/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java\nindex 089022128..0a1e4f5de 100644\n--- a/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperationTests.java\n@@ -108,7 +108,7 @@ public class ReconMarkNewTopicsOperationTests extends RefineTest {\n                 \"http://foo.com/identifierSpace\",\n                 \"http://foo.com/schemaSpace\",\n                 null,\n-                false,\n+                false, 10,\n                 Collections.emptyList(),\n                 0);\n \ndiff --git a/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java\nindex 91987413a..2d2e62c53 100644\n--- a/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java\n@@ -65,6 +65,7 @@ public class ReconOperationTests extends RefineTest {\n             + \"   \\\"schemaSpace\\\":\\\"http://www.wikidata.org/prop/direct/\\\",\"\n             + \"   \\\"type\\\":{\\\"id\\\":\\\"Q5\\\",\\\"name\\\":\\\"human\\\"},\"\n             + \"   \\\"autoMatch\\\":true,\"\n+            + \"   \\\"batchSize\\\":10,\"\n             + \"   \\\"columnDetails\\\":[],\"\n             + \"   \\\"limit\\\":0\"\n             + \"},\"\n@@ -131,7 +132,7 @@ public class ReconOperationTests extends RefineTest {\n         List<Recon> reconList = Arrays.asList((Recon) null, (Recon) null, (Recon) null);\n         ReconJob reconJob = mock(ReconJob.class);\n         when(reconConfig.batchRecon(Mockito.any(), Mockito.anyLong())).thenReturn(reconList);\n-        when(reconConfig.getBatchSize()).thenReturn(10);\n+        when(reconConfig.getBatchSize(project.rows.size())).thenReturn(10);\n         when(reconConfig.createJob(Mockito.eq(project), Mockito.anyInt(), Mockito.any(), Mockito.any(), Mockito.any()))\n                 .thenReturn(reconJob);\n \n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #5603 \r\n\r\nChanges proposed in this pull request:\r\n- This tweaks the batchsize to 1% of the dataset if batchsize in service manifest allows for it \r\n- if there is no batchsize given in the service manifest or 1% of dataset is already less than the 10(the default batch size) we keep the batch size to 10.\r\n\r\n", "PR_Title": "#5603 changes the batch size as per condition", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-5992_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 5992, "issue_title": "#5603 changes the batch size as per condition", "issue_body": "Fixes #5603 \r\n\r\nChanges proposed in this pull request:\r\n- This tweaks the batchsize to 1% of the dataset if batchsize in service manifest allows for it \r\n- if there is no batchsize given in the service manifest or 1% of dataset is already less than the 10(the default batch size) we keep the batch size to 10.\r\n\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6226", "base_commit": "78f939d60c12bab930e57f8ceeec8946fba128c2", "patch": "diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml\nindex 59375016a..2ed919c1b 100644\n--- a/extensions/gdata/pom.xml\n+++ b/extensions/gdata/pom.xml\n@@ -84,7 +84,7 @@\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-drive</artifactId>\n-      <version>v3-rev20231120-2.0.0</version>\n+      <version>v3-rev20231128-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.google.apis</groupId>\ndiff --git a/extensions/wikibase/module/styles/dialogs/wikibase-dialog.css b/extensions/wikibase/module/styles/dialogs/wikibase-dialog.css\nindex f7006289c..3ce5cd44d 100644\n--- a/extensions/wikibase/module/styles/dialogs/wikibase-dialog.css\n+++ b/extensions/wikibase/module/styles/dialogs/wikibase-dialog.css\n@@ -59,7 +59,7 @@\n \n .wikibase-list .wikibase-url {\n   padding-left: 13px;\n-  color: gray;\n+  color: var(--light-grey);\n }\n \n .wikibase-list li a, .wikibase-list li span {\ndiff --git a/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java b/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java\nindex 353d3a3f5..a54c8eaf8 100644\n--- a/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java\n+++ b/extensions/wikibase/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizer.java\n@@ -22,7 +22,7 @@ public class FileNameScrutinizer extends EditScrutinizer {\n     // see https://commons.wikimedia.org/wiki/Commons:File_naming\n     public static final int maxFileNameBytes = 240;\n     public static final Pattern forbiddenFileNameChars = Pattern.compile(\n-            \".*([^ %!\\\"$&'()*,\\\\-./\\\\d:;=?@\\\\p{L}\\\\p{Mc}\\\\\\\\^_`~\\\\x80-\\\\xFF+]|%[0-9A-Fa-f]{2}|&[A-Za-z0-9\\\\x80-\\\\xff]+;|&#[0-9]+;|&#x[0-9A-Fa-f]+;).*\");\n+            \".*([^ %!\\\"$&'()*,\\\\-./\\\\d:;=?@\\\\p{L}\\\\p{M}\\\\p{N}\\\\\\\\^_`~\\\\x80-\\\\xFF+]|%[0-9A-Fa-f]{2}|&[A-Za-z0-9\\\\x80-\\\\xff]+;|&#[0-9]+;|&#x[0-9A-Fa-f]+;).*\");\n \n     public static final String duplicateFileNamesInBatchType = \"duplicate-file-names-in-batch\";\n     public static final String fileNamesAlreadyExistOnWikiType = \"file-names-already-exist-on-wiki\";\n@@ -98,7 +98,7 @@ public class FileNameScrutinizer extends EditScrutinizer {\n             // Invalid characters\n             Matcher matcher = forbiddenFileNameChars.matcher(fileName);\n             if (matcher.matches()) {\n-                QAWarning issue = new QAWarning(invalidCharactersInFileNameType, null, QAWarning.Severity.CRITICAL,\n+                QAWarning issue = new QAWarning(invalidCharactersInFileNameType, null, QAWarning.Severity.IMPORTANT,\n                         1);\n                 issue.setProperty(\"example_filename\", fileName);\n                 issue.setProperty(\"invalid_character\", matcher.group(1));\ndiff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js\nindex 2fa089a27..ce9328949 100644\n--- a/main/webapp/modules/core/MOD-INF/controller.js\n+++ b/main/webapp/modules/core/MOD-INF/controller.js\n@@ -483,6 +483,7 @@ function init() {\n \n       \"scripts/reconciliation/recon-manager.js\",\n       \"scripts/reconciliation/recon-dialog.js\",\n+      \"scripts/reconciliation/recon-dialog-2.js\",\n       \"scripts/reconciliation/standard-service-panel.js\",\n \n       \"scripts/dialogs/expression-preview-dialog.js\",\ndiff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json\nindex d6b4687ea..2eec9bb9e 100644\n--- a/main/webapp/modules/core/langs/translation-en.json\n+++ b/main/webapp/modules/core/langs/translation-en.json\n@@ -440,8 +440,9 @@\n     \"core-recon/contact-service\": \"Contacting reconciliation service\",\n     \"core-recon/error-contact\": \"Error contacting recon service\",\n     \"core-recon/wd-recon-lang\": \"en\",\n-    \"core-recon/recon-col\": \"Reconcile column\",\n-    \"core-recon/pick-service\": \"Pick a service or extension on left\",\n+    \"core-recon/recon-col\": \"Reconcile column $1\",\n+    \"core-recon/pick-service\": \"Select a service to reconcile against:\",\n+    \"core-recon/disable-next-button\": \"Pick a service to continue\",\n     \"core-recon/enter-url\": \"Enter the service's URL\",\n     \"core-recon/cell-contains\": \"Each cell contains:\",\n     \"core-recon/max-candidates\": \"Maximum number of candidates to return\",\ndiff --git a/main/webapp/modules/core/project.vt b/main/webapp/modules/core/project.vt\nindex bc7bf7eea..7c21ea12a 100644\n--- a/main/webapp/modules/core/project.vt\n+++ b/main/webapp/modules/core/project.vt\n@@ -38,7 +38,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n     <title>OpenRefine</title>\n     <link rel=\"icon\" type=\"image/png\" href=\"images/favicon.png\">\n     $styleInjection\n-    <script type=\"text/javascript\">var theProject = { id : $projectID };</script>\n+    <script type=\"text/javascript\">\n+      const urlParams = new URLSearchParams(window.location.search);\n+      var theProject = { id : urlParams.get(\"project\") };\n+    </script>\n     <script type=\"text/javascript\" src=\"wirings.js\"></script>\n     $scriptInjection\n     <script>Refine.encodings = $encodingJson; Refine.defaultEncoding = $defaultEncoding;</script>\ndiff --git a/main/webapp/modules/core/scripts/reconciliation/recon-dialog-2.html b/main/webapp/modules/core/scripts/reconciliation/recon-dialog-2.html\nnew file mode 100644\nindex 000000000..bacc61723\n--- /dev/null\n+++ b/main/webapp/modules/core/scripts/reconciliation/recon-dialog-2.html\n@@ -0,0 +1,21 @@\n+<div class=\"dialog-frame\" style=\"width: 900px;\">\n+\t<div class=\"dialog-header\" bind=\"dialogHeader\"></div>\n+\t<div class=\"dialog-body\" bind=\"dialogBody\">\n+\t\t<div class=\"grid-layout layout-normal layout-full grid-layout-for-ui\">\n+\t\t\t<div class=\"recon-dialog-service\">\n+\t\t\t\t<div class=\"recon-dialog-service-panel-container\"\n+\t\t\t\t\tbind=\"servicePanelContainer\">\n+                </div>\n+\t\t\t</div>\n+\t\t</div>\n+\t</div>\n+\t<div class=\"dialog-footer\" bind=\"dialogFooter\" style=\"justify-content: space-between\">\n+\t\t<div class=\"dialog-footer-bg\">\n+            <button class=\"button\" bind=\"backButton\"></button>\n+\t\t</div>\n+\t\t<div class=\"dialog-footer-bg\">\n+            <button class=\"button button-primary\" bind=\"reconcileButton\"></button>\n+\t\t\t<button class=\"button\" bind=\"cancelButton\"></button>\n+\t\t</div>\n+\t</div>\n+</div>\ndiff --git a/main/webapp/modules/core/scripts/reconciliation/recon-dialog-2.js b/main/webapp/modules/core/scripts/reconciliation/recon-dialog-2.js\nnew file mode 100644\nindex 000000000..a8d4e3c42\n--- /dev/null\n+++ b/main/webapp/modules/core/scripts/reconciliation/recon-dialog-2.js\n@@ -0,0 +1,128 @@\n+/*\n+\n+Copyright 2010, Google Inc.\n+All rights reserved.\n+\n+Redistribution and use in source and binary forms, with or without\n+modification, are permitted provided that the following conditions are\n+met:\n+\n+ * Redistributions of source code must retain the above copyright\n+notice, this list of conditions and the following disclaimer.\n+ * Redistributions in binary form must reproduce the above\n+copyright notice, this list of conditions and the following disclaimer\n+in the documentation and/or other materials provided with the\n+distribution.\n+ * Neither the name of Google Inc. nor the names of its\n+contributors may be used to endorse or promote products derived from\n+this software without specific prior written permission.\n+\n+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS\n+\"AS IS\" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT\n+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR\n+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT\n+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT\n+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,           \n+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY           \n+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT\n+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE\n+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n+\n+ */\n+\n+function ReconDialog2(column, selectedServiceRecordindex, serviceRecords, record, previousService) {\n+  this._column = column;\n+  this._serviceRecords = serviceRecords;\n+  this._selectedServiceRecordIndex = selectedServiceRecordindex;\n+  this._previousService = previousService;\n+  this._record = record;\n+\n+  this._createDialog();\n+}\n+\n+ReconDialog2.prototype._createDialog = function() {\n+  var self = this;\n+  var dialog = $(DOM.loadHTML(\"core\", \"scripts/reconciliation/recon-dialog-2.html\"));\n+\n+  this._elmts = DOM.bind(dialog);\n+  this._elmts.dialogHeader.text($.i18n('core-recon/recon-col',this._column.name ));\n+  this._elmts.reconcileButton.html($.i18n('core-buttons/start-recon'));\n+  this._elmts.cancelButton.html($.i18n('core-buttons/cancel'));\n+  this._elmts.backButton.html($.i18n('core-buttons/previous'));\n+\n+  this._elmts.reconcileButton.on('click',function() { self._onOK(); });\n+  this._elmts.cancelButton.on('click',function() { self._dismiss(); });\n+  this._elmts.backButton.on('click',function() { self._previousDialog(self._column, self._previousService); });\n+\n+\n+  this._level = DialogSystem.showDialog(dialog);\n+  this._selectService(self._record);\n+};\n+\n+\n+ReconDialog2.prototype._previousDialog = function(column, previousService) {\n+  this._dismiss();\n+  new ReconDialog(column, previousService);\n+}\n+\n+\n+ReconDialog2.prototype._onOK = function() {\n+\n+  if (this._selectedServiceRecordIndex >= 0) {\n+    var record = this._serviceRecords[this._selectedServiceRecordIndex];\n+    if (record.handler) {\n+      record.handler.start();\n+    }\n+  }\n+  this._dismiss();\n+};\n+\n+\n+ReconDialog2.prototype._dismiss = function() {\n+  for (var i = 0; i < this._serviceRecords.length; i++) {\n+    var record = this._serviceRecords[i];\n+    if (record.handler) {\n+      record.handler.dispose();\n+    }\n+  }\n+  this._serviceRecords = null;\n+\n+  DialogSystem.dismissUntil(this._level - 1);\n+};\n+\n+\n+ReconDialog2.prototype._cleanDialog = function() {\n+  for (var i = 0; i < this._serviceRecords.length; i++) {\n+    var record = this._serviceRecords[i];\n+    if (record.handler) {\n+      record.handler.deactivate();\n+    }\n+    record.selector.remove();\n+  }\n+  this._serviceRecords = [];\n+  this._selectedServiceRecordIndex = -1;\n+};\n+\n+\n+ReconDialog2.prototype._selectService = function(record) {\n+  for (var i = 0; i < this._serviceRecords.length; i++) {\n+    if (record === this._serviceRecords[i]) {\n+       {  this._selectedServiceRecordIndex = i;\n+          if (record.handler) {\n+            record.handler.activate();\n+          } else {\n+          var handlerConstructor = eval(record.service.ui.handler);\n+          record.handler = new handlerConstructor(\n+              this._column, record.service, this._elmts.servicePanelContainer);\n+        }  \n+        return;\n+    }\n+  };   \n+};\n+}\n+\n+ReconDialog2.prototype._refresh = function(newSelectIndex) {\n+  this._cleanDialog();\n+  this._populateDialog();\n+};\ndiff --git a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html\nindex cfb8336b2..1903b709a 100644\n--- a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html\n+++ b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.html\n@@ -3,17 +3,13 @@\n \t<div class=\"dialog-body\" bind=\"dialogBody\">\n \t\t<div class=\"grid-layout layout-normal layout-full grid-layout-for-ui\">\n \t\t\t<div class=\"recon-dialog-service\">\n-\t\t\t\t<div class=\"recon-dialog-service-list-container\">\n-\t\t\t\t\t<div class=\"recon-dialog-service-opener\">\n-\t\t\t\t\t\t<div class=\"recon-dialog-service-opener-title\" bind=\"serviceListTitle\"></div>\n-\t\t\t\t\t\t<img class=\"recon-dialog-service-opener-img\" src=\"images/menu-opener.png\" />\n-\t\t\t\t\t</div>\n-\t\t\t\t\t<div class=\"recon-dialog-service-list\" bind=\"serviceList\"></div>\n-\t\t\t\t</div>\n-\t\t\t\t<div class=\"recon-dialog-service-panel-container\"\n+                <div class=\"recon-dialog-service-panel-container\"\n \t\t\t\t\tbind=\"servicePanelContainer\">\n \t\t\t\t\t<div class=\"recon-dialog-service-panel-message\"\n \t\t\t\t\t\tbind=\"servicePanelMessage\"></div>\n+\t\t\t\t\t</div>\n+                <div class=\"recon-dialog-service-list-container\">\n+\t\t\t\t\t<div class=\"recon-dialog-service-list\" input type=\"radio\" name=\"service-choice\" bind=\"serviceList\"></div>\n \t\t\t\t</div>\n \t\t\t</div>\n \t\t</div>\n@@ -24,7 +20,8 @@\n \t\t\t<a class=\"button\" bind=\"discoverServicesButton\" href=\"https://reconciliation-api.github.io/testbench\" target=\"_blank\" ></a>\n \t\t</div>\n \t\t<div class=\"dialog-footer-bg\">\n-\t\t\t<button class=\"button\" bind=\"reconcileButton\"></button>\n+\t\t\t<div class=\"pop-up-message\" id=\"popup-message\" bind=\"popUpMessage\"></div>\n+\t\t\t<button class=\"button button-primary\" bind=\"nextButton\"></button>\n \t\t\t<button class=\"button\" bind=\"cancelButton\"></button>\n \t\t</div>\n \t</div>\ndiff --git a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.js b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.js\nindex e75947549..65cbb6800 100644\n--- a/main/webapp/modules/core/scripts/reconciliation/recon-dialog.js\n+++ b/main/webapp/modules/core/scripts/reconciliation/recon-dialog.js\n@@ -31,10 +31,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n  */\n \n-function ReconDialog(column, types) {\n+function ReconDialog(column, previousServiceURL) {\n   this._column = column;\n   this._serviceRecords = [];\n   this._selectedServiceRecordIndex = -1;\n+  this._record = null;\n+  this.previousRecordURL = previousServiceURL;\n \n   this._createDialog();\n }\n@@ -44,44 +46,43 @@ ReconDialog.prototype._createDialog = function() {\n   var dialog = $(DOM.loadHTML(\"core\", \"scripts/reconciliation/recon-dialog.html\"));\n \n   this._elmts = DOM.bind(dialog);\n-  this._elmts.dialogHeader.text($.i18n('core-recon/recon-col')+' \"' + this._column.name + '\"');\n-  \n+  this._elmts.dialogHeader.text($.i18n('core-recon/recon-col',this._column.name));\n+\n   this._elmts.servicePanelMessage.html($.i18n('core-recon/pick-service'));\n-  this._elmts.serviceListTitle.html($.i18n('core-recon/service-title'));\n   this._elmts.addStandardServiceButton.html($.i18n('core-buttons/add-std-svc')+\"...\");\n-  this._elmts.reconcileButton.html($.i18n('core-buttons/start-recon'));\n   this._elmts.cancelButton.html($.i18n('core-buttons/cancel'));\n   this._elmts.discoverServicesButton.html($.i18n('core-buttons/discover-services'));\n+  this._elmts.nextButton.html($.i18n('core-buttons/next'));\n+  this._elmts.popUpMessage.html($.i18n('core-recon/disable-next-button'));\n \n   this._elmts.addStandardServiceButton.on('click',function() { self._onAddStandardService(); });\n \n-  this._elmts.reconcileButton.on('click',function() { self._onOK(); });\n   this._elmts.cancelButton.on('click',function() { self._dismiss(); });\n+  this._elmts.nextButton.on('click',function() { \n+    if(self._record){\n+    self._nextDialog(self._column, self._selectedServiceRecordIndex, self._serviceRecords, self._record, self.previousRecord);\n+    }\n+    else{\n+      var message = document.getElementById('popup-message');\n+        message.classList.add('show');\n+        setTimeout(function() {\n+            message.classList.remove('show');\n+        }, 1000); \n+\n+    }\n+   });\n \n   this._level = DialogSystem.showDialog(dialog);\n-  this._populateDialog();\n-  this._registerDialogServiceOpener();\n+  this._populateDialog(self.previousRecordURL);\n+\n };\n \n-ReconDialog.prototype._registerDialogServiceOpener = function() {\n-  var self = this;\n \n-  $('.recon-dialog-service-opener').on('click',function() {\n-    self._toggleServices();\n-  });\n+ReconDialog.prototype._nextDialog = function(column, selectedServiceRecordIndex, serviceRecords, record, previousService) {\n+  this._dismiss();\n+  new ReconDialog2(column, selectedServiceRecordIndex, serviceRecords, record, previousService);\n }\n \n-ReconDialog.prototype._onOK = function() {\n-  if (this._selectedServiceRecordIndex >= 0) {\n-    var record = this._serviceRecords[this._selectedServiceRecordIndex];\n-    if (record.handler) {\n-      if (record.handler.start()) {\n-        this._dismiss();\n-      }\n-    }\n-  }\n-};\n-\n ReconDialog.prototype._dismiss = function() {\n   for (var i = 0; i < this._serviceRecords.length; i++) {\n     var record = this._serviceRecords[i];\n@@ -106,102 +107,80 @@ ReconDialog.prototype._cleanDialog = function() {\n   this._selectedServiceRecordIndex = -1;\n };\n \n-ReconDialog.prototype._populateDialog = function() {\n+ReconDialog.prototype._populateDialog = function(selectedURL) {\n   var self = this;\n+  self._elmts.serviceList.empty();\n \n   var services = ReconciliationManager.getAllServices();\n   if (services.length > 0) {\n+    \n     var renderService = function(service) {\n       var record = {\n           service: service,\n           handler: null\n       };\n \n-      record.selector = $('<a>')\n-      .attr(\"href\", \"javascript:{}\")\n-      .addClass(\"recon-dialog-service-selector\")\n-      .text(service.name)\n-      .appendTo(self._elmts.serviceList)\n-      .on('click',function() {\n-    \tself._toggleServices();\n-        self._selectService(record);\n-      });\n+      var label = $('<label>')\n+        .addClass('recon-dialog-service-list-element')\n+        .appendTo(self._elmts.serviceList);\n+\n+        \n+      record.selector = $('<input type=\"radio\" name=\"service-choice\">')\n+        .addClass(\"recon-dialog-service-selector\")\n+        .val(service.name) \n+        .appendTo(label);\n+\n+      if(selectedURL === service.url) {\n+        record.selector.prop('checked',true);\n+        self._record=record;\n+      }\n+\n+      var mainSpan=$('<span>')\n+        .addClass(\"recon-service-entry\")\n+        .appendTo(label);\n+\n+      var divElement=$('<div>')\n+        .text(service.name)\n+        .appendTo(mainSpan);\n+\n+      var divElementURL = $('<div>')\n+        .addClass(\"recon-dialog-url-element\")\n+        .text(service.url)\n+        .appendTo(mainSpan);\n+      \n+       label.on('click', function() {\n+       self._record = record;\n+      \n+});\n \n       $('<a>')\n       .html(\"&nbsp;\")\n       .addClass(\"recon-dialog-service-selector-remove\")\n-      .prependTo(record.selector)\n+      .prependTo(label)\n       .on('click',function(event) {\n+        $(this).parents('label').remove();\n         ReconciliationManager.unregisterService(service, function() {\n-          self._refresh(-1);\n+          self._record = null;\n         });\n+\n         event.stopImmediatePropagation();\n       });\n \n       self._serviceRecords.push(record);\n+      \n     };\n \n     for (var i = 0; i < services.length; i++) {\n       renderService(services[i]);\n     }\n+    \n   }\n };\n \n-ReconDialog.prototype._toggleServices = function() {\n-  var self = this;\n-  self._toggleServiceTitle(500);\n-  self._toggleServiceList(500);\n-};\n-\n-ReconDialog.prototype._toggleServiceTitle = function(duration) {\n-  var title = $('.recon-dialog-service-opener-title');\n-  title.animate({\n-\twidth : 'toggle'\n-\t}, duration, 'swing', function() {\n-  });\n-};\n-\n-ReconDialog.prototype._toggleServiceList = function(duration) {\n-  $(\".recon-dialog-service-list\").toggle(\"slide\", duration);\n-};\n \n-ReconDialog.prototype._selectService = function(record) {\n-  for (var i = 0; i < this._serviceRecords.length; i++) {\n-    if (record === this._serviceRecords[i]) {\n-      if (i !== this._selectedServiceRecordIndex) {\n-        if (this._selectedServiceRecordIndex >= 0) {\n-          var oldRecord = this._serviceRecords[this._selectedServiceRecordIndex];\n-          if (oldRecord.handler) {\n-            oldRecord.selector.removeClass(\"selected\");\n-            oldRecord.handler.deactivate();\n-          }\n-        }\n-\n-        this._elmts.servicePanelMessage.hide();\n-\n-        record.selector.addClass(\"selected\");\n-        if (record.handler) {\n-          record.handler.activate();\n-        } else {\n-          var handlerConstructor = eval(record.service.ui.handler);\n-\n-          record.handler = new handlerConstructor(\n-              this._column, record.service, this._elmts.servicePanelContainer);\n-        }\n-\n-        this._selectedServiceRecordIndex = i;\n-        return;\n-      }\n-    }\n-  }\n-};\n-\n-ReconDialog.prototype._refresh = function(newSelectIndex) {\n+ReconDialog.prototype._refresh = function(selectedURL) {\n   this._cleanDialog();\n-  this._populateDialog();\n-  if (newSelectIndex >= 0) {\n-    this._selectService(this._serviceRecords[newSelectIndex]);\n-  }\n+  this._populateDialog(selectedURL);\n };\n \n ReconDialog.prototype._onAddStandardService = function() {\n@@ -224,7 +203,7 @@ ReconDialog.prototype._onAddStandardService = function() {\n     var url = jQueryTrim(elmts.input[0].value);\n     if (url.length > 0) {\n       ReconciliationManager.registerStandardService(url, function(index) {\n-        self._refresh(index);\n+        self._refresh(url);\n       });\n     }\n     dismiss();\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js b/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js\nindex 8f7ed51c6..2356e9071 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js\n@@ -69,7 +69,7 @@ DataTableColumnHeaderUI.prototype._render = function() {\n   elmts.dropdownMenu.on('click',function() {\n     self._createMenuForColumnHeader(this);\n   });\n-\n+  \n   if (\"reconStats\" in this._column) {\n     var stats = this._column.reconStats;\n     if (stats.nonBlanks > 0) {\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js b/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js\nindex a34695d15..ab0e794c5 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/menu-reconcile.js\n@@ -33,8 +33,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) {\n   var columnIndex = Refine.columnNameToColumnIndex(column.name);\n+  var serviceUrl = null;\n+  var service = null;\n+  if (column.reconConfig) {\n+    serviceUrl = column.reconConfig.service;\n+  }\n+  if (serviceUrl) {\n+    service = ReconciliationManager.getServiceFromUrl(serviceUrl);\n+  }\n   var doReconcile = function() {\n-    new ReconDialog(column);\n+      new ReconDialog(column, serviceUrl);\n   };\n \n   var doReconDiscardJudgments = function() {\ndiff --git a/main/webapp/modules/core/styles/reconciliation/recon-dialog.css b/main/webapp/modules/core/styles/reconciliation/recon-dialog.css\nindex 2a219ccfe..e035a75ea 100644\n--- a/main/webapp/modules/core/styles/reconciliation/recon-dialog.css\n+++ b/main/webapp/modules/core/styles/reconciliation/recon-dialog.css\n@@ -32,96 +32,111 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n */\n \n .recon-dialog-service {\n-  padding: 0 0 10px;\n+  padding: 0 10px 10px;\n }\n \n .recon-dialog-service-list-container {\n-  position: absolute;\n+  border: 1px solid #ccc;\n+  max-height: 470px;\n+  height: 470px !important;\n   z-index: 10;\n-}\n-\n-.recon-dialog-service-list {\n-  background: none repeat scroll 0 0 #FFFFFF;\n-  border: 1px solid #AAAAAA;\n-  height: 470px;\n-  margin-left: 10px;\n   overflow: auto;\n-  padding: 1px;\n-  width: 200px;\n-}\n-\n-.recon-dialog-service-opener {\n-  height: 25px;\n-  margin-left: -5px;\n-}\n-\n-.recon-dialog-service-opener:hover {\n-  cursor: pointer;\n }\n \n-.recon-dialog-service-opener-title {\n-  background: none repeat scroll 0 0 #E0EDFE;\n-  float: left;\n-  font-size: 18px;\n-  height: 100%;\n-  text-align: center;\n-  width: 220px;\n-}\n+.recon-dialog-service-list {\n+padding:1px;\n+padding-bottom:10px ;\n+height: 10px ;\n+max-height: 100px;\n+display: block;\n \n-.recon-dialog-service-opener-img {\n-  background: none repeat scroll 0 0 #E0EDFE;\n-  border-bottom-right-radius: 12px;\n-  border-top-right-radius: 12px;\n-  padding: 4px 2px;\n }\n \n-.recon-dialog-service-opener-img:hover {\n-  background: none repeat scroll 0 0 #BFDBFF;\n-}\n \n-.recon-dialog-service-panel-container {\n-  float: left;\n-  min-height: 500px;\n-  margin-left: 20px;\n-  width: 850px;\n-}\n-\n-a.recon-dialog-service-selector {\n-  display: block;\n+a.recon-dialog-service-list-container {\n+  border: 1px solid #ccc;\n   padding: 10px;\n-  text-decoration: none;\n-  color: var(--text-primary);\n+  max-height: 100px;\n+  height: 100px !important;\n }\n \n-a.recon-dialog-service-selector:hover {\n+a.recon-dialog-service-list-container {\n   background: #eee;\n }\n \n-a.recon-dialog-service-selector.selected {\n+a.recon-dialog-service-list-container.selected {\n   background: #eee;\n   font-weight: bold;\n }\n \n .recon-dialog-service-panel-message {\n-  text-align: center;\n-  font-size: 200%;\n-  padding: 50px 0;\n-  color: #aaa;\n+    text-align: left;\n+    font-size: 100%;\n+    padding: 10px 0;\n+    color:black;\n }\n+.recon-service-entry{\n+  margin-left: 0.2em;\n+  margin-right: 0.25em;\n+  white-space: nowrap;\n+  text-overflow: ellipsis;\n+  max-width: 15ch;\n+  display: inline-block;\n+  vertical-align: middle \n \n+}\n+\n+.recon-dialog-url-element{\n+  color:var(--light-grey);\n+}\n a.recon-dialog-service-selector-remove {\n   float: right;\n   position: relative;\n-  top: -5px;\n+  top: 5px;\n   left: 5px;\n   width: 12px;\n   height: 12px;\n+  margin-right: 10px;\n   text-decoration: none;\n   background-image: url(../../images/close-map.png);\n   background-repeat: no-repeat;\n   background-position: 0px 0px;\n }\n+.dialog-footer {\n+  display: flex;\n+  justify-content: space-between;\n+}\n+\n+.button-left {\n+  display: flex;\n+}\n+\n+.button-right {\n+  display: flex;\n+  gap: 10px; \n+}\n+.recon-service-entry{\n+  display:inline-block;\n+\n+}\n+.recon-dialog-service-list-element{\n+  display:block;\n+  margin-bottom: 0.5em ;\n+  padding:5px 10px\n+}\n+.recon-dialog-service-list-element:hover{\n+  background-color:var(--dialog-header);\n+}\n+\n+.pop-up-message {\n+  position: absolute;\n+  background-color: white;\n+  color: black;\n+  padding: 5px;\n+  display: none; \n+  top:570px;\n+}\n \n-a.recon-dialog-service-selector-remove:hover {\n-  background-position: -12px 0px;\n+.pop-up-message.show {\n+  display: block; \n }\ndiff --git a/refine b/refine\nindex 58cdda042..08c9208d4 100755\n--- a/refine\n+++ b/refine\n@@ -42,17 +42,18 @@ Options\n     --jmx                         Enable JMX monitoring.\n \n Actions\n+    run                           Run OpenRefine [default].\n     build                         Build OpenRefine.\n     clean                         Clean compiled classes.\n-    dist <version>                Make all distributions.\n+    test                          Run all tests.\n     extensions_test               Run the extensions tests.\n-    linux_dist <version>          Make Linux binary distribution.\n-    mac_dist <version>            Make MacOSX binary distribution.\n-    run                           Run OpenRefine [default].\n     server_test                   Run the server tests.\n-    test                          Run all tests.\n-    e2e_tests                      Run the e2e tests.\n+    e2e_tests                     Run the e2e tests.\n+    lint                          Reformat the source code according to OpenRefine's conventions.\n+    mac_dist <version>            Make MacOS binary distribution.\n     windows_dist <version>        Make Windows binary distribution.\n+    linux_dist <version>          Make Linux binary distribution.\n+    dist <version>                Make all distributions.\n EOF\n exit 1\n }\n@@ -244,6 +245,13 @@ do_mvn() {\n \n # ----------------------------------------------------------------------------------------------\n \n+lint() {\n+    mvn_prepare\n+    \"$MVN\" formatter:format impsort:sort\n+}\n+\n+# ----------------------------------------------------------------------------------------------\n+\n dist() {\n     get_version $1\n     build_prepare\n@@ -720,12 +728,13 @@ case \"$ACTION\" in\n   clean) do_mvn clean;;\n   test) test $1;;\n   tests) test $1;;\n-  e2e_tests) e2e_tests;;    \n+  e2e_tests) e2e_tests;;\n   server_test) server_test $1;;  \n   server_tests) server_test $1;;  \n   extensions_test) extensions_test $1;;\n   extensions_tests) extensions_test $1;;\n   run) run;;\n+  lint) lint;;\n   mac_dist) mac_dist $1;;\n   windows_dist) windows_dist $1;;\n   linux_dist) linux_dist $1;;\ndiff --git a/refine.bat b/refine.bat\nindex ef9361f6f..3e6768dfd 100644\n--- a/refine.bat\n+++ b/refine.bat\n@@ -48,6 +48,7 @@ echo     extensions_test         Run the extensions tests.\n echo     run                     Run OpenRefine.\n echo     server_test             Run the server tests.\n echo     test                    Run all the tests.\n+echo     lint                    Reformat the source code according to OpenRefine's conventions.\n goto :eof\n \n \n@@ -190,6 +191,7 @@ if \"\"%ACTION%\"\" == \"\"build\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"server_test\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"extensions_test\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"test\"\" goto doMvn\n+if \"\"%ACTION%\"\" == \"\"lint\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"clean\"\" goto doMvn\n if \"\"%ACTION%\"\" == \"\"run\"\" goto doRun\n if \"\"%ACTION%\"\" == \"\"\"\" goto doRun\n@@ -270,6 +272,12 @@ set MVN_ACTION=compile test-compile dependency:build-classpath\n if \"\"%ACTION%\"\" == \"\"test\"\" set MVN_ACTION=test dependency:build-classpath\n if \"\"%ACTION%\"\" == \"\"server_test\"\" set MVN_ACTION=test -f main\n if \"\"%ACTION%\"\" == \"\"extensions_test\"\" set MVN_ACTION=test -f extensions\n+if \"\"%ACTION%\"\" == \"\"lint\"\" (\n+    set MVN_ACTION=formatter:format impsort:sort\n+    rem Skip the call to process-resources as it's not needed for this action\n+    goto :mvnCall\n+)\n call \"%MVN%\" process-resources\n+:mvnCall\n call \"%MVN%\" %MVN_ACTION%\n goto :eof\n", "test_patch": "diff --git a/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java b/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java\nindex abb1da6c4..5ced94b25 100644\n--- a/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java\n+++ b/extensions/wikibase/tests/src/org/openrefine/wikibase/qa/scrutinizers/FileNameScrutinizerTest.java\n@@ -78,6 +78,16 @@ public class FileNameScrutinizerTest extends ScrutinizerTest {\n         assertNoWarningRaised();\n     }\n \n+    @Test\n+    public void testValidCharactersInFilenameNonAscii() {\n+        MediaInfoEdit edit = new MediaInfoEditBuilder(TestingData.newMidA)\n+                .addFileName(\"সমাচার দর্পণ - ৮ অক্টোবর ১৮৩৬.pdf\")\n+                .build();\n+\n+        scrutinize(edit);\n+        assertNoWarningRaised();\n+    }\n+\n     @Test()\n     public void testInvalidCharactersInFilenameTab() throws IOException, MediaWikiApiErrorException {\n         MediaInfoEdit edit = new MediaInfoEditBuilder(TestingData.newMidA)\ndiff --git a/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java b/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java\nindex 7edf3c6b7..13693c706 100644\n--- a/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java\n+++ b/main/tests/server/src/com/google/refine/importers/ExcelImporterTests.java\n@@ -50,6 +50,7 @@ import java.time.Duration;\n import java.time.LocalDateTime;\n import java.time.OffsetDateTime;\n import java.time.format.DateTimeFormatter;\n+import java.util.Locale;\n \n import com.fasterxml.jackson.databind.node.ArrayNode;\n import org.apache.poi.hssf.usermodel.HSSFWorkbook;\n@@ -94,7 +95,6 @@ public class ExcelImporterTests extends ImporterTest {\n \n     private static final File xlsFileWithMultiSheets = createSheetsWithDifferentColumns(false);\n     private static final File xlsxFileWithMultiSheets = createSheetsWithDifferentColumns(true);\n-    private static final NumberFormat NUMBER_FORMAT = DecimalFormat.getInstance();\n \n     @Override\n     @BeforeTest\n@@ -268,8 +268,10 @@ public class ExcelImporterTests extends ImporterTest {\n \n         Assert.assertEquals(project.rows.size(), ROWS);\n         Assert.assertEquals(project.rows.get(1).cells.size(), COLUMNS);\n-        Assert.assertEquals(((String) project.rows.get(1).getCellValue(0)), NUMBER_FORMAT.format(1.1));\n-        Assert.assertEquals(((String) project.rows.get(2).getCellValue(0)), NUMBER_FORMAT.format(2.2));\n+\n+        final NumberFormat numberFormat = DecimalFormat.getInstance(Locale.getDefault());\n+        Assert.assertEquals((String) project.rows.get(1).getCellValue(0), numberFormat.format(1.1));\n+        Assert.assertEquals((String) project.rows.get(2).getCellValue(0), numberFormat.format(2.2));\n \n         assertEquals((String) project.rows.get(1).getCellValue(1), \"FALSE\");\n         assertEquals((String) project.rows.get(2).getCellValue(1), \"TRUE\");\n@@ -286,8 +288,10 @@ public class ExcelImporterTests extends ImporterTest {\n         assertEquals(project.rows.get(1).getCellValue(7), \"1\");\n         assertEquals(project.rows.get(2).getCellValue(7), \"2\");\n \n-        assertEquals(project.rows.get(1).getCellValue(8), String.format(\"%.2f\", 100.0) + \"%\");\n-        assertEquals(project.rows.get(2).getCellValue(8), String.format(\"%.2f\", 200.0) + \"%\");\n+        final DecimalFormat decimalFormat = (DecimalFormat) NumberFormat.getNumberInstance(Locale.getDefault());\n+        decimalFormat.applyPattern(\"0.00\");\n+        assertEquals(project.rows.get(1).getCellValue(8), decimalFormat.format(100.00) + \"%\");\n+        assertEquals(project.rows.get(2).getCellValue(8), decimalFormat.format(200.00) + \"%\");\n \n         assertEquals(project.rows.get(1).getCellValue(9), \"0001\");\n         assertEquals(project.rows.get(2).getCellValue(9), \"0002\");\n@@ -296,7 +300,7 @@ public class ExcelImporterTests extends ImporterTest {\n \n         assertEquals(project.rows.get(ROWS - 1).getCellValue(11), NOW_STRING.substring(0, 10)); // date only\n \n-        assertEquals(project.rows.get(ROWS - 1).getCellValue(12), \"$\" + NUMBER_FORMAT.format(1234.56));\n+        assertEquals(project.rows.get(ROWS - 1).getCellValue(12), \"$\" + numberFormat.format(1234.56));\n \n         verify(options, times(1)).get(\"ignoreLines\");\n         verify(options, times(1)).get(\"headerLines\");\ndiff --git a/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java b/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java\nindex c61468cf3..1c7c2314d 100644\n--- a/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java\n+++ b/main/tests/server/src/com/google/refine/importers/ImporterUtilitiesTests.java\n@@ -48,6 +48,7 @@ import org.testng.annotations.BeforeTest;\n import org.testng.annotations.Test;\n \n import com.google.refine.RefineTest;\n+import com.google.refine.messages.OpenRefineMessage;\n import com.google.refine.model.Cell;\n import com.google.refine.model.Column;\n import com.google.refine.model.Project;\n@@ -173,8 +174,8 @@ public class ImporterUtilitiesTests extends RefineTest {\n         List<String> newColumnNames = new ArrayList<String>();\n         Column c0 = ImporterUtilities.getOrAllocateColumn(project, newColumnNames, 0, false);\n         Column c1 = ImporterUtilities.getOrAllocateColumn(project, newColumnNames, 1, false);\n-        Assert.assertEquals(c0.getName(), \"Column 1\");\n-        Assert.assertEquals(c1.getName(), \"Column 2\");\n+        Assert.assertEquals(c0.getName(), OpenRefineMessage.importer_utilities_column() + \" 1\");\n+        Assert.assertEquals(c1.getName(), OpenRefineMessage.importer_utilities_column() + \" 2\");\n         Assert.assertEquals(newColumnNames.size(), 2);\n     }\n }\ndiff --git a/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java b/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java\nindex f96121f62..1ae54cd7e 100644\n--- a/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java\n+++ b/main/tests/server/src/com/google/refine/importers/SeparatorBasedImporterTests.java\n@@ -53,6 +53,7 @@ import org.testng.annotations.BeforeTest;\n import org.testng.annotations.DataProvider;\n import org.testng.annotations.Test;\n \n+import com.google.refine.messages.OpenRefineMessage;\n import com.google.refine.util.ParsingUtilities;\n \n public class SeparatorBasedImporterTests extends ImporterTest {\n@@ -164,9 +165,9 @@ public class SeparatorBasedImporterTests extends ImporterTest {\n             Assert.fail(\"Exception during file parse\", e);\n         }\n         Assert.assertEquals(project.columnModel.columns.size(), 3);\n-        Assert.assertEquals(project.columnModel.columns.get(0).getName(), \"Column 1\");\n-        Assert.assertEquals(project.columnModel.columns.get(1).getName(), \"Column 2\");\n-        Assert.assertEquals(project.columnModel.columns.get(2).getName(), \"Column 3\");\n+        Assert.assertEquals(project.columnModel.columns.get(0).getName(), OpenRefineMessage.importer_utilities_column() + \" 1\");\n+        Assert.assertEquals(project.columnModel.columns.get(1).getName(), OpenRefineMessage.importer_utilities_column() + \" 2\");\n+        Assert.assertEquals(project.columnModel.columns.get(2).getName(), OpenRefineMessage.importer_utilities_column() + \" 3\");\n         Assert.assertEquals(project.rows.size(), 1);\n         Assert.assertEquals(project.rows.get(0).cells.size(), 3);\n         Assert.assertEquals(project.rows.get(0).cells.get(0).value, \"data1\");\n@@ -337,9 +338,9 @@ public class SeparatorBasedImporterTests extends ImporterTest {\n         Assert.assertEquals(project.columnModel.columns.get(0).getName(), \"col1\");\n         Assert.assertEquals(project.columnModel.columns.get(1).getName(), \"col2\");\n         Assert.assertEquals(project.columnModel.columns.get(2).getName(), \"col3\");\n-        Assert.assertEquals(project.columnModel.columns.get(3).getName(), \"Column 4\");\n-        Assert.assertEquals(project.columnModel.columns.get(4).getName(), \"Column 5\");\n-        Assert.assertEquals(project.columnModel.columns.get(5).getName(), \"Column 6\");\n+        Assert.assertEquals(project.columnModel.columns.get(3).getName(), OpenRefineMessage.importer_utilities_column() + \" 4\");\n+        Assert.assertEquals(project.columnModel.columns.get(4).getName(), OpenRefineMessage.importer_utilities_column() + \" 5\");\n+        Assert.assertEquals(project.columnModel.columns.get(5).getName(), OpenRefineMessage.importer_utilities_column() + \" 6\");\n         Assert.assertEquals(project.rows.size(), 1);\n         Assert.assertEquals(project.rows.get(0).cells.size(), 6);\n         Assert.assertEquals(project.rows.get(0).cells.get(0).value, \"data1\");\ndiff --git a/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java\nindex 2d2e62c53..e21ae400c 100644\n--- a/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/recon/ReconOperationTests.java\n@@ -34,6 +34,7 @@ import java.util.Arrays;\n import java.util.List;\n import java.util.Properties;\n \n+import org.apache.commons.text.StringEscapeUtils;\n import org.mockito.Mockito;\n import org.testng.Assert;\n import org.testng.annotations.BeforeSuite;\n@@ -41,6 +42,7 @@ import org.testng.annotations.Test;\n \n import com.google.refine.RefineTest;\n import com.google.refine.browsing.EngineConfig;\n+import com.google.refine.messages.OpenRefineMessage;\n import com.google.refine.model.Column;\n import com.google.refine.model.Project;\n import com.google.refine.model.Recon;\n@@ -82,7 +84,8 @@ public class ReconOperationTests extends RefineTest {\n             \"           \\\"columnName\\\" : \\\"researcher\\\",\\n\" +\n             \"           \\\"expression\\\" : \\\"forNonBlank(cell.recon.judgment, v, v, if(isNonBlank(value), \\\\\\\"(unreconciled)\\\\\\\", \\\\\\\"(blank)\\\\\\\"))\\\",\\n\"\n             +\n-            \"           \\\"name\\\" : \\\"researcher: judgment\\\"\\n\" +\n+            \"           \\\"name\\\" : \\\"researcher: \" +\n+            StringEscapeUtils.escapeJson(OpenRefineMessage.recon_operation_judgement_facet_name()) + \"\\\"\\n\" +\n             \"         },\\n\" +\n             \"         \\\"facetOptions\\\" : {\\n\" +\n             \"           \\\"scroll\\\" : true\\n\" +\n@@ -94,7 +97,8 @@ public class ReconOperationTests extends RefineTest {\n             \"           \\\"columnName\\\" : \\\"researcher\\\",\\n\" +\n             \"           \\\"expression\\\" : \\\"cell.recon.best.score\\\",\\n\" +\n             \"           \\\"mode\\\" : \\\"range\\\",\\n\" +\n-            \"           \\\"name\\\" : \\\"researcher: best candidate's score\\\"\\n\" +\n+            \"           \\\"name\\\" : \\\"researcher: \" +\n+            StringEscapeUtils.escapeJson(OpenRefineMessage.recon_operation_score_facet_name()) + \"\\\"\\n\" +\n             \"         },\\n\" +\n             \"         \\\"facetType\\\" : \\\"range\\\"\\n\" +\n             \"       } ],\\n\" +\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6171 \r\n\r\nChanges proposed in this pull request:\r\n- Made it so the following Maven tests do not depend on locale:\r\n  - `readSimpleData_0Header_1Row()`\r\n  - `readSimpleData_RowLongerThanHeader()`\r\n  - `serializeReconProcess()`\r\n  - `readXlsxAsText()`\r\n", "PR_Title": "Fixed Maven tests to work in different locales", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6226_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6226, "issue_title": "Fixed Maven tests to work in different locales", "issue_body": "Fixes #6171 \r\n\r\nChanges proposed in this pull request:\r\n- Made it so the following Maven tests do not depend on locale:\r\n  - `readSimpleData_0Header_1Row()`\r\n  - `readSimpleData_RowLongerThanHeader()`\r\n  - `serializeReconProcess()`\r\n  - `readXlsxAsText()`\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6173", "base_commit": "c8622a0ccbde679dd134b41c6da31814797a0d82", "patch": "diff --git a/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java b/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java\nindex e16cc4828..e240320f4 100644\n--- a/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java\n+++ b/extensions/jython/src/com/google/refine/jython/JythonEvaluable.java\n@@ -49,6 +49,8 @@ import org.python.core.PyNone;\n import org.python.core.PyObject;\n import org.python.core.PyString;\n import org.python.util.PythonInterpreter;\n+import org.slf4j.Logger;\n+import org.slf4j.LoggerFactory;\n \n import com.google.refine.expr.EvalError;\n import com.google.refine.expr.Evaluable;\n@@ -58,6 +60,8 @@ import com.google.refine.expr.ParsingException;\n \n public class JythonEvaluable implements Evaluable {\n \n+    final static Logger logger = LoggerFactory.getLogger(\"jython\");\n+\n     static public LanguageSpecificParser createParser() {\n         return new LanguageSpecificParser() {\n \n@@ -79,6 +83,7 @@ public class JythonEvaluable implements Evaluable {\n     // don't have access to the servlet context from this class this is\n     // the best we can do for now.\n     static {\n+        logger.debug(\"Executing static block in JythonEvaluable\");\n         File libPath = new File(\"webapp/WEB-INF/lib/jython\");\n         if (!libPath.exists() && !libPath.canRead()) {\n             libPath = new File(\"main/webapp/WEB-INF/lib/jython\");\n@@ -93,10 +98,16 @@ public class JythonEvaluable implements Evaluable {\n             PythonInterpreter.initialize(System.getProperties(), props, new String[] { \"\" });\n         }\n \n-        _engine = new PythonInterpreter();\n+        logger.debug(\"Done with static block in Jython initialization\");\n     }\n \n     public JythonEvaluable(String s) {\n+        if (_engine == null) {\n+            // TODO: This could potentially be done in the background, after startup, but before the user needs it\n+            logger.debug(\"Invoking constructor for PythonInterpreter()\");\n+            _engine = new PythonInterpreter();\n+            logger.debug(\"Done constructor for PythonInterpreter()\");\n+        }\n         this.s_functionName = String.format(\"__temp_%d__\", Math.abs(s.hashCode()));\n \n         // indent and create a function out of the code\ndiff --git a/main/pom.xml b/main/pom.xml\nindex 9a9e2c4e8..033738f26 100644\n--- a/main/pom.xml\n+++ b/main/pom.xml\n@@ -228,8 +228,8 @@\n       <version>${commons-validator.version}</version>\n     </dependency>\n     <dependency>\n-      <groupId>velocity</groupId>\n-      <artifactId>velocity</artifactId>\n+      <groupId>org.apache.velocity</groupId>\n+      <artifactId>velocity-engine-core</artifactId>\n       <version>${velocity.version}</version>\n     </dependency>\n     <dependency>\ndiff --git a/main/src/com/google/refine/ProjectManager.java b/main/src/com/google/refine/ProjectManager.java\nindex 40530adbc..4ce487239 100644\n--- a/main/src/com/google/refine/ProjectManager.java\n+++ b/main/src/com/google/refine/ProjectManager.java\n@@ -38,6 +38,7 @@ import java.io.InputStream;\n import java.time.Duration;\n import java.time.Instant;\n import java.util.ArrayList;\n+import java.util.Collections;\n import java.util.HashMap;\n import java.util.List;\n import java.util.Map;\n@@ -76,7 +77,10 @@ public abstract class ProjectManager {\n     static protected final Duration QUICK_SAVE_MAX_TIME = Duration.ofSeconds(30);\n \n     protected Map<Long, ProjectMetadata> _projectsMetadata;\n-    protected Map<String, Integer> _projectsTags;// TagName, number of projects having that tag\n+    /**\n+     * Count of projects which have the given tag\n+     */\n+    private Map<String, Integer> _projectsTags;\n     protected PreferenceStore _preferenceStore;\n \n     final Logger logger = LoggerFactory.getLogger(this.getClass());\n@@ -104,7 +108,7 @@ public abstract class ProjectManager {\n         _projectsMetadata = new HashMap<Long, ProjectMetadata>();\n         _preferenceStore = new PreferenceStore();\n         _projects = new HashMap<Long, Project>();\n-        _projectsTags = new HashMap<String, Integer>();\n+        _projectsTags = new HashMap<>();\n \n         preparePreferenceStore(_preferenceStore);\n     }\n@@ -134,18 +138,7 @@ public abstract class ProjectManager {\n             projectMetadata.setRowCount(project.rows.size());\n             _projects.put(project.id, project);\n             _projectsMetadata.put(project.id, projectMetadata);\n-            if (_projectsTags == null)\n-                _projectsTags = new HashMap<>();\n-            String[] tags = projectMetadata.getTags();\n-            if (tags != null) {\n-                for (String tag : tags) {\n-                    if (_projectsTags.containsKey(tag)) {\n-                        _projectsTags.put(tag, _projectsTags.get(tag) + 1);\n-                    } else {\n-                        _projectsTags.put(tag, 1);\n-                    }\n-                }\n-            }\n+            addProjectTags(projectMetadata.getTags());\n         }\n     }\n \n@@ -348,7 +341,7 @@ public abstract class ProjectManager {\n     }\n \n     /**\n-     * Gets the project metadata from memory Requires that the metadata has already been loaded from the data store\n+     * Gets the project metadata from memory. Requires that the metadata has already been loaded from the data store\n      * \n      * @param id\n      * @return\n@@ -358,7 +351,7 @@ public abstract class ProjectManager {\n     }\n \n     /**\n-     * Gets the project metadata from memory Requires that the metadata has already been loaded from the data store\n+     * Gets the project metadata from memory. Requires that the metadata has already been loaded from the data store\n      * \n      * @param name\n      * @return\n@@ -488,11 +481,59 @@ public abstract class ProjectManager {\n         return _projectsMetadata;\n     }\n \n+    /**\n+     * Increment usage count for all tags in the list.\n+     *\n+     * @param tags\n+     *            String[] array containing all tag names to be updated\n+     */\n+    public void addProjectTags(String[] tags) {\n+        if (tags != null) {\n+            for (String tag : tags) {\n+                if (_projectsTags.containsKey(tag)) {\n+                    _projectsTags.put(tag, _projectsTags.get(tag) + 1);\n+                } else {\n+                    _projectsTags.put(tag, 1);\n+                }\n+            }\n+        }\n+    }\n+\n+    /**\n+     * Decrement usage count for all tags in the list and remove any which are no longer used at all.\n+     *\n+     * @param tags\n+     *            String[] array containing all tag names to be updated\n+     */\n+    public void removeProjectTags(String[] tags) {\n+        for (String tag : tags) {\n+            if (_projectsTags.containsKey(tag)) {\n+                int occurrence = _projectsTags.get(tag);\n+                if (occurrence <= 1)\n+                    _projectsTags.remove(tag);\n+                else {\n+                    _projectsTags.put(tag, occurrence - 1);\n+                }\n+            }\n+        }\n+    }\n+\n+    /**\n+     * Get tag names and usage counts for all projects\n+     *\n+     * @return unmodifiable map keyed by tag name with usage counts as the values\n+     */\n+    @JsonIgnore\n+    public Map<String, Integer> getAllProjectsTags() {\n+        return Collections.unmodifiableMap(_projectsTags);\n+    }\n+\n     /**\n      * Gets all the project tags currently held in memory\n-     * \n-     * @return\n+     *\n+     * @deprecated Deprecated for v3.8. Use {@link #getAllProjectsTags()}\n      */\n+    @Deprecated\n     @JsonIgnore\n     public Map<String, Integer> getAllProjectTags() {\n         return _projectsTags;\ndiff --git a/main/src/com/google/refine/commands/project/DeleteProjectCommand.java b/main/src/com/google/refine/commands/project/DeleteProjectCommand.java\nindex efc502625..85293fff7 100644\n--- a/main/src/com/google/refine/commands/project/DeleteProjectCommand.java\n+++ b/main/src/com/google/refine/commands/project/DeleteProjectCommand.java\n@@ -34,14 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n package com.google.refine.commands.project;\n \n import java.io.IOException;\n-import java.util.Map;\n \n import javax.servlet.ServletException;\n import javax.servlet.http.HttpServletRequest;\n import javax.servlet.http.HttpServletResponse;\n \n import com.google.refine.ProjectManager;\n-import com.google.refine.ProjectMetadata;\n import com.google.refine.commands.Command;\n \n public class DeleteProjectCommand extends Command {\n@@ -58,21 +56,6 @@ public class DeleteProjectCommand extends Command {\n         try {\n             long projectID = Long.parseLong(request.getParameter(\"project\"));\n \n-            // Remove the project tags from the general map\n-            Map<String, Integer> allProjectTags = ProjectManager.singleton.getAllProjectTags();\n-            ProjectMetadata metadata = ProjectManager.singleton.getProjectMetadata(projectID);\n-            for (String tag : metadata.getTags()) {\n-                if (allProjectTags.containsKey(tag)) {\n-                    int occurrence = allProjectTags.get(tag);\n-\n-                    if (occurrence == 1)\n-                        allProjectTags.remove(tag);\n-                    else {\n-                        allProjectTags.put(tag, occurrence - 1);\n-                    }\n-                }\n-            }\n-\n             ProjectManager.singleton.deleteProject(projectID);\n \n             respond(response, \"{ \\\"code\\\" : \\\"ok\\\" }\");\n@@ -81,4 +64,5 @@ public class DeleteProjectCommand extends Command {\n             respondException(response, e);\n         }\n     }\n+\n }\ndiff --git a/main/src/com/google/refine/commands/project/RenameProjectCommand.java b/main/src/com/google/refine/commands/project/RenameProjectCommand.java\nindex 4dad20473..a0fe53c70 100644\n--- a/main/src/com/google/refine/commands/project/RenameProjectCommand.java\n+++ b/main/src/com/google/refine/commands/project/RenameProjectCommand.java\n@@ -58,7 +58,7 @@ public class RenameProjectCommand extends Command {\n \n             pm.setName(name);\n \n-            respond(response, \"{ \\\"code\\\" : \\\"ok\\\" }\");\n+            respond(response, \"{\\\"code\\\":\\\"ok\\\"}\");\n         } catch (Exception e) {\n             respondException(response, e);\n         }\ndiff --git a/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java b/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java\nindex 09205950f..3cf45c486 100644\n--- a/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java\n+++ b/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java\n@@ -54,7 +54,7 @@ public class SetProjectMetadataCommand extends Command {\n         ProjectMetadata meta = null;\n \n         if (project == null) {\n-            respond(response, \"{ \\\"code\\\" : \\\"error\\\", \\\"message\\\" : \\\"Project cannot be found\\\" }\");\n+            respond(response, \"{\\\"code\\\":\\\"error\\\",\\\"message\\\":\\\"Project cannot be found\\\"}\");\n             return;\n         }\n \ndiff --git a/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java b/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java\nindex 923ce2faf..5e726659c 100644\n--- a/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java\n+++ b/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java\n@@ -26,16 +26,12 @@\n package com.google.refine.commands.project;\n \n import java.io.IOException;\n-import java.util.ArrayList;\n-import java.util.List;\n-import java.util.Map;\n+import java.util.stream.Stream;\n \n import javax.servlet.ServletException;\n import javax.servlet.http.HttpServletRequest;\n import javax.servlet.http.HttpServletResponse;\n \n-import com.google.common.base.CharMatcher;\n-\n import com.google.refine.ProjectManager;\n import com.google.refine.ProjectMetadata;\n import com.google.refine.commands.Command;\n@@ -66,43 +62,16 @@ public class SetProjectTagsCommand extends Command {\n         String oldT = request.getParameter(\"old\");\n         String newT = request.getParameter(\"new\");\n \n-        Map<String, Integer> allProjectTags = ProjectManager.singleton.getAllProjectTags();\n-\n-        // Lets remove the old tags from the general map\n-        String[] oldTags = oldT.split(\",\");\n-        for (String tag : oldTags) {\n-            if (allProjectTags != null && allProjectTags.containsKey(tag)) {\n-                int occurrence = allProjectTags.get(tag);\n+        String[] oldTags = oldT == null ? new String[0] : oldT.split(\",\");\n+        ProjectManager.singleton.removeProjectTags(oldTags);\n \n-                if (occurrence == 1) {\n-                    allProjectTags.remove(tag);\n-                } else {\n-                    allProjectTags.put(tag, occurrence - 1);\n-                }\n-            }\n-        }\n+        String[] newTags = newT == null ? new String[0]\n+                : Stream.of(newT.split(\" |\\\\,\")).map(String::trim).filter(t -> !t.isEmpty()).toArray(String[]::new);\n+        ProjectManager.singleton.addProjectTags(newTags);\n \n-        // Lets add the new tags to the general map\n-        String[] newTags = newT.split(\" |\\\\,\");\n-        List<String> polishedTags = new ArrayList<String>(newTags.length);\n-        for (String tag : newTags) {\n-            tag = CharMatcher.whitespace().trimFrom(tag);\n+        metadata.setTags(newTags);\n \n-            if (!tag.isEmpty()) {\n-                if (allProjectTags != null) {\n-                    if (allProjectTags.containsKey(tag)) {\n-                        allProjectTags.put(tag, allProjectTags.get(tag) + 1);\n-                    } else {\n-                        allProjectTags.put(tag, 1);\n-                    }\n-                }\n-                polishedTags.add(tag);\n-            }\n-        }\n-\n-        // Let's update the project tags\n-        metadata.setTags(polishedTags.toArray(new String[polishedTags.size()]));\n-\n-        respond(response, \"{ \\\"code\\\" : \\\"ok\\\" }\");\n+        respond(response, \"{\\\"code\\\":\\\"ok\\\"}\");\n     }\n+\n }\ndiff --git a/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java b/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java\nindex 44000c74e..0fdd801b3 100644\n--- a/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java\n+++ b/main/src/com/google/refine/commands/workspace/GetAllProjectTagsCommand.java\n@@ -55,7 +55,7 @@ public class GetAllProjectTagsCommand extends Command {\n     public void doGet(HttpServletRequest request, HttpServletResponse response)\n             throws ServletException, IOException {\n \n-        Map<String, Integer> tagMap = ProjectManager.singleton.getAllProjectTags();\n+        Map<String, Integer> tagMap = ProjectManager.singleton.getAllProjectsTags();\n         Set<String> tags = tagMap == null ? Collections.emptySet() : tagMap.keySet();\n         respondJSON(response, new AllProjectsTags(tags));\n     }\ndiff --git a/main/src/com/google/refine/history/HistoryEntry.java b/main/src/com/google/refine/history/HistoryEntry.java\nindex 6b734a82c..076a58f21 100644\n--- a/main/src/com/google/refine/history/HistoryEntry.java\n+++ b/main/src/com/google/refine/history/HistoryEntry.java\n@@ -1,6 +1,6 @@\n /*\n \n-Copyright 2010, Google Inc.\n+Copyright 2010, 2023 Google Inc. & OpenRefine contributors\n All rights reserved.\n \n Redistribution and use in source and binary forms, with or without\n@@ -35,8 +35,8 @@ package com.google.refine.history;\n \n import java.io.IOException;\n import java.io.Writer;\n+import java.time.Instant;\n import java.time.OffsetDateTime;\n-import java.time.ZoneId;\n import java.util.Properties;\n \n import com.fasterxml.jackson.annotation.JacksonInject;\n@@ -69,7 +69,7 @@ public class HistoryEntry {\n     @JsonProperty(\"description\")\n     final public String description;\n     @JsonProperty(\"time\")\n-    final public OffsetDateTime time;\n+    final public Instant time;\n \n     // the manager (deals with IO systems or databases etc.)\n     @JsonIgnore\n@@ -105,15 +105,23 @@ public class HistoryEntry {\n             @JacksonInject(\"projectID\") long projectID,\n             @JsonProperty(\"description\") String description,\n             @JsonProperty(OPERATION) AbstractOperation operation) {\n-        this(id, projectID, description, operation, OffsetDateTime.now(ZoneId.of(\"Z\")));\n+        this(id, projectID, description, operation, Instant.now());\n     }\n \n     public HistoryEntry(long id, Project project, String description, AbstractOperation operation, Change change) {\n-        this(id, project.id, description, operation, OffsetDateTime.now(ZoneId.of(\"Z\")));\n+        this(id, project.id, description, operation, Instant.now());\n         setChange(change);\n     }\n \n+    @Deprecated(since = \"3.8\")\n     protected HistoryEntry(long id, long projectID, String description, AbstractOperation operation, OffsetDateTime time) {\n+        // TODO: I'm not sure attempting to preserve this backward compatibility is worthwhile, since:\n+        // a) this constructor is unused in the core, and\n+        // b) there's a public field which has changed datatype\n+        this(id, projectID, description, operation, time.toInstant());\n+    }\n+\n+    protected HistoryEntry(long id, long projectID, String description, AbstractOperation operation, Instant time) {\n         this.id = id;\n         this.projectID = projectID;\n         this.description = description;\ndiff --git a/main/src/com/google/refine/io/FileProjectManager.java b/main/src/com/google/refine/io/FileProjectManager.java\nindex d950766a4..09d175538 100644\n--- a/main/src/com/google/refine/io/FileProjectManager.java\n+++ b/main/src/com/google/refine/io/FileProjectManager.java\n@@ -39,7 +39,6 @@ import java.io.FileOutputStream;\n import java.io.IOException;\n import java.io.InputStream;\n import java.io.OutputStream;\n-import java.util.HashMap;\n import java.util.List;\n import java.util.Map.Entry;\n import java.util.Set;\n@@ -130,19 +129,7 @@ public class FileProjectManager extends ProjectManager {\n \n             if (metadata != null) {\n                 _projectsMetadata.put(projectID, metadata);\n-                if (_projectsTags == null) {\n-                    _projectsTags = new HashMap<String, Integer>();\n-                }\n-\n-                if (metadata != null && metadata.getTags() != null) {\n-                    for (String tag : metadata.getTags()) {\n-                        if (_projectsTags.containsKey(tag)) {\n-                            _projectsTags.put(tag, _projectsTags.get(tag) + 1);\n-                        } else {\n-                            _projectsTags.put(tag, 1);\n-                        }\n-                    }\n-                }\n+                addProjectTags(metadata.getTags());\n                 return true;\n             } else {\n                 return false;\n@@ -341,6 +328,16 @@ public class FileProjectManager extends ProjectManager {\n     @Override\n     public void deleteProject(long projectID) {\n         synchronized (this) {\n+\n+            // Remove this project's tags from the overall map\n+            ProjectMetadata metadata = getProjectMetadata(projectID);\n+            if (metadata != null) {\n+                String[] tags = metadata.getTags();\n+                if (tags != null) { // should only ever happen during tests with mocked ProjectMetadata\n+                    removeProjectTags(tags);\n+                }\n+            }\n+\n             removeProject(projectID);\n \n             File dir = getProjectDir(projectID);\n@@ -470,14 +467,8 @@ public class FileProjectManager extends ProjectManager {\n \n             _projectsMetadata.put(id, metadata);\n \n-            if (metadata != null && metadata.getTags() != null) {\n-                for (String tag : metadata.getTags()) {\n-                    if (_projectsTags.containsKey(tag)) {\n-                        _projectsTags.put(tag, _projectsTags.get(tag) + 1);\n-                    } else {\n-                        _projectsTags.put(tag, 1);\n-                    }\n-                }\n+            if (metadata != null) {\n+                addProjectTags(metadata.getTags());\n             }\n         }\n     }\ndiff --git a/main/webapp/WEB-INF/velocity.properties b/main/webapp/WEB-INF/velocity.properties\nindex 5e78fcb88..8e9747099 100644\n--- a/main/webapp/WEB-INF/velocity.properties\n+++ b/main/webapp/WEB-INF/velocity.properties\n@@ -7,5 +7,11 @@ velocimacro.context.localscope=false\n velocimacro.library.autoreload=false\n velocimacro.permissions.allow.inline.local.scope=true\n \n+# UTF-8 is the default encoding for 2.x, so these might be superfluous\n input.encoding=UTF-8\n output.encoding=UTF-8\n+\n+# Settings to maximize backward compatibility with 1.x\n+runtime.conversion.handler = none\n+space.gobbling = bc\n+directive.if.emptycheck = false\ndiff --git a/main/webapp/modules/core/langs/translation-es.json b/main/webapp/modules/core/langs/translation-es.json\nindex 0286cc564..9b9b8c168 100644\n--- a/main/webapp/modules/core/langs/translation-es.json\n+++ b/main/webapp/modules/core/langs/translation-es.json\n@@ -374,7 +374,7 @@\n     \"core-recon/include\": \"¿Incluir\",\n     \"core-recon/contact-service\": \"Contactando al servicio de cotejo\",\n     \"core-recon/enter-url\": \"Ingrese la URL del servicio\",\n-    \"core-recon/url-already-registered\":\"El servicio de cotejo que intenta agregar ya se encuentra registrado.\",\n+    \"core-recon/url-already-registered\": \"El servicio de cotejo que intenta agregar ya se encuentra registrado.\",\n     \"core-util-enc/all\": \"Todas las codificaciones\",\n     \"core-util-enc/working\": \"Trabajando\",\n     \"core-util-enc/encoding\": \"Codificación\",\n@@ -748,7 +748,7 @@\n     \"core-views/column-join-before-column-picker\": \"Seleccione y ordene las columnas que deben unirse\",\n     \"core-facets/choice-count\": \"$1 {{plural:$1|elección|elecciones}}\",\n     \"core-dialogs/clusters-filtered\": \"<b>$1</b> {{plural:$1|agrupamiento filtrado|agrupamientos filtrados}} de un total de <b>$2</b>\",\n-    \"core-dialogs/clusters-found\": \"<b>$1</b> {{plural:$1|agrupamiento encontrado|agrupamientos encontrados}}\",\n+    \"core-dialogs/clusters-found\": \"<b>$1</b>&nbsp;{{plural:$1|cluster|clusters}} encontrado\",\n     \"core-index-import/files-selected\": \"$1 de $2 {{plural:$2|archivo seleccionado|archivos seleccionados}}\",\n     \"core-index-import/file-count\": \"$1 {{plural:$1|archivo|archivos}}\",\n     \"core-index-import/match-count\": \"$1 {{plural:$1|coincidencia|coincidencias}}\",\ndiff --git a/main/webapp/modules/core/scripts/index/open-project-ui.js b/main/webapp/modules/core/scripts/index/open-project-ui.js\nindex 40bb9601c..9540b75d5 100644\n--- a/main/webapp/modules/core/scripts/index/open-project-ui.js\n+++ b/main/webapp/modules/core/scripts/index/open-project-ui.js\n@@ -63,7 +63,7 @@ Refine.OpenProjectUI.prototype._fetchProjects = function() {\n       null,\n       function(data) {\n         self._renderProjects(data);\n-        self.resize();\n+        self.resize(); // other version of this function excludes this resize\n       },\n       \"json\"\n   );\n@@ -119,7 +119,7 @@ Refine.OpenProjectUI._filterTags = function(tag) {\n   });\n };\n \n-\n+// FIXME: This is overwriting an earlier function definition\n Refine.OpenProjectUI.prototype._fetchProjects = function() {\n     var self = this;\n     $.ajax({\n@@ -134,12 +134,9 @@ Refine.OpenProjectUI.prototype._fetchProjects = function() {\n     });\n };\n \n-const dateOptions = { year: 'numeric', month: '2-digit', day: '2-digit' };\n-const timeOptions = { hour: '2-digit', minute: '2-digit', hour12: false };\n-const dateFormatter = new Intl.DateTimeFormat(navigator.language, dateOptions);\n-const timeFormatter =  new Intl.DateTimeFormat(navigator.language, timeOptions);\n-\n Refine.OpenProjectUI.prototype._renderProjects = function(data) {\n+  const options  = { dateStyle: 'medium', timeStyle: 'medium' };\n+  const dateFormatter = new Intl.DateTimeFormat(Refine.userLang || navigator.language, options);\n   var self = this;\n   var projects = [];\n   for (var n in data.projects) {\n@@ -154,19 +151,10 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {\n          console.log('Project '+project.id+' name is not set. skipping...');\n          continue;\n       }\n-      // project.modified is ISO 8601 format\n-      const date = new Date(project.modified);\n-      const dateParts = dateFormatter.formatToParts(date);\n-      const timeParts = timeFormatter.formatToParts(date);\n-      const findPart = (parts, type) => parts.find(part => part.type === type)?.value;\n \n-      const year = findPart(dateParts, 'year');\n-      const month = findPart(dateParts, 'month');\n-      const day = findPart(dateParts, 'day');\n-      const hour = findPart(timeParts, 'hour');\n-      const minute = findPart(timeParts, 'minute');\n-\n-      project.date = `${year}-${month}-${day} ${hour}:${minute}`;\n+      // project.modified is ISO 8601 format string\n+      const date = new Date(project.modified);\n+      project.date = dateFormatter.format(date);\n       \n       if (typeof project.userMetadata !== \"undefined\")  {\n           for (var m in data.customMetadataColumns) {\n@@ -179,7 +167,7 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {\n                   if (!found) {\n                       project.userMetadata.push({\n                           name: data.customMetadataColumns[m].name,\n-                          dispay: data.customMetadataColumns[m].display,\n+                          display: data.customMetadataColumns[m].display,\n                           value: \"\"\n                       });\n                   }\n@@ -260,7 +248,7 @@ Refine.OpenProjectUI.prototype._renderProjects = function(data) {\n       );\n       \n       $('<div></div>')\n-      .html(project.date)\n+      .html('<span style=\"display:none\">' + project.modified + '</span>' + project.date)\n       .addClass(\"last-modified\")\n       .appendTo($(tr.insertCell(tr.cells.length)));\n       \ndiff --git a/main/webapp/modules/core/scripts/util/i18n.js b/main/webapp/modules/core/scripts/util/i18n.js\nindex e7ec8e58a..3816e0105 100644\n--- a/main/webapp/modules/core/scripts/util/i18n.js\n+++ b/main/webapp/modules/core/scripts/util/i18n.js\n@@ -37,5 +37,7 @@ I18NUtil.init = function (module) {\n     $('html').attr('lang', lang.replace('_', '-'));\n     if (module === 'core') {\n       $.i18n({locale: lang});\n+      // TODO: This should be globally accessible, but this is OK for our current needs\n+      Refine.userLang = lang;\n     }\n }\ndiff --git a/main/webapp/modules/core/styles/index/open-project-ui.css b/main/webapp/modules/core/styles/index/open-project-ui.css\nindex 78157e5f6..665c83c27 100644\n--- a/main/webapp/modules/core/styles/index/open-project-ui.css\n+++ b/main/webapp/modules/core/styles/index/open-project-ui.css\n@@ -69,6 +69,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n #projects-container .project .project-name {\n   font-size: 120%;\n+  white-space: nowrap;\n }\n \n #projects-container .project .last-modified {\n@@ -84,24 +85,28 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n   border: 0;\n }\n \n-#projects-container>table thead th:nth-child(2) {\n+#projects-container table thead th:nth-child(2) {\n   border-left: 0;\n }\n \n-#projects-container>table thead th:nth-child(3) {\n+#projects-container table thead th:nth-child(3) {\n   white-space: nowrap;\n }\n \n-/* Name */\n-#projects-container>table td:nth-child(4) {\n-  white-space: nowrap;\n+#projects-container table thead th:nth-child(9) {\n+  text-align: end;\n }\n \n /* Subject */\n-#projects-container>table td:nth-child(6) {\n+#projects-container table tbody td:nth-child(7) {\n   white-space: nowrap;\n }\n \n+/* Row Count is right aligned for numbers */\n+#projects-container table tbody td:nth-child(9) {\n+  text-align: end;\n+}\n+\n #projects-container>table>tbody>tr>td {\n   word-wrap: break-word;\n }\ndiff --git a/pom.xml b/pom.xml\nindex e6bacf7d9..ed400d2a1 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -74,14 +74,14 @@\n     <!-- dependency versions -->\n     <jackson.version>2.13.4</jackson.version>\n     <servlet-api.version>4.0.1</servlet-api.version>\n-    <butterfly.version>1.2.4</butterfly.version>\n+    <butterfly.version>1.2.5</butterfly.version>\n     <slf4j.version>2.0.9</slf4j.version>\n-    <log4j.version>2.21.1</log4j.version>\n+    <log4j.version>2.22.0</log4j.version>\n     <jetty.version>10.0.16</jetty.version>\n     <okhttp.version>4.10.0</okhttp.version>\n     <jena.version>4.10.0</jena.version>\n-    <poi.version>5.2.4</poi.version>\n-    <commons-lang3.version>3.13.0</commons-lang3.version>\n+    <poi.version>5.2.5</poi.version>\n+    <commons-lang3.version>3.14.0</commons-lang3.version>\n     <commons-fileupload.version>1.5</commons-fileupload.version>\n     <commons-collections.version>3.2.2</commons-collections.version>\n     <commons-text.version>1.11.0</commons-text.version>\n@@ -90,7 +90,7 @@\n     <!-- v1.15 of commons-codec is needed for Jena 3.14+ - copied from org.apache.jena:jena:pom -->\n     <commons-codec.version>1.16.0</commons-codec.version>\n     <commons-compress.version>1.25.0</commons-compress.version>\n-    <velocity.version>1.5</velocity.version>\n+    <velocity.version>2.3</velocity.version>\n     <marc4j.version>2.9.5</marc4j.version>\n     <jsoup.version>1.15.3</jsoup.version>\n     <odfdom-java.version>0.9.0</odfdom-java.version> <!-- do not update to 0.10.0, see issue #4397 -->\n", "test_patch": "diff --git a/main/tests/cypress/cypress/e2e/project/grid/column/edit-column/add_columns_based_on_this_column.cy.js b/main/tests/cypress/cypress/e2e/project/grid/column/edit-column/add_columns_based_on_this_column.cy.js\nindex f92beceb9..b97f970e2 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/column/edit-column/add_columns_based_on_this_column.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/column/edit-column/add_columns_based_on_this_column.cy.js\n@@ -29,9 +29,9 @@ describe(__filename, function () {\n \n     cy.get('input[bind=\"columnNameInput\"]').type('Test_Python_toLower');\n     cy.get('select[bind=\"expressionPreviewLanguageSelect\"]').select('jython');\n-    cy.typeExpression('return value.lower()');\n+    cy.typeExpression('return value.lower()',{timeout: 10000});\n     cy.get(\n-      '.expression-preview-table-wrapper tr:nth-child(2) td:last-child'\n+      '.expression-preview-table-wrapper tr:nth-child(2) td:last-child',{timeout: 10000}\n     ).should('to.contain', 'butter,with salt');\n     cy.confirmDialogPanel();\n \ndiff --git a/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/copy_reconciliation_data.cy.js b/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/copy_reconciliation_data.cy.js\nindex 0e54a416b..005e8d844 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/copy_reconciliation_data.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/column/reconcile/copy_reconciliation_data.cy.js\n@@ -42,9 +42,10 @@ describe('Copy reconciliation data', () => {\n       'Copy 4 recon judgments from column species to duplicated_column'\n     );\n \n-    // ensure 4 are matched on the duplicate column\n-    cy.get(\n-      'table.data-table td .data-table-cell-content:contains(\"Choose new match\")'\n-    ).should('have.length', 4);\n+    cy.get('table.data-table th').contains('duplicated_column').should('exist').then(() => {\n+      cy.get('table.data-table tbody tr')\n+              .find('td:last .data-table-cell-content:contains(\"Choose new match\")')\n+              .should('have.length', 4);\n+    });\n   });\n });\ndiff --git a/main/tests/cypress/cypress/e2e/project/grid/misc/expressions.cy.js b/main/tests/cypress/cypress/e2e/project/grid/misc/expressions.cy.js\nindex 8d497a25d..c8664582f 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/misc/expressions.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/misc/expressions.cy.js\n@@ -47,10 +47,10 @@ describe(__filename, function () {\n     cy.loadAndVisitProject('food.mini');\n     loadExpressionPanel();\n     cy.get('select[bind=\"expressionPreviewLanguageSelect\"]').select('jython');\n-    cy.typeExpression('return value.lower()');\n+    cy.typeExpression('return value.lower()',{timeout: 10000});\n     cy.get('.expression-preview-parsing-status').contains('No syntax error.');\n     cy.get(\n-      '.expression-preview-table-wrapper tr:nth-child(2) td:last-child'\n+      '.expression-preview-table-wrapper tr:nth-child(2) td:last-child',{timeout: 10000}\n     ).should('to.contain', 'butter,with salt');\n   });\n \n@@ -76,7 +76,7 @@ describe(__filename, function () {\n     cy.loadAndVisitProject('food.mini');\n     loadExpressionPanel();\n     cy.get('select[bind=\"expressionPreviewLanguageSelect\"]').select('jython');\n-    cy.typeExpression('(;)');\n+    cy.typeExpression('(;)',{timeout: 10000});\n     cy.get('.expression-preview-parsing-status').contains('Internal error');\n   });\n \n@@ -103,7 +103,7 @@ describe(__filename, function () {\n     cy.loadAndVisitProject('food.mini');\n     loadExpressionPanel();\n     cy.get('select[bind=\"expressionPreviewLanguageSelect\"]').select('jython');\n-    cy.typeExpression('return value.thisPythonFunctionDoesNotExists()');\n+    cy.typeExpression('return value.thisPythonFunctionDoesNotExists()',{timeout: 10000});\n \n     cy.get(\n       '.expression-preview-table-wrapper tr:nth-child(2) td:last-child'\ndiff --git a/main/tests/cypress/cypress/support/commands.js b/main/tests/cypress/cypress/support/commands.js\nindex d9d70f9c5..798b41262 100644\n--- a/main/tests/cypress/cypress/support/commands.js\n+++ b/main/tests/cypress/cypress/support/commands.js\n@@ -294,15 +294,10 @@ Cypress.Commands.add('waitForImportUpdate', () => {\n  * Utility method to fill something into the expression input\n  * Need to wait for OpenRefine to preview the result, hence the cy.wait\n  */\n-Cypress.Commands.add('typeExpression', (expression) => {\n-  if (expression.length <= 30) {\n-    cy.get('textarea.expression-preview-code').type(expression);\n-    cy.get('tbody > tr:nth-child(1) > td:nth-child(3)').should('contain',expression);\n-  } else {\n-    cy.get('textarea.expression-preview-code').type(expression);\n-    cy.get('tbody > tr:nth-child(1) > td:nth-child(3)').should('contain',expression.substring(0,30) + ' ...');\n-  }\n-\n+Cypress.Commands.add('typeExpression', (expression, options = {}) => {\n+    cy.get('textarea.expression-preview-code', options).type(expression);\n+    const expectedText = expression.length <= 30 ? expression : `${expression.substring(0, 30)} ...`;\n+    cy.get('tbody > tr:nth-child(1) > td:nth-child(3)', options).should('contain', expectedText);\n });\n \n /**\ndiff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex efec0f35f..e79896d7e 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -16,11 +16,11 @@\n         \"lint\": \"prettier --check . && eslint .\"\n     },\n     \"dependencies\": {\n-        \"cypress\": \"13.5.1\",\n+        \"cypress\": \"13.6.0\",\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.53.0\",\n+        \"eslint\": \"^8.54.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^9.0.0\",\n         \"eslint-plugin-cypress\": \"^2.15.1\",\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 7d7854f72..5743e1169 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -66,10 +66,10 @@\n     minimatch \"^3.1.2\"\n     strip-json-comments \"^3.1.1\"\n \n-\"@eslint/js@8.53.0\":\n-  version \"8.53.0\"\n-  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.53.0.tgz#bea56f2ed2b5baea164348ff4d5a879f6f81f20d\"\n-  integrity sha512-Kn7K8dx/5U6+cT1yEhpX1w4PCSg0M+XyRILPgvwcEBjerFWCwQj5sbr3/VmxqV0JGHCBCzyd6LxypEuehypY1w==\n+\"@eslint/js@8.54.0\":\n+  version \"8.54.0\"\n+  resolved \"https://registry.yarnpkg.com/@eslint/js/-/js-8.54.0.tgz#4fab9a2ff7860082c304f750e94acd644cf984cf\"\n+  integrity sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==\n \n \"@humanwhocodes/config-array@^0.11.13\":\n   version \"0.11.13\"\n@@ -436,10 +436,10 @@ cypress-file-upload@^5.0.8:\n   resolved \"https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1\"\n   integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==\n \n-cypress@13.5.1:\n-  version \"13.5.1\"\n-  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.5.1.tgz#8b19bf0b9f31ea43f78980b2479bd3f25197d5cc\"\n-  integrity sha512-yqLViT0D/lPI8Kkm7ciF/x/DCK/H/DnogdGyiTnQgX4OVR2aM30PtK+kvklTOD1u3TuItiD9wUQAF8EYWtyZug==\n+cypress@13.6.0:\n+  version \"13.6.0\"\n+  resolved \"https://registry.yarnpkg.com/cypress/-/cypress-13.6.0.tgz#b98b7b837679012ed09c7ecee5565bf7b31d4982\"\n+  integrity sha512-quIsnFmtj4dBUEJYU4OH0H12bABJpSujvWexC24Ju1gTlKMJbeT6tTO0vh7WNfiBPPjoIXLN+OUqVtiKFs6SGw==\n   dependencies:\n     \"@cypress/request\" \"^3.0.0\"\n     \"@cypress/xvfb\" \"^1.2.4\"\n@@ -595,15 +595,15 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4\n   resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800\"\n   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==\n \n-eslint@^8.53.0:\n-  version \"8.53.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.53.0.tgz#14f2c8244298fcae1f46945459577413ba2697ce\"\n-  integrity sha512-N4VuiPjXDUa4xVeV/GC/RV3hQW9Nw+Y463lkWaKKXKYMvmRiRDAtfpuPFLN+E1/6ZhyR8J2ig+eVREnYgUsiag==\n+eslint@^8.54.0:\n+  version \"8.54.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.54.0.tgz#588e0dd4388af91a2e8fa37ea64924074c783537\"\n+  integrity sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n     \"@eslint-community/regexpp\" \"^4.6.1\"\n     \"@eslint/eslintrc\" \"^2.1.3\"\n-    \"@eslint/js\" \"8.53.0\"\n+    \"@eslint/js\" \"8.54.0\"\n     \"@humanwhocodes/config-array\" \"^0.11.13\"\n     \"@humanwhocodes/module-importer\" \"^1.0.1\"\n     \"@nodelib/fs.walk\" \"^1.2.8\"\ndiff --git a/main/tests/server/src/com/google/refine/ProjectManagerTests.java b/main/tests/server/src/com/google/refine/ProjectManagerTests.java\nindex 740ab7e91..3204fd76c 100644\n--- a/main/tests/server/src/com/google/refine/ProjectManagerTests.java\n+++ b/main/tests/server/src/com/google/refine/ProjectManagerTests.java\n@@ -41,10 +41,12 @@ import static org.mockito.Mockito.times;\n import static org.mockito.Mockito.verify;\n import static org.mockito.Mockito.verifyNoMoreInteractions;\n import static org.mockito.Mockito.when;\n+import static org.testng.AssertJUnit.assertEquals;\n \n import java.lang.reflect.Field;\n import java.time.Instant;\n import java.util.ArrayList;\n+import java.util.Set;\n \n import org.mockito.Mockito;\n import org.slf4j.LoggerFactory;\n@@ -63,6 +65,7 @@ public class ProjectManagerTests extends RefineTest {\n \n     private static final Instant BASE_DATE = Instant.parse(\"1970-01-02T00:30:00Z\");\n     private static final int ROW_COUNT = 3;\n+    private static final String[] TAGS = { \"testtag1\", \"testtag2\" };\n     ProjectManagerStub pm;\n     ProjectManagerStub SUT;\n     Project project;\n@@ -88,6 +91,7 @@ public class ProjectManagerTests extends RefineTest {\n         addRows(project);\n \n         metadata = mock(ProjectMetadata.class);\n+        when(metadata.getTags()).thenReturn(TAGS);\n         procmgr = mock(ProcessManager.class);\n         when(project.getProcessManager()).thenReturn(procmgr);\n         when(procmgr.hasPending()).thenReturn(false); // always false for now, but should test separately\n@@ -118,6 +122,7 @@ public class ProjectManagerTests extends RefineTest {\n \n         verifyNoMoreInteractions(project);\n         verifyNoMoreInteractions(metadata);\n+        assertEquals(SUT.getAllProjectsTags().keySet(), Set.of(TAGS));\n     }\n \n     // TODO test registerProject in race condition\ndiff --git a/main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java b/main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java\nindex c18348913..825b2de5b 100644\n--- a/main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java\n+++ b/main/tests/server/src/com/google/refine/browsing/facets/ListFacetTests.java\n@@ -28,9 +28,14 @@\n package com.google.refine.browsing.facets;\n \n import java.io.IOException;\n+import java.util.ArrayList;\n+import java.util.Comparator;\n+import java.util.List;\n \n import com.fasterxml.jackson.core.JsonParseException;\n import com.fasterxml.jackson.databind.JsonMappingException;\n+import com.fasterxml.jackson.databind.JsonNode;\n+import com.fasterxml.jackson.databind.node.ObjectNode;\n import org.testng.annotations.Test;\n \n import com.google.refine.RefineTest;\n@@ -69,8 +74,8 @@ public class ListFacetTests extends RefineTest {\n             + \"\\\"columnName\\\":\\\"Column A\\\",\"\n             + \"\\\"invert\\\":false,\"\n             + \"\\\"choices\\\":[\"\n-            + \"     {\\\"v\\\":{\\\"v\\\":\\\"foobar\\\",\\\"l\\\":\\\"foobar\\\"},\\\"c\\\":1,\\\"s\\\":true},\"\n-            + \"     {\\\"v\\\":{\\\"v\\\":\\\"barbar\\\",\\\"l\\\":\\\"barbar\\\"},\\\"c\\\":1,\\\"s\\\":false}\"\n+            + \"     {\\\"v\\\":{\\\"v\\\":\\\"barbar\\\",\\\"l\\\":\\\"barbar\\\"},\\\"c\\\":1,\\\"s\\\":false},\"\n+            + \"     {\\\"v\\\":{\\\"v\\\":\\\"foobar\\\",\\\"l\\\":\\\"foobar\\\"},\\\"c\\\":1,\\\"s\\\":true}\"\n             + \"]}\";\n \n     private static String selectedEmptyChoiceFacet = \"{\"\n@@ -79,9 +84,9 @@ public class ListFacetTests extends RefineTest {\n             + \"\\\"columnName\\\":\\\"Column A\\\",\"\n             + \"\\\"invert\\\":false,\"\n             + \"\\\"choices\\\":[\"\n-            + \"    {\\\"v\\\":{\\\"v\\\":\\\"ebar\\\",\\\"l\\\":\\\"ebar\\\"},\\\"c\\\":1,\\\"s\\\":false},\"\n-            + \"    {\\\"v\\\":{\\\"v\\\":\\\"cbar\\\",\\\"l\\\":\\\"cbar\\\"},\\\"c\\\":1,\\\"s\\\":false},\"\n             + \"    {\\\"v\\\":{\\\"v\\\":\\\"abar\\\",\\\"l\\\":\\\"abar\\\"},\\\"c\\\":1,\\\"s\\\":false},\"\n+            + \"    {\\\"v\\\":{\\\"v\\\":\\\"cbar\\\",\\\"l\\\":\\\"cbar\\\"},\\\"c\\\":1,\\\"s\\\":false},\"\n+            + \"    {\\\"v\\\":{\\\"v\\\":\\\"ebar\\\",\\\"l\\\":\\\"ebar\\\"},\\\"c\\\":1,\\\"s\\\":false},\"\n             + \"    {\\\"v\\\":{\\\"v\\\":\\\"foobar\\\",\\\"l\\\":\\\"true\\\"},\\\"c\\\":0,\\\"s\\\":true}\"\n             + \"]}\";\n \n@@ -103,7 +108,14 @@ public class ListFacetTests extends RefineTest {\n         Facet facet = facetConfig.apply(project);\n         facet.computeChoices(project, engine.getAllFilteredRows());\n \n-        TestUtils.isSerializedTo(facet, jsonFacet);\n+        ObjectNode actual = ParsingUtilities.mapper.valueToTree(facet);\n+        List<JsonNode> choicesList = new ArrayList<>();\n+\n+        actual.findValues(\"choices\").get(0).forEach(choicesList::add);\n+        choicesList.sort(Comparator.comparing(JsonNode::toString));\n+        actual.replace(\"choices\", ParsingUtilities.mapper.createArrayNode().addAll(choicesList));\n+\n+        TestUtils.assertEqualsAsJson(actual.toString(), jsonFacet);\n     }\n \n     @Test\n@@ -128,6 +140,14 @@ public class ListFacetTests extends RefineTest {\n         ListFacetConfig facetConfig = ParsingUtilities.mapper.readValue(jsonConfig, ListFacetConfig.class);\n         Facet facet = facetConfig.apply(project);\n         facet.computeChoices(project, engine.getAllFilteredRows());\n-        TestUtils.isSerializedTo(facet, selectedEmptyChoiceFacet);\n+\n+        ObjectNode actual = ParsingUtilities.mapper.valueToTree(facet);\n+        List<JsonNode> choicesList = new ArrayList<>();\n+\n+        actual.findValues(\"choices\").get(0).forEach(choicesList::add);\n+        choicesList.sort(Comparator.comparing(n -> n.get(\"v\").toString()));\n+        actual.replace(\"choices\", ParsingUtilities.mapper.createArrayNode().addAll(choicesList));\n+\n+        TestUtils.assertEqualsAsJson(actual.toString(), selectedEmptyChoiceFacet);\n     }\n }\ndiff --git a/main/tests/server/src/com/google/refine/commands/CommandTestBase.java b/main/tests/server/src/com/google/refine/commands/CommandTestBase.java\nindex 7c90339c1..8ee589834 100644\n--- a/main/tests/server/src/com/google/refine/commands/CommandTestBase.java\n+++ b/main/tests/server/src/com/google/refine/commands/CommandTestBase.java\n@@ -3,6 +3,8 @@ package com.google.refine.commands;\n \n import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.when;\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertFalse;\n \n import java.io.IOException;\n import java.io.PrintWriter;\n@@ -11,11 +13,15 @@ import java.io.StringWriter;\n import javax.servlet.http.HttpServletRequest;\n import javax.servlet.http.HttpServletResponse;\n \n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.databind.JsonNode;\n import org.testng.annotations.BeforeMethod;\n \n+import com.google.refine.RefineTest;\n+import com.google.refine.util.ParsingUtilities;\n import com.google.refine.util.TestUtils;\n \n-public class CommandTestBase {\n+public class CommandTestBase extends RefineTest {\n \n     protected HttpServletRequest request = null;\n     protected HttpServletResponse response = null;\n@@ -40,4 +46,14 @@ public class CommandTestBase {\n     protected void assertCSRFCheckFailed() {\n         TestUtils.assertEqualsAsJson(writer.toString(), \"{\\\"code\\\":\\\"error\\\",\\\"message\\\":\\\"Missing or invalid csrf_token parameter\\\"}\");\n     }\n+\n+    /**\n+     * Convenience method to check that CSRF protection was NOT triggered\n+     */\n+    protected void assertErrorNotCSRF() throws JsonProcessingException {\n+        String response = writer.toString();\n+        JsonNode node = ParsingUtilities.mapper.readValue(response, JsonNode.class);\n+        assertEquals(node.get(\"code\").toString(), \"\\\"error\\\"\");\n+        assertFalse(response.contains(\"Missing or invalid csrf_token parameter\"));\n+    }\n }\ndiff --git a/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java b/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java\nindex 4dbaa3c56..5b583ff23 100644\n--- a/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java\n+++ b/main/tests/server/src/com/google/refine/commands/project/RenameProjectCommandTests.java\n@@ -1,6 +1,8 @@\n \n package com.google.refine.commands.project;\n \n+import static org.mockito.Mockito.when;\n+\n import java.io.IOException;\n \n import javax.servlet.ServletException;\n@@ -8,6 +10,7 @@ import javax.servlet.ServletException;\n import org.testng.annotations.BeforeMethod;\n import org.testng.annotations.Test;\n \n+import com.google.refine.commands.Command;\n import com.google.refine.commands.CommandTestBase;\n \n public class RenameProjectCommandTests extends CommandTestBase {\n@@ -22,4 +25,12 @@ public class RenameProjectCommandTests extends CommandTestBase {\n         command.doPost(request, response);\n         assertCSRFCheckFailed();\n     }\n+\n+    @Test\n+    public void testNoProjectId() throws ServletException, IOException {\n+        when(request.getParameter(\"csrf_token\")).thenReturn(Command.csrfFactory.getFreshToken());\n+        command.doPost(request, response);\n+        assertErrorNotCSRF();\n+    }\n+\n }\ndiff --git a/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java b/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java\nindex ccfb38f05..aae52672b 100644\n--- a/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java\n+++ b/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java\n@@ -33,6 +33,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n \n package com.google.refine.commands.project;\n \n+import static com.google.refine.util.TestUtils.assertEqualsAsJson;\n import static org.mockito.ArgumentMatchers.anyLong;\n import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.times;\n@@ -41,6 +42,7 @@ import static org.mockito.Mockito.when;\n \n import java.io.IOException;\n import java.io.PrintWriter;\n+import java.io.StringWriter;\n import java.util.List;\n import java.util.Map;\n \n@@ -59,12 +61,12 @@ import org.testng.annotations.Test;\n \n import com.google.refine.ProjectManager;\n import com.google.refine.ProjectMetadata;\n-import com.google.refine.RefineTest;\n import com.google.refine.commands.Command;\n+import com.google.refine.commands.CommandTestBase;\n import com.google.refine.model.Project;\n import com.google.refine.util.ParsingUtilities;\n \n-public class SetProjectMetadataCommandTests extends RefineTest {\n+public class SetProjectMetadataCommandTests extends CommandTestBase {\n \n     @Override\n     @BeforeTest\n@@ -77,22 +79,19 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n \n     // variables\n     long PROJECT_ID_LONG = 1234;\n-    String PROJECT_ID = \"1234\";\n+    String PROJECT_ID = Long.toString(PROJECT_ID_LONG);\n     String SUBJECT = \"subject for project\";\n \n     // mocks\n-    HttpServletRequest request = null;\n-    HttpServletResponse response = null;\n     ProjectManager projMan = null;\n     Project proj = null;\n-    PrintWriter pw = null;\n \n     @BeforeMethod\n     public void SetUp() throws IOException {\n         projMan = mock(ProjectManager.class);\n         ProjectManager.singleton = projMan;\n         proj = mock(Project.class);\n-        pw = mock(PrintWriter.class);\n+        writer = new StringWriter();\n \n         request = mock(HttpServletRequest.class);\n         response = mock(HttpServletResponse.class);\n@@ -108,7 +107,7 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         when(proj.getMetadata()).thenReturn(metadata);\n \n         try {\n-            when(response.getWriter()).thenReturn(pw);\n+            when(response.getWriter()).thenReturn(new PrintWriter(writer));\n         } catch (IOException e1) {\n             Assert.fail();\n         }\n@@ -121,7 +120,7 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         projMan = null;\n         ProjectManager.singleton = null;\n         proj = null;\n-        pw = null;\n+        writer = null;\n         request = null;\n         response = null;\n     }\n@@ -155,15 +154,13 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         } catch (IOException e) {\n             Assert.fail();\n         }\n-        verify(pw, times(1)).write(\"{ \\\"code\\\" : \\\"ok\\\" }\");\n+        assertEqualsAsJson(writer.toString(), \"{\\\"code\\\":\\\"ok\\\"}\");\n \n         Assert.assertEquals(proj.getMetadata().getSubject(), SUBJECT);\n     }\n \n     /**\n      * set a user defined metadata field\n-     * \n-     * @throws JSONException\n      */\n     @Test\n     public void setUserMetadataFieldTest() {\n@@ -191,7 +188,7 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         } catch (IOException e) {\n             Assert.fail();\n         }\n-        verify(pw, times(1)).write(\"{ \\\"code\\\" : \\\"ok\\\" }\");\n+        assertEqualsAsJson(writer.toString(), \"{\\\"code\\\":\\\"ok\\\"}\");\n \n         ObjectNode obj = (ObjectNode) proj.getMetadata().getUserMetadata().get(0);\n         Assert.assertEquals(obj.get(\"name\").asText(), \"clientID\");\n@@ -235,6 +232,20 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         Assert.assertThrows(() -> meta.setAnyField(\"customMetadata\", customMetadata));\n     }\n \n+    @Test\n+    public void testCSRFProtection() throws ServletException, IOException {\n+        when(request.getParameter(\"csrf_token\")).thenReturn(\"\");\n+        SUT.doPost(request, response);\n+        assertCSRFCheckFailed();\n+    }\n+\n+    @Test\n+    public void testNoProjectId() throws ServletException, IOException {\n+        when(request.getParameter(\"project\")).thenReturn(null);\n+        SUT.doPost(request, response);\n+        assertErrorNotCSRF();\n+    }\n+\n     private String getValidCustomMetadata() {\n         return \"{\\n\" + //\n                 \"  \\\"name\\\":\\\"test\\\",\\n\" + //\ndiff --git a/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java b/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java\nindex bd2027755..3d72db5a4 100644\n--- a/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java\n+++ b/main/tests/server/src/com/google/refine/commands/project/SetProjectTagsCommandTests.java\n@@ -1,24 +1,114 @@\n \n package com.google.refine.commands.project;\n \n+import static com.google.refine.util.TestUtils.assertEqualsAsJson;\n+import static org.mockito.Mockito.times;\n+import static org.mockito.Mockito.verify;\n+import static org.mockito.Mockito.when;\n+import static org.testng.Assert.assertEquals;\n+\n import java.io.IOException;\n+import java.io.PrintWriter;\n+import java.util.Arrays;\n+import java.util.Map;\n \n import javax.servlet.ServletException;\n \n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.databind.node.ArrayNode;\n+import org.testng.Assert;\n import org.testng.annotations.BeforeMethod;\n import org.testng.annotations.Test;\n \n+import com.google.refine.ProjectManager;\n+import com.google.refine.ProjectManagerStub;\n+import com.google.refine.ProjectMetadata;\n+import com.google.refine.commands.Command;\n import com.google.refine.commands.CommandTestBase;\n+import com.google.refine.model.Project;\n+import com.google.refine.model.ProjectStub;\n+import com.google.refine.util.ParsingUtilities;\n \n public class SetProjectTagsCommandTests extends CommandTestBase {\n \n+    private static long PROJECT_ID = 1234;\n+    private String[] TAGS = new String[] { \"tag1\", \"tag2\" };\n+    ProjectManager projectManager = null;\n+    Project project = null;\n+    PrintWriter pw = null;\n+\n     @BeforeMethod\n-    public void setUpCommand() {\n+    public void setUpCommand() throws JsonProcessingException {\n         command = new SetProjectTagsCommand();\n+\n+        pw = new PrintWriter(writer);\n+\n+        ProjectMetadata metadata = new ProjectMetadata();\n+        metadata.setUserMetadata((ArrayNode) ParsingUtilities.mapper.readTree(\"[ {name: \\\"clientID\\\", display: true} ]\"));\n+        metadata.setTags(TAGS);\n+\n+        projectManager = new ProjectManagerStub();\n+        ProjectManager.singleton = projectManager;\n+        project = new ProjectStub(PROJECT_ID);\n+        ProjectManager.singleton.registerProject(project, metadata);\n+\n+        // mock dependencies\n+        when(request.getParameter(\"project\")).thenReturn(Long.toString(PROJECT_ID));\n+        when(request.getParameter(\"csrf_token\")).thenReturn(Command.csrfFactory.getFreshToken());\n+\n+        try {\n+            when(response.getWriter()).thenReturn(pw);\n+        } catch (IOException e1) {\n+            Assert.fail();\n+        }\n+    }\n+\n+    @Test\n+    public void setProjectTagsTest() {\n+        // Check that our tags got set up correctly at project registration time.\n+        assertEquals(ProjectManager.singleton.getAllProjectsTags().keySet().stream().sorted().toArray(String[]::new), TAGS);\n+\n+        when(request.getParameter(\"old\")).thenReturn(String.join(\",\", TAGS));\n+        when(request.getParameter(\"new\")).thenReturn(\"a b c\");\n+        // run\n+        try {\n+            command.doPost(request, response);\n+        } catch (ServletException e) {\n+            Assert.fail();\n+        } catch (IOException e) {\n+            Assert.fail();\n+        }\n+\n+        // verify\n+        verify(request, times(1)).getParameter(\"csrf_token\");\n+        verify(request, times(1)).getParameter(\"project\");\n+\n+        verify(response, times(1))\n+                .setHeader(\"Content-Type\", \"application/json\");\n+        try {\n+            verify(response, times(1)).getWriter();\n+        } catch (IOException e) {\n+            Assert.fail();\n+        }\n+        assertEqualsAsJson(writer.toString(), \"{\\\"code\\\":\\\"ok\\\"}\");\n+\n+        String[] tags = project.getMetadata().getTags();\n+        assertEquals(tags.length, 3);\n+        Arrays.sort(tags);\n+        assertEquals(tags[1], \"b\");\n+\n+        Map<String, Integer> tagCounts = ProjectManager.singleton.getAllProjectsTags();\n+        assertEquals(tagCounts.size(), 3);\n+        assertEquals(ProjectManager.singleton.getAllProjectsTags().keySet().stream().sorted().toArray(String[]::new)[1], \"b\");\n+\n+        projectManager.deleteProject(PROJECT_ID);\n+        // TODO: ProjectManagerStub doesn't manage tags on project delete, so this fails\n+//        assertEquals(ProjectManager.singleton.getAllProjectsTags().size(), 0);\n     }\n \n     @Test\n     public void testCSRFProtection() throws ServletException, IOException {\n+        when(request.getParameter(\"csrf_token\")).thenReturn(null);\n         command.doPost(request, response);\n         assertCSRFCheckFailed();\n     }\ndiff --git a/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java b/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java\nindex a03583dba..dce133832 100644\n--- a/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java\n+++ b/main/tests/server/src/com/google/refine/io/FileProjectManagerTests.java\n@@ -66,7 +66,6 @@ public class FileProjectManagerTests {\n         protected FileProjectManagerStub(File dir) {\n             super(dir);\n             _projectsMetadata.put(5555L, mock(ProjectMetadata.class));\n-\n         }\n     }\n \n@@ -115,6 +114,7 @@ public class FileProjectManagerTests {\n     public void deleteProjectAndSaveWorkspace() throws IOException {\n         FileProjectManager manager = new FileProjectManagerStub(workspaceDir);\n         manager.saveWorkspace();\n+        // TODO: Test tag updating on project deletion\n         manager.deleteProject(5555);\n         manager.saveWorkspace();\n \n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6172. Built on #6169.\r\n\r\nChanges proposed in this pull request:\r\n- format dates according the the language the user set in\r\n  OpenRefine preferences with browser language as fallback\r\n- right justify numbers in Row Count column\r\n- consolidate CSS for project name\r\n- fix pre-existing CSS off-by-one errors\r\n- fix unrelated typo with user metadata\r\n", "PR_Title": "Localize date on Open Project page. Fixes #6172", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6173_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6173, "issue_title": "Localize date on Open Project page. Fixes #6172", "issue_body": "Fixes #6172. Built on #6169.\r\n\r\nChanges proposed in this pull request:\r\n- format dates according the the language the user set in\r\n  OpenRefine preferences with browser language as fallback\r\n- right justify numbers in Row Count column\r\n- consolidate CSS for project name\r\n- fix pre-existing CSS off-by-one errors\r\n- fix unrelated typo with user metadata\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6961", "base_commit": "dac141c2049e651ff63ac339639add5b7e02ba51", "patch": "diff --git a/.github/workflows/snapshot_release.yml b/.github/workflows/snapshot_release.yml\nindex 97fdad8e8..46b8b0fd9 100644\n--- a/.github/workflows/snapshot_release.yml\n+++ b/.github/workflows/snapshot_release.yml\n@@ -42,11 +42,6 @@ jobs:\n           ref: ${{ github.event.pull_request.head.ref }}\n           repository: ${{ github.event.pull_request.head.repo.full_name }}\n \n-      - name: Set up secrets\n-        run: |\n-          echo \"CYPRESS_RECORD_KEY=$(echo YzE3ZDU4OGItZTBkOC00ZjJmLTg4NjYtNzJmNmFmYmRhNGQxCg== | base64 -d)\" >> $GITHUB_ENV\n-          echo \"CYPRESS_PROJECT_ID=s5du3k\" >> $GITHUB_ENV\n-\n       - name: Set up Java 11\n         uses: actions/setup-java@v4\n         with:\n@@ -87,8 +82,8 @@ jobs:\n           ./refine e2e_tests\n         env:\n           CYPRESS_BROWSER: ${{ matrix.browser }}\n-          CYPRESS_RECORD_KEY: ${{ env.CYPRESS_RECORD_KEY }}\n-          CYPRESS_PROJECT_ID: ${{ env.CYPRESS_PROJECT_ID }}\n+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}\n+          CYPRESS_PROJECT_ID: ${{ vars.CYPRESS_PROJECT_ID }}\n           CYPRESS_CI_BUILD_ID: '${{ github.run_id }}'\n           CYPRESS_SPECS: ${{ matrix.specs.paths }}\n           CYPRESS_GROUP: ${{ matrix.specs.group }}\ndiff --git a/benchmark/pom.xml b/benchmark/pom.xml\nindex 720be7997..c3c649056 100644\n--- a/benchmark/pom.xml\n+++ b/benchmark/pom.xml\n@@ -141,7 +141,7 @@\n         </plugin>\n         <plugin>\n           <artifactId>maven-site-plugin</artifactId>\n-          <version>3.20.0</version>\n+          <version>3.21.0</version>\n         </plugin>\n         <plugin>\n           <artifactId>maven-source-plugin</artifactId>\ndiff --git a/extensions/database/pom.xml b/extensions/database/pom.xml\nindex 223271ac5..55b2d2507 100644\n--- a/extensions/database/pom.xml\n+++ b/extensions/database/pom.xml\n@@ -109,12 +109,12 @@\n     <dependency>\n       <groupId>org.mariadb.jdbc</groupId>\n       <artifactId>mariadb-java-client</artifactId>\n-      <version>3.4.1</version>\n+      <version>3.5.0</version>\n     </dependency>\n     <dependency>\n       <groupId>org.xerial</groupId>\n       <artifactId>sqlite-jdbc</artifactId>\n-      <version>3.46.1.3</version>\n+      <version>3.47.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.fasterxml.jackson.core</groupId>\ndiff --git a/modules/core/src/main/java/com/google/refine/importing/ImportingUtilities.java b/modules/core/src/main/java/com/google/refine/importing/ImportingUtilities.java\nindex 0e4898964..7942f67e3 100644\n--- a/modules/core/src/main/java/com/google/refine/importing/ImportingUtilities.java\n+++ b/modules/core/src/main/java/com/google/refine/importing/ImportingUtilities.java\n@@ -301,7 +301,6 @@ public class ImportingUtilities {\n                     JSONUtilities.safePut(fileRecord, \"origin\", \"clipboard\");\n                     JSONUtilities.safePut(fileRecord, \"declaredEncoding\", encoding);\n                     JSONUtilities.safePut(fileRecord, \"declaredMimeType\", (String) null);\n-                    JSONUtilities.safePut(fileRecord, \"format\", \"text\");\n                     JSONUtilities.safePut(fileRecord, \"fileName\", \"(clipboard)\");\n                     JSONUtilities.safePut(fileRecord, \"location\", getRelativePath(file, rawDataDir));\n \n@@ -309,6 +308,7 @@ public class ImportingUtilities {\n                             calculateProgressPercent(update.totalExpectedSize, update.totalRetrievedSize));\n \n                     JSONUtilities.safePut(fileRecord, \"size\", saveStreamToFile(stream, file, null));\n+                    JSONUtilities.safePut(fileRecord, \"format\", guessBetterFormat(file, fileRecord));\n                     JSONUtilities.append(fileRecords, fileRecord);\n \n                     clipboardCount++;\n@@ -439,7 +439,6 @@ public class ImportingUtilities {\n                             calculateProgressPercent(update.totalExpectedSize, update.totalRetrievedSize));\n \n                     JSONUtilities.safePut(fileRecord, \"size\", saveStreamToFile(stream, file, null));\n-                    JSONUtilities.safePut(fileRecord, \"format\", guessBetterFormat(file, request.getCharacterEncoding(), \"text\"));\n                     // TODO: This needs to be refactored to be able to test import from archives\n                     if (postProcessRetrievedFile(rawDataDir, file, fileRecord, fileRecords, progress)) {\n                         archiveCount++;\n@@ -700,10 +699,7 @@ public class ImportingUtilities {\n \n     static public void postProcessSingleRetrievedFile(File file, ObjectNode fileRecord) {\n         if (!fileRecord.has(\"format\")) {\n-            JSONUtilities.safePut(fileRecord, \"format\",\n-                    ImportingManager.getFormat(\n-                            file.getName(),\n-                            JSONUtilities.getString(fileRecord, \"declaredMimeType\", null)));\n+            JSONUtilities.safePut(fileRecord, \"format\", guessBetterFormat(file, fileRecord));\n         }\n     }\n \n@@ -1048,6 +1044,13 @@ public class ImportingUtilities {\n         return bestFormat;\n     }\n \n+    static String guessBetterFormat(File file, ObjectNode fileRecord) {\n+        String encoding = JSONUtilities.getString(fileRecord, \"declaredEncoding\", null);\n+        String bestFormat = ImportingManager.getFormat(file.getName(), JSONUtilities.getString(fileRecord, \"declaredMimeType\", null));\n+        bestFormat = bestFormat == null ? \"text\" : bestFormat;\n+        return guessBetterFormat(file, encoding, bestFormat);\n+    }\n+\n     static void rankFormats(ImportingJob job, final String bestFormat, ArrayNode rankedFormats) {\n         final Map<String, String[]> formatToSegments = new HashMap<String, String[]>();\n \ndiff --git a/pom.xml b/pom.xml\nindex 53724fe57..8c4f6e554 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -101,8 +101,8 @@\n     <odfdom-java.version>0.12.0</odfdom-java.version> <!-- do not update to 0.10.0, see issue #4397 -->\n     <vicino.version>1.2.1</vicino.version>\n     <clojure.version>1.12.0</clojure.version>\n-    <httpclient5.version>5.4</httpclient5.version>\n-    <httpcore5.version>5.3</httpcore5.version>\n+    <httpclient5.version>5.4.1</httpclient5.version>\n+    <httpcore5.version>5.3.1</httpcore5.version>\n     <univocity-csv.version>2.9.1</univocity-csv.version>\n     <swc-parser-lazy.version>3.1.9</swc-parser-lazy.version>\n     <commons-io.version>2.17.0</commons-io.version>\n@@ -119,8 +119,8 @@\n     <build-helper-maven-plugin.version>3.6.0</build-helper-maven-plugin.version>\n     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>\n     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>\n-    <exec-maven-plugin.version>3.4.1</exec-maven-plugin.version>\n-    <maven-dependency-plugin.version>3.8.0</maven-dependency-plugin.version>\n+    <exec-maven-plugin.version>3.5.0</exec-maven-plugin.version>\n+    <maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>\n     <jacoco-maven-plugin.version>0.8.12</jacoco-maven-plugin.version>\n     <surefire.version>3.5.1</surefire.version>\n     <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>\n", "test_patch": "diff --git a/.github/workflows/pull_request_e2e.yml b/.github/workflows/pull_request_e2e.yml\nindex fb09561a5..0b0810892 100644\n--- a/.github/workflows/pull_request_e2e.yml\n+++ b/.github/workflows/pull_request_e2e.yml\n@@ -40,11 +40,6 @@ jobs:\n     steps:\n       - uses: actions/checkout@v4\n \n-      - name: Set up secrets\n-        run: |\n-          echo \"CYPRESS_RECORD_KEY=$(echo YzE3ZDU4OGItZTBkOC00ZjJmLTg4NjYtNzJmNmFmYmRhNGQxCg== | base64 -d)\" >> $GITHUB_ENV\n-          echo \"CYPRESS_PROJECT_ID=s5du3k\" >> $GITHUB_ENV\n-\n       - name: Set up Java 17\n         uses: actions/setup-java@v4\n         with:\n@@ -85,8 +80,8 @@ jobs:\n           ./refine e2e_tests\n         env:\n           CYPRESS_BROWSER: ${{ matrix.browser }}\n-          CYPRESS_RECORD_KEY: ${{ env.CYPRESS_RECORD_KEY }}\n-          CYPRESS_PROJECT_ID: ${{ env.CYPRESS_PROJECT_ID }}\n+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}\n+          CYPRESS_PROJECT_ID: ${{ vars.CYPRESS_PROJECT_ID }}\n           CYPRESS_CI_BUILD_ID: '${{ github.run_id }}'\n           CYPRESS_SPECS: ${{ matrix.specs.paths }}\n           CYPRESS_GROUP: ${{ matrix.specs.group }}\ndiff --git a/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.cy.js b/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.cy.js\nindex 8d94a1985..3b191f161 100644\n--- a/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.cy.js\n+++ b/main/tests/cypress/cypress/e2e/project/grid/column/facet/facets.cy.js\n@@ -4,25 +4,23 @@\n  */\n \n /*\n-   IMPORTANT: Any test reliant on Facet Actions (Edit,Include/Exclude) should wait 100 msec to ensure the event\n+   IMPORTANT: Any test reliant on Facet Actions (Edit,Include/Exclude) should wait >100 msec to ensure the event\n    handlers are setup, otherwise clicking on the action will do nothing.\n    Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n  */\n-const clickFacetAction = (facetType, text, action, setVisibility = false) => {\n+const clickFacetAction = (facetType, text, action) => {\n   cy.getFacetContainer(facetType)\n-      .contains(text)\n-      .parent()\n-      .within(() => {\n-        const elem = cy.contains(action);\n-\n-        if (setVisibility) {\n-          elem.invoke('css', 'visibility', 'visible')\n-              .should('have.css', 'visibility', 'visible')\n-              .click();\n-        } else {\n-          elem.click();\n-        }\n-      });\n+    .contains(text)\n+    .parent()\n+    .invoke('trigger', 'mouseenter'); // include/exclude not visible until we mouse over\n+  // start a new chain after the trigger\n+  cy.getFacetContainer(facetType)\n+    .contains(text)\n+    .siblings()\n+    .get(\".facet-choice-toggle\")\n+    .contains(action)\n+    .should('have.css', 'visibility', 'visible') // partially occluded, so \"be.visible\" won't work\n+    .click();\n };\n \n describe(__filename, function () {\n@@ -226,28 +224,28 @@ describe(__filename, function () {\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n-    clickFacetAction('Shrt_Desc','ALLSPICE,GROUND', 'include', true);\n+    cy.wait(150);\n+    clickFacetAction('Shrt_Desc','ALLSPICE,GROUND', 'include');\n     cy.getCell(0, 'Shrt_Desc').should('contain', 'ALLSPICE,GROUND');\n     cy.get('#tool-panel').contains('1 matching rows');\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n-    clickFacetAction('Shrt_Desc','ANISE SEED', 'include', true);\n+    cy.wait(150);\n+    clickFacetAction('Shrt_Desc','ANISE SEED', 'include');\n     cy.getCell(1, 'Shrt_Desc').should('contain', 'ANISE SEED');\n     cy.get('#tool-panel').contains('2 matching rows');\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n-    clickFacetAction('Shrt_Desc','BUTTER OIL,ANHYDROUS', 'include', true);\n+    cy.wait(150);\n+    clickFacetAction('Shrt_Desc','BUTTER OIL,ANHYDROUS', 'include');\n     cy.getCell(0, 'Shrt_Desc').should('contain', 'BUTTER OIL,ANHYDROUS');\n     cy.get('#tool-panel').contains('3 matching rows');\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n+    cy.wait(150);\n     clickFacetAction('Shrt_Desc','ALLSPICE,GROUND', 'exclude');\n     cy.get('#tool-panel').contains('2 matching rows');\n   });\n@@ -258,9 +256,9 @@ describe(__filename, function () {\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n+    cy.wait(150);\n     // do a basic facetting, expect 1 row\n-    clickFacetAction('Shrt_Desc','ALLSPICE,GROUND','include',true);\n+    clickFacetAction('Shrt_Desc','ALLSPICE,GROUND','include');\n     cy.getCell(0, 'Shrt_Desc').should('to.contain', 'ALLSPICE,GROUND');\n     cy.get('#tool-panel').contains('1 matching rows');\n \n@@ -285,7 +283,7 @@ describe(__filename, function () {\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n+    cy.wait(150);\n     // do a basic facetting, expect 1 row\n     clickFacetAction('Shrt_Desc','ALLSPICE,GROUND','include',true);\n     cy.get('#tool-panel').contains('1 matching rows');\n@@ -342,7 +340,7 @@ describe(__filename, function () {\n \n     // Wait to ensure action click handler is setup\n     // Ref:  window.setTimeout(wireEvents, 100); in list-facet.js\n-    cy.wait(100);\n+    cy.wait(150);\n \n     cy.get('div.facet-body-inner > div:nth-child(8)')\n         .contains('15.87')\n@@ -380,27 +378,15 @@ describe(__filename, function () {\n     );\n   });\n \n-  // // This test is unstable, mouseover behavior is unpredictable\n-  // // This might be because the element is detached from the DOM in the middle\n-  // // it('Test include/exlude toggle', function () {\n-  // // \tcy.loadAndVisitProject('food.small');\n-  // // \tcy.columnActionClick('NDB_No', ['Facet', 'Text facet']);\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"]').trigger('mouseover');\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').contains('include').should('be.visible');\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').click();\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').contains('exclude');\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').click();\n-  // // \tcy.getFacetContainer('NDB_No').find('.facet-choice[choiceindex=\"0\"] a.facet-choice-toggle').contains('include');\n-  // // });\n-\n-  // it('Test collapsing facet panels', function () {\n-  // The following test does not work\n-  // Because the facet panels uses soem weird CSS with overflow:hidden, Cypress can not detect it\n-  // //// # cy.loadAndVisitProject('food.small');\n-  // //// # cy.columnActionClick('NDB_No', ['Facet', 'Text facet']);\n-  // //// # ensure facet inner panel is visible\n-  // //// # cy.get('#refine-tabs-facets .facets-container li:nth-child(1) .facet-body-inner').should('be.visible');\n-  // //// #collapse the panel\n-  // //// # cy.get('#refine-tabs-facets .facets-container li:nth-child(1) a[bind=\"minimizeButton\"]').click();\n-  // ////\n+  it('Test collapsing facet panels', function () {\n+    cy.loadAndVisitProject('food.small');\n+    cy.columnActionClick('NDB_No', ['Facet', 'Text facet']);\n+    // ensure facet inner panel is visible\n+    cy.get('#refine-tabs-facets .facets-container li:nth-child(1) .facet-body-inner').should('be.visible');\n+    // collapse the panel\n+    cy.get('#refine-tabs-facets .facets-container li:nth-child(1) a[bind=\"minimizeButton\"]').click();\n+    // Make sure the body is hidden\n+    cy.get('#refine-tabs-facets .facets-container li:nth-child(1) .facet-body').should('not.be.visible');\n+  });\n+\n });\ndiff --git a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\nindex aa75b61c8..a44686a12 100644\n--- a/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n+++ b/main/tests/server/src/com/google/refine/importing/ImportingUtilitiesTests.java\n@@ -94,8 +94,7 @@ public class ImportingUtilitiesTests extends ImporterTest {\n     @BeforeMethod\n     public void setUp() {\n         super.setUp();\n-        ImportingManager.registerFormatGuesser(\"text\", new TextFormatGuesser());\n-        ImportingManager.registerFormatGuesser(\"text/line-based\", new LineBasedFormatGuesser());\n+        importFlowSettings();\n     }\n \n     @Test\n@@ -594,7 +593,7 @@ public class ImportingUtilitiesTests extends ImporterTest {\n     @Test\n     public void testFormatForMultipleExcelFiles() throws IOException, FileUploadException {\n         testMultipleFiles(\"dates\", \"excel95\", \".xls\",\n-                ContentType.create(\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"), \"binary\");\n+                ContentType.create(\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\"), \"binary/text/xml/xls/xlsx\");\n     }\n \n     @Test\n@@ -602,6 +601,11 @@ public class ImportingUtilitiesTests extends ImporterTest {\n         testMultipleFiles(\"grid_small\", \"grid_small\", \".json\", ContentType.create(\"text/json\"), \"text/json\");\n     }\n \n+    @Test\n+    public void testFormatForMultipleODSFiles() throws IOException, FileUploadException {\n+        testMultipleFiles(\"films\", \"films\", \".ods\", ContentType.create(\"application/vnd.oasis.opendocument.spreadsheet\"), \"text/xml/ods\");\n+    }\n+\n     private void testMultipleFiles(String file1, String file2, String fileSuffix, ContentType contentType, String expectedFormat)\n             throws IOException, FileUploadException {\n \n@@ -666,4 +670,65 @@ public class ImportingUtilitiesTests extends ImporterTest {\n         assertEquals(expectedFormat, JSONUtilities.getArray(retrievalRecord, \"files\").get(0).get(\"format\").asText());\n         assertEquals(expectedFormat, JSONUtilities.getArray(retrievalRecord, \"files\").get(1).get(\"format\").asText());\n     }\n+\n+    private void importFlowSettings() {\n+        // Register Format guessers\n+        ImportingManager.registerFormatGuesser(\"text\", new TextFormatGuesser());\n+        ImportingManager.registerFormatGuesser(\"text/line-based\", new LineBasedFormatGuesser());\n+\n+        // Extension to format mappings\n+        ImportingManager.registerExtension(\".txt\", \"text\");\n+        ImportingManager.registerExtension(\".csv\", \"text/line-based/*sv\");\n+        ImportingManager.registerExtension(\".tsv\", \"text/line-based/*sv\");\n+        ImportingManager.registerExtension(\".xml\", \"text/xml\");\n+        ImportingManager.registerExtension(\".atom\", \"text/xml\");\n+        ImportingManager.registerExtension(\".json\", \"text/json\");\n+        ImportingManager.registerExtension(\".js\", \"text/json\");\n+        ImportingManager.registerExtension(\".xls\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerExtension(\".xlsx\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerExtension(\".ods\", \"text/xml/ods\");\n+        ImportingManager.registerExtension(\".nt\", \"text/rdf/nt\");\n+        ImportingManager.registerExtension(\".ntriples\", \"text/rdf/nt\");\n+        ImportingManager.registerExtension(\".n3\", \"text/rdf/n3\");\n+        ImportingManager.registerExtension(\".ttl\", \"text/rdf/ttl\");\n+        ImportingManager.registerExtension(\".jsonld\", \"text/rdf/ld+json\");\n+        ImportingManager.registerExtension(\".rdf\", \"text/rdf/xml\");\n+        ImportingManager.registerExtension(\".marc\", \"text/marc\");\n+        ImportingManager.registerExtension(\".mrc\", \"text/marc\");\n+        ImportingManager.registerExtension(\".wiki\", \"text/wiki\");\n+\n+        // Mime type to format mappings\n+        ImportingManager.registerMimeType(\"text/plain\", \"text\");\n+        ImportingManager.registerMimeType(\"text/csv\", \"text/line-based/*sv\");\n+        ImportingManager.registerMimeType(\"text/x-csv\", \"text/line-based/*sv\");\n+        ImportingManager.registerMimeType(\"text/tab-separated-value\", \"text/line-based/*sv\");\n+        ImportingManager.registerMimeType(\"text/tab-separated-values\", \"text/line-based/*sv\");\n+        ImportingManager.registerMimeType(\"text/fixed-width\", \"text/line-based/fixed-width\");\n+        ImportingManager.registerMimeType(\"application/n-triples\", \"text/rdf/nt\");\n+        ImportingManager.registerMimeType(\"text/n3\", \"text/rdf/n3\");\n+        ImportingManager.registerMimeType(\"text/rdf+n3\", \"text/rdf/n3\");\n+        ImportingManager.registerMimeType(\"text/turtle\", \"text/rdf/ttl\");\n+        ImportingManager.registerMimeType(\"application/xml\", \"text/xml\");\n+        ImportingManager.registerMimeType(\"text/xml\", \"text/xml\");\n+        ImportingManager.registerMimeType(\"+xml\", \"text/xml\"); // suffix will be tried only as fallback\n+        ImportingManager.registerMimeType(\"application/rdf+xml\", \"text/rdf/xml\");\n+        ImportingManager.registerMimeType(\"application/ld+json\", \"text/rdf/ld+json\");\n+        ImportingManager.registerMimeType(\"application/atom+xml\", \"text/xml\");\n+        ImportingManager.registerMimeType(\"application/msexcel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/x-msexcel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/x-ms-excel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/vnd.ms-excel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/x-excel\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/xls\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/x-xls\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet\", \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/vnd.openxmlformats-officedocument.spreadsheetml.template\",\n+                \"binary/text/xml/xls/xlsx\");\n+        ImportingManager.registerMimeType(\"application/vnd.oasis.opendocument.spreadsheet\", \"text/xml/ods\");\n+        ImportingManager.registerMimeType(\"application/json\", \"text/json\");\n+        ImportingManager.registerMimeType(\"application/javascript\", \"text/json\");\n+        ImportingManager.registerMimeType(\"text/json\", \"text/json\");\n+        ImportingManager.registerMimeType(\"+json\", \"text/json\"); // suffix will be tried only as fallback\n+        ImportingManager.registerMimeType(\"application/marc\", \"text/marc\");\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Closes #6959.\r\n\r\nI haven't invalidated the old token yet, it should be done after merging this PR. I believe existing PRs will then start using the new workflow, if not they can be rebased.", "PR_Title": "ci: Move Cypress record key to a GH Actions secret", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6961_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6961, "issue_title": "ci: Move Cypress record key to a GH Actions secret", "issue_body": "Closes #6959.\r\n\r\nI haven't invalidated the old token yet, it should be done after merging this PR. I believe existing PRs will then start using the new workflow, if not they can be rebased."}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "TheAlgorithms/Java", "instance_id": "TheAlgorithms__Java-4571", "base_commit": "a4711d61d87cf75bf68f1f0b25345b1439220acf", "patch": "diff --git a/src/main/java/com/thealgorithms/maths/MatrixRank.java b/src/main/java/com/thealgorithms/maths/MatrixRank.java\nnew file mode 100644\nindex 00000000..7a628b92\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/maths/MatrixRank.java\n@@ -0,0 +1,164 @@\n+package com.thealgorithms.maths;\n+\n+/**\n+ * This class provides a method to compute the rank of a matrix.\n+ * In linear algebra, the rank of a matrix is the maximum number of linearly independent rows or columns in the matrix.\n+ * For example, consider the following 3x3 matrix:\n+ * 1 2 3\n+ * 2 4 6\n+ * 3 6 9\n+ * Despite having 3 rows and 3 columns, this matrix only has a rank of 1 because all rows (and columns) are multiples of each other.\n+ * It's a fundamental concept that gives key insights into the structure of the matrix.\n+ * It's important to note that the rank is not only defined for square matrices but for any m x n matrix.\n+ *\n+ * @author Anup Omkar\n+ */\n+public final class MatrixRank {\n+\n+    private MatrixRank() {\n+    }\n+\n+    private static final double EPSILON = 1e-10;\n+\n+    /**\n+     * @brief Computes the rank of the input matrix\n+     *\n+     * @param matrix The input matrix\n+     * @return The rank of the input matrix\n+     */\n+    public static int computeRank(double[][] matrix) {\n+        validateInputMatrix(matrix);\n+\n+        int numRows = matrix.length;\n+        int numColumns = matrix[0].length;\n+        int rank = 0;\n+\n+        boolean[] rowMarked = new boolean[numRows];\n+\n+        double[][] matrixCopy = deepCopy(matrix);\n+\n+        for (int colIndex = 0; colIndex < numColumns; ++colIndex) {\n+            int pivotRow = findPivotRow(matrixCopy, rowMarked, colIndex);\n+            if (pivotRow != numRows) {\n+                ++rank;\n+                rowMarked[pivotRow] = true;\n+                normalizePivotRow(matrixCopy, pivotRow, colIndex);\n+                eliminateRows(matrixCopy, pivotRow, colIndex);\n+            }\n+        }\n+        return rank;\n+    }\n+\n+    private static boolean isZero(double value) {\n+        return Math.abs(value) < EPSILON;\n+    }\n+\n+    private static double[][] deepCopy(double[][] matrix) {\n+        int numRows = matrix.length;\n+        int numColumns = matrix[0].length;\n+        double[][] matrixCopy = new double[numRows][numColumns];\n+        for (int rowIndex = 0; rowIndex < numRows; ++rowIndex) {\n+            System.arraycopy(matrix[rowIndex], 0, matrixCopy[rowIndex], 0, numColumns);\n+        }\n+        return matrixCopy;\n+    }\n+\n+    private static void validateInputMatrix(double[][] matrix) {\n+        if (matrix == null) {\n+            throw new IllegalArgumentException(\"The input matrix cannot be null\");\n+        }\n+        if (matrix.length == 0) {\n+            throw new IllegalArgumentException(\"The input matrix cannot be empty\");\n+        }\n+        if (!hasValidRows(matrix)) {\n+            throw new IllegalArgumentException(\"The input matrix cannot have null or empty rows\");\n+        }\n+        if (isJaggedMatrix(matrix)) {\n+            throw new IllegalArgumentException(\"The input matrix cannot be jagged\");\n+        }\n+    }\n+\n+    private static boolean hasValidRows(double[][] matrix) {\n+        for (double[] row : matrix) {\n+            if (row == null || row.length == 0) {\n+                return false;\n+            }\n+        }\n+        return true;\n+    }\n+\n+    /**\n+     * @brief Checks if the input matrix is a jagged matrix.\n+     * Jagged matrix is a matrix where the number of columns in each row is not the same.\n+     *\n+     * @param matrix The input matrix\n+     * @return True if the input matrix is a jagged matrix, false otherwise\n+     */\n+    private static boolean isJaggedMatrix(double[][] matrix) {\n+        int numColumns = matrix[0].length;\n+        for (double[] row : matrix) {\n+            if (row.length != numColumns) {\n+                return true;\n+            }\n+        }\n+        return false;\n+    }\n+\n+    /**\n+     * @brief The pivot row is the row in the matrix that is used to eliminate other rows and reduce the matrix to its row echelon form.\n+     * The pivot row is selected as the first row (from top to bottom) where the value in the current column (the pivot column) is not zero.\n+     * This row is then used to \"eliminate\" other rows, by subtracting multiples of the pivot row from them, so that all other entries in the pivot column become zero.\n+     * This process is repeated for each column, each time selecting a new pivot row, until the matrix is in row echelon form.\n+     * The number of pivot rows (rows with a leading entry, or pivot) then gives the rank of the matrix.\n+     *\n+     * @param matrix The input matrix\n+     * @param rowMarked An array indicating which rows have been marked\n+     * @param colIndex The column index\n+     * @return The pivot row index, or the number of rows if no suitable pivot row was found\n+     */\n+    private static int findPivotRow(double[][] matrix, boolean[] rowMarked, int colIndex) {\n+        int numRows = matrix.length;\n+        for (int pivotRow = 0; pivotRow < numRows; ++pivotRow) {\n+            if (!rowMarked[pivotRow] && !isZero(matrix[pivotRow][colIndex])) {\n+                return pivotRow;\n+            }\n+        }\n+        return numRows;\n+    }\n+\n+    /**\n+     * @brief This method divides all values in the pivot row by the value in the given column.\n+     * This ensures that the pivot value itself will be 1, which simplifies further calculations.\n+     *\n+     * @param matrix The input matrix\n+     * @param pivotRow The pivot row index\n+     * @param colIndex The column index\n+     */\n+    private static void normalizePivotRow(double[][] matrix, int pivotRow, int colIndex) {\n+        int numColumns = matrix[0].length;\n+        for (int nextCol = colIndex + 1; nextCol < numColumns; ++nextCol) {\n+            matrix[pivotRow][nextCol] /= matrix[pivotRow][colIndex];\n+        }\n+    }\n+\n+    /**\n+     * @brief This method subtracts multiples of the pivot row from all other rows,\n+     * so that all values in the given column of other rows will be zero.\n+     * This is a key step in reducing the matrix to row echelon form.\n+     *\n+     * @param matrix The input matrix\n+     * @param pivotRow The pivot row index\n+     * @param colIndex The column index\n+     */\n+    private static void eliminateRows(double[][] matrix, int pivotRow, int colIndex) {\n+        int numRows = matrix.length;\n+        int numColumns = matrix[0].length;\n+        for (int otherRow = 0; otherRow < numRows; ++otherRow) {\n+            if (otherRow != pivotRow && !isZero(matrix[otherRow][colIndex])) {\n+                for (int col2 = colIndex + 1; col2 < numColumns; ++col2) {\n+                    matrix[otherRow][col2] -= matrix[pivotRow][col2] * matrix[otherRow][colIndex];\n+                }\n+            }\n+        }\n+    }\n+}\n", "test_patch": "diff --git a/src/test/java/com/thealgorithms/maths/MatrixRankTest.java b/src/test/java/com/thealgorithms/maths/MatrixRankTest.java\nnew file mode 100644\nindex 00000000..415b84ec\n--- /dev/null\n+++ b/src/test/java/com/thealgorithms/maths/MatrixRankTest.java\n@@ -0,0 +1,45 @@\n+package com.thealgorithms.maths;\n+\n+import static org.junit.jupiter.api.Assertions.assertEquals;\n+import static org.junit.jupiter.api.Assertions.assertThrows;\n+\n+import java.util.Arrays;\n+import java.util.stream.Stream;\n+import org.junit.jupiter.params.ParameterizedTest;\n+import org.junit.jupiter.params.provider.Arguments;\n+import org.junit.jupiter.params.provider.MethodSource;\n+\n+class MatrixRankTest {\n+\n+    private static Stream<Arguments> validInputStream() {\n+        return Stream.of(Arguments.of(3, new double[][] {{1, 0, 0}, {0, 1, 0}, {0, 0, 1}}), Arguments.of(0, new double[][] {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}}), Arguments.of(1, new double[][] {{1}}), Arguments.of(2, new double[][] {{1, 2}, {3, 4}}),\n+            Arguments.of(2, new double[][] {{3, -1, 2}, {-3, 1, 2}, {-6, 2, 4}}), Arguments.of(3, new double[][] {{2, 3, 0, 1}, {1, 0, 1, 2}, {-1, 1, 1, -2}, {1, 5, 3, -1}}), Arguments.of(1, new double[][] {{1, 2, 3}, {3, 6, 9}}),\n+            Arguments.of(2, new double[][] {{0.25, 0.5, 0.75, 2}, {1.5, 3, 4.5, 6}, {1, 2, 3, 4}}));\n+    }\n+\n+    private static Stream<Arguments> invalidInputStream() {\n+        return Stream.of(Arguments.of((Object) new double[][] {{1, 2}, {10}, {100, 200, 300}}), // jagged array\n+            Arguments.of((Object) new double[][] {}), // empty matrix\n+            Arguments.of((Object) new double[][] {{}, {}}), // empty row\n+            Arguments.of((Object) null), // null matrix\n+            Arguments.of((Object) new double[][] {{1, 2}, null}) // null row\n+        );\n+    }\n+\n+    @ParameterizedTest\n+    @MethodSource(\"validInputStream\")\n+    void computeRankTests(int expectedRank, double[][] matrix) {\n+        int originalHashCode = Arrays.deepHashCode(matrix);\n+        int rank = MatrixRank.computeRank(matrix);\n+        int newHashCode = Arrays.deepHashCode(matrix);\n+\n+        assertEquals(expectedRank, rank);\n+        assertEquals(originalHashCode, newHashCode);\n+    }\n+\n+    @ParameterizedTest\n+    @MethodSource(\"invalidInputStream\")\n+    void computeRankWithInvalidMatrix(double[][] matrix) {\n+        assertThrows(IllegalArgumentException.class, () -> MatrixRank.computeRank(matrix));\n+    }\n+}\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "<!--\r\nThank you for your contribution!\r\nIn order to reduce the number of notifications sent to the maintainers, please:\r\n- create your PR as draft, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests,\r\n- make sure that all of the CI checks pass,\r\n- mark your PR as ready for review, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review\r\n-->\r\n\r\n<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n\r\ncloses #4570\r\n", "PR_Title": "Add `MatrixRank`", "docker_image": "xinzhou1997/swe_rpg_java:TheAlgorithms__Java-4571_linux", "log_parser": "def parse_java_mvn(log: str) -> dict[str, str]:\n    \"\"\"Parse Maven logs into {identifier: status}.\"\"\"\n    results = {}\n\n    failure_re = re.compile(\n        r\"^\\[ERROR\\]\\s+(?P<class>[A-Za-z0-9_$.]+)\\.(?P<method>[A-Za-z0-9_$.]+?)(?::(?P<line>\\d+))?\\b\"\n    )\n    running_re = re.compile(r\"^(?:\\[INFO\\]\\s+)?Running\\s+([A-Za-z0-9_$.]+)$\")\n    summary_re = re.compile(\n        r\"Tests run:\\s*(\\d+),\\s*Failures:\\s*(\\d+),\\s*Errors:\\s*(\\d+),\\s*Skipped:\\s*(\\d+)\"\n    )\n\n    seen_running = set()\n    current_running = None\n\n    for raw in log.splitlines():\n        line = raw.strip()\n        if not line:\n            continue\n        rm = running_re.match(line)\n        if rm:\n            running_name = rm.group(1)\n            current_running = running_name\n            seen_running.add(running_name)\n            continue\n        fm = failure_re.match(line)\n        if fm:\n            clazz = fm.group(\"class\")\n            method = fm.group(\"method\")\n            test_id = f\"{clazz}.{method}\"\n            results[test_id] = \"FAILED\"\n            results.setdefault(clazz, \"FAILED\")\n            continue\n\n        sm = summary_re.search(line)\n        if sm:\n            _tests_run, failures, errors, skipped = map(int, sm.groups())\n            if failures > 0 or errors > 0:\n                status = \"FAILED\"\n            elif skipped > 0:\n                status = \"SKIPPED\"\n            else:\n                status = \"PASSED\"\n            if current_running:\n                results.setdefault(current_running, status)\n            current_running = None\n\n    if not results and seen_running:\n        for clazz in seen_running:\n            results.setdefault(clazz, \"PASSED\")\n    return results\n", "test_cmds": ["bash -c '{ mvn --batch-mode test ; } > /tmp/test.log 2>&1'"], "rebuild_cmds": ["unset _JAVA_OPTIONS"], "issues": [{"issue_number": 4571, "issue_title": "Add `MatrixRank`", "issue_body": "<!--\r\nThank you for your contribution!\r\nIn order to reduce the number of notifications sent to the maintainers, please:\r\n- create your PR as draft, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests,\r\n- make sure that all of the CI checks pass,\r\n- mark your PR as ready for review, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review\r\n-->\r\n\r\n<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n\r\ncloses #4570\r\n"}], "print_cmds": ["cat /tmp/test.log"], "working_dir": "/Java"}
{"repo": "TheAlgorithms/Java", "instance_id": "TheAlgorithms__Java-4230", "base_commit": "1ef700e8505e90e1df468f9e8164ed7e35e40a39", "patch": "diff --git a/pom.xml b/pom.xml\nindex 82b239e4..0347ccdb 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -38,7 +38,9 @@\n             <groupId>org.assertj</groupId>\n             <artifactId>assertj-core</artifactId>\n             <version>${assertj.version}</version>\n+            <scope>test</scope>\n         </dependency>\n+\n         <dependency>\n             <groupId>org.junit.jupiter</groupId>\n             <artifactId>junit-jupiter-api</artifactId>\ndiff --git a/src/main/java/com/thealgorithms/datastructures/Node.java b/src/main/java/com/thealgorithms/datastructures/Node.java\nnew file mode 100644\nindex 00000000..c8d0e6cb\n--- /dev/null\n+++ b/src/main/java/com/thealgorithms/datastructures/Node.java\n@@ -0,0 +1,32 @@\n+package com.thealgorithms.datastructures;\n+\n+import java.util.ArrayList;\n+import java.util.List;\n+\n+public class Node<T> {\n+\n+    private final T value;\n+    private final List<Node<T>> children;\n+\n+    public Node(final T value) {\n+        this.value = value;\n+        this.children = new ArrayList<>();\n+    }\n+\n+    public Node(final T value, final List<Node<T>> children) {\n+        this.value = value;\n+        this.children = children;\n+    }\n+\n+    public T getValue() {\n+        return value;\n+    }\n+\n+    public void addChild(Node<T> child) {\n+        children.add(child);\n+    }\n+\n+    public List<Node<T>> getChildren() {\n+        return children;\n+    }\n+}\ndiff --git a/src/main/java/com/thealgorithms/searches/BreadthFirstSearch.java b/src/main/java/com/thealgorithms/searches/BreadthFirstSearch.java\nindex 99ee6c27..77043a03 100644\n--- a/src/main/java/com/thealgorithms/searches/BreadthFirstSearch.java\n+++ b/src/main/java/com/thealgorithms/searches/BreadthFirstSearch.java\n@@ -1,32 +1,45 @@\n package com.thealgorithms.searches;\n \n-import com.thealgorithms.searches.DepthFirstSearch.Node;\n-import java.util.ArrayDeque;\n-import java.util.Optional;\n-import java.util.Queue;\n+import com.thealgorithms.datastructures.Node;\n+import java.util.*;\n \n /**\n  * @author: caos321\n  * @date: 31 October 2021 (Sunday)\n+ * @wiki: https://en.wikipedia.org/wiki/Breadth-first_search\n  */\n-public class BreadthFirstSearch {\n-    public static Optional<Node> search(final Node node, final String name) {\n-        if (node.getName().equals(name)) {\n+public class BreadthFirstSearch<T> {\n+\n+    private final List<T> visited = new ArrayList<>();\n+\n+    public Optional<Node<T>> search(final Node<T> node, final T value) {\n+        if (node == null) {\n+            return Optional.empty();\n+        }\n+        if (node.getValue().equals(value)) {\n+            // add root node to visited\n+            visited.add(value);\n             return Optional.of(node);\n         }\n+        visited.add(node.getValue());\n \n-        Queue<Node> queue = new ArrayDeque<>(node.getSubNodes());\n+        Queue<Node<T>> queue = new ArrayDeque<>(node.getChildren());\n \n         while (!queue.isEmpty()) {\n-            final Node current = queue.poll();\n+            final Node<T> current = queue.poll();\n+            visited.add(current.getValue());\n \n-            if (current.getName().equals(name)) {\n+            if (current.getValue().equals(value)) {\n                 return Optional.of(current);\n             }\n \n-            queue.addAll(current.getSubNodes());\n+            queue.addAll(current.getChildren());\n         }\n \n         return Optional.empty();\n     }\n+\n+    public List<T> getVisited() {\n+        return visited;\n+    }\n }\ndiff --git a/src/main/java/com/thealgorithms/searches/DepthFirstSearch.java b/src/main/java/com/thealgorithms/searches/DepthFirstSearch.java\nindex 3a12537a..781768d8 100644\n--- a/src/main/java/com/thealgorithms/searches/DepthFirstSearch.java\n+++ b/src/main/java/com/thealgorithms/searches/DepthFirstSearch.java\n@@ -1,79 +1,32 @@\n package com.thealgorithms.searches;\n \n+import com.thealgorithms.datastructures.Node;\n import java.util.ArrayList;\n import java.util.List;\n-import java.util.Objects;\n import java.util.Optional;\n \n /**\n  * @author: caos321\n  * @date: 31 October 2021 (Sunday)\n+ * @wiki: https://en.wikipedia.org/wiki/Depth-first_search\n  */\n-public class DepthFirstSearch {\n+public class DepthFirstSearch<T> {\n \n-    static class Node {\n+    private final List<T> visited = new ArrayList<>();\n \n-        private final String name;\n-        private final List<Node> subNodes;\n-\n-        public Node(final String name) {\n-            this.name = name;\n-            this.subNodes = new ArrayList<>();\n-        }\n-\n-        public Node(final String name, final List<Node> subNodes) {\n-            this.name = name;\n-            this.subNodes = subNodes;\n-        }\n-\n-        public String getName() {\n-            return name;\n-        }\n-\n-        public List<Node> getSubNodes() {\n-            return subNodes;\n+    public Optional<Node<T>> recursiveSearch(final Node<T> node, final Integer value) {\n+        if (node == null) {\n+            return Optional.empty();\n         }\n-    }\n-\n-    public static Optional<Node> search(final Node node, final String name) {\n-        if (node.getName().equals(name)) {\n+        visited.add(node.getValue());\n+        if (node.getValue().equals(value)) {\n             return Optional.of(node);\n         }\n \n-        return node.getSubNodes().stream().map(value -> search(value, name)).flatMap(Optional::stream).findAny();\n-    }\n-\n-    public static void assertThat(final Object actual, final Object expected) {\n-        if (!Objects.equals(actual, expected)) {\n-            throw new AssertionError(String.format(\"expected=%s but was actual=%s\", expected, actual));\n-        }\n+        return node.getChildren().stream().map(v -> recursiveSearch(v, value)).flatMap(Optional::stream).findAny();\n     }\n \n-    public static void main(final String[] args) {\n-        final Node rootNode = new Node(\"A\", List.of(new Node(\"B\", List.of(new Node(\"D\"), new Node(\"F\", List.of(new Node(\"H\"), new Node(\"I\"))))), new Node(\"C\", List.of(new Node(\"G\"))), new Node(\"E\")));\n-\n-        {\n-            final String expected = \"I\";\n-\n-            final Node result = search(rootNode, expected).orElseThrow(() -> new AssertionError(\"Node not found!\"));\n-\n-            assertThat(result.getName(), expected);\n-        }\n-\n-        {\n-            final String expected = \"G\";\n-\n-            final Node result = search(rootNode, expected).orElseThrow(() -> new AssertionError(\"Node not found!\"));\n-\n-            assertThat(result.getName(), expected);\n-        }\n-\n-        {\n-            final String expected = \"E\";\n-\n-            final Node result = search(rootNode, expected).orElseThrow(() -> new AssertionError(\"Node not found!\"));\n-\n-            assertThat(result.getName(), expected);\n-        }\n+    public List<T> getVisited() {\n+        return visited;\n     }\n }\n", "test_patch": "diff --git a/src/test/java/com/thealgorithms/searches/BreadthFirstSearchTest.java b/src/test/java/com/thealgorithms/searches/BreadthFirstSearchTest.java\nindex 2a5fe0b9..4c9f16d4 100644\n--- a/src/test/java/com/thealgorithms/searches/BreadthFirstSearchTest.java\n+++ b/src/test/java/com/thealgorithms/searches/BreadthFirstSearchTest.java\n@@ -2,33 +2,101 @@ package com.thealgorithms.searches;\n \n import static org.junit.jupiter.api.Assertions.*;\n \n+import com.thealgorithms.datastructures.Node;\n import java.util.List;\n import java.util.Optional;\n+import org.junit.jupiter.api.BeforeEach;\n import org.junit.jupiter.api.Test;\n \n-class BreadthFirstSearchTest {\n+public class BreadthFirstSearchTest {\n+    private Node<String> root;\n+    private BreadthFirstSearch<String> bfs;\n \n-    private static final DepthFirstSearch.Node rootNode = new DepthFirstSearch.Node(\"A\",\n-        List.of(new DepthFirstSearch.Node(\"B\", List.of(new DepthFirstSearch.Node(\"D\"), new DepthFirstSearch.Node(\"F\", List.of(new DepthFirstSearch.Node(\"H\"), new DepthFirstSearch.Node(\"I\"))))), new DepthFirstSearch.Node(\"C\", List.of(new DepthFirstSearch.Node(\"G\"))), new DepthFirstSearch.Node(\"E\")));\n+    // Tree structure:\n+    //\n+    //        A\n+    //      / | \\\n+    //     B  C  D\n+    //    / \\\n+    //   E   F\n+\n+    @BeforeEach\n+    public void setUp() {\n+        // nodes declaration\n+        root = new Node<>(\"A\");\n+\n+        var nodeB = new Node<>(\"B\");\n+        var nodeC = new Node<>(\"C\");\n+        var nodeD = new Node<>(\"D\");\n+\n+        var nodeE = new Node<>(\"E\");\n+        var nodeF = new Node<>(\"F\");\n+\n+        // tree initialization\n+        root.addChild(nodeB);\n+        root.addChild(nodeC);\n+        root.addChild(nodeD);\n+\n+        nodeB.addChild(nodeE);\n+        nodeB.addChild(nodeF);\n+\n+        // create an instance to monitor the visited nodes\n+        bfs = new BreadthFirstSearch<>();\n+    }\n \n     @Test\n-    void searchI() {\n-        Optional<DepthFirstSearch.Node> Inode = BreadthFirstSearch.search(rootNode, \"I\");\n-        assertTrue(Inode.isPresent());\n-        assertEquals(Inode.get().getName(), \"I\");\n+    public void testSearchRoot() {\n+        String expectedValue = \"A\";\n+        List<String> expectedPath = List.of(\"A\");\n+\n+        // check value\n+        Optional<Node<String>> value = bfs.search(root, expectedValue);\n+        assertEquals(expectedValue, value.orElse(new Node<>(\"\")).getValue());\n+\n+        // check path\n+        assertArrayEquals(expectedPath.toArray(), bfs.getVisited().toArray());\n     }\n \n     @Test\n-    void searchG() {\n-        Optional<DepthFirstSearch.Node> Gnode = BreadthFirstSearch.search(rootNode, \"G\");\n-        assertTrue(Gnode.isPresent());\n-        assertEquals(Gnode.get().getName(), \"G\");\n+    public void testSearchF() {\n+        String expectedValue = \"F\";\n+        List<String> expectedPath = List.of(\"A\", \"B\", \"C\", \"D\", \"E\", \"F\");\n+\n+        // check value\n+        Optional<Node<String>> value = Optional.of(bfs.search(root, expectedValue).orElse(new Node<>(null)));\n+        assertEquals(expectedValue, value.get().getValue());\n+\n+        // check path\n+        assertArrayEquals(expectedPath.toArray(), bfs.getVisited().toArray());\n     }\n \n     @Test\n-    void searchE() {\n-        Optional<DepthFirstSearch.Node> Enode = BreadthFirstSearch.search(rootNode, \"E\");\n-        assertTrue(Enode.isPresent());\n-        assertEquals(Enode.get().getName(), \"E\");\n+    void testSearchNull() {\n+        List<String> expectedPath = List.of(\"A\", \"B\", \"C\", \"D\", \"E\", \"F\");\n+        Optional<Node<String>> node = bfs.search(root, null);\n+\n+        // check value\n+        assertTrue(node.isEmpty());\n+\n+        // check path\n+        assertArrayEquals(expectedPath.toArray(), bfs.getVisited().toArray());\n+    }\n+\n+    @Test\n+    void testNullRoot() {\n+        var value = bfs.search(null, \"B\");\n+        assertTrue(value.isEmpty());\n+    }\n+\n+    @Test\n+    void testSearchValueThatNotExists() {\n+        List<String> expectedPath = List.of(\"A\", \"B\", \"C\", \"D\", \"E\", \"F\");\n+        var value = bfs.search(root, \"Z\");\n+\n+        // check that the value is empty because it's not exists in the tree\n+        assertTrue(value.isEmpty());\n+\n+        // check path is the whole list\n+        assertArrayEquals(expectedPath.toArray(), bfs.getVisited().toArray());\n     }\n }\n\\ No newline at end of file\ndiff --git a/src/test/java/com/thealgorithms/searches/DepthFirstSearchTest.java b/src/test/java/com/thealgorithms/searches/DepthFirstSearchTest.java\nnew file mode 100644\nindex 00000000..f85e9409\n--- /dev/null\n+++ b/src/test/java/com/thealgorithms/searches/DepthFirstSearchTest.java\n@@ -0,0 +1,91 @@\n+package com.thealgorithms.searches;\n+\n+import static org.junit.jupiter.api.Assertions.*;\n+\n+import com.thealgorithms.datastructures.Node;\n+import java.util.List;\n+import java.util.Optional;\n+import org.junit.jupiter.api.BeforeEach;\n+import org.junit.jupiter.api.Test;\n+\n+public class DepthFirstSearchTest {\n+\n+    private Node<Integer> root;\n+    private DepthFirstSearch<Integer> dfs;\n+\n+    //\n+    // Tree structure:\n+    //          1\n+    //        / | \\\n+    //       2  3  4\n+    //      / \\\n+    //     5   6\n+\n+    @BeforeEach\n+    public void setUp() {\n+        // nodes declaration\n+        root = new Node<>(1);\n+\n+        var nodeB = new Node<>(2);\n+        var nodeC = new Node<>(3);\n+        var nodeD = new Node<>(4);\n+\n+        var nodeE = new Node<>(5);\n+        var nodeF = new Node<>(6);\n+\n+        // tree initialization\n+        root.addChild(nodeB);\n+        root.addChild(nodeC);\n+        root.addChild(nodeD);\n+\n+        nodeB.addChild(nodeE);\n+        nodeB.addChild(nodeF);\n+\n+        // create an instance to monitor the visited nodes\n+        dfs = new DepthFirstSearch<>();\n+    }\n+\n+    @Test\n+    public void testSearchRoot() {\n+        Integer expectedValue = 1;\n+        List<Integer> expectedPath = List.of(1);\n+\n+        // check value\n+        Optional<Node<Integer>> value = dfs.recursiveSearch(root, expectedValue);\n+        assertEquals(expectedValue, value.orElse(new Node<>(null)).getValue());\n+\n+        // check path\n+        assertArrayEquals(expectedPath.toArray(), dfs.getVisited().toArray());\n+    }\n+\n+    @Test\n+    public void testSearch4() {\n+        Integer expectedValue = 4;\n+        List<Integer> expectedPath = List.of(1, 2, 5, 6, 3, 4);\n+\n+        // check value\n+        Optional<Node<Integer>> value = dfs.recursiveSearch(root, expectedValue);\n+        assertEquals(expectedValue, value.orElse(new Node<>(null)).getValue());\n+\n+        // check path\n+        assertArrayEquals(expectedPath.toArray(), dfs.getVisited().toArray());\n+    }\n+\n+    @Test\n+    void testNullRoot() {\n+        var value = dfs.recursiveSearch(null, 4);\n+        assertTrue(value.isEmpty());\n+    }\n+\n+    @Test\n+    void testSearchValueThatNotExists() {\n+        List<Integer> expectedPath = List.of(1, 2, 5, 6, 3, 4);\n+        var value = dfs.recursiveSearch(root, 10);\n+\n+        // check that the value is empty because it's not exists in the tree\n+        assertTrue(value.isEmpty());\n+\n+        // check path is the whole list\n+        assertArrayEquals(expectedPath.toArray(), dfs.getVisited().toArray());\n+    }\n+}\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n\r\nResolve #4229\r\n", "PR_Title": "DFS and BFS search algorithms  - Resolve #4229", "docker_image": "xinzhou1997/swe_rpg_java:TheAlgorithms__Java-4230_linux", "log_parser": "def parse_java_mvn(log: str) -> dict[str, str]:\n    \"\"\"Parse Maven logs into {identifier: status}.\"\"\"\n    results = {}\n\n    failure_re = re.compile(\n        r\"^\\[ERROR\\]\\s+(?P<class>[A-Za-z0-9_$.]+)\\.(?P<method>[A-Za-z0-9_$.]+?)(?::(?P<line>\\d+))?\\b\"\n    )\n    running_re = re.compile(r\"^(?:\\[INFO\\]\\s+)?Running\\s+([A-Za-z0-9_$.]+)$\")\n    summary_re = re.compile(\n        r\"Tests run:\\s*(\\d+),\\s*Failures:\\s*(\\d+),\\s*Errors:\\s*(\\d+),\\s*Skipped:\\s*(\\d+)\"\n    )\n\n    seen_running = set()\n    current_running = None\n\n    for raw in log.splitlines():\n        line = raw.strip()\n        if not line:\n            continue\n        rm = running_re.match(line)\n        if rm:\n            running_name = rm.group(1)\n            current_running = running_name\n            seen_running.add(running_name)\n            continue\n        fm = failure_re.match(line)\n        if fm:\n            clazz = fm.group(\"class\")\n            method = fm.group(\"method\")\n            test_id = f\"{clazz}.{method}\"\n            results[test_id] = \"FAILED\"\n            results.setdefault(clazz, \"FAILED\")\n            continue\n\n        sm = summary_re.search(line)\n        if sm:\n            _tests_run, failures, errors, skipped = map(int, sm.groups())\n            if failures > 0 or errors > 0:\n                status = \"FAILED\"\n            elif skipped > 0:\n                status = \"SKIPPED\"\n            else:\n                status = \"PASSED\"\n            if current_running:\n                results.setdefault(current_running, status)\n            current_running = None\n\n    if not results and seen_running:\n        for clazz in seen_running:\n            results.setdefault(clazz, \"PASSED\")\n    return results\n", "test_cmds": ["bash -c '{ mvn --batch-mode test ; } > /tmp/test.log 2>&1'"], "rebuild_cmds": ["unset _JAVA_OPTIONS"], "issues": [{"issue_number": 4230, "issue_title": "DFS and BFS search algorithms  - Resolve #4229", "issue_body": "<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n\r\nResolve #4229\r\n"}], "print_cmds": ["cat /tmp/test.log"], "working_dir": "/Java"}
{"repo": "TheAlgorithms/Java", "instance_id": "TheAlgorithms__Java-6333", "base_commit": "ebf5c3d326502cbc6b22d84b489cea9996817bc7", "patch": "diff --git a/src/main/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearch.java b/src/main/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearch.java\nindex 3b4b0b08..b40c7554 100644\n--- a/src/main/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearch.java\n+++ b/src/main/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearch.java\n@@ -29,7 +29,7 @@ public class RowColumnWiseSorted2dArrayBinarySearch implements MatrixSearchAlgor\n \n     public static <T extends Comparable<T>> int[] search(T[][] matrix, T target) {\n         int rowPointer = 0; // The pointer at 0th row\n-        int colPointer = matrix.length - 1; // The pointer at end column\n+        int colPointer = matrix[0].length - 1; // The pointer at end column\n \n         while (rowPointer < matrix.length && colPointer >= 0) {\n             int comp = target.compareTo(matrix[rowPointer][colPointer]);\n", "test_patch": "diff --git a/src/test/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearchTest.java b/src/test/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearchTest.java\nindex 39ac5bf0..8d1423cb 100644\n--- a/src/test/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearchTest.java\n+++ b/src/test/java/com/thealgorithms/searches/RowColumnWiseSorted2dArrayBinarySearchTest.java\n@@ -110,4 +110,131 @@ public class RowColumnWiseSorted2dArrayBinarySearchTest {\n         assertEquals(expected[0], ans[0]);\n         assertEquals(expected[1], ans[1]);\n     }\n+\n+    /**\n+     * Tests for a WIDE rectangular matrix (3 rows, 4 columns)\n+     */\n+    private static final Integer[][] WIDE_RECTANGULAR_MATRIX = {\n+        {10, 20, 30, 40},\n+        {15, 25, 35, 45},\n+        {18, 28, 38, 48},\n+    };\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestWideMatrixMiddle() {\n+        Integer target = 25; // A value in the middle\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(WIDE_RECTANGULAR_MATRIX, target);\n+        int[] expected = {1, 1};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestWideMatrixTopRightCorner() {\n+        Integer target = 40; // The top-right corner element\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(WIDE_RECTANGULAR_MATRIX, target);\n+        int[] expected = {0, 3};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestWideMatrixBottomLeftCorner() {\n+        Integer target = 18; // The bottom-left corner element\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(WIDE_RECTANGULAR_MATRIX, target);\n+        int[] expected = {2, 0};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestWideMatrixTopLeftCorner() {\n+        Integer target = 10; // The top-left corner element\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(WIDE_RECTANGULAR_MATRIX, target);\n+        int[] expected = {0, 0};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestWideMatrixBottomRightCorner() {\n+        Integer target = 48; // The bottom-right corner element\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(WIDE_RECTANGULAR_MATRIX, target);\n+        int[] expected = {2, 3};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestWideMatrixNotFound() {\n+        Integer target = 99; // A value that does not exist\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(WIDE_RECTANGULAR_MATRIX, target);\n+        int[] expected = {-1, -1};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    /**\n+     * Tests for a TALL rectangular matrix (4 rows, 3 columns)\n+     */\n+    private static final Integer[][] TALL_RECTANGULAR_MATRIX = {\n+        {10, 20, 30},\n+        {15, 25, 35},\n+        {18, 28, 38},\n+        {21, 31, 41},\n+    };\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestTallMatrixMiddle() {\n+        Integer target = 28; // A value in the middle\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(TALL_RECTANGULAR_MATRIX, target);\n+        int[] expected = {2, 1};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestTallMatrixTopRightCorner() {\n+        Integer target = 30; // The top-right corner element\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(TALL_RECTANGULAR_MATRIX, target);\n+        int[] expected = {0, 2};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestTallMatrixBottomLeftCorner() {\n+        Integer target = 21; // The bottom-left corner element\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(TALL_RECTANGULAR_MATRIX, target);\n+        int[] expected = {3, 0};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestTallMatrixTopLeftCorner() {\n+        Integer target = 10; // The top-left corner element\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(TALL_RECTANGULAR_MATRIX, target);\n+        int[] expected = {0, 0};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestTallMatrixBottomRightCorner() {\n+        Integer target = 41; // The bottom-right corner element\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(TALL_RECTANGULAR_MATRIX, target);\n+        int[] expected = {3, 2};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n+\n+    @Test\n+    public void rowColumnSorted2dArrayBinarySearchTestTallMatrixNotFound() {\n+        Integer target = 5; // A value that does not exist\n+        int[] ans = RowColumnWiseSorted2dArrayBinarySearch.search(TALL_RECTANGULAR_MATRIX, target);\n+        int[] expected = {-1, -1};\n+        assertEquals(expected[0], ans[0]);\n+        assertEquals(expected[1], ans[1]);\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "<!--\r\nThank you for your contribution!\r\nIn order to reduce the number of notifications sent to the maintainers, please:\r\n- create your PR as draft, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests,\r\n- make sure that all of the CI checks pass,\r\n- mark your PR as ready for review, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review\r\n-->\r\n\r\n<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n- [x] All new code is formatted with `clang-format -i --style=file path/to/your/file.java`\r\n\r\nCloses #6332 \r\n\r\nThis pull request fixes a bug in the `RowColumnWiseSorted2dArrayBinarySearch.java` file where the column pointer was incorrectly initialized.\r\n\r\n**The Problem:**\r\nThe column pointer (`colPointer`) was being initialized with `matrix.length - 1`. However, `matrix.length` returns the number of rows, not columns. This causes the algorithm to start at an incorrect position and fail for any matrix that is not square.\r\n\r\n**The Solution:**\r\nI have corrected the initialization to `int colPointer = matrix[0].length - 1;`. This correctly uses the length of the first row to determine the number of columns, ensuring the pointer is set to the last column's index as intended by the algorithm's logic.", "PR_Title": "Fix(searches): Correct column pointer initialization in RowColumnWiseSorted2dArrayBinarySearch", "docker_image": "xinzhou1997/swe_rpg_java:TheAlgorithms__Java-6333_linux", "log_parser": "def parse_java_mvn(log: str) -> dict[str, str]:\n    \"\"\"Parse Maven logs into {identifier: status}.\"\"\"\n    results = {}\n\n    failure_re = re.compile(\n        r\"^\\[ERROR\\]\\s+(?P<class>[A-Za-z0-9_$.]+)\\.(?P<method>[A-Za-z0-9_$.]+?)(?::(?P<line>\\d+))?\\b\"\n    )\n    running_re = re.compile(r\"^(?:\\[INFO\\]\\s+)?Running\\s+([A-Za-z0-9_$.]+)$\")\n    summary_re = re.compile(\n        r\"Tests run:\\s*(\\d+),\\s*Failures:\\s*(\\d+),\\s*Errors:\\s*(\\d+),\\s*Skipped:\\s*(\\d+)\"\n    )\n\n    seen_running = set()\n    current_running = None\n\n    for raw in log.splitlines():\n        line = raw.strip()\n        if not line:\n            continue\n        rm = running_re.match(line)\n        if rm:\n            running_name = rm.group(1)\n            current_running = running_name\n            seen_running.add(running_name)\n            continue\n        fm = failure_re.match(line)\n        if fm:\n            clazz = fm.group(\"class\")\n            method = fm.group(\"method\")\n            test_id = f\"{clazz}.{method}\"\n            results[test_id] = \"FAILED\"\n            results.setdefault(clazz, \"FAILED\")\n            continue\n\n        sm = summary_re.search(line)\n        if sm:\n            _tests_run, failures, errors, skipped = map(int, sm.groups())\n            if failures > 0 or errors > 0:\n                status = \"FAILED\"\n            elif skipped > 0:\n                status = \"SKIPPED\"\n            else:\n                status = \"PASSED\"\n            if current_running:\n                results.setdefault(current_running, status)\n            current_running = None\n\n    if not results and seen_running:\n        for clazz in seen_running:\n            results.setdefault(clazz, \"PASSED\")\n    return results\n", "test_cmds": ["bash -c '{ mvn --batch-mode test ; } > /tmp/test.log 2>&1'"], "rebuild_cmds": ["unset _JAVA_OPTIONS"], "issues": [{"issue_number": 6333, "issue_title": "Fix(searches): Correct column pointer initialization in RowColumnWiseSorted2dArrayBinarySearch", "issue_body": "<!--\r\nThank you for your contribution!\r\nIn order to reduce the number of notifications sent to the maintainers, please:\r\n- create your PR as draft, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests#draft-pull-requests,\r\n- make sure that all of the CI checks pass,\r\n- mark your PR as ready for review, cf. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/changing-the-stage-of-a-pull-request#marking-a-pull-request-as-ready-for-review\r\n-->\r\n\r\n<!-- For completed items, change [ ] to [x] -->\r\n\r\n- [x] I have read [CONTRIBUTING.md](https://github.com/TheAlgorithms/Java/blob/master/CONTRIBUTING.md).\r\n- [x] This pull request is all my own work -- I have not plagiarized it.\r\n- [x] All filenames are in PascalCase.\r\n- [x] All functions and variable names follow Java naming conventions.\r\n- [x] All new algorithms have a URL in their comments that points to Wikipedia or other similar explanations.\r\n- [x] All new code is formatted with `clang-format -i --style=file path/to/your/file.java`\r\n\r\nCloses #6332 \r\n\r\nThis pull request fixes a bug in the `RowColumnWiseSorted2dArrayBinarySearch.java` file where the column pointer was incorrectly initialized.\r\n\r\n**The Problem:**\r\nThe column pointer (`colPointer`) was being initialized with `matrix.length - 1`. However, `matrix.length` returns the number of rows, not columns. This causes the algorithm to start at an incorrect position and fail for any matrix that is not square.\r\n\r\n**The Solution:**\r\nI have corrected the initialization to `int colPointer = matrix[0].length - 1;`. This correctly uses the length of the first row to determine the number of columns, ensuring the pointer is set to the last column's index as intended by the algorithm's logic."}], "print_cmds": ["cat /tmp/test.log"], "working_dir": "/Java"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-5973", "base_commit": "721351c6f8815e0fe3b73087cdd8bc7d3e87322d", "patch": "diff --git a/README.md b/README.md\nindex 570405b06..a31129741 100644\n--- a/README.md\n+++ b/README.md\n@@ -20,11 +20,8 @@ Community forum: **https://forum.openrefine.org**\n \n ## Snapshot releases\n \n-Latest development version, packaged for:\n-* [Linux](https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.openrefine&a=openrefine&v=3.8-SNAPSHOT&c=linux&p=tar.gz)\n-* [MacOS](https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.openrefine&a=openrefine&v=3.8-SNAPSHOT&c=mac&p=dmg)\n-* [Windows without embedded JRE](https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.openrefine&a=openrefine&v=3.8-SNAPSHOT&c=win&p=zip)\n-* [Windows with embedded JRE](https://oss.sonatype.org/service/local/artifact/maven/content?r=snapshots&g=org.openrefine&a=openrefine&v=3.8-SNAPSHOT&c=win-with-java&p=zip)\n+You can download snapshots of the development version of OpenRefine.\n+To do so, you need to be logged in to GitHub. Then, click on the first item with a green tick / check mark on [this page](https://github.com/OpenRefine/OpenRefine/actions/workflows/snapshot_release.yml) and scroll down to the Artifacts section to find the version that matches your operating system.\n \n ## Run from source\n \ndiff --git a/main/src/com/google/refine/ProjectMetadata.java b/main/src/com/google/refine/ProjectMetadata.java\nindex 50cef88de..b90e18228 100644\n--- a/main/src/com/google/refine/ProjectMetadata.java\n+++ b/main/src/com/google/refine/ProjectMetadata.java\n@@ -49,6 +49,8 @@ import org.slf4j.LoggerFactory;\n import com.fasterxml.jackson.annotation.JsonIgnore;\n import com.fasterxml.jackson.annotation.JsonInclude;\n import com.fasterxml.jackson.annotation.JsonInclude.Include;\n+import com.fasterxml.jackson.core.JsonProcessingException;\n+import com.fasterxml.jackson.core.json.JsonReadFeature;\n import com.fasterxml.jackson.annotation.JsonProperty;\n import com.fasterxml.jackson.annotation.JsonView;\n import com.fasterxml.jackson.databind.node.ArrayNode;\n@@ -374,9 +376,17 @@ public class ProjectMetadata {\n             Field metaField = metaClass.getDeclaredField(\"_\" + metaName);\n             if (metaName.equals(\"tags\")) {\n                 metaField.set(this, valueString.split(\",\"));\n+            } else if (metaName.equals(\"customMetadata\")) {\n+                ParsingUtilities.mapper.enable(JsonReadFeature.ALLOW_BACKSLASH_ESCAPING_ANY_CHARACTER.mappedFeature());\n+                Map<String, Object> map = ParsingUtilities.mapper.readValue(valueString, HashMap.class);\n+                metaField.set(this, map);\n             } else {\n                 metaField.set(this, valueString);\n             }\n+        } catch (JsonProcessingException e) {\n+            String errorMessage = \"Error reading JSON: \" + e.getOriginalMessage();\n+            logger.error(errorMessage);\n+            throw new RuntimeException(errorMessage);\n         } catch (NoSuchFieldException e) {\n             updateUserMetadata(metaName, valueString);\n         } catch (SecurityException | IllegalArgumentException | IllegalAccessException e) {\ndiff --git a/packaging/pom.xml b/packaging/pom.xml\nindex 99dfd5890..a07206e70 100644\n--- a/packaging/pom.xml\n+++ b/packaging/pom.xml\n@@ -513,88 +513,6 @@\n           <skip>true</skip>\n         </configuration>\n       </plugin>\n-\n-      <plugin>\n-        <groupId>org.codehaus.mojo</groupId>\n-        <artifactId>build-helper-maven-plugin</artifactId>\n-        <version>${build-helper-maven-plugin.version}</version>\n-        <inherited>false</inherited>\n-        <executions>\n-          <!-- Attach tar.gz artifact for linux -->\n-          <execution>\n-              <id>attach-linux</id>\n-              <phase>deploy</phase>\n-              <goals>\n-                  <goal>attach-artifact</goal>\n-              </goals>\n-              <configuration>\n-                  <artifacts>\n-                      <artifact>\n-                          <file>${project.build.directory}/${project.build.finalName}-linux-${project.version}.tar.gz</file>\n-                          <type>tar.gz</type>\n-                          <classifier>linux</classifier>\n-                      </artifact>\n-                  </artifacts>\n-              </configuration>\n-          </execution>\n-\n-          <!-- Attach the zip file for windows, without embedded JRE -->\n-          <execution>\n-              <id>attach-win-without-jre</id>\n-              <phase>deploy</phase>\n-              <goals>\n-                  <goal>attach-artifact</goal>\n-              </goals>\n-              <configuration>\n-                  <skipAttach>${skipCreateExe}</skipAttach>\n-                  <artifacts>\n-                      <artifact>\n-                          <file>${project.build.directory}/${project.build.finalName}-win-${project.version}.zip</file>\n-                          <type>zip</type>\n-                          <classifier>win</classifier>\n-                      </artifact>\n-                  </artifacts>\n-              </configuration>\n-          </execution>\n-\n-          <!-- Attach the zip file for windows, with embedded JRE -->\n-          <execution>\n-              <id>attach-win-with-jre</id>\n-              <phase>deploy</phase>\n-              <goals>\n-                  <goal>attach-artifact</goal>\n-              </goals>\n-              <configuration>\n-                  <skipAttach>${skipCreateExe}</skipAttach>\n-                  <artifacts>\n-                      <artifact>\n-                          <file>${project.build.directory}/${project.build.finalName}-win-with-java-${project.version}.zip</file>\n-                          <type>zip</type>\n-                          <classifier>win-with-java</classifier>\n-                      </artifact>\n-                  </artifacts>\n-              </configuration>\n-          </execution>\n-\n-          <!-- Attach the final DMG for MacOS -->\n-          <execution>\n-              <id>attach-dmg</id>\n-              <phase>deploy</phase>\n-              <goals>\n-                  <goal>attach-artifact</goal>\n-              </goals>\n-              <configuration>\n-                  <artifacts>\n-                      <artifact>\n-                          <file>${project.build.directory}/${project.build.finalName}-mac-${project.version}.dmg</file>\n-                          <type>dmg</type>\n-                          <classifier>mac</classifier>\n-                      </artifact>\n-                  </artifacts>\n-              </configuration>\n-          </execution>\n-        </executions>\n-      </plugin>\n     </plugins>\n     <pluginManagement>\n     \t<plugins>\n", "test_patch": "diff --git a/main/tests/cypress/package.json b/main/tests/cypress/package.json\nindex 739d96726..c9b25e828 100644\n--- a/main/tests/cypress/package.json\n+++ b/main/tests/cypress/package.json\n@@ -20,7 +20,7 @@\n         \"cypress-file-upload\": \"^5.0.8\"\n     },\n     \"devDependencies\": {\n-        \"eslint\": \"^8.44.0\",\n+        \"eslint\": \"^8.45.0\",\n         \"eslint-config-google\": \"^0.14.0\",\n         \"eslint-config-prettier\": \"^8.8.0\",\n         \"eslint-plugin-cypress\": \"^2.13.3\",\ndiff --git a/main/tests/cypress/yarn.lock b/main/tests/cypress/yarn.lock\nindex 8bf8be48c..066e8d958 100644\n--- a/main/tests/cypress/yarn.lock\n+++ b/main/tests/cypress/yarn.lock\n@@ -594,10 +594,10 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:\n   resolved \"https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.1.tgz#c22c48f48942d08ca824cc526211ae400478a994\"\n   integrity sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==\n \n-eslint@^8.44.0:\n-  version \"8.44.0\"\n-  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.44.0.tgz#51246e3889b259bbcd1d7d736a0c10add4f0e500\"\n-  integrity sha512-0wpHoUbDUHgNCyvFB5aXLiQVfK9B0at6gUvzy83k4kAsQ/u769TQDX6iKC+aO4upIHO9WSaA3QoXYQDHbNwf1A==\n+eslint@^8.45.0:\n+  version \"8.45.0\"\n+  resolved \"https://registry.yarnpkg.com/eslint/-/eslint-8.45.0.tgz#bab660f90d18e1364352c0a6b7c6db8edb458b78\"\n+  integrity sha512-pd8KSxiQpdYRfYa9Wufvdoct3ZPQQuVuU5O6scNgMuOMYuxvH0IGaYK0wUFjo4UYYQQCUndlXiMbnxopwvvTiw==\n   dependencies:\n     \"@eslint-community/eslint-utils\" \"^4.2.0\"\n     \"@eslint-community/regexpp\" \"^4.4.0\"\n@@ -624,7 +624,6 @@ eslint@^8.44.0:\n     globals \"^13.19.0\"\n     graphemer \"^1.4.0\"\n     ignore \"^5.2.0\"\n-    import-fresh \"^3.0.0\"\n     imurmurhash \"^0.1.4\"\n     is-glob \"^4.0.0\"\n     is-path-inside \"^3.0.3\"\n@@ -636,7 +635,6 @@ eslint@^8.44.0:\n     natural-compare \"^1.4.0\"\n     optionator \"^0.9.3\"\n     strip-ansi \"^6.0.1\"\n-    strip-json-comments \"^3.1.0\"\n     text-table \"^0.2.0\"\n \n espree@^9.6.0:\n@@ -948,7 +946,7 @@ ignore@^5.2.0:\n   resolved \"https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a\"\n   integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==\n \n-import-fresh@^3.0.0, import-fresh@^3.2.1:\n+import-fresh@^3.2.1:\n   version \"3.3.0\"\n   resolved \"https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz\"\n   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==\n@@ -1511,7 +1509,7 @@ strip-final-newline@^2.0.0:\n   resolved \"https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz\"\n   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==\n \n-strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:\n+strip-json-comments@^3.1.1:\n   version \"3.1.1\"\n   resolved \"https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz\"\n   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==\ndiff --git a/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java b/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java\nindex d80f3b8fb..bbee28a84 100644\n--- a/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java\n+++ b/main/tests/server/src/com/google/refine/commands/project/SetProjectMetadataCommandTests.java\n@@ -41,6 +41,8 @@ import static org.mockito.Mockito.when;\n \n import java.io.IOException;\n import java.io.PrintWriter;\n+import java.util.List;\n+import java.util.Map;\n \n import javax.servlet.ServletException;\n import javax.servlet.http.HttpServletRequest;\n@@ -211,4 +213,42 @@ public class SetProjectMetadataCommandTests extends RefineTest {\n         verify(request, times(2)).getParameter(\"project\");\n         verify(projMan, times(1)).getProject(PROJECT_ID_LONG);\n     }\n+\n+    @Test\n+    public void setCustomMetadataTest() {\n+        String customMetadata = this.getValidCustomMetadata();\n+        ProjectMetadata meta = proj.getMetadata();\n+        meta.setAnyField(\"customMetadata\", customMetadata);\n+\n+        Assert.assertEquals(meta.getCustomMetadata(\"name\"), \"test\");\n+        Assert.assertEquals(meta.getCustomMetadata(\"isValid\"), true);\n+        Assert.assertEquals(meta.getCustomMetadata(\"id\"), 1);\n+        Assert.assertTrue(meta.getCustomMetadata(\"companies\") instanceof List);\n+        Assert.assertTrue(meta.getCustomMetadata(\"information\") instanceof Map);\n+    }\n+\n+    @Test\n+    public void setInvalidCustomMetadataTest() {\n+        String customMetadata = this.getInvalidCustomMetadata();\n+        ProjectMetadata meta = proj.getMetadata();\n+\n+        Assert.assertThrows(() -> meta.setAnyField(\"customMetadata\", customMetadata));\n+    }\n+\n+    private String getValidCustomMetadata() {\n+        return \"{\\n\" + //\n+                \"  \\\"name\\\":\\\"test\\\",\\n\" + //\n+                \"  \\\"companies\\\":[\\\"Google\\\", \\\"IBM\\\", \\\"meta\\\"],\\n\" + //\n+                \"  \\\"isValid\\\": true,\\n\" + //\n+                \"  \\\"information\\\": {\\n\" + //\n+                \"    \\\"text-field\\\":\\\"value\\\",\\n\" + //\n+                \"    \\\"numeric-field\\\": 1\\n\" + //\n+                \"  },\\n\" + //\n+                \"  \\\"id\\\":1\\n\" + //\n+                \"}\";\n+    }\n+\n+    private String getInvalidCustomMetadata() {\n+        return \"{\\n  \\\"name\\\":test\\n}\";\n+    }\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #5772 \r\n\r\nChanges proposed in this pull request:\r\n- edit setAnyField() method in ProjectMetadata class\r\n- add case to edit customMetadata field\r\n- parse given String to JSON and JSON to HashMap\r\n", "PR_Title": "fix custom metadata edit action", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-5973_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 5973, "issue_title": "fix custom metadata edit action", "issue_body": "Fixes #5772 \r\n\r\nChanges proposed in this pull request:\r\n- edit setAnyField() method in ProjectMetadata class\r\n- add case to edit customMetadata field\r\n- parse given String to JSON and JSON to HashMap\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-5997", "base_commit": "c457bc44b9f8a530dccc7ad81c95598824bb6ada", "patch": "diff --git a/main/resources/com/google/refine/grel/ControlEvalError.properties b/main/resources/com/google/refine/grel/ControlEvalError.properties\nindex 9cb0e415e..d2a138e61 100644\n--- a/main/resources/com/google/refine/grel/ControlEvalError.properties\n+++ b/main/resources/com/google/refine/grel/ControlEvalError.properties\n@@ -1,5 +1,5 @@\n filter=First argument is not an array\n-foreach_index=First argument to forEach is not an array\n+foreach_index=First argument to forEachIndex is not an array or JSON object\n foreach=First argument to forEach is not an array or JSON object\n for_range=First, second, and third arguments of forRange must all be numbers\n \n@@ -12,3 +12,4 @@ expects_five_args={0} expects five arguments\n expects_second_arg_var_name={0} expects second argument to be a variable name\n expects_second_arg_index_var_name={0} expects second argument to be the index's variable name\n expects_third_arg_element_var_name={0} expects second argument to be the element's variable name\n+expects_second_third_args_different={0} expects the second and third arguments to be different variable names\ndiff --git a/main/src/com/google/refine/grel/ast/VariableExpr.java b/main/src/com/google/refine/grel/ast/VariableExpr.java\nindex 4ed7a3370..3188a5dc2 100644\n--- a/main/src/com/google/refine/grel/ast/VariableExpr.java\n+++ b/main/src/com/google/refine/grel/ast/VariableExpr.java\n@@ -45,7 +45,11 @@ public class VariableExpr implements Evaluable {\n     final protected String _name;\n \n     public VariableExpr(String name) {\n-        _name = name;\n+        if (name != null || !name.isEmpty()) {\n+            _name = name;\n+        } else {\n+            throw new IllegalArgumentException(\"Illegal variable name \");\n+        }\n     }\n \n     @Override\n@@ -61,4 +65,14 @@ public class VariableExpr implements Evaluable {\n     public String getName() {\n         return _name;\n     }\n+\n+    @Override\n+    public boolean equals(Object other) {\n+        return other instanceof VariableExpr && getName().equals(((VariableExpr) other).getName());\n+    }\n+\n+    @Override\n+    public int hashCode() {\n+        return _name.hashCode();\n+    }\n }\ndiff --git a/main/src/com/google/refine/grel/controls/ForEachIndex.java b/main/src/com/google/refine/grel/controls/ForEachIndex.java\nindex 53cf9ca18..367781026 100644\n--- a/main/src/com/google/refine/grel/controls/ForEachIndex.java\n+++ b/main/src/com/google/refine/grel/controls/ForEachIndex.java\n@@ -34,10 +34,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n package com.google.refine.grel.controls;\n \n import java.util.ArrayList;\n+import java.util.Iterator;\n import java.util.List;\n+import java.util.Map;\n import java.util.Properties;\n \n+import com.fasterxml.jackson.databind.JsonNode;\n import com.fasterxml.jackson.databind.node.ArrayNode;\n+import com.fasterxml.jackson.databind.node.ObjectNode;\n+\n+import com.google.refine.expr.EvalError;\n import com.google.refine.expr.Evaluable;\n import com.google.refine.expr.ExpressionUtils;\n import com.google.refine.expr.util.JsonValueConverter;\n@@ -59,6 +65,8 @@ public class ForEachIndex implements Control {\n         } else if (!(args[2] instanceof VariableExpr)) {\n             // variable name\";\n             return ControlEvalError.expects_third_arg_element_var_name(ControlFunctionRegistry.getControlName(this));\n+        } else if (args[1].equals(args[2])) {\n+            return ControlEvalError.expects_second_third_args_different(ControlFunctionRegistry.getControlName(this));\n         }\n         return null;\n     }\n@@ -68,8 +76,8 @@ public class ForEachIndex implements Control {\n         Object o = args[0].evaluate(bindings);\n         if (ExpressionUtils.isError(o)) {\n             return o;\n-        } else if (!ExpressionUtils.isArrayOrCollection(o) && !(o instanceof ArrayNode)) {\n-            return ControlEvalError.foreach_index();\n+        } else if (!ExpressionUtils.isArrayOrCollection(o) && !(o instanceof ArrayNode) && !(o instanceof ObjectNode)) {\n+            return new EvalError(ControlEvalError.foreach_index());\n         }\n \n         String indexName = ((VariableExpr) args[1]).getName();\n@@ -108,6 +116,21 @@ public class ForEachIndex implements Control {\n \n                     Object r = args[3].evaluate(bindings);\n \n+                    results.add(r);\n+                }\n+            } else if (o instanceof ObjectNode) {\n+                ObjectNode obj = (ObjectNode) o;\n+                results = new ArrayList<>(obj.size());\n+                for (Iterator<Map.Entry<String, JsonNode>> it = obj.fields(); it.hasNext();) {\n+                    Map.Entry<String, JsonNode> entry = it.next();\n+                    if (entry != null) {\n+                        bindings.put(indexName, entry.getKey());\n+                        bindings.put(elementName, entry.getValue());\n+                    } else {\n+                        bindings.remove(indexName);\n+                        bindings.remove(elementName);\n+                    }\n+                    Object r = args[3].evaluate(bindings);\n                     results.add(r);\n                 }\n             } else {\n", "test_patch": "diff --git a/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java b/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java\nindex d2d353cbf..6f25f3ee9 100644\n--- a/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java\n+++ b/main/tests/server/src/com/google/refine/grel/controls/ForEachIndexTests.java\n@@ -1,5 +1,5 @@\n /*******************************************************************************\n- * Copyright (C) 2018, OpenRefine contributors\n+ * Copyright (C) 2018, 2023, OpenRefine contributors\n  * All rights reserved.\n  * \n  * Redistribution and use in source and binary forms, with or without\n@@ -27,15 +27,90 @@\n \n package com.google.refine.grel.controls;\n \n+import static org.testng.Assert.fail;\n+\n+import java.util.Properties;\n+\n import org.testng.annotations.Test;\n \n+import com.google.refine.RefineTest;\n+import com.google.refine.expr.MetaParser;\n+import com.google.refine.expr.ParsingException;\n import com.google.refine.util.TestUtils;\n \n-public class ForEachIndexTests {\n+public class ForEachIndexTests extends RefineTest {\n \n     @Test\n     public void serializeForEachIndex() {\n         String json = \"{\\\"description\\\":\\\"Evaluates expression a to an array. Then for each array element, binds its index to variable i and its value to variable name v, evaluates expression e, and pushes the result onto the result array.\\\",\\\"params\\\":\\\"expression a, variable i, variable v, expression e\\\",\\\"returns\\\":\\\"array\\\"}\";\n         TestUtils.isSerializedTo(new ForEachIndex(), json);\n     }\n+\n+    private void assertParseException(String expression) {\n+        assertParseException(expression, null);\n+    }\n+\n+    private void assertParseException(String expression, String message) {\n+        try {\n+            MetaParser.parse(\"grel:\" + expression);\n+            if (message == null) {\n+                fail(\"Expression didn't return error : \" + expression);\n+            } else {\n+                fail(message);\n+            }\n+        } catch (ParsingException e) {\n+            // success\n+        }\n+    }\n+\n+    @Test\n+    public void testInvalidParams() throws ParsingException {\n+        bindings = new Properties();\n+        bindings.put(\"v\", \"\");\n+        assertParseException(\"forEachIndex('test', v, v)\");\n+        assertParseException(\"forEachIndex([], 1, 1, 1)\", \"Didn't throw a ParsingException for wrong argument type\");\n+        assertParseException(\"forEachIndex([], v, v, v)\", \"Didn't throw ParsingException for duplicate variables\");\n+        assertParseException(\"forEachIndex([], v, v)\", \"Didn't throw a ParsingException for 3 arguments\");\n+        assertParseException(\"forEachIndex([], v)\", \"Didn't throw a ParsingException for 2 arguments\");\n+        assertParseException(\"forEachIndex([])\", \"Didn't throw a ParsingException for 1 argument\");\n+    }\n+\n+    @Test\n+    public void testForEachJsonObject() throws ParsingException {\n+        String json = \"{\"\n+                + \"\\\"2511\\\": {\\\"parent_area\\\": null, \\\"generation_high\\\": 40, \\\"all_names\\\": {}, \\\"id\\\": 2511, \\\"codes\\\": {\\\"ons\\\": \\\"00AB\\\", \\\"gss\\\": \\\"E09000002\\\", \\\"local-authority-eng\\\": \\\"BDG\\\", \\\"local-authority-canonical\\\": \\\"BDG\\\", \\\"unit_id\\\": \\\"10949\\\"}, \\\"name\\\": \\\"Barking and Dagenham Borough Council\\\", \\\"country\\\": \\\"E\\\", \\\"type_name\\\": \\\"London borough\\\", \\\"generation_low\\\": 1, \\\"country_name\\\": \\\"England\\\", \\\"type\\\": \\\"LBO\\\"},\"\n+                + \"\\\"2247\\\": {\\\"parent_area\\\": null, \\\"generation_high\\\": 40, \\\"all_names\\\": {}, \\\"id\\\": 2247, \\\"codes\\\": {\\\"unit_id\\\": \\\"41441\\\"}, \\\"name\\\": \\\"Greater London Authority\\\", \\\"country\\\": \\\"E\\\", \\\"type_name\\\": \\\"Greater London Authority\\\", \\\"generation_low\\\": 1, \\\"country_name\\\": \\\"England\\\", \\\"type\\\": \\\"GLA\\\"},\"\n+                + \"\\\"8706\\\": {\\\"parent_area\\\": 2511, \\\"generation_high\\\": 40, \\\"all_names\\\": {}, \\\"id\\\": 8706, \\\"codes\\\": {\\\"ons\\\": \\\"00ABGH\\\", \\\"gss\\\": \\\"E05000036\\\", \\\"unit_id\\\": \\\"10936\\\"}, \\\"name\\\": \\\"Mayesbrook\\\", \\\"country\\\": \\\"E\\\", \\\"type_name\\\": \\\"London borough ward\\\", \\\"generation_low\\\": 1, \\\"country_name\\\": \\\"England\\\", \\\"type\\\": \\\"LBW\\\"}\"\n+                + \"}\";\n+\n+        String[] test = { \"forEachIndex('\" + json + \"'.parseJson(), k, v, v.id).sort().join(',')\", \"2247,2511,8706\" };\n+        bindings = new Properties();\n+        bindings.put(\"k\", \"\");\n+        bindings.put(\"v\", \"\");\n+        parseEval(bindings, test);\n+\n+        String[] test2 = { \"forEachIndex('\" + json + \"'.parseJson(), k, v, k).sort().join(',')\", \"2247,2511,8706\" };\n+        parseEval(bindings, test2);\n+        String[] test3 = { \"forEachIndex('\" + json + \"'.parseJson(), k, v, k.toNumber()==v.id).join(',')\", \"true,true,true\" };\n+        parseEval(bindings, test3);\n+    }\n+\n+    @Test\n+    public void testForEachIndexArray() throws ParsingException {\n+        bindings = new Properties();\n+        bindings.put(\"k\", \"\");\n+        bindings.put(\"v\", \"\");\n+        parseEval(bindings, new String[] { \"forEachIndex([5,4,3,2.0], k, v, v*2).join(',')\", \"10,8,6,4.0\" });\n+        parseEval(bindings, new String[] { \"forEachIndex([5,4,3,2.0], k, v, k).join(',')\", \"0,1,2,3\" });\n+    }\n+\n+    @Test\n+    public void testForEachIndexJsonArray() throws ParsingException {\n+        bindings = new Properties();\n+        bindings.put(\"k\", \"\");\n+        bindings.put(\"v\", \"\");\n+        parseEval(bindings, new String[] { \"forEachIndex('[3,2,1.0]'.parseJson(), k, v, v*2).join(',')\", \"6,4,2.0\" });\n+        parseEval(bindings, new String[] { \"forEachIndex('[3,2,1.0]'.parseJson(), k, v, k).join(',')\", \"0,1,2\" });\n+    }\n+\n }\n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #3147\r\n\r\nI'm on the fence as to whether this should be a separate control (name TBD), as I originally spec'd, or if rolling the functionality into the existing `forEachIndex` is close enough semantically given that the array index and the object key are both performing essentially the same function. This pull request adopts the latter approach. Doing it the other way would basically involve cloning the code, giving it a new function name, and making the error messages more specific.\r\n\r\nChanges proposed in this pull request:\r\n- add tests for `forEachIndex`\r\n- enhance error checking to reject using the same variable name for both index and value\r\n- add support for JSON objects withe same structure, but the object key instead of the array index returned in the index/key variable\r\n", "PR_Title": "Add support for JSON Objects to forEachIndex() control", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-5997_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 5997, "issue_title": "Add support for JSON Objects to forEachIndex() control", "issue_body": "Fixes #3147\r\n\r\nI'm on the fence as to whether this should be a separate control (name TBD), as I originally spec'd, or if rolling the functionality into the existing `forEachIndex` is close enough semantically given that the array index and the object key are both performing essentially the same function. This pull request adopts the latter approach. Doing it the other way would basically involve cloning the code, giving it a new function name, and making the error messages more specific.\r\n\r\nChanges proposed in this pull request:\r\n- add tests for `forEachIndex`\r\n- enhance error checking to reject using the same variable name for both index and value\r\n- add support for JSON objects withe same structure, but the object key instead of the array index returned in the index/key variable\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-6318", "base_commit": "ab42257ccf76616ac8b2dcf6046e107902e5e457", "patch": "diff --git a/.github/workflows/snapshot_release.yml b/.github/workflows/snapshot_release.yml\nindex 634d7e676..4cd3ce040 100644\n--- a/.github/workflows/snapshot_release.yml\n+++ b/.github/workflows/snapshot_release.yml\n@@ -350,7 +350,7 @@ jobs:\n \n     - name: Download build artifact for Windows Installer (with Java)\n       id: download-build-artifact-win-with-java\n-      uses: actions/download-artifact@v3\n+      uses: actions/download-artifact@v4\n       with:\n         name: installertemp-win-with-java-${{ needs.mac_test_and_deploy.outputs.version_number_string }}\n         path: ./packaging/target/openrefine-win-with-java-${{ needs.mac_test_and_deploy.outputs.version_number_string }}\ndiff --git a/extensions/database/pom.xml b/extensions/database/pom.xml\nindex 0a294e654..02c073747 100644\n--- a/extensions/database/pom.xml\n+++ b/extensions/database/pom.xml\n@@ -105,7 +105,7 @@\n     <dependency>\n       <groupId>org.xerial</groupId>\n       <artifactId>sqlite-jdbc</artifactId>\n-      <version>3.44.1.0</version>\n+      <version>3.45.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.fasterxml.jackson.core</groupId>\ndiff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml\nindex 159794763..cc0ca6c03 100644\n--- a/extensions/gdata/pom.xml\n+++ b/extensions/gdata/pom.xml\n@@ -84,7 +84,7 @@\n     <dependency>\n       <groupId>com.google.apis</groupId>\n       <artifactId>google-api-services-drive</artifactId>\n-      <version>v3-rev20240110-2.0.0</version>\n+      <version>v3-rev20240123-2.0.0</version>\n     </dependency>\n     <dependency>\n       <groupId>com.google.apis</groupId>\ndiff --git a/extensions/wikibase/module/scripts/preview-renderer.js b/extensions/wikibase/module/scripts/preview-renderer.js\nindex 9f61a6cf3..96bc6ddb9 100644\n--- a/extensions/wikibase/module/scripts/preview-renderer.js\n+++ b/extensions/wikibase/module/scripts/preview-renderer.js\n@@ -238,7 +238,7 @@ EditRenderer._renderStatement = function(json, container) {\n   var referencesToggle = $('<a></a>').appendTo(referencesToggleContainer);\n   right = $('<div></div>').addClass('wbs-right').appendTo(referencesSection);\n   var referenceContainer = $('<div></div>').addClass('wbs-reference-container').appendTo(right);\n-  referencesToggle.on('click',function () {\n+  referencesToggleContainer.on('click',function () {\n       triangle.toggleClass('pointing-down');\n       triangle.toggleClass('pointing-right');\n       referenceContainer.toggle(100);\ndiff --git a/extensions/wikibase/pom.xml b/extensions/wikibase/pom.xml\nindex 697c0dbf5..5a176bcaa 100644\n--- a/extensions/wikibase/pom.xml\n+++ b/extensions/wikibase/pom.xml\n@@ -15,7 +15,7 @@\n   </parent>\n \n   <properties>\n-    <wdtk.version>0.14.6</wdtk.version>\n+    <wdtk.version>0.14.7</wdtk.version>\n   </properties>\n \n   <build>\ndiff --git a/main/src/com/google/refine/model/Column.java b/main/src/com/google/refine/model/Column.java\nindex 7c456cec6..7dd296055 100644\n--- a/main/src/com/google/refine/model/Column.java\n+++ b/main/src/com/google/refine/model/Column.java\n@@ -55,6 +55,7 @@ public class Column {\n     private ReconStats _reconStats;\n \n     transient protected Map<String, Object> _precomputes;\n+    private ReconConfig _sourceReconConfig;\n \n     @JsonCreator\n     public Column(\n@@ -95,6 +96,17 @@ public class Column {\n         return _reconConfig;\n     }\n \n+    @JsonProperty(\"sourceReconConfig\")\n+    public void setSourceReconConfig(ReconConfig sourceConfig) {\n+        this._sourceReconConfig = sourceConfig;\n+    }\n+\n+    @JsonProperty(\"sourceReconConfig\")\n+    @JsonInclude(Include.NON_NULL)\n+    public ReconConfig getSourceReconConfig() {\n+        return _sourceReconConfig;\n+    }\n+\n     @JsonProperty(\"reconStats\")\n     public void setReconStats(ReconStats stats) {\n         this._reconStats = stats;\ndiff --git a/main/src/com/google/refine/model/changes/DataExtensionChange.java b/main/src/com/google/refine/model/changes/DataExtensionChange.java\nindex 8adbcb9b7..1ba0366b5 100644\n--- a/main/src/com/google/refine/model/changes/DataExtensionChange.java\n+++ b/main/src/com/google/refine/model/changes/DataExtensionChange.java\n@@ -220,6 +220,9 @@ public class DataExtensionChange implements Change {\n                         _identifierSpace,\n                         _schemaSpace,\n                         columnType));\n+                if (project.columnModel.getColumnByName(_baseColumnName) != null) {\n+                    column.setSourceReconConfig(project.columnModel.getColumnByName(_baseColumnName).getReconConfig());\n+                }\n                 ReconStats reconStats = ReconStats.create(project, cellIndex);\n                 if (reconStats.matchedTopics > 0) {\n                     column.setReconStats(reconStats);\ndiff --git a/main/webapp/modules/core/langs/translation-ca.json b/main/webapp/modules/core/langs/translation-ca.json\nindex 78afd0111..ce642b217 100644\n--- a/main/webapp/modules/core/langs/translation-ca.json\n+++ b/main/webapp/modules/core/langs/translation-ca.json\n@@ -859,5 +859,7 @@\n     \"core-views/column-join-before-column-picker\": \"Seleccioneu i ordeneu les columnes a unir\",\n     \"core-views/column-join-before-options\": \"Selecciona les opcions\",\n     \"core-views/column-join-field-separator\": \"Separador entre el contingut de cada columna\",\n-    \"core-views/column-join-field-separator-advice\": \"Introduïu un o més caràcters, o manteniu-lo en blanc per a unir les columnes sense separador.\"\n+    \"core-views/column-join-field-separator-advice\": \"Introduïu un o més caràcters, o manteniu-lo en blanc per a unir les columnes sense separador.\",\n+    \"core-views/see-more\": \"Veure més\",\n+    \"core-views/see-less\": \"Veure menys\"\n }\ndiff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json\nindex f07422f56..1c64feb83 100644\n--- a/main/webapp/modules/core/langs/translation-en.json\n+++ b/main/webapp/modules/core/langs/translation-en.json\n@@ -526,6 +526,7 @@\n     \"core-views/warning-sel-judg\": \"Please select at least one kind of judgment to copy.\",\n     \"core-views/start-recon\": \"Start reconciling…\",\n     \"core-views/recon-text-fb\": \"Reconcile text in this column with items in another data source\",\n+    \"core-views/data-extended-from\" : \"Data extended from $1\",\n     \"core-views/facets\": \"Facets\",\n     \"core-views/by-judg\": \"By judgment\",\n     \"core-views/judgment\": \"$1: judgment\",\ndiff --git a/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js b/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js\nindex 2356e9071..1c7f1191f 100644\n--- a/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js\n+++ b/main/webapp/modules/core/scripts/views/data-table/column-header-ui.js\n@@ -94,6 +94,18 @@ DataTableColumnHeaderUI.prototype._render = function() {\n       .appendTo(whole);\n     }\n   }\n+  if(\"sourceReconConfig\" in this._column) {\n+    if(this._column.sourceReconConfig.service){\n+     var service = ReconciliationManager.getServiceFromUrl(this._column.sourceReconConfig.service);\n+     var serviceName;\n+     if(service) {\n+       serviceName=service.name;\n+     }\n+     if(serviceName){\n+      elmts.nameContainer.attr(\"title\",$.i18n('core-views/data-extended-from',service.name));\n+      }\n+    }\n+  }\n };\n \n DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) {\ndiff --git a/pom.xml b/pom.xml\nindex e25b50f4e..4098e5c8d 100644\n--- a/pom.xml\n+++ b/pom.xml\n@@ -96,7 +96,7 @@\n     <odfdom-java.version>0.12.0</odfdom-java.version> <!-- do not update to 0.10.0, see issue #4397 -->\n     <vicino.version>1.2</vicino.version>\n     <clojure.version>1.11.1</clojure.version>\n-    <httpclient5.version>5.3</httpclient5.version>\n+    <httpclient5.version>5.3.1</httpclient5.version>\n     <httpcore.version>4.4.16</httpcore.version>\n     <univocity-csv.version>2.9.1</univocity-csv.version>\n     <swc-parser-lazy.version>3.1.9</swc-parser-lazy.version>\n@@ -108,7 +108,7 @@\n     <httpmime.version>4.5.14</httpmime.version>\n     <owasp-encoder.version>1.2.3</owasp-encoder.version>\n     <jasypt.version>1.9.3</jasypt.version>\n-    <mockito.version>5.9.0</mockito.version>\n+    <mockito.version>5.10.0</mockito.version>\n \n     <!-- plugin versions -->\n     <build-helper-maven-plugin.version>3.5.0</build-helper-maven-plugin.version>\n@@ -123,7 +123,7 @@\n     <maven-clean-plugin.version>3.3.2</maven-clean-plugin.version>\n     <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>\n     <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>\n-    <license-plugin.version>2.3.0</license-plugin.version>\n+    <license-plugin.version>2.4.0</license-plugin.version>\n     <org-jvnet-localizer-plugin.version>1.31</org-jvnet-localizer-plugin.version>\n   </properties>\n \n", "test_patch": "diff --git a/main/tests/server/src/com/google/refine/model/ColumnTests.java b/main/tests/server/src/com/google/refine/model/ColumnTests.java\nindex 0d34c1cef..7aa7c2523 100644\n--- a/main/tests/server/src/com/google/refine/model/ColumnTests.java\n+++ b/main/tests/server/src/com/google/refine/model/ColumnTests.java\n@@ -60,6 +60,19 @@ public class ColumnTests {\n                 + \"      {\\\"column\\\":\\\"organization_id\\\",\\\"propertyName\\\":\\\"SPARQL: P3500|P2427\\\",\\\"propertyID\\\":\\\"P3500|P2427\\\"}\"\n                 + \"    ],\"\n                 + \"    \\\"limit\\\":0},\"\n+                + \"\\\"sourceReconConfig\\\":{\"\n+                + \"   \\\"mode\\\":\\\"standard-service\\\",\"\n+                + \"   \\\"service\\\":\\\"https://tools.wmflabs.org/openrefine-wikidata/en/api\\\",\"\n+                + \"   \\\"identifierSpace\\\":\\\"http://www.wikidata.org/entity/\\\",\"\n+                + \"   \\\"schemaSpace\\\":\\\"http://www.wikidata.org/prop/direct/\\\",\"\n+                + \"   \\\"type\\\":{\\\"id\\\":\\\"Q43229\\\",\\\"name\\\":\\\"organization\\\"},\"\n+                + \"   \\\"autoMatch\\\":true,\"\n+                + \"   \\\"batchSize\\\":10,\"\n+                + \"   \\\"columnDetails\\\":[\"\n+                + \"      {\\\"column\\\":\\\"organization_country\\\",\\\"propertyName\\\":\\\"SPARQL: P17/P297\\\",\\\"propertyID\\\":\\\"P17/P297\\\"},\"\n+                + \"      {\\\"column\\\":\\\"organization_id\\\",\\\"propertyName\\\":\\\"SPARQL: P3500|P2427\\\",\\\"propertyID\\\":\\\"P3500|P2427\\\"}\"\n+                + \"    ],\"\n+                + \"    \\\"limit\\\":0},\"\n                 + \"\\\"reconStats\\\":{\"\n                 + \"    \\\"nonBlanks\\\":299,\"\n                 + \"    \\\"newTopics\\\":0,\"\ndiff --git a/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java b/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java\nindex b7e191ba0..b3067160d 100644\n--- a/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/recon/ExtendDataOperationTests.java\n@@ -68,6 +68,7 @@ import com.google.refine.model.Project;\n import com.google.refine.model.Recon;\n import com.google.refine.model.ReconCandidate;\n import com.google.refine.model.Row;\n+import com.google.refine.model.recon.DataExtensionReconConfig;\n import com.google.refine.model.recon.ReconciledDataExtensionJob;\n import com.google.refine.model.recon.ReconciledDataExtensionJob.DataExtensionConfig;\n import com.google.refine.operations.EngineDependentOperation;\n@@ -154,6 +155,9 @@ public class ExtendDataOperationTests extends RefineTest {\n     public void SetUp() throws IOException, ModelException {\n         OperationRegistry.registerOperation(getCoreModule(), \"extend-reconciled-data\", ExtendDataOperation.class);\n         project = createProjectWithColumns(\"DataExtensionTests\", \"country\");\n+        project.columnModel.getColumnByName(\"country\").setReconConfig(new DataExtensionReconConfig(RECON_SERVICE,\n+                RECON_IDENTIFIER_SPACE,\n+                RECON_SCHEMA_SPACE, null));\n \n         options = mock(Properties.class);\n         engine = new Engine(project);\n@@ -284,6 +288,9 @@ public class ExtendDataOperationTests extends RefineTest {\n \n             // Make sure we did not create any recon stats for that column (no reconciled value)\n             Assert.assertTrue(project.columnModel.getColumnByName(\"ISO 3166-1 alpha-2 code\").getReconStats() == null);\n+            // adding an assertion for sourceReconConfig\n+            Assert.assertTrue(project.columnModel.getColumnByName(\"ISO 3166-1 alpha-2 code\").getSourceReconConfig() != null);\n+\n         }\n     }\n \n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #6304\r\n\r\nChanges proposed in this pull request:\r\n\r\nIn this pull request, I have fixed the bug in which the referenceContainer was not unfolding on clicking of the triangle icon.\r\n\r\nPFA Evidence.\r\n\r\n\r\nhttps://github.com/OpenRefine/OpenRefine/assets/37299522/841f28db-7f15-4ea2-b07e-5d390574def2\r\n\r\n", "PR_Title": "Issue 6304 unfolding triangle bug", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-6318_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 6318, "issue_title": "Issue 6304 unfolding triangle bug", "issue_body": "Fixes #6304\r\n\r\nChanges proposed in this pull request:\r\n\r\nIn this pull request, I have fixed the bug in which the referenceContainer was not unfolding on clicking of the triangle icon.\r\n\r\nPFA Evidence.\r\n\r\n\r\nhttps://github.com/OpenRefine/OpenRefine/assets/37299522/841f28db-7f15-4ea2-b07e-5d390574def2\r\n\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}
{"repo": "OpenRefine/OpenRefine", "instance_id": "OpenRefine__OpenRefine-7254", "base_commit": "8fee038bc70966d315cc708cb2ab6610c019b712", "patch": "diff --git a/main/src/com/google/refine/operations/row/RowAdditionOperation.java b/main/src/com/google/refine/operations/row/RowAdditionOperation.java\nindex c7e3bc7d9..d829c5f90 100644\n--- a/main/src/com/google/refine/operations/row/RowAdditionOperation.java\n+++ b/main/src/com/google/refine/operations/row/RowAdditionOperation.java\n@@ -28,6 +28,7 @@\n package com.google.refine.operations.row;\n \n import java.util.List;\n+import java.util.stream.Collectors;\n \n import com.fasterxml.jackson.annotation.JsonCreator;\n import com.fasterxml.jackson.annotation.JsonProperty;\n@@ -44,15 +45,39 @@ public class RowAdditionOperation extends AbstractOperation {\n     final private List<Row> _rows;\n     final private int _insertionIndex;\n \n+    public RowAdditionOperation(\n+            List<Row> rows,\n+            int insertionIndex) {\n+        _rows = rows;\n+        _insertionIndex = insertionIndex;\n+    }\n+\n+    /**\n+     * Deserialization constructor to provide compatibility for the legacy serialization format. In this format, only\n+     * the number of rows is relevant: the contents of the rows must be ignored, because they might have been corrupted\n+     * due to mutability issues in https://github.com/OpenRefine/OpenRefine/issues/7245.\n+     * \n+     * @param addedRows\n+     *            the rows to add to the project\n+     * @param rows\n+     *            a legacy serialization field, whose length is is the only thing that matters. If provided, it will be\n+     *            converted to a list of empty rows of the same size.\n+     * @param insertionIndex\n+     *            the place in the grid where to insert this list.\n+     * @deprecated should not be called directly, is only provided for JSON deserialization.\n+     */\n+    @Deprecated\n     @JsonCreator\n     public RowAdditionOperation(\n-            @JsonProperty(\"rows\") List<Row> rows,\n+            @JsonProperty(\"addedRows\") List<Row> addedRows,\n+            @JsonProperty(\"rows\") List<Object> rows,\n             @JsonProperty(\"insertionIndex\") int insertionIndex) {\n-        _rows = rows;\n+        _rows = addedRows != null ? addedRows\n+                : (rows == null ? List.of() : rows.stream().map(r -> new Row(0)).collect(Collectors.toList()));\n         _insertionIndex = insertionIndex;\n     }\n \n-    @JsonProperty(\"rows\")\n+    @JsonProperty(\"addedRows\")\n     public List<Row> getRows() {\n         return _rows;\n     }\ndiff --git a/modules/core/src/main/java/com/google/refine/model/Cell.java b/modules/core/src/main/java/com/google/refine/model/Cell.java\nindex 119f90e0d..084452272 100644\n--- a/modules/core/src/main/java/com/google/refine/model/Cell.java\n+++ b/modules/core/src/main/java/com/google/refine/model/Cell.java\n@@ -193,6 +193,13 @@ public class Cell implements HasFields, Serializable {\n         return new Cell((Serializable) value, recon);\n     }\n \n+    /**\n+     * Return a deep copy of this object, making sure that if one instance is modified, the other isn't.\n+     */\n+    public Cell deepCopy() {\n+        return new Cell(value, recon == null ? null : recon.dup());\n+    }\n+\n     @Override\n     public String toString() {\n         // TODO this is kept like this for now, but it should rather be a string which makes the difference\ndiff --git a/modules/core/src/main/java/com/google/refine/model/Row.java b/modules/core/src/main/java/com/google/refine/model/Row.java\nindex 2aff00999..5550ec9fa 100644\n--- a/modules/core/src/main/java/com/google/refine/model/Row.java\n+++ b/modules/core/src/main/java/com/google/refine/model/Row.java\n@@ -38,6 +38,7 @@ import java.io.Writer;\n import java.util.ArrayList;\n import java.util.List;\n import java.util.Properties;\n+import java.util.stream.Collectors;\n \n import com.fasterxml.jackson.annotation.JsonCreator;\n import com.fasterxml.jackson.annotation.JsonIgnore;\n@@ -93,6 +94,19 @@ public class Row implements HasFields {\n         return row;\n     }\n \n+    /**\n+     * Make a deep copy of the row, making sure that if one is modified, the other isn't.\n+     */\n+    public Row deepCopy() {\n+        Row row = new Row(cells.size());\n+        row.flagged = flagged;\n+        row.starred = starred;\n+        row.cells.addAll(cells.stream()\n+                .map(cell -> cell == null ? null : cell.deepCopy())\n+                .collect(Collectors.toList()));\n+        return row;\n+    }\n+\n     @Override\n     public Object getField(String name, Properties bindings) {\n         if (FLAGGED.equals(name)) {\ndiff --git a/modules/core/src/main/java/com/google/refine/model/changes/RowAdditionChange.java b/modules/core/src/main/java/com/google/refine/model/changes/RowAdditionChange.java\nindex f3efb0f9c..5671d27e6 100644\n--- a/modules/core/src/main/java/com/google/refine/model/changes/RowAdditionChange.java\n+++ b/modules/core/src/main/java/com/google/refine/model/changes/RowAdditionChange.java\n@@ -33,6 +33,7 @@ import java.io.Writer;\n import java.util.ArrayList;\n import java.util.List;\n import java.util.Properties;\n+import java.util.stream.Collectors;\n \n import com.google.refine.ProjectManager;\n import com.google.refine.history.Change;\n@@ -57,7 +58,7 @@ public class RowAdditionChange implements Change {\n     @Override\n     public void apply(Project project) {\n         synchronized (project) {\n-            project.rows.addAll(_insertionIndex, _additionalRows);\n+            project.rows.addAll(_insertionIndex, _additionalRows.stream().map(row -> row.deepCopy()).collect(Collectors.toList()));\n \n             project.update();\n             project.columnModel.clearPrecomputes();\n", "test_patch": "diff --git a/main/tests/server/src/com/google/refine/operations/row/RowAdditionOperationTests.java b/main/tests/server/src/com/google/refine/operations/row/RowAdditionOperationTests.java\nindex d029e0121..bbc3658cb 100644\n--- a/main/tests/server/src/com/google/refine/operations/row/RowAdditionOperationTests.java\n+++ b/main/tests/server/src/com/google/refine/operations/row/RowAdditionOperationTests.java\n@@ -30,6 +30,7 @@ package com.google.refine.operations.row;\n import static org.testng.Assert.assertEquals;\n \n import java.io.IOException;\n+import java.io.Serializable;\n import java.util.ArrayList;\n import java.util.List;\n \n@@ -43,6 +44,8 @@ import org.testng.annotations.BeforeTest;\n import org.testng.annotations.Test;\n \n import com.google.refine.RefineTest;\n+import com.google.refine.model.Cell;\n+import com.google.refine.model.Project;\n import com.google.refine.model.Row;\n import com.google.refine.operations.OperationDescription;\n import com.google.refine.operations.OperationRegistry;\n@@ -51,7 +54,8 @@ import com.google.refine.util.TestUtils;\n \n public class RowAdditionOperationTests extends RefineTest {\n \n-    String json;\n+    String legacyJson;\n+    String newJson;\n \n     @BeforeSuite\n     public void registerOperation() {\n@@ -60,9 +64,17 @@ public class RowAdditionOperationTests extends RefineTest {\n \n     @BeforeMethod\n     public void setUp() {\n-        json = \"{\"\n+        // JSON serialization before 3.9.3, which might contain some corrupted cells because of mutability issues,\n+        // manifesting themselves in https://github.com/OpenRefine/OpenRefine/issues/7245\n+        legacyJson = \"{\"\n                 + \"\\\"op\\\":\\\"core/row-addition\\\",\"\n-                + \"\\\"rows\\\":[{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]},{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]}],\"\n+                + \"\\\"rows\\\":[{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[{\\\"foo\\\":3}]},{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]}],\"\n+                + \"\\\"index\\\":0,\"\n+                + \"\\\"description\\\":\" + new TextNode(OperationDescription.row_addition_brief()).toString() + \"}\";\n+        // JSON serialization from 3.9.3 on\n+        newJson = \"{\"\n+                + \"\\\"op\\\":\\\"core/row-addition\\\",\"\n+                + \"\\\"addedRows\\\":[{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]},{\\\"starred\\\":false,\\\"flagged\\\":false,\\\"cells\\\":[]}],\"\n                 + \"\\\"index\\\":0,\"\n                 + \"\\\"description\\\":\" + new TextNode(OperationDescription.row_addition_brief()).toString() + \"}\";\n     }\n@@ -74,9 +86,15 @@ public class RowAdditionOperationTests extends RefineTest {\n     }\n \n     @Test\n-    public void testDeserialization() throws IOException {\n-        RowAdditionOperation op = ParsingUtilities.mapper.readValue(json, RowAdditionOperation.class);\n-        TestUtils.isSerializedTo(op, json);\n+    public void testLegacyDeserialization() throws IOException {\n+        RowAdditionOperation op = ParsingUtilities.mapper.readValue(legacyJson, RowAdditionOperation.class);\n+        TestUtils.isSerializedTo(op, newJson);\n+    }\n+\n+    @Test\n+    public void testNewDeserialization() throws IOException {\n+        RowAdditionOperation op = ParsingUtilities.mapper.readValue(newJson, RowAdditionOperation.class);\n+        TestUtils.isSerializedTo(op, newJson);\n     }\n \n     @Test\n@@ -89,7 +107,36 @@ public class RowAdditionOperationTests extends RefineTest {\n         RowAdditionOperation op = new RowAdditionOperation(rows, index);\n         ObjectMapper objectMapper = new ObjectMapper();\n         String serializedObject = objectMapper.writeValueAsString(op);\n-        assertEquals(serializedObject, json);\n+        assertEquals(serializedObject, newJson);\n     }\n \n+\n+    // regression test for https://github.com/OpenRefine/OpenRefine/issues/7245\n+    @Test\n+    public void mutabilityBugRegressionTest() throws Exception {\n+        Project project = createProject(new String[] { \"foo\", \"bar\" },\n+                new Serializable[][] {\n+                        { \"a\", \"b \" },\n+                        { null, \"c\" },\n+                });\n+\n+        RowAdditionOperation op = ParsingUtilities.mapper.readValue(newJson, RowAdditionOperation.class);\n+\n+        // add the two rows at the beginning\n+        runOperation(op, project);\n+        // and then edit a cell in the first row\n+        project.rows.get(0).setCell(0, new Cell(\"hello\", null));\n+\n+        Project expected = createProject(new String[] { \"foo\", \"bar\" },\n+                new Serializable[][] {\n+                        { \"hello\", null },\n+                        { null, null },\n+                        { \"a\", \"b \" },\n+                        { null, \"c\" },\n+                });\n+        assertProjectEquals(project, expected);\n+\n+        // the operation metadata is still unchanged\n+        TestUtils.isSerializedTo(op, newJson);\n+    }\n }\ndiff --git a/modules/core/src/test/java/com/google/refine/model/CellTests.java b/modules/core/src/test/java/com/google/refine/model/CellTests.java\nindex 1fecf9e1e..b2048df01 100644\n--- a/modules/core/src/test/java/com/google/refine/model/CellTests.java\n+++ b/modules/core/src/test/java/com/google/refine/model/CellTests.java\n@@ -184,4 +184,17 @@ public class CellTests {\n         assertNotEquals(c1, \"foo\");\n         assertEquals(c1.hashCode(), new Cell(\"foo\", recon).hashCode());\n     }\n+\n+    @Test\n+    public void testDeepCopy() {\n+        Recon recon = mock(Recon.class);\n+        Recon reconDup = mock(Recon.class);\n+        when(recon.dup()).thenReturn(reconDup);\n+\n+        Cell c1 = new Cell(\"foo\", recon);\n+        Cell c2 = c1.deepCopy();\n+\n+        assertEquals(c2.value, \"foo\");\n+        assertEquals(c2.recon, reconDup);\n+    }\n }\ndiff --git a/modules/core/src/test/java/com/google/refine/model/RowTests.java b/modules/core/src/test/java/com/google/refine/model/RowTests.java\nindex 8337acd1b..c37662ef6 100644\n--- a/modules/core/src/test/java/com/google/refine/model/RowTests.java\n+++ b/modules/core/src/test/java/com/google/refine/model/RowTests.java\n@@ -35,6 +35,9 @@ package com.google.refine.model;\n \n import static org.mockito.Mockito.mock;\n import static org.mockito.Mockito.when;\n+import static org.testng.Assert.assertEquals;\n+import static org.testng.Assert.assertFalse;\n+import static org.testng.Assert.assertTrue;\n \n import java.io.StringWriter;\n import java.util.Properties;\n@@ -187,4 +190,18 @@ public class RowTests extends RefineTest {\n         Assert.assertTrue((Boolean) row.getField(\"starred\", options));\n     }\n \n+    @Test\n+    public void deepCopy() {\n+        Row row = new Row(1);\n+        row.flagged = true;\n+        row.setCell(0, new Cell(\"original value\", null));\n+\n+        Row copied = row.deepCopy();\n+        row.starred = true;\n+        row.setCell(0, new Cell(\"new value\", null));\n+\n+        assertTrue(copied.flagged);\n+        assertFalse(copied.starred);\n+        assertEquals(copied.cells.get(0).value, \"original value\");\n+    }\n }\ndiff --git a/modules/core/src/test/java/com/google/refine/model/changes/RowAdditionChangeTests.java b/modules/core/src/test/java/com/google/refine/model/changes/RowAdditionChangeTests.java\nindex b742aa489..3d6a48ffd 100644\n--- a/modules/core/src/test/java/com/google/refine/model/changes/RowAdditionChangeTests.java\n+++ b/modules/core/src/test/java/com/google/refine/model/changes/RowAdditionChangeTests.java\n@@ -29,7 +29,7 @@ package com.google.refine.model.changes;\n \n import static org.testng.Assert.assertEquals;\n import static org.testng.Assert.assertNotNull;\n-import static org.testng.Assert.assertSame;\n+import static org.testng.Assert.assertNotSame;\n import static org.testng.Assert.assertTrue;\n \n import java.io.IOException;\n@@ -107,13 +107,18 @@ public class RowAdditionChangeTests extends RefineTest {\n     }\n \n     @Test\n-    // After prepend apply, project's new prepended rows are identical those passed to constructor\n+    // After prepend apply, project's new prepended rows are equal those passed to constructor\n+    // but not identical, because otherwise modifying the row will change the operation's metadata.\n+    // See https://github.com/OpenRefine/OpenRefine/issues/7245\n     public void testPrependApplyRowIdentity() {\n         change.apply(project);\n         for (int i = insertionIndex; i < newRows.size(); i++) {\n             Row actual = project.rows.get(i);\n             Row expected = newRows.get(i);\n-            assertSame(actual, expected);\n+            assertNotSame(actual, expected);\n+            assertEquals(actual.flagged, expected.flagged);\n+            assertEquals(actual.starred, expected.starred);\n+            assertEquals(actual.cells, expected.cells);\n         }\n     }\n \n@@ -205,6 +210,8 @@ public class RowAdditionChangeTests extends RefineTest {\n \n     @Test\n     // After append apply, project's new append rows are identical those passed to constructor\n+    // but not identical, because otherwise modifying the row will change the operation's metadata.\n+    // See https://github.com/OpenRefine/OpenRefine/issues/7245\n     public void testAppendApplyRowIdentity() {\n         insertionIndex = project.rows.size();\n         change = new RowAdditionChange(newRows, insertionIndex);\n@@ -213,7 +220,10 @@ public class RowAdditionChangeTests extends RefineTest {\n         for (int i = insertionIndex; i < newRows.size(); i++) {\n             Row actual = project.rows.get(insertionIndex + i);\n             Row expected = newRows.get(i);\n-            assertSame(actual, expected);\n+            assertNotSame(actual, expected);\n+            assertEquals(actual.flagged, expected.flagged);\n+            assertEquals(actual.starred, expected.starred);\n+            assertEquals(actual.cells, expected.cells);\n         }\n     }\n \n", "FAIL_TO_PASS": [], "PASS_TO_PASS": [], "PR_Body": "Fixes #7245 on branch `3.9`.\r\n\r\nCherry-picked from 1f9d248e3d641ea2509b83909573f375a04e72b8 (PR #7247)\r\n", "PR_Title": "Backport: Fix deserialization of RowAdditionOperation", "docker_image": "xinzhou1997/swe_rpg_java:OpenRefine__OpenRefine-7254_linux", "log_parser": "def parser(log: str) -> dict[str, str]:\n    import re\n    import xml.etree.ElementTree as ET\n\n    results: dict[str, str] = {}\n\n    # Helper: merge statuses with precedence fail > skip > pass\n    def merge_status(name: str, new_status: str):\n        if new_status not in (\"pass\", \"fail\", \"skip\"):\n            return\n        old_status = results.get(name)\n        if old_status is None:\n            results[name] = new_status\n            return\n        if old_status == new_status:\n            return\n        # Precedence: fail > skip > pass\n        priority = {\"fail\": 3, \"skip\": 2, \"pass\": 1}\n        if priority[new_status] > priority[old_status]:\n            results[name] = new_status\n\n    # -----------------------\n    # XML-based parsing pass\n    # -----------------------\n\n    # Non-greedy patterns for JUnit/TestNG XML blocks\n    xml_pattern = re.compile(\n        r\"(<testng-results[\\s\\S]*?</testng-results>|<testsuite[\\s\\S]*?</testsuite>)\",\n        re.IGNORECASE,\n    )\n\n    for match in xml_pattern.finditer(log):\n        xml_block = match.group(1)\n        try:\n            root = ET.fromstring(xml_block)\n        except ET.ParseError:\n            # Skip this block but continue with others\n            continue\n\n        tag_lower = root.tag.lower()\n\n        # Handle TestNG summary reports (<testng-results>)\n        if tag_lower.endswith(\"testng-results\"):\n            # Look for all test-method elements anywhere\n            for tm in root.findall(\".//test-method\"):\n                # Skip configuration methods\n                if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                    continue\n                name = tm.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                # Try to get class name from surrounding <class> element\n                class_elem = tm.find(\"..\")\n                class_name = \"\"\n                # xml.etree doesn't support parent lookup directly, so search ancestors:\n                # We instead search for the nearest <class> ancestor manually:\n            # Since parent lookup is tricky, fall back to the attribute 'class' on <test-method> if present\n            # or to a surrounding <class> element found via xpath with name match, which is usually enough.\n            # Re-parse with a simpler loop using suites/tests/classes for better class name resolution.\n            for suite in root.findall(\".//suite\"):\n                for test in suite.findall(\".//test\"):\n                    for clazz in test.findall(\".//class\"):\n                        class_name = clazz.attrib.get(\"name\", \"\")\n                        for tm in clazz.findall(\"test-method\"):\n                            if tm.attrib.get(\"is-config\", \"false\").lower() == \"true\":\n                                continue\n                            m_name = tm.attrib.get(\"name\", \"\")\n                            if not m_name:\n                                continue\n                            fq_name = f\"{class_name}.{m_name}\" if class_name else m_name\n                            status_attr = tm.attrib.get(\"status\", \"\").upper()\n                            # Map TestNG status to our statuses\n                            if status_attr == \"PASS\":\n                                status = \"pass\"\n                            elif status_attr in (\"FAIL\", \"FAILURE\"):\n                                status = \"fail\"\n                            elif status_attr == \"SKIP\":\n                                status = \"skip\"\n                            else:\n                                # Fallback: if there is an exception element, mark as fail; else pass\n                                if tm.find(\".//exception\") is not None:\n                                    status = \"fail\"\n                                else:\n                                    status = \"pass\"\n                            merge_status(fq_name, status)\n            continue\n\n        # Handle JUnit-style <testsuite> reports\n        if tag_lower.endswith(\"testsuite\"):\n            for tc in root.findall(\".//testcase\"):\n                class_name = tc.attrib.get(\"classname\", \"\")\n                name = tc.attrib.get(\"name\", \"\")\n                if not name:\n                    continue\n                fq_name = f\"{class_name}.{name}\" if class_name else name\n\n                # Determine status via children\n                status = \"pass\"\n                if tc.find(\"skipped\") is not None:\n                    status = \"skip\"\n                elif tc.find(\"failure\") is not None or tc.find(\"error\") is not None:\n                    status = \"fail\"\n\n                merge_status(fq_name, status)\n\n    # ---------------------------\n    # Text-based parsing fallback\n    # ---------------------------\n\n    # Compile regexes for common frameworks\n\n    # pytest: path::test_name STATUS\n    pytest_re = re.compile(\n        r\"^(?P<name>\\S+::\\S+)\\s+\"\n        r\"(?P<status>PASSED|FAILED|SKIPPED|ERROR|XFAILED|XPASSED)\\b\"\n    )\n\n    # unittest / nose: ClassName.test_method ... ok/FAIL/ERROR/skipped\n    unittest_re = re.compile(\n        r\"^(?P<class>[A-Za-z_]\\w*)\\.(?P<method>[A-Za-z_]\\w*)\\s+\\.\\.\\.\\s+\"\n        r\"(?P<status>ok|FAIL|ERROR|skipped)\\b\"\n    )\n\n    # go test: --- STATUS: TestName\n    gotest_re = re.compile(\n        r\"^---\\s+(?P<status>PASS|FAIL|SKIP):\\s+(?P<name>\\S+)\"\n    )\n\n    # Jest-like symbol lines: ✓/✕/○ test name\n    jest_symbol_re = re.compile(r\"^\\s*([✓✕○])\\s+(?P<name>.+)\")\n\n    # Map various raw statuses to our canonical ones\n    def map_status(raw: str) -> str | None:\n        r = raw.upper()\n        if r in (\"PASSED\", \"OK\", \"XPASSED\", \"PASS\"):\n            return \"pass\"\n        if r in (\"FAILED\", \"FAIL\", \"ERROR\", \"XFAILED\"):\n            return \"fail\"\n        if r in (\"SKIPPED\", \"SKIP\", \"SKIPPED (EXPECTED FAILURE)\"):\n            return \"skip\"\n        return None\n\n    for line in log.splitlines():\n        line = line.rstrip(\"\\n\")\n\n        # pytest\n        m = pytest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # unittest\n        m = unittest_re.match(line)\n        if m:\n            name = f\"{m.group('class')}.{m.group('method')}\"\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # go test\n        m = gotest_re.match(line)\n        if m:\n            name = m.group(\"name\")\n            status = map_status(m.group(\"status\"))\n            if status:\n                merge_status(name, status)\n            continue\n\n        # Jest symbols\n        m = jest_symbol_re.match(line)\n        if m:\n            symbol = m.group(1)\n            name = m.group(\"name\").strip()\n            if symbol == \"✓\":\n                status = \"pass\"\n            elif symbol == \"✕\":\n                status = \"fail\"\n            elif symbol == \"○\":\n                status = \"skip\"\n            else:\n                status = None\n            if status:\n                merge_status(name, status)\n            continue\n\n    return results\n", "test_cmds": ["export _JAVA_OPTIONS=\"-Djava.net.preferIPv6Addresses=false\"", "mvn -B test"], "rebuild_cmds": ["export DEBIAN_FRONTEND=noninteractive", "apt-get update -qq", "apt-get install -y -qq nodejs npm", "./refine build"], "issues": [{"issue_number": 7254, "issue_title": "Backport: Fix deserialization of RowAdditionOperation", "issue_body": "Fixes #7245 on branch `3.9`.\r\n\r\nCherry-picked from 1f9d248e3d641ea2509b83909573f375a04e72b8 (PR #7247)\r\n"}], "print_cmds": ["find . -maxdepth 6 -path '*surefire-reports/*.xml' -print0 | xargs -0 -I {} sh -c 'echo \"===== {} =====\"; cat {}'"], "working_dir": "/OpenRefine"}