Skip to content

Commit 4f3e9d3

Browse files
rbygraverbygrave
committed
Rename BeanContextFactory to BeanScopeFactory
1 parent cbadf9d commit 4f3e9d3

File tree

8 files changed

+38
-36
lines changed

8 files changed

+38
-36
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ module org.example {
88

99
requires io.avaje.inject;
1010

11-
// register org.example._DI$BeanContextFactory from generated sources
12-
provides io.avaje.inject.spi.BeanContextFactory with org.example._DI$BeanContextFactory;
11+
// register org.example._DI$BeanScopeFactory from generated sources
12+
provides io.avaje.inject.spi.BeanScopeFactory with org.example._DI$BeanScopeFactory;
1313
}
1414
```
1515

‎inject-generator/src/main/java/io/avaje/inject/generator/Constants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Constants {
1717

1818
static final String AT_SINGLETON = "@Singleton";
1919
static final String AT_GENERATED = "@Generated(\"io.avaje.inject.generator\")";
20-
static final String META_INF_FACTORY = "META-INF/services/io.avaje.inject.spi.BeanContextFactory";
20+
static final String META_INF_FACTORY = "META-INF/services/io.avaje.inject.spi.BeanScopeFactory";
2121

2222
static final String REQUESTSCOPE = "io.avaje.inject.RequestScope";
2323
static final String BEANCONTEXT = "io.avaje.inject.BeanScope";
@@ -28,5 +28,5 @@ class Constants {
2828
static final String BEAN_FACTORY2 = "io.avaje.inject.spi.BeanFactory2";
2929
static final String BUILDER = "io.avaje.inject.spi.Builder";
3030
static final String DEPENDENCYMETA = "io.avaje.inject.spi.DependencyMeta";
31-
static final String BEANCONTEXTFACTORY = "io.avaje.inject.spi.BeanContextFactory";
31+
static final String BEANSCOPEFACTORY = "io.avaje.inject.spi.BeanScopeFactory";
3232
}

‎inject-generator/src/main/java/io/avaje/inject/generator/SimpleFactoryWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class SimpleFactoryWriter {
2424
" * module example {\n" +
2525
" * requires io.avaje.inject;\n" +
2626
" * \n" +
27-
" * provides io.avaje.inject.spi.BeanContextFactory with %s._DI$BeanContextFactory;\n" +
27+
" * provides io.avaje.inject.spi.BeanScopeFactory with %s._DI$BeanScopeFactory;\n" +
2828
" * \n" +
2929
" * }\n" +
3030
" * \n" +
@@ -56,7 +56,7 @@ class SimpleFactoryWriter {
5656
String pkg = context.getContextPackage();
5757
this.factoryPackage = (pkg != null) ? pkg : ordering.getTopPackage();
5858
context.deriveContextName(factoryPackage);
59-
this.factoryShortName = "_DI$BeanContextFactory";
59+
this.factoryShortName = "_DI$BeanScopeFactory";
6060
this.factoryFullName = factoryPackage + "." + factoryShortName;
6161
}
6262

@@ -128,7 +128,7 @@ private Set<String> factoryImportTypes() {
128128
importTypes.add(Constants.BEANCONTEXT);
129129
importTypes.add(Constants.CONTEXTMODULE);
130130
importTypes.add(Constants.DEPENDENCYMETA);
131-
importTypes.add(Constants.BEANCONTEXTFACTORY);
131+
importTypes.add(Constants.BEANSCOPEFACTORY);
132132
importTypes.add(Constants.BUILDER);
133133
return importTypes;
134134
}
@@ -137,7 +137,7 @@ private void writeStartClass() {
137137
writer.append(CODE_COMMENT_FACTORY, context.contextName(), factoryPackage).eol();
138138
context.buildAtContextModule(writer);
139139

140-
writer.append("public class %s implements BeanContextFactory {", factoryShortName).eol().eol();
140+
writer.append("public class %s implements BeanScopeFactory {", factoryShortName).eol().eol();
141141
writer.append(" private final String name;").eol();
142142
writer.append(" private final String[] provides;").eol();
143143
writer.append(" private final String[] dependsOn;").eol();

‎inject-test/src/test/java/io/avaje/inject/BeanScopeBuilderTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.avaje.inject;
22

3-
import io.avaje.inject.spi.BeanContextFactory;
3+
import io.avaje.inject.spi.BeanScopeFactory;
44
import io.avaje.inject.spi.Builder;
55
import org.junit.jupiter.api.Test;
66

@@ -86,27 +86,27 @@ public void feature_depends2() {
8686
assertThat(names(factoryOrder.factories())).containsExactly("one", "three", "two");
8787
}
8888

89-
private List<String> names(List<BeanContextFactory> factories) {
89+
private List<String> names(List<BeanScopeFactory> factories) {
9090
return factories.stream()
91-
.map(BeanContextFactory::getName)
91+
.map(BeanScopeFactory::getName)
9292
.collect(Collectors.toList());
9393
}
9494

95-
private TDBeanContext bc(String name, String provides, String dependsOn) {
96-
return new TDBeanContext(name, split(provides), split(dependsOn));
95+
private TDBeanScope bc(String name, String provides, String dependsOn) {
96+
return new TDBeanScope(name, split(provides), split(dependsOn));
9797
}
9898

9999
private String[] split(String val) {
100100
return val == null ? null : val.split(",");
101101
}
102102

103-
private static class TDBeanContext implements BeanContextFactory {
103+
private static class TDBeanScope implements BeanScopeFactory {
104104

105105
final String name;
106106
final String[] provides;
107107
final String[] dependsOn;
108108

109-
private TDBeanContext(String name, String[] provides, String[] dependsOn) {
109+
private TDBeanScope(String name, String[] provides, String[] dependsOn) {
110110
this.name = name;
111111
this.provides = provides;
112112
this.dependsOn = dependsOn;

‎inject/README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@ APT based dependency injection for server side developers - https://avaje.io/inj
44
### Example module use
55

66
```java
7+
import io.avaje.inject.spi.BeanScopeFactory;
8+
79
module org.example {
810

9-
requires io.avaje.inject;
11+
requires io.avaje.inject;
1012

11-
// register org.example._DI$BeanContextFactory from generated sources
12-
provides io.avaje.inject.spi.BeanContextFactory with org.example._DI$BeanContextFactory;
13+
// register org.example._DI$BeanScopeFactory from generated sources
14+
provides io.avaje.inject.spi.BeanScopeFactory with org.example._DI$BeanScopeFactory;
1315
}
1416
```
1517

‎inject/src/main/java/io/avaje/inject/DBeanScopeBuilder.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.avaje.inject;
22

3-
import io.avaje.inject.spi.BeanContextFactory;
3+
import io.avaje.inject.spi.BeanScopeFactory;
44
import io.avaje.inject.spi.Builder;
55
import io.avaje.inject.spi.EnrichBean;
66
import io.avaje.inject.spi.SuppliedBean;
@@ -99,7 +99,7 @@ public <D> DBeanScopeBuilder withSpy(Class<D> type, Consumer<D> consumer) {
9999
public BeanScope build() {
100100
// sort factories by dependsOn
101101
FactoryOrder factoryOrder = new FactoryOrder(includeModules, !suppliedBeans.isEmpty(), ignoreMissingModuleDependencies);
102-
ServiceLoader.load(BeanContextFactory.class).forEach(factoryOrder::add);
102+
ServiceLoader.load(BeanScopeFactory.class).forEach(factoryOrder::add);
103103

104104
Set<String> moduleNames = factoryOrder.orderFactories();
105105
if (moduleNames.isEmpty()) {
@@ -111,7 +111,7 @@ public BeanScope build() {
111111
}
112112
log.debug("building context with modules {}", moduleNames);
113113
Builder builder = Builder.newBuilder(suppliedBeans, enrichBeans);
114-
for (BeanContextFactory factory : factoryOrder.factories()) {
114+
for (BeanScopeFactory factory : factoryOrder.factories()) {
115115
factory.build(builder);
116116
}
117117
return builder.build(shutdownHook);
@@ -140,7 +140,7 @@ static class FactoryOrder {
140140
private final boolean ignoreMissingModuleDependencies;
141141

142142
private final Set<String> moduleNames = new LinkedHashSet<>();
143-
private final List<BeanContextFactory> factories = new ArrayList<>();
143+
private final List<BeanScopeFactory> factories = new ArrayList<>();
144144
private final List<FactoryState> queue = new ArrayList<>();
145145
private final List<FactoryState> queueNoDependencies = new ArrayList<>();
146146

@@ -152,7 +152,7 @@ static class FactoryOrder {
152152
this.ignoreMissingModuleDependencies = ignoreMissingModuleDependencies;
153153
}
154154

155-
void add(BeanContextFactory factory) {
155+
void add(BeanScopeFactory factory) {
156156

157157
if (includeModule(factory)) {
158158
FactoryState wrappedFactory = new FactoryState(factory);
@@ -184,7 +184,7 @@ private boolean isEmpty(String[] values) {
184184
/**
185185
* Return true of the factory (for the module) should be included.
186186
*/
187-
private boolean includeModule(BeanContextFactory factory) {
187+
private boolean includeModule(BeanScopeFactory factory) {
188188
return includeModules.isEmpty() || includeModules.contains(factory.getName());
189189
}
190190

@@ -213,7 +213,7 @@ Set<String> orderFactories() {
213213
/**
214214
* Return the list of factories in the order they should be built.
215215
*/
216-
List<BeanContextFactory> factories() {
216+
List<BeanScopeFactory> factories() {
217217
return factories;
218218
}
219219

@@ -292,10 +292,10 @@ private boolean satisfiedDependencies(FactoryState factory) {
292292
*/
293293
private static class FactoryState {
294294

295-
private final BeanContextFactory factory;
295+
private final BeanScopeFactory factory;
296296
private boolean pushed;
297297

298-
private FactoryState(BeanContextFactory factory) {
298+
private FactoryState(BeanScopeFactory factory) {
299299
this.factory = factory;
300300
}
301301

@@ -310,7 +310,7 @@ boolean isPushed() {
310310
return pushed;
311311
}
312312

313-
BeanContextFactory getFactory() {
313+
BeanScopeFactory getFactory() {
314314
return factory;
315315
}
316316

‎inject/src/main/java/io/avaje/inject/spi/BeanContextFactory.java renamed to ‎inject/src/main/java/io/avaje/inject/spi/BeanScopeFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* This is the service loader interface defining the bean scope.
55
*/
6-
public interface BeanContextFactory {
6+
public interface BeanScopeFactory {
77

88
/**
99
* Return the name of the bean scope (module) this will create.

‎inject/src/test/java/io/avaje/inject/BeanScopeBuilderTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.avaje.inject;
22

3-
import io.avaje.inject.spi.BeanContextFactory;
3+
import io.avaje.inject.spi.BeanScopeFactory;
44
import io.avaje.inject.spi.Builder;
55
import org.junit.jupiter.api.Test;
66

@@ -86,27 +86,27 @@ public void feature_depends2() {
8686
assertThat(names(factoryOrder.factories())).containsExactly("one", "three", "two");
8787
}
8888

89-
private List<String> names(List<BeanContextFactory> factories) {
89+
private List<String> names(List<BeanScopeFactory> factories) {
9090
return factories.stream()
91-
.map(BeanContextFactory::getName)
91+
.map(BeanScopeFactory::getName)
9292
.collect(Collectors.toList());
9393
}
9494

95-
private TDBeanContext bc(String name, String provides, String dependsOn) {
96-
return new TDBeanContext(name, split(provides), split(dependsOn));
95+
private TDBeanScope bc(String name, String provides, String dependsOn) {
96+
return new TDBeanScope(name, split(provides), split(dependsOn));
9797
}
9898

9999
private String[] split(String val) {
100100
return val == null ? null : val.split(",");
101101
}
102102

103-
private static class TDBeanContext implements BeanContextFactory {
103+
private static class TDBeanScope implements BeanScopeFactory {
104104

105105
final String name;
106106
final String[] provides;
107107
final String[] dependsOn;
108108

109-
private TDBeanContext(String name, String[] provides, String[] dependsOn) {
109+
private TDBeanScope(String name, String[] provides, String[] dependsOn) {
110110
this.name = name;
111111
this.provides = provides;
112112
this.dependsOn = dependsOn;

0 commit comments

Comments
 (0)