Skip to content

Refactor rename AvajeModuleData to ModuleData, plus some method renames, plus imports #612

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.

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
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ static void registerModuleProvidedTypes(Set<String> providedTypes) {
Arrays.stream(module.requiresPackages()).map(Type::getTypeName).forEach(requires::add);
Arrays.stream(module.autoRequiresAspects()).map(Type::getTypeName).map(Util::wrapAspect).forEach(requires::add);

ProcessingContext.addAvajeModule(new AvajeModuleData(name, provides, requires));
ProcessingContext.addModule(new ModuleData(name, provides, requires));
} catch (final ServiceConfigurationError expected) {
// ignore expected error reading the module that we are also writing
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
class FactoryOrder {

private final Set<String> moduleNames = new LinkedHashSet<>();
private final List<AvajeModuleData> factories = new ArrayList<>();
private final List<ModuleData> factories = new ArrayList<>();
private final List<FactoryState> queue = new ArrayList<>();
private final List<FactoryState> queueNoDependencies = new ArrayList<>();
private final Map<String, List<String>> unsatisfiedDependencies = new HashMap<>();
Expand All @@ -22,15 +22,15 @@ class FactoryOrder {
private final Set<String> pluginProvided;
private final List<String> loadedModules = new ArrayList<>();

FactoryOrder(Collection<AvajeModuleData> includeModules, Set<String> pluginProvided) {
FactoryOrder(Collection<ModuleData> includeModules, Set<String> pluginProvided) {
includeModules.forEach(m -> {
add(m);
loadedModules.add(m.name());
});
this.pluginProvided = pluginProvided;
}

void add(AvajeModuleData module) {
void add(ModuleData module) {
final FactoryState factoryState = new FactoryState(module);
providesMap.computeIfAbsent(module.name(), s -> new FactoryList()).add(factoryState);
addFactoryProvides(factoryState, module.provides());
Expand Down Expand Up @@ -96,7 +96,7 @@ private void processQueue() {
}
}

private void unsatisfiedRequires(StringBuilder sb, AvajeModuleData module) {
private void unsatisfiedRequires(StringBuilder sb, ModuleData module) {
for (final var depModuleName : module.requires()) {
if (notProvided(depModuleName)) {
unsatisfiedDependencies
Expand Down Expand Up @@ -171,10 +171,10 @@ boolean allPushed() {
/** Wrapper on Factory holding the pushed state. */
static class FactoryState {

private final AvajeModuleData factory;
private final ModuleData factory;
private boolean pushed;

FactoryState(AvajeModuleData factory) {
FactoryState(ModuleData factory) {
this.factory = factory;
}

Expand All @@ -187,7 +187,7 @@ boolean isPushed() {
return pushed;
}

AvajeModuleData factory() {
ModuleData factory() {
return factory;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ private void loadOrderFiles() {
.filter(s -> !s.startsWith("External Module Type"))
.distinct()
.map(l -> l.split("\\|"))
.map(AvajeModuleData::new)
.forEach(ProcessingContext::addAvajeModule);
.map(ModuleData::new)
.forEach(ProcessingContext::addModule);
}

private List<String> lines(String relativeName) {
Expand Down Expand Up @@ -156,7 +156,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment

if (processingOver) {
var order =
new FactoryOrder(ProcessingContext.avajeModules(), defaultScope.pluginProvided())
new FactoryOrder(ProcessingContext.modules(), defaultScope.pluginProvided())
.orderModules();

if (ProcessingContext.strictWiring()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
import java.util.Arrays;
import java.util.List;

final class AvajeModuleData {
final class ModuleData {

private final String fqn;
private final List<String> provides;
private final List<String> requires;

AvajeModuleData(String name, List<String> provides, List<String> requires) {
ModuleData(String name, List<String> provides, List<String> requires) {
this.fqn = name;
this.provides = provides;
this.requires = requires;
}

AvajeModuleData(String[] moduleCsv) {
ModuleData(String[] moduleCsv) {
this.fqn = moduleCsv[0];
this.provides = Arrays.stream(moduleCsv[1].split(",")).filter(not(String::isBlank)).collect(toList());
this.requires = Arrays.stream(moduleCsv[2].split(",")).filter(not(String::isBlank)).collect(toList());
Expand All @@ -38,6 +38,6 @@ String name() {

@Override
public String toString() {
return "AvajeModuleData [fqn=" + fqn + ", provides=" + provides + ", requires=" + requires + "]";
return "ModuleData [fqn=" + fqn + ", provides=" + provides + ", requires=" + requires + "]";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.LineNumberReader;
import java.io.Writer;
import java.nio.file.NoSuchFileException;

import javax.annotation.processing.FilerException;
Expand All @@ -14,7 +13,6 @@
import java.util.*;

import static io.avaje.inject.generator.APContext.*;
import static io.avaje.inject.generator.ProcessingContext.addInjectSPI;
import static java.util.stream.Collectors.toSet;

final class ProcessingContext {
Expand All @@ -28,7 +26,7 @@ static final class Ctx {
private final Set<String> providedTypes = new HashSet<>();
private final Set<String> optionalTypes = new LinkedHashSet<>();
private final Map<String, AspectImportPrism> aspectImportPrisms = new HashMap<>();
private final List<AvajeModuleData> avajeModules = new ArrayList<>();
private final List<ModuleData> modules = new ArrayList<>();
private final List<TypeElement> delayQueue = new ArrayList<>();
private final List<String> spiServices = new ArrayList<>();
private boolean strictWiring;
Expand All @@ -52,12 +50,12 @@ static void testInit() {

static String loadMetaInfServices() {
return loadMetaInf(Constants.META_INF_SPI).stream()
.filter(ProcessingContext::isAvajeModule)
.filter(ProcessingContext::isInjectModule)
.findFirst()
.orElse(null);
}

private static boolean isAvajeModule(String spi) {
private static boolean isInjectModule(String spi) {
var moduleType = APContext.typeElement(spi);
return moduleType != null && moduleType.getSuperclass().toString().contains("AvajeModule");
}
Expand Down Expand Up @@ -169,12 +167,12 @@ static void clear() {
APContext.clear();
}

static void addAvajeModule(AvajeModuleData module) {
CTX.get().avajeModules.add(module);
static void addModule(ModuleData module) {
CTX.get().modules.add(module);
}

static List<AvajeModuleData> avajeModules() {
return CTX.get().avajeModules;
static List<ModuleData> modules() {
return CTX.get().modules;
}

static void strictWiring(boolean strictWiring) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ private void writeProvides() {
provides.addAll(autoProvides);
autoProvidesAspects.stream().map(Util::wrapAspect).forEach(provides::add);

ProcessingContext.addAvajeModule(new AvajeModuleData(fullName, provides, requires));
ProcessingContext.addModule(new ModuleData(fullName, provides, requires));
}

private void writeClassesMethod() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,11 @@
package io.avaje.inject.generator;

import io.avaje.inject.*;
import io.avaje.inject.aop.*;
import io.avaje.inject.spi.*;
import io.avaje.inject.aop.Aspect;
import io.avaje.inject.aop.AOPFallback;
import io.avaje.inject.spi.DependencyMeta;
import io.avaje.inject.spi.Generated;
import io.avaje.inject.spi.Proxy;
import io.avaje.prism.GeneratePrism;
import jakarta.inject.Inject;
import jakarta.inject.Named;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
*/
public class AvajeInjectPlugin implements Plugin<Project> {

private final List<AvajeModuleData> modules = new ArrayList<>();
private final List<ModuleData> modules = new ArrayList<>();

@Override
public void apply(Project project) {
Expand Down Expand Up @@ -131,7 +131,7 @@ private void writeProvidedModules(ClassLoader classLoader, FileWriter moduleWrit
.map(Type::getTypeName)
.map(AvajeInjectPlugin::wrapAspect)
.forEach(requires::add);
modules.add(new AvajeModuleData(name, provides, requires));
modules.add(new ModuleData(name, provides, requires));
}

for (final String providedType : providedTypes) {
Expand Down Expand Up @@ -164,7 +164,7 @@ private static URL[] createClassPath(Project project) {

private void writeModuleCSV(FileWriter moduleWriter) throws IOException {
moduleWriter.write("\nExternal Module Type|Provides|Requires");
for (AvajeModuleData avajeModule : modules) {
for (ModuleData avajeModule : modules) {
moduleWriter.write("\n");
moduleWriter.write(avajeModule.name());
moduleWriter.write("|");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import java.util.ArrayList;
import java.util.List;

final class AvajeModuleData {
final class ModuleData {

private final String fqn;
private final List<String> provides = new ArrayList<>();
private final List<String> requires = new ArrayList<>();

AvajeModuleData(String name, List<String> provides, List<String> requires) {
ModuleData(String name, List<String> provides, List<String> requires) {
this.fqn = name;
this.provides.addAll(provides);
this.requires.addAll(requires);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class AutoProvidesMojo extends AbstractMojo {
@Parameter(defaultValue = "${project}", readonly = true, required = true)
private MavenProject project;

private final List<AvajeModuleData> modules = new ArrayList<>();
private final List<ModuleData> modules = new ArrayList<>();

@Override
public void execute() throws MojoExecutionException {
Expand Down Expand Up @@ -170,7 +170,7 @@ private void writeProvidedModules(URLClassLoader newClassLoader, FileWriter modu
.map(Type::getTypeName)
.map(AutoProvidesMojo::wrapAspect)
.forEach(requires::add);
modules.add(new AvajeModuleData(name, provides, requires));
modules.add(new ModuleData(name, provides, requires));
}

for (final String providedType : providedTypes) {
Expand All @@ -181,7 +181,7 @@ private void writeProvidedModules(URLClassLoader newClassLoader, FileWriter modu

private void writeModuleCSV(FileWriter moduleWriter) throws IOException {
moduleWriter.write("\nExternal Module Type|Provides|Requires");
for (AvajeModuleData avajeModule : modules) {
for (ModuleData avajeModule : modules) {
moduleWriter.write("\n");
moduleWriter.write(avajeModule.name());
moduleWriter.write("|");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import java.util.ArrayList;
import java.util.List;

final class AvajeModuleData {
final class ModuleData {

private final String fqn;
private final List<String> provides = new ArrayList<>();
private final List<String> requires = new ArrayList<>();

AvajeModuleData(String name, List<String> provides, List<String> requires) {
ModuleData(String name, List<String> provides, List<String> requires) {
this.fqn = name;
this.provides.addAll(provides);
this.requires.addAll(requires);
Expand Down
Loading