tga/fxml-compiler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds gpg, sonatype, changes groupId

Browse Source
This commit is contained in:
Guillaume Tâche
2025-01-03 22:08:50 +01:00
parent c3d9e72e42
commit f59863c628
183 changed files with 860 additions and 779 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
maven-plugin/pom.xml
View File

@@ -4,7 +4,7 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.github.gtache</groupId>
<groupId>ch.gtache.fxml-compiler</groupId>
<artifactId>fxml-compiler</artifactId>
<version>1.0-SNAPSHOT</version>
</parent>
@@ -12,7 +12,8 @@
<artifactId>fxml-compiler-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<name>fxml-compiler-maven-plugin Maven Mojo</name>
<name>fxml-compiler-maven-plugin</name>
<description>Maven plugin for the fxml-compiler project</description>
<properties>
<maven.api.version>3.9.9</maven.api.version>
@@ -43,7 +44,7 @@
<dependencies>
<dependency>
<groupId>com.github.gtache</groupId>
<groupId>ch.gtache.fxml-compiler</groupId>
<artifactId>fxml-compiler-xml</artifactId>
</dependency>

24
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/FXMLCompilerMojo.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/FXMLCompilerMojo.java
View File

@@ -1,16 +1,16 @@
package com.github.gtache.fxml.compiler.maven;
package ch.gtache.fxml.compiler.maven;
import com.github.gtache.fxml.compiler.ControllerFieldInjectionType;
import com.github.gtache.fxml.compiler.ControllerInjectionType;
import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType;
import com.github.gtache.fxml.compiler.ResourceBundleInjectionType;
import com.github.gtache.fxml.compiler.compatibility.impl.GenerationCompatibilityImpl;
import com.github.gtache.fxml.compiler.impl.GenerationParametersImpl;
import com.github.gtache.fxml.compiler.maven.internal.CompilationInfo;
import com.github.gtache.fxml.compiler.maven.internal.CompilationInfoProvider;
import com.github.gtache.fxml.compiler.maven.internal.Compiler;
import com.github.gtache.fxml.compiler.maven.internal.ControllerProvider;
import com.github.gtache.fxml.compiler.maven.internal.FXMLProvider;
import ch.gtache.fxml.compiler.ControllerFieldInjectionType;
import ch.gtache.fxml.compiler.ControllerInjectionType;
import ch.gtache.fxml.compiler.ControllerMethodsInjectionType;
import ch.gtache.fxml.compiler.ResourceBundleInjectionType;
import ch.gtache.fxml.compiler.compatibility.impl.GenerationCompatibilityImpl;
import ch.gtache.fxml.compiler.impl.GenerationParametersImpl;
import ch.gtache.fxml.compiler.maven.internal.CompilationInfo;
import ch.gtache.fxml.compiler.maven.internal.CompilationInfoProvider;
import ch.gtache.fxml.compiler.maven.internal.Compiler;
import ch.gtache.fxml.compiler.maven.internal.ControllerProvider;
import ch.gtache.fxml.compiler.maven.internal.FXMLProvider;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.annotations.LifecyclePhase;

2
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/CompilationInfo.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/CompilationInfo.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import java.nio.file.Path;
import java.util.HashMap;

4
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/CompilationInfoProvider.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/CompilationInfoProvider.java
View File

@@ -1,6 +1,6 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import com.github.gtache.fxml.compiler.maven.FXMLCompilerMojo;
import ch.gtache.fxml.compiler.maven.FXMLCompilerMojo;
import javafx.event.EventHandler;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

18
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/Compiler.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/Compiler.java
View File

@@ -1,13 +1,13 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import com.github.gtache.fxml.compiler.GenerationException;
import com.github.gtache.fxml.compiler.GenerationParameters;
import com.github.gtache.fxml.compiler.Generator;
import com.github.gtache.fxml.compiler.impl.GenerationRequestImpl;
import com.github.gtache.fxml.compiler.impl.GeneratorImpl;
import com.github.gtache.fxml.compiler.parsing.FXMLParser;
import com.github.gtache.fxml.compiler.parsing.ParseException;
import com.github.gtache.fxml.compiler.parsing.xml.DOMFXMLParser;
import ch.gtache.fxml.compiler.GenerationException;
import ch.gtache.fxml.compiler.GenerationParameters;
import ch.gtache.fxml.compiler.Generator;
import ch.gtache.fxml.compiler.impl.GenerationRequestImpl;
import ch.gtache.fxml.compiler.impl.GeneratorImpl;
import ch.gtache.fxml.compiler.parsing.FXMLParser;
import ch.gtache.fxml.compiler.parsing.ParseException;
import ch.gtache.fxml.compiler.parsing.xml.DOMFXMLParser;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.maven.plugin.MojoExecutionException;

