diff --git a/annotations/.classpath b/annotations/.classpath index 5e577b9..49d12bb 100644 --- a/annotations/.classpath +++ b/annotations/.classpath @@ -23,5 +23,22 @@ + + + + + + + + + + + + + + + + + diff --git a/annotations/.factorypath b/annotations/.factorypath new file mode 100644 index 0000000..270ec3d --- /dev/null +++ b/annotations/.factorypath @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/annotations/.project b/annotations/.project index fb0a5ec..ecf4695 100644 --- a/annotations/.project +++ b/annotations/.project @@ -1,6 +1,6 @@ - annotations + jackfruit diff --git a/annotations/.settings/org.eclipse.jdt.apt.core.prefs b/annotations/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..dfa4f3a --- /dev/null +++ b/annotations/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations diff --git a/annotations/.settings/org.eclipse.jdt.core.prefs b/annotations/.settings/org.eclipse.jdt.core.prefs index eeac0e7..7f3081d 100644 --- a/annotations/.settings/org.eclipse.jdt.core.prefs +++ b/annotations/.settings/org.eclipse.jdt.core.prefs @@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=enabled org.eclipse.jdt.core.compiler.source=17 diff --git a/annotations/src/main/java/srncfg/annotations/Comment.java b/annotations/src/main/java/jackfruit/annotations/Comment.java similarity index 91% rename from annotations/src/main/java/srncfg/annotations/Comment.java rename to annotations/src/main/java/jackfruit/annotations/Comment.java index d185f29..33219b5 100644 --- a/annotations/src/main/java/srncfg/annotations/Comment.java +++ b/annotations/src/main/java/jackfruit/annotations/Comment.java @@ -1,4 +1,4 @@ -package srncfg.annotations; +package jackfruit.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/annotations/src/main/java/srncfg/annotations/ConfigParams.java b/annotations/src/main/java/jackfruit/annotations/ConfigParams.java similarity index 90% rename from annotations/src/main/java/srncfg/annotations/ConfigParams.java rename to annotations/src/main/java/jackfruit/annotations/ConfigParams.java index dbf4061..0e1f4d8 100644 --- a/annotations/src/main/java/srncfg/annotations/ConfigParams.java +++ b/annotations/src/main/java/jackfruit/annotations/ConfigParams.java @@ -1,4 +1,4 @@ -package srncfg.annotations; +package jackfruit.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/annotations/src/main/java/srncfg/annotations/DefaultValue.java b/annotations/src/main/java/jackfruit/annotations/DefaultValue.java similarity index 91% rename from annotations/src/main/java/srncfg/annotations/DefaultValue.java rename to annotations/src/main/java/jackfruit/annotations/DefaultValue.java index 3848723..3d05aff 100644 --- a/annotations/src/main/java/srncfg/annotations/DefaultValue.java +++ b/annotations/src/main/java/jackfruit/annotations/DefaultValue.java @@ -1,4 +1,4 @@ -package srncfg.annotations; +package jackfruit.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/annotations/src/main/java/srncfg/annotations/Key.java b/annotations/src/main/java/jackfruit/annotations/Key.java similarity index 90% rename from annotations/src/main/java/srncfg/annotations/Key.java rename to annotations/src/main/java/jackfruit/annotations/Key.java index 4e3684d..60cabd2 100644 --- a/annotations/src/main/java/srncfg/annotations/Key.java +++ b/annotations/src/main/java/jackfruit/annotations/Key.java @@ -1,4 +1,4 @@ -package srncfg.annotations; +package jackfruit.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/annotations/src/main/java/srncfg/annotations/Parameter.java b/annotations/src/main/java/jackfruit/annotations/Parameter.java similarity index 91% rename from annotations/src/main/java/srncfg/annotations/Parameter.java rename to annotations/src/main/java/jackfruit/annotations/Parameter.java index be8e904..6ab6b12 100644 --- a/annotations/src/main/java/srncfg/annotations/Parameter.java +++ b/annotations/src/main/java/jackfruit/annotations/Parameter.java @@ -1,4 +1,4 @@ -package srncfg.annotations; +package jackfruit.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/annotations/src/main/java/srncfg/annotations/Parser.java b/annotations/src/main/java/jackfruit/annotations/Parser.java similarity index 75% rename from annotations/src/main/java/srncfg/annotations/Parser.java rename to annotations/src/main/java/jackfruit/annotations/Parser.java index 636064e..392eb4f 100644 --- a/annotations/src/main/java/srncfg/annotations/Parser.java +++ b/annotations/src/main/java/jackfruit/annotations/Parser.java @@ -1,4 +1,4 @@ -package srncfg.annotations; +package jackfruit.annotations; public interface Parser { public T fromString(String s); diff --git a/annotations/src/main/java/srncfg/annotations/ParserClass.java b/annotations/src/main/java/jackfruit/annotations/ParserClass.java similarity index 92% rename from annotations/src/main/java/srncfg/annotations/ParserClass.java rename to annotations/src/main/java/jackfruit/annotations/ParserClass.java index 3d6495c..08a8ce1 100644 --- a/annotations/src/main/java/srncfg/annotations/ParserClass.java +++ b/annotations/src/main/java/jackfruit/annotations/ParserClass.java @@ -1,4 +1,4 @@ -package srncfg.annotations; +package jackfruit.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/annotations/src/main/java/srncfg/annotations/AnnotationBundle.java b/annotations/src/main/java/jackfruit/processor/AnnotationBundle.java similarity index 90% rename from annotations/src/main/java/srncfg/annotations/AnnotationBundle.java rename to annotations/src/main/java/jackfruit/processor/AnnotationBundle.java index 293ce03..7d72aa1 100644 --- a/annotations/src/main/java/srncfg/annotations/AnnotationBundle.java +++ b/annotations/src/main/java/jackfruit/processor/AnnotationBundle.java @@ -1,4 +1,4 @@ -package srncfg.annotations; +package jackfruit.processor; import java.util.Optional; import javax.lang.model.type.TypeMirror; diff --git a/annotations/src/main/java/srncfg/processor/ConfigFactory.java b/annotations/src/main/java/jackfruit/processor/ConfigFactory.java similarity index 90% rename from annotations/src/main/java/srncfg/processor/ConfigFactory.java rename to annotations/src/main/java/jackfruit/processor/ConfigFactory.java index 114c91a..e63ab33 100644 --- a/annotations/src/main/java/srncfg/processor/ConfigFactory.java +++ b/annotations/src/main/java/jackfruit/processor/ConfigFactory.java @@ -1,4 +1,4 @@ -package srncfg.processor; +package jackfruit.processor; import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.PropertiesConfiguration; diff --git a/annotations/src/main/java/srncfg/processor/ConfigProcessor.java b/annotations/src/main/java/jackfruit/processor/ConfigProcessor.java similarity index 97% rename from annotations/src/main/java/srncfg/processor/ConfigProcessor.java rename to annotations/src/main/java/jackfruit/processor/ConfigProcessor.java index 9db7b0f..d9530f0 100644 --- a/annotations/src/main/java/srncfg/processor/ConfigProcessor.java +++ b/annotations/src/main/java/jackfruit/processor/ConfigProcessor.java @@ -1,4 +1,4 @@ -package srncfg.processor; +package jackfruit.processor; import java.io.File; import java.io.IOException; @@ -50,13 +50,11 @@ import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; import com.squareup.javapoet.TypeVariableName; -import srncfg.annotations.AnnotationBundle; -import srncfg.annotations.Comment; -import srncfg.annotations.ConfigParams; -import srncfg.annotations.DefaultValue; -import srncfg.annotations.ImmutableAnnotationBundle; -import srncfg.annotations.Key; -import srncfg.annotations.ParserClass; +import jackfruit.annotations.Comment; +import jackfruit.annotations.ConfigParams; +import jackfruit.annotations.DefaultValue; +import jackfruit.annotations.Key; +import jackfruit.annotations.ParserClass; /** * https://www.javacodegeeks.com/2015/09/java-annotation-processors.html @@ -65,7 +63,7 @@ import srncfg.annotations.ParserClass; * */ @SupportedSourceVersion(SourceVersion.RELEASE_17) -@SupportedAnnotationTypes("srncfg.annotations.ConfigParams") +@SupportedAnnotationTypes("jackfruit.annotations.ConfigParams") @AutoService(Processor.class) public class ConfigProcessor extends AbstractProcessor { @@ -100,7 +98,7 @@ public class ConfigProcessor extends AbstractProcessor { // This is the generic class; e.g. "ConfigFactory" ParameterizedTypeName ptn = - ParameterizedTypeName.get(ClassName.get(srncfg.processor.ConfigFactory.class), tvn); + ParameterizedTypeName.get(ClassName.get(jackfruit.processor.ConfigFactory.class), tvn); String factoryName = String.format("%sFactory", annotatedType.getSimpleName()); diff --git a/demo/.classpath b/demo/.classpath index 5e577b9..c1dbc68 100644 --- a/demo/.classpath +++ b/demo/.classpath @@ -8,9 +8,17 @@ + - + + + + + + + + @@ -23,5 +31,15 @@ + + + + + + + + + + diff --git a/demo/.factorypath b/demo/.factorypath new file mode 100644 index 0000000..bffb93d --- /dev/null +++ b/demo/.factorypath @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/demo/.project b/demo/.project index 7421ab6..2885fcf 100644 --- a/demo/.project +++ b/demo/.project @@ -1,6 +1,6 @@ - demo + jackfruit-demo diff --git a/demo/.settings/org.eclipse.jdt.apt.core.prefs b/demo/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..dfa4f3a --- /dev/null +++ b/demo/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=true +org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations +org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations diff --git a/demo/.settings/org.eclipse.jdt.core.prefs b/demo/.settings/org.eclipse.jdt.core.prefs index cf2cd45..87f474b 100644 --- a/demo/.settings/org.eclipse.jdt.core.prefs +++ b/demo/.settings/org.eclipse.jdt.core.prefs @@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=17 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=enabled org.eclipse.jdt.core.compiler.release=disabled org.eclipse.jdt.core.compiler.source=17 diff --git a/demo/src/main/java/srncfg/demo/ConfigTemplate.java b/demo/src/main/java/jackfruit/demo/ConfigTemplate.java similarity index 84% rename from demo/src/main/java/srncfg/demo/ConfigTemplate.java rename to demo/src/main/java/jackfruit/demo/ConfigTemplate.java index f1012e6..0a7606a 100644 --- a/demo/src/main/java/srncfg/demo/ConfigTemplate.java +++ b/demo/src/main/java/jackfruit/demo/ConfigTemplate.java @@ -1,10 +1,10 @@ -package srncfg.demo; +package jackfruit.demo; -import srncfg.annotations.Comment; -import srncfg.annotations.ConfigParams; -import srncfg.annotations.DefaultValue; -import srncfg.annotations.Key; -import srncfg.annotations.ParserClass; +import jackfruit.annotations.Comment; +import jackfruit.annotations.ConfigParams; +import jackfruit.annotations.DefaultValue; +import jackfruit.annotations.Key; +import jackfruit.annotations.ParserClass; /** * @Configurable on interface diff --git a/demo/src/main/java/srncfg/demo/SomeRandomClass.java b/demo/src/main/java/jackfruit/demo/SomeRandomClass.java similarity index 59% rename from demo/src/main/java/srncfg/demo/SomeRandomClass.java rename to demo/src/main/java/jackfruit/demo/SomeRandomClass.java index 9263a96..3dac738 100644 --- a/demo/src/main/java/srncfg/demo/SomeRandomClass.java +++ b/demo/src/main/java/jackfruit/demo/SomeRandomClass.java @@ -1,4 +1,4 @@ -package srncfg.demo; +package jackfruit.demo; public class SomeRandomClass { diff --git a/demo/src/main/java/srncfg/demo/SomeRandomClassParser.java b/demo/src/main/java/jackfruit/demo/SomeRandomClassParser.java similarity index 88% rename from demo/src/main/java/srncfg/demo/SomeRandomClassParser.java rename to demo/src/main/java/jackfruit/demo/SomeRandomClassParser.java index eb4a82f..bf351c0 100644 --- a/demo/src/main/java/srncfg/demo/SomeRandomClassParser.java +++ b/demo/src/main/java/jackfruit/demo/SomeRandomClassParser.java @@ -1,9 +1,8 @@ -package srncfg.demo; +package jackfruit.demo; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; - -import srncfg.annotations.Parser; +import jackfruit.annotations.Parser; public class SomeRandomClassParser implements Parser { diff --git a/demo/src/test/java/srncfg/demo/TestProcessor.java b/demo/src/test/java/jackfruit/demo/TestProcessor.java similarity index 96% rename from demo/src/test/java/srncfg/demo/TestProcessor.java rename to demo/src/test/java/jackfruit/demo/TestProcessor.java index e3ee70a..ba56be2 100644 --- a/demo/src/test/java/srncfg/demo/TestProcessor.java +++ b/demo/src/test/java/jackfruit/demo/TestProcessor.java @@ -1,4 +1,4 @@ -package srncfg.demo; +package jackfruit.demo; import java.io.File; import java.io.PrintWriter; @@ -14,7 +14,7 @@ import javax.tools.StandardLocation; import javax.tools.ToolProvider; import org.junit.Test; import crucible.crust.logging.Log4j2Configurator; -import srncfg.processor.ConfigProcessor; +import jackfruit.processor.ConfigProcessor; /** * From