Skip to content

Commit 9a4b279

Browse files
JavaSaBrJavaSaBr
authored
Merge pull request #35 from JavaSaBr/improve-modules-v2
Improve modules v2
2 parents c2201da + 11c940b commit 9a4b279

File tree

63 files changed

+912
-1577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+912
-1577
lines changed

‎rlib-classpath/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
dependencies {
33
api projects.rlibCommon
4+
api projects.rlibIo
45
testImplementation projects.rlibLoggerImpl
56
}

rlib-classpath/src/main/java/javasabr/rlib/common/classpath/ClassPathScanner.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/ClassPathScanner.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package javasabr.rlib.common.classpath;
1+
package javasabr.rlib.classpath;
22

33
import java.lang.annotation.Annotation;
44
import java.net.URL;
55
import java.net.URLClassLoader;
66
import java.util.function.Predicate;
7-
import javasabr.rlib.common.classpath.impl.ClassPathScannerImpl;
7+
import javasabr.rlib.classpath.impl.ClassPathScannerImpl;
88
import javasabr.rlib.common.util.array.Array;
99
import org.jspecify.annotations.Nullable;
1010

@@ -14,6 +14,8 @@
1414
public interface ClassPathScanner {
1515

1616
String JAR_EXTENSION = ".jar";
17+
String SOURCE_EXTENSION = ".java";
18+
String CLASS_EXTENSION = ".class";
1719

1820
@Nullable ClassPathScanner NULL_SCANNER = null;
1921

rlib-classpath/src/main/java/javasabr/rlib/common/classpath/ClassPathScannerFactory.java renamed to rlib-classpath/src/main/java/javasabr/rlib/classpath/ClassPathScannerFactory.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package javasabr.rlib.common.classpath;
1+
package javasabr.rlib.classpath;
22

3-
import javasabr.rlib.common.classpath.impl.ClassPathScannerImpl;
4-
import javasabr.rlib.common.classpath.impl.ManifestClassPathScannerImpl;
3+
import javasabr.rlib.classpath.impl.ClassPathScannerImpl;
4+
import javasabr.rlib.classpath.impl.ManifestClassPathScannerImpl;
55

66
/**
77
* @author JavaSaBr

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package javasabr.rlib.common.classpath.impl;
1+
package javasabr.rlib.classpath.impl;
22

33
import static java.lang.reflect.Modifier.isAbstract;
44
import static javasabr.rlib.common.util.ClassUtils.unsafeNNCast;
@@ -14,14 +14,13 @@
1414
import java.util.function.Predicate;
1515
import java.util.jar.JarInputStream;
1616
import java.util.zip.ZipException;
17-
import javasabr.rlib.common.classpath.ClassPathScanner;
18-
import javasabr.rlib.common.compiler.Compiler;
19-
import javasabr.rlib.common.io.impl.ReuseBytesInputStream;
20-
import javasabr.rlib.common.io.impl.ReuseBytesOutputStream;
17+
import javasabr.rlib.classpath.ClassPathScanner;
18+
import javasabr.rlib.io.impl.ReuseBytesInputStream;
19+
import javasabr.rlib.io.impl.ReuseBytesOutputStream;
2120
import javasabr.rlib.common.util.ArrayUtils;
22-
import javasabr.rlib.common.util.IOUtils;
2321
import javasabr.rlib.common.util.array.Array;
2422
import javasabr.rlib.common.util.array.ArrayFactory;
23+
import javasabr.rlib.io.util.IoUtils;
2524
import javasabr.rlib.logger.api.Logger;
2625
import javasabr.rlib.logger.api.LoggerManager;
2726
import lombok.AccessLevel;
@@ -246,7 +245,7 @@ private void scanDirectory(
246245
}
247246

248247
loadClass(rootPath, file, path, classes);
249-
} else if (!filename.endsWith(Compiler.SOURCE_EXTENSION)) {
248+
} else if (!filename.endsWith(SOURCE_EXTENSION)) {
250249

251250
String path = file
252251
.subpath(rootPath.getNameCount(), file.getNameCount())
@@ -305,12 +304,12 @@ private void scanJarInputStream(
305304

306305
if (name.endsWith(JAR_EXTENSION)) {
307306
rout.reset();
308-
IOUtils.copy(jin, rout, buffer, false);
309-
rin.initFor(rout.getData(), 0, rout.size());
307+
IoUtils.copy(jin, rout, buffer, false);
308+
rin.initFor(rout.data(), 0, rout.size());
310309
scanJar(classes, resources, rin);
311310
} else if (name.endsWith(CLASS_EXTENSION)) {
312311
loadClass(null, null, name, classes);
313-
} else if (!name.endsWith(Compiler.SOURCE_EXTENSION)) {
312+
} else if (!name.endsWith(SOURCE_EXTENSION)) {
314313
resources.add(name);
315314
}
316315
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package javasabr.rlib.common.classpath.impl;
1+
package javasabr.rlib.classpath.impl;
22

33
import java.io.InputStream;
44
import java.net.URL;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@NullMarked
2-
package javasabr.rlib.common.compiler;
2+
package javasabr.rlib.classpath.impl;
33

44
import org.jspecify.annotations.NullMarked;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@NullMarked
2-
package javasabr.rlib.common.classpath;
2+
package javasabr.rlib.classpath;
33

44
import org.jspecify.annotations.NullMarked;

rlib-classpath/src/test/java/javasabr/rlib/common/classpath/ClasspathScannerTests.java renamed to rlib-classpath/src/test/java/javasabr/rlib/classpath/ClasspathScannerTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package javasabr.rlib.common.classpath;
1+
package javasabr.rlib.classpath;
22

33
import java.util.Collection;
44
import javasabr.rlib.common.util.array.Array;
@@ -14,7 +14,7 @@
1414
public class ClasspathScannerTests {
1515

1616
static {
17-
LoggerManager.enable(ClassPathScanner.class, LoggerLevel.DEBUG);
17+
LoggerManager.configureDefault(LoggerLevel.DEBUG, true);
1818
}
1919

2020
@Test

‎rlib-common/src/main/java/javasabr/rlib/common/compiler/ByteCode.java‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎rlib-common/src/main/java/javasabr/rlib/common/compiler/Compiler.java‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)