14
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/ControllerInfoProvider.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/ControllerInfoProvider.java
View File

@@ -1,11 +1,11 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import com.github.gtache.fxml.compiler.ControllerFieldInfo;
import com.github.gtache.fxml.compiler.ControllerInfo;
import com.github.gtache.fxml.compiler.impl.ClassesFinder;
import com.github.gtache.fxml.compiler.impl.ControllerFieldInfoImpl;
import com.github.gtache.fxml.compiler.impl.ControllerInfoImpl;
import com.github.gtache.fxml.compiler.maven.FXMLCompilerMojo;
import ch.gtache.fxml.compiler.ControllerFieldInfo;
import ch.gtache.fxml.compiler.ControllerInfo;
import ch.gtache.fxml.compiler.impl.ClassesFinder;
import ch.gtache.fxml.compiler.impl.ControllerFieldInfoImpl;
import ch.gtache.fxml.compiler.impl.ControllerInfoImpl;
import ch.gtache.fxml.compiler.maven.FXMLCompilerMojo;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.maven.plugin.MojoExecutionException;

2
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/ControllerProvider.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/ControllerProvider.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import org.apache.maven.plugin.MojoExecutionException;
import org.xml.sax.SAXException;

2
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/FXMLProvider.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/FXMLProvider.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

2
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/FieldInfo.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/FieldInfo.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import java.util.Objects;

6
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/GenericParser.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/GenericParser.java
View File

@@ -1,7 +1,7 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import com.github.gtache.fxml.compiler.GenericTypes;
import com.github.gtache.fxml.compiler.impl.GenericTypesImpl;
import ch.gtache.fxml.compiler.GenericTypes;
import ch.gtache.fxml.compiler.impl.GenericTypesImpl;
import org.apache.maven.plugin.MojoExecutionException;
import java.util.ArrayList;

2
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/Inclusion.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/Inclusion.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import java.nio.file.Path;
import java.util.Objects;

8
maven-plugin/src/main/java/com/github/gtache/fxml/compiler/maven/internal/SourceInfoProvider.java → maven-plugin/src/main/java/ch/gtache/fxml/compiler/maven/internal/SourceInfoProvider.java
View File

@@ -1,8 +1,8 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import com.github.gtache.fxml.compiler.SourceInfo;
import com.github.gtache.fxml.compiler.impl.SourceInfoImpl;
import com.github.gtache.fxml.compiler.maven.FXMLCompilerMojo;
import ch.gtache.fxml.compiler.SourceInfo;
import ch.gtache.fxml.compiler.impl.SourceInfoImpl;
import ch.gtache.fxml.compiler.maven.FXMLCompilerMojo;
import java.nio.file.Path;
import java.util.ArrayList;

24
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/TestFXMLCompilerMojo.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/TestFXMLCompilerMojo.java
View File

@@ -1,16 +1,16 @@
package com.github.gtache.fxml.compiler.maven;
package ch.gtache.fxml.compiler.maven;
import com.github.gtache.fxml.compiler.ControllerFieldInjectionType;
import com.github.gtache.fxml.compiler.ControllerInjectionType;
import com.github.gtache.fxml.compiler.ControllerMethodsInjectionType;
import com.github.gtache.fxml.compiler.ResourceBundleInjectionType;
import com.github.gtache.fxml.compiler.compatibility.impl.GenerationCompatibilityImpl;
import com.github.gtache.fxml.compiler.impl.GenerationParametersImpl;
import com.github.gtache.fxml.compiler.maven.internal.CompilationInfo;
import com.github.gtache.fxml.compiler.maven.internal.CompilationInfoProvider;
import com.github.gtache.fxml.compiler.maven.internal.Compiler;
import com.github.gtache.fxml.compiler.maven.internal.ControllerProvider;
import com.github.gtache.fxml.compiler.maven.internal.FXMLProvider;
import ch.gtache.fxml.compiler.ControllerFieldInjectionType;
import ch.gtache.fxml.compiler.ControllerInjectionType;
import ch.gtache.fxml.compiler.ControllerMethodsInjectionType;
import ch.gtache.fxml.compiler.ResourceBundleInjectionType;
import ch.gtache.fxml.compiler.compatibility.impl.GenerationCompatibilityImpl;
import ch.gtache.fxml.compiler.impl.GenerationParametersImpl;
import ch.gtache.fxml.compiler.maven.internal.CompilationInfo;
import ch.gtache.fxml.compiler.maven.internal.CompilationInfoProvider;
import ch.gtache.fxml.compiler.maven.internal.Compiler;
import ch.gtache.fxml.compiler.maven.internal.ControllerProvider;
import ch.gtache.fxml.compiler.maven.internal.FXMLProvider;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
import org.junit.jupiter.api.BeforeEach;

