Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tobiasstamann committed Mar 13, 2024
2 parents a198d97 + b800072 commit 326739c
Show file tree
Hide file tree
Showing 112 changed files with 6,844 additions and 6,269 deletions.
2 changes: 1 addition & 1 deletion annotationwrapper/api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.toolisticon.aptk</groupId>
<artifactId>aptk-annotationwrapper-parent</artifactId>
<version>0.22.11</version>
<version>0.23.0</version>
</parent>

<name>aptk-annotationwrapper-api</name>
Expand Down
8 changes: 7 additions & 1 deletion annotationwrapper/integrationtest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>io.toolisticon.aptk</groupId>
<artifactId>aptk-annotationwrapper-parent</artifactId>
<version>0.22.11</version>
<version>0.23.0</version>
</parent>

<name>aptk-annotationwrapper-integrationTest</name>
Expand Down Expand Up @@ -112,6 +112,12 @@
<artifactId>cute</artifactId>
</dependency>

<dependency>
<groupId>io.toolisticon.cute</groupId>
<artifactId>cute-legacy</artifactId>
</dependency>


</dependencies>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface TestAnnotation {
public @interface ExampleTestAnnotation {

// single value attributes

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.toolisticon.aptk.annotationwrapper.test.annotationonpackage;

import io.toolisticon.aptk.annotationwrapper.api.CustomCodeMethod;
import io.toolisticon.aptk.annotationwrapper.test.TestAnnotation;
import io.toolisticon.aptk.annotationwrapper.test.ExampleTestAnnotation;

public class AutoDetectedCustomCodeClass {

@CustomCodeMethod(TestAnnotation.class)
public static String autoDetectedMethod(TestAnnotationWrapper testAnnotationWrapper, String firstArg) {
@CustomCodeMethod(ExampleTestAnnotation.class)
public static String autoDetectedMethod(ExampleTestAnnotationWrapper testAnnotationWrapper, String firstArg) {
testAnnotationWrapper.enumAttribute();
return "it worked : " + firstArg;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package io.toolisticon.aptk.annotationwrapper.test.annotationonpackage;

import io.toolisticon.aptk.annotationwrapper.api.CustomCodeMethod;
import io.toolisticon.aptk.annotationwrapper.test.TestAnnotation;
import io.toolisticon.aptk.annotationwrapper.test.ExampleTestAnnotation;

public class CustomCodeClass {

@CustomCodeMethod(TestAnnotation.class)
public static String forwardedMethod(TestAnnotationWrapper testAnnotationWrapper, String firstArg) {
@CustomCodeMethod(ExampleTestAnnotation.class)
public static String forwardedMethod(ExampleTestAnnotationWrapper testAnnotationWrapper, String firstArg) {
testAnnotationWrapper.enumAttribute();
return "it worked : " + firstArg;
}

@CustomCodeMethod(TestAnnotation.class)
public static void forwardedMethodWithNoReturnValue(TestAnnotationWrapper testAnnotationWrapper, String firstArg) {
@CustomCodeMethod(ExampleTestAnnotation.class)
public static void forwardedMethodWithNoReturnValue(ExampleTestAnnotationWrapper testAnnotationWrapper, String firstArg) {
testAnnotationWrapper.enumAttribute();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@AnnotationWrapper(
value = {TestAnnotation.class, TestDefaultsAnnotation.class},
value = {ExampleTestAnnotation.class, TestDefaultsAnnotation.class},
bindCustomCode = {CustomCodeClass.class},
automaticallyWrapEmbeddedAnnotations = true)
package io.toolisticon.aptk.annotationwrapper.test.annotationonpackage;

import io.toolisticon.aptk.annotationwrapper.api.AnnotationWrapper;
import io.toolisticon.aptk.annotationwrapper.test.TestAnnotation;
import io.toolisticon.aptk.annotationwrapper.test.ExampleTestAnnotation;
import io.toolisticon.aptk.annotationwrapper.test.TestDefaultsAnnotation;


Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.toolisticon.aptk.annotationwrapper.test.annotationontype;

import io.toolisticon.aptk.annotationwrapper.api.CustomCodeMethod;
import io.toolisticon.aptk.annotationwrapper.test.TestAnnotation;
import io.toolisticon.aptk.annotationwrapper.test.ExampleTestAnnotation;

public class AutoDetectedCustomCodeClass {

@CustomCodeMethod(TestAnnotation.class)
public static String autoDetectedMethod(TestAnnotationWrapper testAnnotationWrapper, String firstArg) {
@CustomCodeMethod(ExampleTestAnnotation.class)
public static String autoDetectedMethod(ExampleTestAnnotationWrapper testAnnotationWrapper, String firstArg) {
testAnnotationWrapper.enumAttribute();
return "it worked : " + firstArg;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package io.toolisticon.aptk.annotationwrapper.test.annotationontype;

import io.toolisticon.aptk.annotationwrapper.api.CustomCodeMethod;
import io.toolisticon.aptk.annotationwrapper.test.TestAnnotation;
import io.toolisticon.aptk.annotationwrapper.test.ExampleTestAnnotation;

public class CustomCodeClass {

@CustomCodeMethod(TestAnnotation.class)
public static String forwardedMethod(TestAnnotationWrapper testAnnotationWrapper, String firstArg) {
@CustomCodeMethod(ExampleTestAnnotation.class)
public static String forwardedMethod(ExampleTestAnnotationWrapper testAnnotationWrapper, String firstArg) {
testAnnotationWrapper.enumAttribute();
return "it worked : " + firstArg;
}

@CustomCodeMethod(TestAnnotation.class)
public static void forwardedMethodWithNoReturnValue(TestAnnotationWrapper testAnnotationWrapper, String firstArg) {
@CustomCodeMethod(ExampleTestAnnotation.class)
public static void forwardedMethodWithNoReturnValue(ExampleTestAnnotationWrapper testAnnotationWrapper, String firstArg) {
testAnnotationWrapper.enumAttribute();
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package io.toolisticon.aptk.annotationwrapper.test.annotationontype;

import io.toolisticon.aptk.annotationwrapper.api.AnnotationWrapper;
import io.toolisticon.aptk.annotationwrapper.test.TestAnnotation;
import io.toolisticon.aptk.annotationwrapper.test.ExampleTestAnnotation;
import io.toolisticon.aptk.annotationwrapper.test.TestDefaultsAnnotation;


@AnnotationWrapper(
value = {TestAnnotation.class, TestDefaultsAnnotation.class},
value = {ExampleTestAnnotation.class, TestDefaultsAnnotation.class},
bindCustomCode = {CustomCodeClass.class},
automaticallyWrapEmbeddedAnnotations = true)

Expand Down
Loading

0 comments on commit 326739c

Please sign in to comment.