From 7a2cbd108c661276dbe1746783bf0a3412c0c4d0 Mon Sep 17 00:00:00 2001 From: Markus Kreth Date: Mon, 5 Aug 2024 20:44:41 +0200 Subject: [PATCH] Format in main Package verschoben. --- src/main/java/de/kreth/property2java/Configuration.java | 1 - src/main/java/de/kreth/property2java/Format.java | 2 +- .../java/de/kreth/property2java/config/FreemarkerConfig.java | 2 +- .../de/kreth/property2java/processor/GenerateProperty2Java.java | 2 ++ .../processor/GenerateResourceBundleProperty2Java.java | 2 ++ .../kreth/property2java/processor/ProcessorConfiguration.java | 1 + .../kreth/property2java/processor/Property2JavaGenerator.java | 1 + src/test/java/de/kreth/property2java/GeneratorTests.java | 2 -- .../kreth/property2java/GeneratorWithInnerPropertiesTest.java | 2 -- src/test/java/de/kreth/property2java/TestPropertiesSource.java | 1 + 10 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/de/kreth/property2java/Configuration.java b/src/main/java/de/kreth/property2java/Configuration.java index 47e750d..93bd0ac 100644 --- a/src/main/java/de/kreth/property2java/Configuration.java +++ b/src/main/java/de/kreth/property2java/Configuration.java @@ -12,7 +12,6 @@ import java.util.Map; import org.apache.commons.text.WordUtils; import de.kreth.property2java.config.Regex; -import de.kreth.property2java.processor.Format; public interface Configuration { diff --git a/src/main/java/de/kreth/property2java/Format.java b/src/main/java/de/kreth/property2java/Format.java index 12a80dd..c6b9638 100644 --- a/src/main/java/de/kreth/property2java/Format.java +++ b/src/main/java/de/kreth/property2java/Format.java @@ -1,4 +1,4 @@ -package de.kreth.property2java.processor; +package de.kreth.property2java; import java.util.PropertyResourceBundle; diff --git a/src/main/java/de/kreth/property2java/config/FreemarkerConfig.java b/src/main/java/de/kreth/property2java/config/FreemarkerConfig.java index 557396a..057b1b1 100644 --- a/src/main/java/de/kreth/property2java/config/FreemarkerConfig.java +++ b/src/main/java/de/kreth/property2java/config/FreemarkerConfig.java @@ -2,7 +2,7 @@ package de.kreth.property2java.config; import java.io.IOException; -import de.kreth.property2java.processor.Format; +import de.kreth.property2java.Format; import freemarker.template.Configuration; import freemarker.template.Template; diff --git a/src/main/java/de/kreth/property2java/processor/GenerateProperty2Java.java b/src/main/java/de/kreth/property2java/processor/GenerateProperty2Java.java index fcc2409..8291a26 100644 --- a/src/main/java/de/kreth/property2java/processor/GenerateProperty2Java.java +++ b/src/main/java/de/kreth/property2java/processor/GenerateProperty2Java.java @@ -6,6 +6,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import de.kreth.property2java.Format; + @Target(TYPE) @Retention(RetentionPolicy.SOURCE) /** diff --git a/src/main/java/de/kreth/property2java/processor/GenerateResourceBundleProperty2Java.java b/src/main/java/de/kreth/property2java/processor/GenerateResourceBundleProperty2Java.java index 765c3b8..9e15a2b 100644 --- a/src/main/java/de/kreth/property2java/processor/GenerateResourceBundleProperty2Java.java +++ b/src/main/java/de/kreth/property2java/processor/GenerateResourceBundleProperty2Java.java @@ -7,6 +7,8 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import de.kreth.property2java.Format; + @Target(TYPE) @Retention(RetentionPolicy.SOURCE) @Repeatable(value = GenerateResourceBundleProperty2Javas.class) diff --git a/src/main/java/de/kreth/property2java/processor/ProcessorConfiguration.java b/src/main/java/de/kreth/property2java/processor/ProcessorConfiguration.java index 6ef0eef..8691a74 100644 --- a/src/main/java/de/kreth/property2java/processor/ProcessorConfiguration.java +++ b/src/main/java/de/kreth/property2java/processor/ProcessorConfiguration.java @@ -19,6 +19,7 @@ import javax.tools.FileObject; import javax.tools.StandardLocation; import de.kreth.property2java.Configuration; +import de.kreth.property2java.Format; import de.kreth.property2java.Generator; import de.kreth.property2java.GeneratorException; diff --git a/src/main/java/de/kreth/property2java/processor/Property2JavaGenerator.java b/src/main/java/de/kreth/property2java/processor/Property2JavaGenerator.java index de55ee1..c119438 100644 --- a/src/main/java/de/kreth/property2java/processor/Property2JavaGenerator.java +++ b/src/main/java/de/kreth/property2java/processor/Property2JavaGenerator.java @@ -16,6 +16,7 @@ import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; +import de.kreth.property2java.Format; import de.kreth.property2java.GeneratorException; @SupportedAnnotationTypes({ "de.kreth.property2java.processor.GenerateProperty2Java", diff --git a/src/test/java/de/kreth/property2java/GeneratorTests.java b/src/test/java/de/kreth/property2java/GeneratorTests.java index f600b7f..dadcc04 100644 --- a/src/test/java/de/kreth/property2java/GeneratorTests.java +++ b/src/test/java/de/kreth/property2java/GeneratorTests.java @@ -29,8 +29,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import de.kreth.property2java.processor.Format; - class GeneratorTests { private String path = "application.properties"; diff --git a/src/test/java/de/kreth/property2java/GeneratorWithInnerPropertiesTest.java b/src/test/java/de/kreth/property2java/GeneratorWithInnerPropertiesTest.java index 3e469d8..705fda5 100644 --- a/src/test/java/de/kreth/property2java/GeneratorWithInnerPropertiesTest.java +++ b/src/test/java/de/kreth/property2java/GeneratorWithInnerPropertiesTest.java @@ -30,8 +30,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import de.kreth.property2java.processor.Format; - public class GeneratorWithInnerPropertiesTest { private String path = "application.properties"; diff --git a/src/test/java/de/kreth/property2java/TestPropertiesSource.java b/src/test/java/de/kreth/property2java/TestPropertiesSource.java index 72561b1..be716f8 100644 --- a/src/test/java/de/kreth/property2java/TestPropertiesSource.java +++ b/src/test/java/de/kreth/property2java/TestPropertiesSource.java @@ -22,4 +22,5 @@ public class TestPropertiesSource { + "message.user.loginfailure = Login Error! Wrong user or password?\r\n" + "message.user.passwordmissmatch = Passwords don't match.\r\n" + ""); } + }