Refactoring and added sql Helper
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
||||
package de.neitzel.fx.component;
|
||||
package de.neitzel.core.fx.component;
|
||||
|
||||
import javafx.beans.property.*;
|
||||
import java.lang.reflect.*;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package de.neitzel.fx.component;
|
||||
package de.neitzel.core.fx.component;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package de.neitzel.fx.component;
|
||||
package de.neitzel.core.fx.component;
|
||||
|
||||
import javafx.beans.property.Property;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package de.neitzel.fx.injectfx;
|
||||
package de.neitzel.core.fx.injectfx;
|
||||
|
||||
import de.neitzel.inject.InjectableComponentScanner;
|
||||
import de.neitzel.core.inject.InjectableComponentScanner;
|
||||
|
||||
import java.lang.reflect.Constructor;
|
||||
import java.util.*;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package de.neitzel.fx.injectfx;
|
||||
package de.neitzel.core.fx.injectfx;
|
||||
|
||||
import javafx.util.Callback;
|
||||
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
package de.neitzel.fx.injectfx;
|
||||
package de.neitzel.core.fx.injectfx;
|
||||
|
||||
import de.neitzel.inject.InjectableComponentScanner;
|
||||
import de.neitzel.core.inject.InjectableComponentScanner;
|
||||
import javafx.fxml.FXMLLoader;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package de.neitzel.fx.mvvm;
|
||||
package de.neitzel.core.fx.mvvm;
|
||||
|
||||
/**
|
||||
* Enum representing the direction of data binding between a JavaFX control and a ViewModel property.
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package de.neitzel.fx.mvvm;
|
||||
package de.neitzel.core.fx.mvvm;
|
||||
|
||||
import javafx.beans.property.Property;
|
||||
import javafx.beans.property.StringProperty;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package de.neitzel.fx.mvvm;
|
||||
package de.neitzel.core.fx.mvvm;
|
||||
|
||||
import javafx.fxml.Initializable;
|
||||
import java.net.URL;
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package de.neitzel.fx.mvvm;
|
||||
package de.neitzel.core.fx.mvvm;
|
||||
|
||||
import javafx.beans.property.*;
|
||||
|
||||
@@ -1,51 +0,0 @@
|
||||
package de.neitzel.fx.injectfx;
|
||||
|
||||
import de.neitzel.fx.injectfx.testcomponents.test1ok.SuperClass;
|
||||
import de.neitzel.fx.injectfx.testcomponents.test1ok.TestComponent1_1;
|
||||
import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_1;
|
||||
import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_2;
|
||||
import de.neitzel.fx.injectfx.testcomponents.test1ok.sub.TestComponent1_2;
|
||||
import de.neitzel.inject.InjectableComponentScanner;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.*;
|
||||
|
||||
class InjectableComponentScannerTest {
|
||||
|
||||
/**
|
||||
* Tests loading of multiple FXMLComponents including sub packages.
|
||||
*/
|
||||
@Test
|
||||
void testLoadComponents() {
|
||||
InjectableComponentScanner scanner = new InjectableComponentScanner("de.neitzel.injectfx.testcomponents.test1ok");
|
||||
var instantiableComponents = scanner.getInstantiableComponents();
|
||||
var nonUniqueTypes = scanner.getNotUniqueTypes();
|
||||
|
||||
assertAll(
|
||||
() -> assertNotNull(instantiableComponents),
|
||||
() -> assertEquals(3, instantiableComponents.size()),
|
||||
() -> assertTrue(instantiableComponents.containsKey(TestComponent1_1.class)),
|
||||
() -> assertTrue(instantiableComponents.containsKey(TestComponent1_2.class)),
|
||||
() -> assertTrue(instantiableComponents.containsKey(TestInterface1_1.class)),
|
||||
() -> assertTrue(nonUniqueTypes.contains(SuperClass.class)),
|
||||
() -> assertTrue(nonUniqueTypes.contains(TestInterface1_2.class)),
|
||||
() -> assertTrue(scanner.getErrors().isEmpty())
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Tests failing to load a FXMLComponent which has an unknwown parameter.
|
||||
*/
|
||||
@Test
|
||||
void testComponentsFailWithUnknownParameters() {
|
||||
InjectableComponentScanner scanner = new InjectableComponentScanner("de.neitzel.injectfx.testcomponents.test2fail");
|
||||
var instantiableComponents = scanner.getInstantiableComponents();
|
||||
var nonUniqueTypes = scanner.getNotUniqueTypes();
|
||||
|
||||
assertAll(
|
||||
() -> assertNotNull(instantiableComponents),
|
||||
() -> assertEquals(0, instantiableComponents.size()),
|
||||
() -> assertFalse(scanner.getErrors().isEmpty())
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
package de.neitzel.fx.injectfx.testcomponents.test1ok;
|
||||
|
||||
public class SuperClass {
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
package de.neitzel.fx.injectfx.testcomponents.test1ok;
|
||||
|
||||
import de.neitzel.inject.annotation.Component;
|
||||
|
||||
@Component
|
||||
public class TestComponent1_1 extends SuperClass implements TestInterface1_2 {
|
||||
public TestComponent1_1() {
|
||||
}
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
package de.neitzel.fx.injectfx.testcomponents.test1ok;
|
||||
|
||||
public interface TestInterface1_1 {
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
package de.neitzel.fx.injectfx.testcomponents.test1ok;
|
||||
|
||||
public interface TestInterface1_2 {
|
||||
}
|
||||
-12
@@ -1,12 +0,0 @@
|
||||
package de.neitzel.fx.injectfx.testcomponents.test1ok.sub;
|
||||
|
||||
import de.neitzel.fx.injectfx.testcomponents.test1ok.SuperClass;
|
||||
import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_1;
|
||||
import de.neitzel.fx.injectfx.testcomponents.test1ok.TestInterface1_2;
|
||||
import de.neitzel.inject.annotation.Component;
|
||||
|
||||
@Component
|
||||
public class TestComponent1_2 extends SuperClass implements TestInterface1_1, TestInterface1_2 {
|
||||
public TestComponent1_2() {
|
||||
}
|
||||
}
|
||||
-12
@@ -1,12 +0,0 @@
|
||||
package de.neitzel.fx.injectfx.testcomponents.test2fail;
|
||||
|
||||
import de.neitzel.inject.annotation.Component;
|
||||
|
||||
/**
|
||||
* TestComponent1 that should fail.
|
||||
*/
|
||||
@Component
|
||||
public class TestComponent2_1 {
|
||||
public TestComponent2_1(String test) {
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user