3
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfo.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfo.java
View File

@@ -1,4 +1,5 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

2
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfoBuilder.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfoBuilder.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

29
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompilationInfoProvider.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompilationInfoProvider.java
View File

@@ -1,4 +1,5 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
@@ -33,16 +34,16 @@ class TestCompilationInfoProvider {
final var path = copyFile("infoView.fxml", tempDir);
final var includedPath = path.getParent().resolve("includeView.fxml");
final var controllerPath = path.getParent().resolve("InfoController.java");
final var controllerClass = "com.github.gtache.fxml.compiler.maven.internal.InfoController";
final var controllerClass = "ch.gtache.fxml.compiler.maven.internal.InfoController";
Files.createFile(controllerPath);
when(project.getCompileSourceRoots()).thenReturn(List.of(tempDir.toString()));
final var expected = new CompilationInfo(path, path.getParent().resolve("InfoView.java"),
"com.github.gtache.fxml.compiler.maven.internal.InfoView", controllerPath, controllerClass,
"ch.gtache.fxml.compiler.maven.internal.InfoView", controllerPath, controllerClass,
Set.of(new FieldInfo("javafx.event.EventHandler", "onContextMenuRequested"), new FieldInfo("Button", "button"),
new FieldInfo("com.github.gtache.fxml.compiler.maven.internal.IncludeController", "includeViewController")),
new FieldInfo("ch.gtache.fxml.compiler.maven.internal.IncludeController", "includeViewController")),
Set.of("onAction"), Map.of("includeView.fxml", new Inclusion(path.getParent().resolve("includeView.fxml"), 1)), true);
final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir);
final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "com.github.gtache.fxml.compiler.maven.internal.IncludeController"));
final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "ch.gtache.fxml.compiler.maven.internal.IncludeController"));
assertEquals(expected, actual);
}
@@ -50,11 +51,11 @@ class TestCompilationInfoProvider {
void testComplexFilename(@TempDir final Path tempDir) throws Exception {
final var path = copyFile("com_plex-view.fxml", tempDir);
final var controllerPath = path.getParent().resolve("InfoController.java");
final var controllerClass = "com.github.gtache.fxml.compiler.maven.internal.InfoController";
final var controllerClass = "ch.gtache.fxml.compiler.maven.internal.InfoController";
Files.createFile(controllerPath);
when(project.getCompileSourceRoots()).thenReturn(List.of(tempDir.toString()));
final var expected = new CompilationInfo(path, path.getParent().resolve("ComPlexView.java"),
"com.github.gtache.fxml.compiler.maven.internal.ComPlexView", controllerPath, controllerClass,
"ch.gtache.fxml.compiler.maven.internal.ComPlexView", controllerPath, controllerClass,
Set.of(), Set.of(), Map.of(), false);
final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir);
final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of());
@@ -79,7 +80,7 @@ class TestCompilationInfoProvider {
Files.createFile(controllerPath);
when(project.getCompileSourceRoots()).thenReturn(List.of(tempDir.toString()));
final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir);
assertThrows(MojoExecutionException.class, () -> compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "com.github.gtache.fxml.compiler.maven.internal.IncludeController")));
assertThrows(MojoExecutionException.class, () -> compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "ch.gtache.fxml.compiler.maven.internal.IncludeController")));
}
@Test
@@ -90,7 +91,7 @@ class TestCompilationInfoProvider {
Files.createFile(controllerPath);
when(project.getCompileSourceRoots()).thenReturn(List.of());
final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir);
assertThrows(MojoExecutionException.class, () -> compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "com.github.gtache.fxml.compiler.maven.internal.IncludeController")));
assertThrows(MojoExecutionException.class, () -> compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "ch.gtache.fxml.compiler.maven.internal.IncludeController")));
}
@Test
@@ -108,16 +109,16 @@ class TestCompilationInfoProvider {
final var path = copyFile("noResourceBundle.fxml", tempDir);
final var includedPath = path.getParent().resolve("includeView.fxml");
final var controllerPath = path.getParent().resolve("InfoController.java");
final var controllerClass = "com.github.gtache.fxml.compiler.maven.internal.InfoController";
final var controllerClass = "ch.gtache.fxml.compiler.maven.internal.InfoController";
Files.createFile(controllerPath);
when(project.getCompileSourceRoots()).thenReturn(List.of(tempDir.toString()));
final var expected = new CompilationInfo(path, path.getParent().resolve("NoResourceBundle.java"),
"com.github.gtache.fxml.compiler.maven.internal.NoResourceBundle", controllerPath, controllerClass,
"ch.gtache.fxml.compiler.maven.internal.NoResourceBundle", controllerPath, controllerClass,
Set.of(new FieldInfo("javafx.event.EventHandler", "onContextMenuRequested"), new FieldInfo("Button", "button"),
new FieldInfo("com.github.gtache.fxml.compiler.maven.internal.IncludeController", "includeViewController")),
new FieldInfo("ch.gtache.fxml.compiler.maven.internal.IncludeController", "includeViewController")),
Set.of("onAction"), Map.of("includeView.fxml", new Inclusion(path.getParent().resolve("includeView.fxml"), 1)), false);
final var compilationInfoProvider = new CompilationInfoProvider(project, tempDir);
final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "com.github.gtache.fxml.compiler.maven.internal.IncludeController"));
final var actual = compilationInfoProvider.getCompilationInfo(tempDir, path, Map.of(includedPath, "ch.gtache.fxml.compiler.maven.internal.IncludeController"));
assertEquals(expected, actual);
}
@@ -132,7 +133,7 @@ class TestCompilationInfoProvider {
}
private Path copyFile(final String source, final Path tempDir) throws IOException {
final var out = tempDir.resolve("com").resolve("github").resolve("gtache").resolve("fxml").resolve("compiler").resolve("maven").resolve("internal").resolve(source);
final var out = tempDir.resolve("ch").resolve("gtache").resolve("fxml").resolve("compiler").resolve("maven").resolve("internal").resolve(source);
Files.createDirectories(out.getParent());
try (final var in = getClass().getResourceAsStream(source)) {
assertNotNull(in);

16
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestCompiler.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestCompiler.java
View File

@@ -1,12 +1,12 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import com.github.gtache.fxml.compiler.GenerationException;
import com.github.gtache.fxml.compiler.GenerationParameters;
import com.github.gtache.fxml.compiler.Generator;
import com.github.gtache.fxml.compiler.impl.GenerationRequestImpl;
import com.github.gtache.fxml.compiler.parsing.FXMLParser;
import com.github.gtache.fxml.compiler.parsing.ParseException;
import com.github.gtache.fxml.compiler.parsing.ParsedObject;
import ch.gtache.fxml.compiler.GenerationException;
import ch.gtache.fxml.compiler.GenerationParameters;
import ch.gtache.fxml.compiler.Generator;
import ch.gtache.fxml.compiler.impl.GenerationRequestImpl;
import ch.gtache.fxml.compiler.parsing.FXMLParser;
import ch.gtache.fxml.compiler.parsing.ParseException;
import ch.gtache.fxml.compiler.parsing.ParsedObject;
import org.apache.maven.plugin.MojoExecutionException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;

16
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestControllerInfoProvider.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestControllerInfoProvider.java
View File

@@ -1,8 +1,8 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import com.github.gtache.fxml.compiler.impl.ControllerFieldInfoImpl;
import com.github.gtache.fxml.compiler.impl.ControllerInfoImpl;
import com.github.gtache.fxml.compiler.impl.GenericTypesImpl;
import ch.gtache.fxml.compiler.impl.ControllerFieldInfoImpl;
import ch.gtache.fxml.compiler.impl.ControllerInfoImpl;
import ch.gtache.fxml.compiler.impl.GenericTypesImpl;
import org.apache.maven.plugin.MojoExecutionException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,7 +35,7 @@ class TestControllerInfoProvider {
void testGetControllerInfo(@TempDir final Path tempDir) throws Exception {
final var fxml = tempDir.resolve("fxml.fxml");
Files.writeString(fxml, """
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import javafx.event.EventHandler;
import javafx.event.KeyEvent;
@@ -64,7 +64,7 @@ class TestControllerInfoProvider {
}
""");
when(compilationInfo.controllerFile()).thenReturn(fxml);
final var controllerClass = "com.github.gtache.fxml.compiler.maven.internal.LoadController";
final var controllerClass = "ch.gtache.fxml.compiler.maven.internal.LoadController";
when(compilationInfo.controllerClass()).thenReturn(controllerClass);
when(compilationInfo.injectedFields()).thenReturn(Set.of(new FieldInfo("EventHandler", "keyEventHandler"),
new FieldInfo("ComboBox", "comboBox"), new FieldInfo("Button", "button"),
@@ -85,7 +85,7 @@ class TestControllerInfoProvider {
void testGetControllerInfoMethodNotFound(@TempDir final Path tempDir) throws Exception {
final var fxml = tempDir.resolve("fxml.fxml");
Files.writeString(fxml, """
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import javafx.event.EventHandler;
import javafx.event.KeyEvent;
@@ -96,7 +96,7 @@ class TestControllerInfoProvider {
}
""");
when(compilationInfo.controllerFile()).thenReturn(fxml);
when(compilationInfo.controllerClass()).thenReturn("com.github.gtache.fxml.compiler.maven.internal.LoadController");
when(compilationInfo.controllerClass()).thenReturn("ch.gtache.fxml.compiler.maven.internal.LoadController");
when(compilationInfo.injectedFields()).thenReturn(Set.of());
when(compilationInfo.injectedMethods()).thenReturn(Set.of("onClick"));
assertThrows(MojoExecutionException.class, () -> ControllerInfoProvider.getControllerInfo(compilationInfo));

2
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestControllerProvider.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestControllerProvider.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import org.apache.maven.plugin.MojoExecutionException;
import org.junit.jupiter.api.Test;

2
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestFXMLProvider.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestFXMLProvider.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import org.apache.maven.model.Resource;
import org.apache.maven.project.MavenProject;

2
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestFieldInfo.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestFieldInfo.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import org.junit.jupiter.api.Test;

4
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestGenericParser.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestGenericParser.java
View File

@@ -1,6 +1,6 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import com.github.gtache.fxml.compiler.impl.GenericTypesImpl;
import ch.gtache.fxml.compiler.impl.GenericTypesImpl;
import org.apache.maven.plugin.MojoExecutionException;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;

2
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestInclusion.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestInclusion.java
View File

@@ -1,4 +1,4 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

4
maven-plugin/src/test/java/com/github/gtache/fxml/compiler/maven/internal/TestSourceInfoProvider.java → maven-plugin/src/test/java/ch/gtache/fxml/compiler/maven/internal/TestSourceInfoProvider.java
View File

@@ -1,6 +1,6 @@
package com.github.gtache.fxml.compiler.maven.internal;
package ch.gtache.fxml.compiler.maven.internal;
import com.github.gtache.fxml.compiler.impl.SourceInfoImpl;
import ch.gtache.fxml.compiler.impl.SourceInfoImpl;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;

2
maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/com_plex-view.fxml → maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/com_plex-view.fxml
View File

@@ -2,7 +2,7 @@
<?import javafx.scene.layout.BorderPane?>
<BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.fxml.compiler.maven.internal.InfoController">
fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController">
<bottom>
</bottom>
</BorderPane>

2
maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/infoView.fxml → maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/infoView.fxml
View File

@@ -4,7 +4,7 @@
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.fxml.compiler.maven.internal.InfoController">
fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController">
<bottom>
<HBox>
<children>

2
maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/missingSource.fxml → maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/missingSource.fxml
View File

@@ -3,7 +3,7 @@
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.fxml.compiler.maven.internal.InfoController">
fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController">
<bottom>
<HBox>
<children>

0
maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/noController.fxml → maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/noController.fxml
View File

2
maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/noResourceBundle.fxml → maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/noResourceBundle.fxml
View File

@@ -4,7 +4,7 @@
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.fxml.compiler.maven.internal.InfoController">
fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController">
<bottom>
<HBox>
<children>

2
maven-plugin/src/test/resources/com/github/gtache/fxml/compiler/maven/internal/unknownOn.fxml → maven-plugin/src/test/resources/ch/gtache/fxml/compiler/maven/internal/unknownOn.fxml
View File

@@ -4,7 +4,7 @@
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.HBox?>
<BorderPane xmlns="http://javafx.com/javafx/22" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="com.github.gtache.fxml.compiler.maven.internal.InfoController">
fx:controller="ch.gtache.fxml.compiler.maven.internal.InfoController">
<bottom>
<HBox>
<children>