Allow combined modules with lower case namespaces (#2566)

* allow combined modules with lower case names

* fix expected case of hello.xqm

Author: GuntherRademacher

basex-core/src/main/java/org/basex/query/util/pkg/RepoManager.java

@@ -127,19 +127,20 @@ public void delete(final String name) throws QueryException {
           repo.delete(pkg);
         }
 
-        if(pkg.type() == PkgType.COMBINED) {
-          // delete associated JAR file
-          final IOFile pkgFile = repo.path(pkgPath.replaceAll("\\.[^.]+$", IO.JARSUFFIX));
-          if(!pkgFile.delete()) throw REPO_DELETE_X.get(info, pkgPath);
-        }
-
         // delete package directory or file
         final IOFile pkgFile = repo.path(pkgPath);
         if(!pkgFile.delete()) throw REPO_DELETE_X.get(info, pkgPath);
 
         // delete directory with extracted jars
-        final IOFile extDir = pkgFile.parent().resolve('.' + pkg.name().replaceAll("^.*\\.", ""));
+        final String className = Strings.uriToClasspath(pkg.name().replaceAll("^.*\\.", ""));
+        final IOFile extDir = pkgFile.parent().resolve('.' + className);
         if(!extDir.delete()) throw REPO_DELETE_X.get(info, extDir);
+
+        if(pkg.type() == PkgType.COMBINED) {
+          // delete associated JAR file
+          final IOFile jarFile = pkgFile.parent().resolve(className + IO.JARSUFFIX);
+          if(!jarFile.delete()) throw REPO_DELETE_X.get(info, pkgPath);
+        }
         deleted = true;
       }
     }
@@ -169,6 +170,14 @@ public ArrayList<Pkg> packages() {
         }
       }
     }
+    // detect combined modules where names have different case
+    for(final Pkg xqm : new ArrayList<>(map.values())) {
+      if(xqm.type == PkgType.XQUERY) {
+        final String jarName = Strings.uriToClasspath(xqm.name);
+        final Pkg jar = map.get(jarName);
+        if(jar != null && xqm.merge(jar).type == PkgType.COMBINED) map.remove(jarName);
+      }
+    }
     return new ArrayList<>(map.values());
   }
 
@@ -208,7 +217,7 @@ private boolean installXQ(final byte[] content, final String path)
     try(QueryContext qc = new QueryContext(context)) {
       final byte[] uri = qc.parseLibrary(string(content), path).sc.module.uri();
       // copy file to rewritten URI file path
-      return write(Strings.uri2path(string(uri)) + IO.XQMSUFFIX, content);
+      return write(Strings.uri2path(string(uri)), IO.XQMSUFFIX, content);
     }
   }
 
@@ -228,29 +237,33 @@ private boolean installJAR(final byte[] content, final String path)
       for(String s; (s = nli.readLine()) != null;) {
         // write file to rewritten file path
         final Matcher main = MAIN_CLASS.matcher(s);
-        if(main.find()) return write(main.group(1).replace('.', '/') + IO.JARSUFFIX, content);
+        if(main.find()) return write(main.group(1), IO.JARSUFFIX, content);
       }
     }
     throw REPO_PARSE_X_X.get(info, path, MANIFEST);
   }
 
   /**
    * Writes a package to disk.
-   * @param path file path
+   * @param pkg package
+   * @param suffix file suffix
    * @param content package content
    * @return {@code true} if existing package was replaced
    * @throws IOException I/O exception
    */
-  private boolean write(final String path, final byte[] content) throws IOException {
+  private boolean write(final String pkg, final String suffix, final byte[] content)
+      throws IOException {
     final IOFile repo = new IOFile(context.soptions.get(StaticOptions.REPOPATH));
-    final IOFile target = new IOFile(repo, path);
+    final boolean isJar = suffix.equals(IO.JARSUFFIX);
+    final String pth = isJar ? Strings.uriToClasspath(pkg) : pkg;
+    final IOFile target = new IOFile(repo, Strings.uri2path(pth) + suffix);
     final boolean exists = target.exists();
     if(!target.parent().md()) throw new BaseXException("Could not create %.", target);
     target.write(content);
 
     // extract files from JAR package
-    if(target.hasSuffix(IO.JARSUFFIX)) {
-      final String pkgPath = path.replaceAll(IO.JARSUFFIX + '$', "");
+    if(isJar) {
+      final String pkgPath =  Strings.uri2path(pkg);
       final String pkgName = target.name().replaceAll(IO.JARSUFFIX + '$', "");
       try(JarFile jarFile = new JarFile(target.file())) {
         for(final JarEntry entry : Collections.list(jarFile.entries())) {

basex-core/src/test/java/org/basex/query/expr/PackageAPITest.java

@@ -289,33 +289,34 @@ private static void copy(final Path source, final Path target) throws IOExceptio
    */
   @Test public void installJar() {
     // ensure that all files are installed
-    execute(new RepoInstall(REPO + "Hello.jar", null));
+    execute(new RepoInstall(REPO + "hello.jar", null));
 
     final IOFile jar = new IOFile(REPO, "org/basex/modules/Hello.jar");
-    final IOFile xqm = new IOFile(REPO, "org/basex/modules/Hello.xqm");
+    final IOFile xqm = new IOFile(REPO, "org/basex/modules/hello.xqm");
     assertTrue(jar.exists(), "File not found: " + jar);
     assertTrue(xqm.exists(), "File not found: " + xqm);
 
     // run query
-    String query = "import module namespace h='http://basex.org/modules/Hello';h:hello('Universe')";
+    String query = "import module namespace h='http://basex.org/modules/hello';h:hello('Universe')";
     query(query, "Hello Universe");
 
     // run query, ensure that wrong types will be rejected
-    query = "import module namespace h='http://basex.org/modules/Hello';h:hello(123)";
+    query = "import module namespace h='http://basex.org/modules/hello';h:hello(123)";
     try(QueryProcessor qp = new QueryProcessor(query, context)) {
       qp.value();
     } catch(final QueryException ex) {
       assertEquals(INVTYPE_X, ex.error());
     }
 
     // ensure that all files were deleted
-    execute(new RepoDelete("org.basex.modules.Hello", null));
+    execute(new RepoDelete("org.basex.modules.hello", null));
     assertFalse(jar.exists(), "File was not deleted:" + jar);
     assertFalse(xqm.exists(), "File was not deleted:" + xqm);
 
     // ensure that package can only be deleted once
     try {
-      new RepoDelete("org.basex.modules.Hello", null).execute(context);
+      new RepoDelete("org.basex.modules.hello", null).execute(context);
+      fail("RepoDelete did not detect missing package.");
     } catch(final BaseXException ex) {
       assertTrue(ex.toString().contains(REPO_NOTFOUND_X.toString()));
     }