Skip to content
This repository was archived by the owner on Apr 16, 2025. It is now read-only.

Commit 64badcc

Browse files
committed
Small improvements
1 parent e94b209 commit 64badcc

File tree

6 files changed

+19
-9
lines changed

6 files changed

+19
-9
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Main features:
1818
#### Resources
1919
___
2020
* Learn more at Progressive [Wiki](https://github.com/CrissNamon/progressive/wiki)
21-
* Look at some examples in [Main](https://github.com/CrissNamon/progressive/blob/main/src/main/java/ru/danilarassokhin/example/Main.java)
21+
* Look at some examples in [example](https://github.com/CrissNamon/progressive/blob/main/src/main/java/ru/danilarassokhin/example/) package
2222
* See javadoc [here](https://crissnamon.github.io/progressive/)
2323

2424
#### Dependencies and source

src/main/java/ru/danilarassokhin/example/game/GameExample.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
import ru.danilarassokhin.example.game.script.EchoSystem;
44
import ru.danilarassokhin.progressive.Game;
5-
import ru.danilarassokhin.progressive.PublisherType;
6-
import ru.danilarassokhin.progressive.basic.BasicComponentManager;
7-
import ru.danilarassokhin.progressive.basic.BasicGame;
8-
import ru.danilarassokhin.progressive.basic.BasicGameObject;
9-
import ru.danilarassokhin.progressive.basic.GameInitializer;
5+
import ru.danilarassokhin.progressive.basic.*;
106
import ru.danilarassokhin.progressive.basic.manager.BasicGameStateManager;
117
import ru.danilarassokhin.progressive.injection.DIContainer;
128
import ru.danilarassokhin.progressive.manager.GameState;

src/main/java/ru/danilarassokhin/progressive/basic/BasicDIContainer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public final class BasicDIContainer implements DIContainer {
2525

2626
private final GameBeanFactory gameBeanFactory;
2727

28-
protected BasicDIContainer() {
28+
public BasicDIContainer() {
2929
BasicComponentManager.getGameLogger().info("Progressive DI initialization...\n");
3030
beans = new ConcurrentHashMap<>();
3131
viewedMethods = Collections.synchronizedSet(new HashSet<>());

src/main/java/ru/danilarassokhin/progressive/basic/BasicGame.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public final class BasicGame implements Game {
3131
private boolean isStarted;
3232
private long deltaTime;
3333

34-
protected BasicGame() {
34+
public BasicGame() {
3535
BasicComponentManager
3636
.getGameLogger().info("Progressive IoC initialization...\n");
3737
gameObjects = new ConcurrentSkipListMap<>();

src/test/java/progressive/DIContainerTest.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import org.junit.jupiter.api.Assertions;
44
import org.junit.jupiter.api.Test;
55
import progressive.variant.AndroidVariant;
6+
import progressive.variant.GlobalVariant;
67
import progressive.variant.ItemVariant;
7-
import ru.danilarassokhin.progressive.Game;
88
import ru.danilarassokhin.progressive.annotation.GameBean;
99
import ru.danilarassokhin.progressive.basic.BasicDIContainer;
1010
import ru.danilarassokhin.progressive.basic.injection.SimplePackageScanner;
@@ -29,6 +29,13 @@ public void testInvalidVariants() {
2929
Assertions.assertThrows(BeanNotFoundException.class, () -> basicDIContainer.getBean(ItemVariant.class));
3030
}
3131

32+
@Test
33+
public void testGlobalVariant() {
34+
BasicDIContainer basicDIContainer = new BasicDIContainer("SomeVariant");
35+
basicDIContainer.scanPackage("progressive.variant", new SimplePackageScanner());
36+
Assertions.assertDoesNotThrow(() -> basicDIContainer.getBean(GlobalVariant.class));
37+
}
38+
3239
@Test
3340
public void testBeanDuplication() {
3441
BasicDIContainer basicDIContainer = new BasicDIContainer("Android");
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package progressive.variant;
2+
3+
import ru.danilarassokhin.progressive.annotation.GameBean;
4+
5+
@GameBean
6+
public class GlobalVariant {
7+
}

0 commit comments

Comments
 (0)