Merge pull request #35 from JavaSaBr/improve-modules-v2

Improve modules v2

Author: JavaSaBr

rlib-classpath/build.gradle

@@ -1,5 +1,6 @@
 
 dependencies {
   api projects.rlibCommon
+  api projects.rlibIo
   testImplementation projects.rlibLoggerImpl
 }

…b/common/classpath/ClassPathScanner.java …abr/rlib/classpath/ClassPathScanner.javarlib-classpath/src/main/java/javasabr/rlib/common/classpath/ClassPathScanner.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/ClassPathScanner.java rlib-classpath/src/main/java/javasabr/rlib/common/classpath/ClassPathScanner.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/ClassPathScanner.java

@@ -1,10 +1,10 @@
-package javasabr.rlib.common.classpath;
+package javasabr.rlib.classpath;
 
 import java.lang.annotation.Annotation;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.util.function.Predicate;
-import javasabr.rlib.common.classpath.impl.ClassPathScannerImpl;
+import javasabr.rlib.classpath.impl.ClassPathScannerImpl;
 import javasabr.rlib.common.util.array.Array;
 import org.jspecify.annotations.Nullable;
 
@@ -14,6 +14,8 @@
 public interface ClassPathScanner {
 
   String JAR_EXTENSION = ".jar";
+  String SOURCE_EXTENSION = ".java";
+  String CLASS_EXTENSION = ".class";
 
   @Nullable ClassPathScanner NULL_SCANNER = null;
 

…n/classpath/ClassPathScannerFactory.java …b/classpath/ClassPathScannerFactory.javarlib-classpath/src/main/java/javasabr/rlib/common/classpath/ClassPathScannerFactory.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/ClassPathScannerFactory.java rlib-classpath/src/main/java/javasabr/rlib/common/classpath/ClassPathScannerFactory.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/ClassPathScannerFactory.java

@@ -1,7 +1,7 @@
-package javasabr.rlib.common.classpath;
+package javasabr.rlib.classpath;
 
-import javasabr.rlib.common.classpath.impl.ClassPathScannerImpl;
-import javasabr.rlib.common.classpath.impl.ManifestClassPathScannerImpl;
+import javasabr.rlib.classpath.impl.ClassPathScannerImpl;
+import javasabr.rlib.classpath.impl.ManifestClassPathScannerImpl;
 
 /**
  * @author JavaSaBr

…classpath/impl/ClassPathScannerImpl.java …classpath/impl/ClassPathScannerImpl.javarlib-classpath/src/main/java/javasabr/rlib/common/classpath/impl/ClassPathScannerImpl.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/impl/ClassPathScannerImpl.java rlib-classpath/src/main/java/javasabr/rlib/common/classpath/impl/ClassPathScannerImpl.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/impl/ClassPathScannerImpl.java

@@ -1,4 +1,4 @@
-package javasabr.rlib.common.classpath.impl;
+package javasabr.rlib.classpath.impl;
 
 import static java.lang.reflect.Modifier.isAbstract;
 import static javasabr.rlib.common.util.ClassUtils.unsafeNNCast;
@@ -14,14 +14,13 @@
 import java.util.function.Predicate;
 import java.util.jar.JarInputStream;
 import java.util.zip.ZipException;
-import javasabr.rlib.common.classpath.ClassPathScanner;
-import javasabr.rlib.common.compiler.Compiler;
-import javasabr.rlib.common.io.impl.ReuseBytesInputStream;
-import javasabr.rlib.common.io.impl.ReuseBytesOutputStream;
+import javasabr.rlib.classpath.ClassPathScanner;
+import javasabr.rlib.io.impl.ReuseBytesInputStream;
+import javasabr.rlib.io.impl.ReuseBytesOutputStream;
 import javasabr.rlib.common.util.ArrayUtils;
-import javasabr.rlib.common.util.IOUtils;
 import javasabr.rlib.common.util.array.Array;
 import javasabr.rlib.common.util.array.ArrayFactory;
+import javasabr.rlib.io.util.IoUtils;
 import javasabr.rlib.logger.api.Logger;
 import javasabr.rlib.logger.api.LoggerManager;
 import lombok.AccessLevel;
@@ -246,7 +245,7 @@ private void scanDirectory(
           }
 
           loadClass(rootPath, file, path, classes);
-        } else if (!filename.endsWith(Compiler.SOURCE_EXTENSION)) {
+        } else if (!filename.endsWith(SOURCE_EXTENSION)) {
 
           String path = file
               .subpath(rootPath.getNameCount(), file.getNameCount())
@@ -305,12 +304,12 @@ private void scanJarInputStream(
 
       if (name.endsWith(JAR_EXTENSION)) {
         rout.reset();
-        IOUtils.copy(jin, rout, buffer, false);
-        rin.initFor(rout.getData(), 0, rout.size());
+        IoUtils.copy(jin, rout, buffer, false);
+        rin.initFor(rout.data(), 0, rout.size());
         scanJar(classes, resources, rin);
       } else if (name.endsWith(CLASS_EXTENSION)) {
         loadClass(null, null, name, classes);
-      } else if (!name.endsWith(Compiler.SOURCE_EXTENSION)) {
+      } else if (!name.endsWith(SOURCE_EXTENSION)) {
         resources.add(name);
       }
     }

…h/impl/ManifestClassPathScannerImpl.java …h/impl/ManifestClassPathScannerImpl.javarlib-classpath/src/main/java/javasabr/rlib/common/classpath/impl/ManifestClassPathScannerImpl.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/impl/ManifestClassPathScannerImpl.java rlib-classpath/src/main/java/javasabr/rlib/common/classpath/impl/ManifestClassPathScannerImpl.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/impl/ManifestClassPathScannerImpl.java

@@ -1,4 +1,4 @@
-package javasabr.rlib.common.classpath.impl;
+package javasabr.rlib.classpath.impl;
 
 import java.io.InputStream;
 import java.net.URL;

…r/rlib/common/compiler/package-info.java …br/rlib/classpath/impl/package-info.javarlib-common/src/main/java/javasabr/rlib/common/compiler/package-info.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/impl/package-info.java rlib-common/src/main/java/javasabr/rlib/common/compiler/package-info.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/impl/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package javasabr.rlib.common.compiler;
+package javasabr.rlib.classpath.impl;
 
 import org.jspecify.annotations.NullMarked;

…/rlib/common/classpath/package-info.java …avasabr/rlib/classpath/package-info.javarlib-classpath/src/main/java/javasabr/rlib/common/classpath/package-info.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/package-info.java rlib-classpath/src/main/java/javasabr/rlib/common/classpath/package-info.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/package-info.java

@@ -1,4 +1,4 @@
 @NullMarked
-package javasabr.rlib.common.classpath;
+package javasabr.rlib.classpath;
 
 import org.jspecify.annotations.NullMarked;

…mon/classpath/ClasspathScannerTests.java …lib/classpath/ClasspathScannerTests.javarlib-classpath/src/test/java/javasabr/rlib/common/classpath/ClasspathScannerTests.java renamed to rlib-classpath/src/test/java/javasabr/rlib/classpath/ClasspathScannerTests.java rlib-classpath/src/test/java/javasabr/rlib/common/classpath/ClasspathScannerTests.java renamed to rlib-classpath/src/test/java/javasabr/rlib/classpath/ClasspathScannerTests.java

@@ -1,4 +1,4 @@
-package javasabr.rlib.common.classpath;
+package javasabr.rlib.classpath;
 
 import java.util.Collection;
 import javasabr.rlib.common.util.array.Array;
@@ -14,7 +14,7 @@
 public class ClasspathScannerTests {
 
   static {
-    LoggerManager.enable(ClassPathScanner.class, LoggerLevel.DEBUG);
+    LoggerManager.configureDefault(LoggerLevel.DEBUG, true);
   }
 
   @Test