Skip to content

Commit 6ee7f81

Browse files
JavaSaBrJavaSaBr
authored
Merge pull request #36 from JavaSaBr/improve-modules-v3
Improve modules part 3
2 parents 9a4b279 + aa9e886 commit 6ee7f81

88 files changed

Lines changed: 3006 additions & 195 deletions

File tree

Some content is hidden

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

‎build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ subprojects {
3232
annotationProcessor libs.lombok
3333

3434
testImplementation libs.junit.api
35+
testImplementation libs.junit.jupiter.params
3536
testCompileOnly libs.lombok
3637
testCompileOnly libs.jspecify
3738
testRuntimeOnly libs.junit.engine

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ jspecify = { module = "org.jspecify:jspecify", version.ref = "jspecify" }
2424
lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
2525
junit-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit-jupiter" }
2626
junit-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit-jupiter" }
27+
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit-jupiter" }
2728
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform-launcher" }
2829
slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
2930
slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" }
@@ -33,5 +34,4 @@ angus-mail = { module = "org.eclipse.angus:angus-mail", version.ref = "angus-mai
3334
testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
3435

3536
[bundles]
36-
junit = ["junit-engine", "junit-api"]
3737
mail = ["jakarta-mail-api", "angus-mail"]

‎rlib-classpath/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
dependencies {
33
api projects.rlibCommon
44
api projects.rlibIo
5+
api projects.rlibCollections
56
testImplementation projects.rlibLoggerImpl
67
}

‎rlib-classpath/src/main/java/javasabr/rlib/classpath/ClassPathScanner.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
import java.net.URLClassLoader;
66
import java.util.function.Predicate;
77
import javasabr.rlib.classpath.impl.ClassPathScannerImpl;
8-
import javasabr.rlib.common.util.array.Array;
8+
import javasabr.rlib.collections.array.Array;
9+
import javasabr.rlib.collections.array.MutableArray;
910
import org.jspecify.annotations.Nullable;
1011

1112
/**
@@ -48,32 +49,32 @@ public void scan(Predicate<String> filter) {}
4849
void useSystemClassPath(boolean useSystemClasspath);
4950

5051
default <T> Array<Class<T>> findImplementations(Class<T> interfaceClass) {
51-
Array<Class<T>> result = Array.ofType(Class.class);
52+
MutableArray<Class<T>> result = MutableArray.ofType(Class.class);
5253
findImplementationsTo(result, interfaceClass);
5354
return result;
5455
}
5556

56-
<T> void findImplementationsTo(Array<Class<T>> container, Class<T> interfaceClass);
57+
<T> void findImplementationsTo(MutableArray<Class<T>> container, Class<T> interfaceClass);
5758

5859
default <T> Array<Class<T>> findInherited(Class<T> parentClass) {
59-
Array<Class<T>> result = Array.ofType(Class.class);
60+
MutableArray<Class<T>> result = MutableArray.ofType(Class.class);
6061
findInheritedTo(result, parentClass);
6162
return result;
6263
}
6364

64-
<T> void findInheritedTo(Array<Class<T>> container, Class<T> parentClass);
65+
<T> void findInheritedTo(MutableArray<Class<T>> container, Class<T> parentClass);
6566

6667
default Array<Class<?>> findAnnotated(Class<? extends Annotation> annotationClass) {
67-
Array<Class<?>> result = Array.ofType(Class.class);
68+
MutableArray<Class<?>> result = MutableArray.ofType(Class.class);
6869
findAnnotatedTo(result, annotationClass);
6970
return result;
7071
}
7172

72-
void findAnnotatedTo(Array<Class<?>> container, Class<? extends Annotation> annotationClass);
73+
void findAnnotatedTo(MutableArray<Class<?>> container, Class<? extends Annotation> annotationClass);
7374

74-
void foundClassesTo(Array<Class<?>> container);
75+
void foundClassesTo(MutableArray<Class<?>> container);
7576

76-
void foundResourcesTo(Array<String> container);
77+
void foundResourcesTo(MutableArray<String> container);
7778

7879
Array<Class<?>> foundClasses();
7980

‎rlib-classpath/src/main/java/javasabr/rlib/classpath/impl/ClassPathScannerImpl.java‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
import java.util.jar.JarInputStream;
1616
import java.util.zip.ZipException;
1717
import javasabr.rlib.classpath.ClassPathScanner;
18+
import javasabr.rlib.collections.array.Array;
19+
import javasabr.rlib.collections.array.ArrayFactory;
20+
import javasabr.rlib.collections.array.MutableArray;
1821
import javasabr.rlib.io.impl.ReuseBytesInputStream;
1922
import javasabr.rlib.io.impl.ReuseBytesOutputStream;
2023
import javasabr.rlib.common.util.ArrayUtils;
21-
import javasabr.rlib.common.util.array.Array;
22-
import javasabr.rlib.common.util.array.ArrayFactory;
2324
import javasabr.rlib.io.util.IoUtils;
2425
import javasabr.rlib.logger.api.Logger;
2526
import javasabr.rlib.logger.api.LoggerManager;
@@ -45,7 +46,7 @@ public class ClassPathScannerImpl implements ClassPathScanner {
4546
private static final String MODULE_INFO_CLASS = "module-info.class";
4647
private static final String META_INF_PREFIX = "META-INF";
4748

48-
final Array<String> additionalPaths;
49+
final MutableArray<String> additionalPaths;
4950
final ClassLoader loader;
5051

5152
Class<?>[] classes;
@@ -55,7 +56,7 @@ public class ClassPathScannerImpl implements ClassPathScanner {
5556
boolean useSystemClassPath;
5657

5758
public ClassPathScannerImpl(ClassLoader classLoader) {
58-
this.additionalPaths = ArrayFactory.newArray(String.class);
59+
this.additionalPaths = MutableArray.ofType(String.class);
5960
this.loader = classLoader;
6061
this.classes = new Class[0];
6162
this.resources = new String[0];
@@ -70,20 +71,20 @@ public void useSystemClassPath(boolean useSystemClassPath) {
7071
public void addClasses(Array<Class<?>> classes) {
7172
this.classes = ArrayUtils.combine(
7273
this.classes,
73-
classes.toArray(ArrayUtils.EMPTY_CLASS_ARRAY),
74+
classes.toArray(),
7475
Class.class);
7576
}
7677

7778
@Override
7879
public void addResources(Array<String> resources) {
7980
this.resources = ArrayUtils.combine(
8081
this.resources,
81-
resources.toArray(ArrayUtils.EMPTY_STRING_ARRAY),
82+
resources.toArray(),
8283
String.class);
8384
}
8485

8586
@Override
86-
public <T> void findImplementationsTo(Array<Class<T>> container, Class<T> interfaceClass) {
87+
public <T> void findImplementationsTo(MutableArray<Class<T>> container, Class<T> interfaceClass) {
8788

8889
if (!interfaceClass.isInterface()) {
8990
throw new IllegalArgumentException("Class " + interfaceClass + " is not interface.");
@@ -100,7 +101,7 @@ public <T> void findImplementationsTo(Array<Class<T>> container, Class<T> interf
100101
}
101102

102103
@Override
103-
public <T> void findInheritedTo(Array<Class<T>> container, Class<T> parentClass) {
104+
public <T> void findInheritedTo(MutableArray<Class<T>> container, Class<T> parentClass) {
104105

105106
if (Modifier.isFinal(parentClass.getModifiers())) {
106107
throw new IllegalArgumentException("Class " + parentClass + " is final class.");
@@ -118,7 +119,7 @@ public <T> void findInheritedTo(Array<Class<T>> container, Class<T> parentClass)
118119
}
119120

120121
@Override
121-
public void findAnnotatedTo(Array<Class<?>> container, Class<? extends Annotation> annotationClass) {
122+
public void findAnnotatedTo(MutableArray<Class<?>> container, Class<? extends Annotation> annotationClass) {
122123
for (Class<?> klass : classes) {
123124
if (klass.isInterface() ||
124125
isAbstract(klass.getModifiers()) ||
@@ -131,35 +132,35 @@ public void findAnnotatedTo(Array<Class<?>> container, Class<? extends Annotatio
131132
}
132133

133134
@Override
134-
public void foundClassesTo(Array<Class<?>> container) {
135+
public void foundClassesTo(MutableArray<Class<?>> container) {
135136
container.addAll(classes);
136137
}
137138

138139
@Override
139-
public void foundResourcesTo(Array<String> container) {
140+
public void foundResourcesTo(MutableArray<String> container) {
140141
container.addAll(resources);
141142
}
142143

143144
@Override
144145
public Array<Class<?>> foundClasses() {
145-
return Array.of(classes);
146+
return Array.typed(Class.class, classes);
146147
}
147148

148149
@Override
149150
public Array<String> foundResources() {
150-
return Array.of(resources);
151+
return Array.typed(String.class, resources);
151152
}
152153

153-
protected String[] calculatePathsToScan() {
154+
protected Array<String> calculatePathsToScan() {
154155

155156
var systemClasspath = useSystemClassPath() ? classpathPaths() : ArrayUtils.EMPTY_STRING_ARRAY;
156157
var capacity = additionalPaths.size() + systemClasspath.length;
157158

158-
var result = Array.ofType(String.class, capacity);
159+
var result = ArrayFactory.mutableArray(String.class, capacity);
159160
result.addAll(systemClasspath);
160161
result.addAll(additionalPaths);
161162

162-
return result.toArray(String.class);
163+
return result;
163164
}
164165

165166
protected String[] classpathPaths() {
@@ -170,7 +171,7 @@ private void loadClass(
170171
@Nullable Path rootPath,
171172
@Nullable Path file,
172173
String name,
173-
Array<Class<?>> container) {
174+
MutableArray<Class<?>> container) {
174175

175176
if (!name.endsWith(CLASS_EXTENSION)) {
176177
return;
@@ -216,8 +217,8 @@ private void loadClass(
216217

217218
private void scanDirectory(
218219
Path rootPath,
219-
Array<Class<?>> classes,
220-
Array<String> resources,
220+
MutableArray<Class<?>> classes,
221+
MutableArray<String> resources,
221222
Path directory) {
222223
LOGGER.debug(directory, "Scanning directory:[%s]"::formatted);
223224
try (DirectoryStream<Path> stream = Files.newDirectoryStream(directory)) {
@@ -264,7 +265,7 @@ private void scanDirectory(
264265
}
265266
}
266267

267-
private void scanJar(Array<Class<?>> classes, Array<String> resources, Path jarFile) {
268+
private void scanJar(MutableArray<Class<?>> classes, MutableArray<String> resources, Path jarFile) {
268269
LOGGER.debug(jarFile, "Scanning jar:[%s]"::formatted);
269270

270271
if (!Files.exists(jarFile)) {
@@ -287,8 +288,8 @@ private void scanJar(Array<Class<?>> classes, Array<String> resources, Path jarF
287288
}
288289

289290
private void scanJarInputStream(
290-
Array<Class<?>> classes,
291-
Array<String> resources,
291+
MutableArray<Class<?>> classes,
292+
MutableArray<String> resources,
292293
ReuseBytesOutputStream rout,
293294
ReuseBytesInputStream rin,
294295
byte[] buffer,
@@ -315,7 +316,7 @@ private void scanJarInputStream(
315316
}
316317
}
317318

318-
private void scanJar(Array<Class<?>> classes, Array<String> resources, InputStream jarFile) {
319+
private void scanJar(MutableArray<Class<?>> classes, MutableArray<String> resources, InputStream jarFile) {
319320
LOGGER.debug(jarFile, "Scanning jar:[%s]"::formatted);
320321

321322
var rout = new ReuseBytesOutputStream();
@@ -337,8 +338,8 @@ public void scan(@Nullable Predicate<String> filter) {
337338

338339
var paths = calculatePathsToScan();
339340

340-
Array<Class<?>> classes = Array.ofType(Class.class);
341-
Array<String> resources = Array.ofType(String.class);
341+
MutableArray<Class<?>> classes = MutableArray.ofType(Class.class);
342+
MutableArray<String> resources = MutableArray.ofType(String.class);
342343

343344
for (String path : paths) {
344345
var file = Path.of(path);

‎rlib-classpath/src/main/java/javasabr/rlib/classpath/impl/ManifestClassPathScannerImpl.java‎

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
import java.util.jar.Attributes;
99
import java.util.jar.JarFile;
1010
import java.util.jar.Manifest;
11+
import java.util.stream.Stream;
12+
import javasabr.rlib.collections.array.Array;
13+
import javasabr.rlib.collections.array.ArrayCollectors;
14+
import javasabr.rlib.collections.array.MutableArray;
1115
import javasabr.rlib.common.util.Utils;
12-
import javasabr.rlib.common.util.array.Array;
13-
import javasabr.rlib.common.util.array.ArrayFactory;
1416
import lombok.AccessLevel;
1517
import lombok.experimental.FieldDefaults;
1618

@@ -32,9 +34,9 @@ public ManifestClassPathScannerImpl(
3234
this.classPathKey = classPathKey;
3335
}
3436

35-
protected String[] calculateManifestClassPath() {
37+
protected Array<String> calculateManifestClassPath() {
3638

37-
var result = Array.ofType(String.class);
39+
var result = MutableArray.ofType(String.class);
3840
var currentThread = Thread.currentThread();
3941

4042
Path root = Utils.getRootFolderFromClass(rootClass);
@@ -74,16 +76,21 @@ protected String[] calculateManifestClassPath() {
7476
}
7577
}
7678

77-
return result.toArray(String.class);
79+
return result;
7880
}
7981

8082
@Override
81-
protected String[] calculatePathsToScan() {
82-
83-
var result = ArrayFactory.newArraySet(String.class);
84-
result.addAll(super.calculatePathsToScan());
85-
result.addAll(calculateManifestClassPath());
86-
87-
return result.toArray(String.class);
83+
protected Array<String> calculatePathsToScan() {
84+
85+
Stream<String> originalStream = super
86+
.calculatePathsToScan()
87+
.stream();
88+
Stream<String> extraStream = calculateManifestClassPath()
89+
.stream();
90+
91+
return Stream
92+
.concat(originalStream, extraStream)
93+
.distinct()
94+
.collect(ArrayCollectors.toArray(String.class));
8895
}
8996
}

‎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,8 +1,8 @@
11
package javasabr.rlib.classpath;
22

33
import java.util.Collection;
4-
import javasabr.rlib.common.util.array.Array;
5-
import javasabr.rlib.common.util.array.impl.AbstractArray;
4+
import javasabr.rlib.collections.array.Array;
5+
import javasabr.rlib.collections.array.impl.AbstractArray;
66
import javasabr.rlib.logger.api.LoggerLevel;
77
import javasabr.rlib.logger.api.LoggerManager;
88
import org.junit.jupiter.api.Assertions;

‎rlib-collections/build.gradle‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
dependencies {
3+
api projects.rlibCommon
4+
api projects.rlibFunctions
5+
testImplementation projects.rlibLoggerImpl
6+
}

0 commit comments

Comments
 (0)