Skip to content

Remove ModuleHandle class, as it is not really needed anymore #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 4, 2023
Merged

Remove ModuleHandle class, as it is not really needed anymore #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 35 additions & 17 deletions ...testing/src/main/java/io/github/ascopes/jct/containers/impl/OutputContainerGroupImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import io.github.ascopes.jct.containers.PackageContainerGroup;
import io.github.ascopes.jct.filemanagers.ModuleLocation;
import io.github.ascopes.jct.filemanagers.PathFileObject;
import io.github.ascopes.jct.utils.ModuleHandle;
import io.github.ascopes.jct.utils.StringUtils;
import io.github.ascopes.jct.workspaces.PathRoot;
import io.github.ascopes.jct.workspaces.impl.WrappingDirectoryImpl;
Expand Down Expand Up @@ -124,13 +123,14 @@ public PackageContainerGroup getModule(String module) {
@Override
@Nullable
public PathFileObject getFileForInput(String packageName, String relativeName) {
var moduleHandle = ModuleHandle.tryExtract(packageName);
var moduleName = extractModuleName(packageName);

if (moduleHandle != null) {
var module = getModule(moduleHandle.getModuleName());
if (moduleName != null) {
var module = getModule(moduleName);

if (module != null) {
var file = module.getFileForInput(moduleHandle.getRest(), relativeName);
var realPackageName = extractPackageName(packageName);
var file = module.getFileForInput(realPackageName, relativeName);

if (file != null) {
return file;
Expand All @@ -144,11 +144,12 @@ public PathFileObject getFileForInput(String packageName, String relativeName) {
@Override
@Nullable
public PathFileObject getFileForOutput(String packageName, String relativeName) {
var moduleHandle = ModuleHandle.tryExtract(packageName);
var moduleName = extractModuleName(packageName);

if (moduleHandle != null) {
var module = getOrCreateModule(moduleHandle.getModuleName());
var file = module.getFileForOutput(moduleHandle.getRest(), relativeName);
if (moduleName != null) {
var module = getOrCreateModule(moduleName);
var realPackageName = extractPackageName(packageName);
var file = module.getFileForOutput(realPackageName, relativeName);

if (file != null) {
return file;
Expand All @@ -161,13 +162,14 @@ public PathFileObject getFileForOutput(String packageName, String relativeName)
@Override
@Nullable
public PathFileObject getJavaFileForInput(String className, Kind kind) {
var moduleHandle = ModuleHandle.tryExtract(className);
var moduleName = extractModuleName(className);

if (moduleHandle != null) {
var module = getModule(moduleHandle.getModuleName());
if (moduleName != null) {
var module = getModule(moduleName);

if (module != null) {
var file = module.getJavaFileForInput(moduleHandle.getRest(), kind);
var realClassName = extractPackageName(className);
var file = module.getJavaFileForInput(realClassName, kind);

if (file != null) {
return file;
Expand All @@ -181,11 +183,12 @@ public PathFileObject getJavaFileForInput(String className, Kind kind) {
@Override
@Nullable
public PathFileObject getJavaFileForOutput(String className, Kind kind) {
var moduleHandle = ModuleHandle.tryExtract(className);
var moduleName = extractModuleName(className);

if (moduleHandle != null) {
var module = getOrCreateModule(moduleHandle.getModuleName());
var file = module.getJavaFileForOutput(moduleHandle.getRest(), kind);
if (moduleName != null) {
var module = getOrCreateModule(moduleName);
var realClassName = extractPackageName(className);
var file = module.getJavaFileForOutput(realClassName, kind);

if (file != null) {
return file;
Expand Down Expand Up @@ -239,6 +242,21 @@ private OutputPackageContainerGroupImpl newPackageGroup(ModuleLocation moduleLoc
return group;
}

@Nullable
private static String extractModuleName(String binaryName) {
// extractModuleName("foo.bar.Baz") -> null
// extractModuleName("some.module/foo.bar.Baz") -> "some.module"
var separatorIndex = binaryName.indexOf('/');
return separatorIndex == -1 ? null : binaryName.substring(0, separatorIndex);
}

private static String extractPackageName(String binaryName) {
// extractPackageName("foo.bar.Baz") -> "foo.bar.Baz"
// extractPackageName("some.module/foo.bar.Baz") -> "foo.bar.Baz"
var separatorIndex = binaryName.indexOf('/');
return separatorIndex == -1 ? binaryName : binaryName.substring(separatorIndex + 1);
}

/**
* Unlike {@link PackageContainerGroupImpl}, this implementation does not reject output-oriented
* locations in the constructor.
Expand Down
97 changes: 0 additions & 97 deletions java-compiler-testing/src/main/java/io/github/ascopes/jct/utils/ModuleHandle.java
View file
Open in desktop

This file was deleted.

124 changes: 0 additions & 124 deletions ...mpiler-testing/src/test/java/io/github/ascopes/jct/tests/unit/utils/ModuleHandleTest.java
View file
Open in desktop

This file was deleted.