From 981f7276230058fda6a169cd09d8107eb8cb93e1 Mon Sep 17 00:00:00 2001 From: JEAF Development Team Date: Fri, 5 Jul 2024 13:20:27 +0200 Subject: [PATCH] Implemented and tested #78 --- .../jeaf/generator/maven/GeneratorMojo.java | 110 ++++++++- .../pom.xml | 18 +- .../jeaf/junit/openapi/base/BankAccount.java | 8 +- .../junit/openapi/base/BeanParameter.java | 20 +- .../jeaf/junit/openapi/base/BidirectA.java | 12 +- .../jeaf/junit/openapi/base/BidirectB.java | 8 +- .../junit/openapi/base/BigDecimalCode.java | 8 +- .../junit/openapi/base/BigIntegerCode.java | 8 +- .../jeaf/junit/openapi/base/Booking.java | 8 +- .../jeaf/junit/openapi/base/BookingCode.java | 8 +- .../jeaf/junit/openapi/base/ByteCode.java | 8 +- .../jeaf/junit/openapi/base/Campaign.java | 6 +- .../jeaf/junit/openapi/base/Channel.java | 4 +- .../jeaf/junit/openapi/base/ChannelBase.java | 20 +- .../jeaf/junit/openapi/base/ChannelCode.java | 8 +- .../jeaf/junit/openapi/base/ChannelType.java | 4 +- .../jeaf/junit/openapi/base/ChildAA.java | 16 +- .../jeaf/junit/openapi/base/ChildBB.java | 8 +- .../junit/openapi/base/CodeTypeUsageTest.java | 28 +-- .../jeaf/junit/openapi/base/Company.java | 8 +- .../jeaf/junit/openapi/base/Context.java | 20 +- .../jeaf/junit/openapi/base/CurrencyCode.java | 8 +- .../jeaf/junit/openapi/base/DataUnit.java | 4 +- .../junit/openapi/base/DeprecatedContext.java | 20 +- .../junit/openapi/base/DeprecatedType.java | 8 +- .../jeaf/junit/openapi/base/DirectedEdge.java | 14 +- .../jeaf/junit/openapi/base/EnumTest.java | 14 +- .../jeaf/junit/openapi/base/FloatCode.java | 8 +- .../junit/openapi/base/HeavyDataTypeUser.java | 50 ++-- .../jeaf/junit/openapi/base/IBAN.java | 8 +- .../junit/openapi/base/IgnoringClass.java | 8 +- .../jeaf/junit/openapi/base/IntegerCode.java | 8 +- .../anaptecs/jeaf/junit/openapi/base/Leg.java | 14 +- .../jeaf/junit/openapi/base/LinkObject.java | 8 +- .../jeaf/junit/openapi/base/LongCode.java | 8 +- .../openapi/base/MultiValuedDataType.java | 18 +- .../openapi/base/NotInlinedBeanParam.java | 26 +- .../anaptecs/jeaf/junit/openapi/base/POI.java | 28 +-- .../openapi/base/ParentBeanParamType.java | 14 +- .../jeaf/junit/openapi/base/ParentClass.java | 8 +- .../jeaf/junit/openapi/base/Person.java | 4 +- .../jeaf/junit/openapi/base/PersonBase.java | 16 +- .../jeaf/junit/openapi/base/PlaceRef.java | 8 +- .../junit/openapi/base/PostalAddress.java | 20 +- .../base/PrimitiveObjectWithRestrictions.java | 80 +++---- .../jeaf/junit/openapi/base/ProductBase.java | 44 ++-- .../jeaf/junit/openapi/base/Reseller.java | 4 +- .../jeaf/junit/openapi/base/ResellerBase.java | 26 +- .../jeaf/junit/openapi/base/Sortiment.java | 6 +- .../junit/openapi/base/SpecialContext.java | 20 +- .../jeaf/junit/openapi/base/Stop.java | 14 +- .../jeaf/junit/openapi/base/StringCode.java | 8 +- .../junit/openapi/base/StringCodeType.java | 8 +- .../base/TheReadOnlyServiceObject.java | 6 +- .../jeaf/junit/openapi/base/UICStop.java | 8 +- .../jeaf/junit/openapi/base/WeirdBooking.java | 14 +- .../jeaf/junit/openapi/base/WeirdParent.java | 22 +- .../junit/openapi/datatypes/MyDataType.java | 8 +- .../openapi/datatypeusage/DataTypeUsage.java | 8 +- .../service1/ChildBeanParameterType.java | 8 +- .../openapi/service1/DateQueryParamsBean.java | 62 ++--- .../openapi/service1/LocalBeanParamType.java | 20 +- .../openapi/service1/ProductService.java | 168 ++++++------- .../jeaf/junit/openapi/service1/Sale.java | 8 +- .../service1/TechnicalHeaderContext.java | 8 +- .../resource/ProductServiceResource.java | 149 ++++++++---- .../junit/openapi/techbase/BusinessChild.java | 8 +- .../junit/openapi/techbase/TechParent.java | 8 +- .../openapi/transientback/ClientClass.java | 8 +- .../openapi/transientback/MasterClass.java | 8 +- .../transientback/ReadOnlyClientBase.java | 6 +- .../openapi/transientback/ReadOnlyMaster.java | 6 +- .../generics/GenericSingleValuedReponse.java | 8 +- .../annotations/MyNotEmptyProperty.java | 11 + .../annotations/MyNotEmptyRESTParam.java | 11 + .../annotations/MyNotEmptyServiceParam.java | 11 + ...MyNotEmpty.java => MyNotNullProperty.java} | 2 +- .../annotations/MyNotNullRESTParam.java | 11 + .../annotations/MyNotNullServiceParam.java | 11 + jeaf-generator-test-spring/pom.xml | 19 +- .../anaptecs/spring/base/AnotherDataType.java | 8 +- .../anaptecs/spring/base/BeanParameter.java | 20 +- .../com/anaptecs/spring/base/BidirectA.java | 12 +- .../com/anaptecs/spring/base/BidirectB.java | 8 +- .../com/anaptecs/spring/base/Booking.java | 14 +- .../com/anaptecs/spring/base/BookingCode.java | 8 +- .../com/anaptecs/spring/base/BookingID.java | 22 +- .../com/anaptecs/spring/base/BooleanCode.java | 8 +- .../com/anaptecs/spring/base/ByteCode.java | 8 +- .../com/anaptecs/spring/base/Channel.java | 18 +- .../com/anaptecs/spring/base/ChannelCode.java | 8 +- .../anaptecs/spring/base/CharacterCode.java | 8 +- .../com/anaptecs/spring/base/ChildAA.java | 8 +- .../com/anaptecs/spring/base/ChildBB.java | 8 +- .../spring/base/CodeTypeUsageTest.java | 22 +- .../com/anaptecs/spring/base/Company.java | 8 +- .../com/anaptecs/spring/base/Context.java | 32 +-- .../anaptecs/spring/base/CurrencyCode.java | 8 +- .../com/anaptecs/spring/base/DataUnit.java | 4 +- .../com/anaptecs/spring/base/DateObject.java | 38 +-- .../spring/base/DeprecatedContext.java | 20 +- .../anaptecs/spring/base/DirectedEdge.java | 14 +- .../com/anaptecs/spring/base/DoubleCode.java | 8 +- .../com/anaptecs/spring/base/Duration.java | 8 +- .../com/anaptecs/spring/base/EnumTest.java | 14 +- .../com/anaptecs/spring/base/FloatCode.java | 8 +- .../anaptecs/spring/base/IgnoringClass.java | 8 +- .../com/anaptecs/spring/base/IntegerCode.java | 8 +- .../java/com/anaptecs/spring/base/Leg.java | 14 +- .../com/anaptecs/spring/base/LinkObject.java | 8 +- .../com/anaptecs/spring/base/LongCode.java | 8 +- .../spring/base/MasterDataObject.java | 6 +- .../spring/base/MasterDataObjectBase.java | 24 +- .../com/anaptecs/spring/base/MoneyAmount.java | 10 +- .../anaptecs/spring/base/NoSubTypesChild.java | 8 +- .../spring/base/OpenAPITestObject.java | 32 +-- .../java/com/anaptecs/spring/base/POI.java | 8 +- .../spring/base/ParentBeanParamType.java | 14 +- .../com/anaptecs/spring/base/ParentClass.java | 8 +- .../java/com/anaptecs/spring/base/Person.java | 4 +- .../com/anaptecs/spring/base/PersonBase.java | 16 +- .../com/anaptecs/spring/base/PlaceRef.java | 8 +- .../anaptecs/spring/base/PostalAddress.java | 26 +- .../spring/base/PrimitiveArraysObject.java | 8 +- .../anaptecs/spring/base/PrimitiveObject.java | 80 +++---- .../base/PrimitiveObjectWithRestrictions.java | 80 +++---- .../com/anaptecs/spring/base/Problem.java | 18 +- .../com/anaptecs/spring/base/Product.java | 44 ++-- .../com/anaptecs/spring/base/Reseller.java | 4 +- .../anaptecs/spring/base/ResellerBase.java | 26 +- .../com/anaptecs/spring/base/ShortCode.java | 8 +- .../anaptecs/spring/base/SoftLinkBase.java | 18 +- .../anaptecs/spring/base/SpecialContext.java | 14 +- .../java/com/anaptecs/spring/base/Stop.java | 8 +- .../com/anaptecs/spring/base/StringCode.java | 8 +- .../anaptecs/spring/base/StringCodeType.java | 8 +- .../spring/base/TechnicalHeaderContext.java | 8 +- .../anaptecs/spring/base/TheReadOnlyPOJO.java | 6 +- .../com/anaptecs/spring/base/UICStop.java | 8 +- .../anaptecs/spring/base/WeirdBooking.java | 8 +- .../backward/SimpleBackwardCompatibility.java | 14 +- .../spring/base/techbase/BusinessChild.java | 8 +- .../spring/base/techbase/TechParent.java | 8 +- .../composite/ComplexBookingIDBase.java | 28 +-- .../DataTypeCustomSerializationBase.java | 8 +- .../spring/service/AdvancedHeader.java | 20 +- .../service/ChildBeanParameterType.java | 8 +- .../spring/service/ContextWithPrimitives.java | 20 +- .../spring/service/DataTypesQueryBean.java | 26 +- .../spring/service/DateHeaderParamsBean.java | 62 ++--- .../spring/service/DateQueryParamsBean.java | 62 ++--- .../spring/service/LocalBeanParamType.java | 14 +- .../service/MultiValuedHeaderBeanParam.java | 8 +- .../spring/service/PathlessService.java | 12 +- .../spring/service/ProductService.java | 119 ++++----- .../spring/service/QueryBeanParam.java | 8 +- .../spring/service/RESTProductService.java | 156 ++++++------ .../com/anaptecs/spring/service/Sale.java | 8 +- .../service/monitoring/MonitoringService.java | 4 +- .../resource/PathlessServiceResource.java | 15 +- .../resource/ProductServiceResource.java | 202 ++++++++++------ .../resource/RESTProductServiceResource.java | 225 +++++++++++------- .../annotations/MyNotEmptyProperty.java | 11 + .../annotations/MyNotEmptyRESTParam.java | 11 + .../annotations/MyNotEmptyServiceParam.java | 11 + .../annotations/MyNotNullProperty.java | 2 +- .../annotations/MyNotNullRESTParam.java | 11 + .../annotations/MyNotNullServiceParam.java | 11 + .../src/main/resources/entity/Entity.xpt | 4 +- .../resources/functions/SystemProperties.ext | 28 +++ .../src/main/resources/java/DomainObject.xpt | 4 +- .../src/main/resources/java/Helper.xpt | 49 +++- .../src/main/resources/java/POJO.xpt | 4 +- .../src/main/resources/java/ServiceObject.xpt | 4 +- .../src/main/resources/jeaf/JEAFComponent.xpt | 2 +- .../src/main/resources/jeaf/JEAFOperation.xpt | 80 +++---- .../src/main/resources/jeaf/JEAFService.xpt | 4 +- .../src/main/resources/jeaf/RESTResource.xpt | 6 + .../main/resources/jeaf/RESTServiceProxy.xpt | 2 +- .../main/resources/jeaf/ServiceProvider.xpt | 4 +- 180 files changed, 2077 insertions(+), 1599 deletions(-) create mode 100644 jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyProperty.java create mode 100644 jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyRESTParam.java create mode 100644 jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyServiceParam.java rename jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/{MyNotEmpty.java => MyNotNullProperty.java} (85%) create mode 100644 jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullRESTParam.java create mode 100644 jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullServiceParam.java create mode 100644 jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyProperty.java create mode 100644 jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyRESTParam.java create mode 100644 jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyServiceParam.java rename jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNull.java => jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullProperty.java (85%) create mode 100644 jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullRESTParam.java create mode 100644 jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullServiceParam.java diff --git a/jeaf-generator-maven-plugin/src/main/java/com/anaptecs/jeaf/generator/maven/GeneratorMojo.java b/jeaf-generator-maven-plugin/src/main/java/com/anaptecs/jeaf/generator/maven/GeneratorMojo.java index 7e5c068be..291983fed 100644 --- a/jeaf-generator-maven-plugin/src/main/java/com/anaptecs/jeaf/generator/maven/GeneratorMojo.java +++ b/jeaf-generator-maven-plugin/src/main/java/com/anaptecs/jeaf/generator/maven/GeneratorMojo.java @@ -488,6 +488,8 @@ public class GeneratorMojo extends AbstractMojo { @Parameter(required = false, defaultValue = "false") private Boolean generateEqualsAndHashCodeForCompositeDataTypes; + // Properties + /** * Switch defines if equals() and hashCode() should be generated for OpenAPI data type POJOs * and ServiceObjects. @@ -521,6 +523,58 @@ public class GeneratorMojo extends AbstractMojo { @Parameter(required = false) private String notEmptyAnnotationNameForMultiValuedProperties = ""; + // Services + + /** + * Switch can be used to enable that NotNull annotation is generated for service operations. + */ + @Parameter(required = false, defaultValue = "false") + private Boolean generateNotNullAnnotationForSingleValuedServiceParameters; + + /** + * Parameter defines the name of the NotNull annotation that should be used for for service operations. + */ + @Parameter(required = false) + private String notNullAnnotationNameForSingleValuedServiceParameters = ""; + + /** + * Switch can be used to enable that NotEmpty annotation is generated for service operations. + */ + @Parameter(required = false, defaultValue = "false") + private Boolean generateNotEmptyAnnotationForMultiValuedServiceParameters; + + /** + * Parameter defines the name of the NotEmpty annotation that should be used for service operations. + */ + @Parameter(required = false) + private String notEmptyAnnotationNameForMultiValuedServiceParameters = ""; + + // REST Controller + + /** + * Switch can be used to enable that NotEmpty annotation is generated for REST resources. + */ + @Parameter(required = false, defaultValue = "false") + private Boolean generateNotNullAnnotationForSingleValuedRESTParameters; + + /** + * Parameter defines the name of the NotEmpty annotation that should be used for REST resources. + */ + @Parameter(required = false) + private String notNullAnnotationNameForSingleValuedRESTParameters = ""; + + /** + * Switch can be used to enable that NotEmpty annotation is generated for for REST resources. + */ + @Parameter(required = false, defaultValue = "false") + private Boolean generateNotEmptyAnnotationForMultiValuedRESTParameters; + + /** + * Parameter defines the name of the NotEmpty annotation that should be used for REST resources. + */ + @Parameter(required = false) + private String notEmptyAnnotationNameForMultiValuedRESTParameters = ""; + /** * Switch defines whether POJO's should be serializable or not. */ @@ -1543,12 +1597,45 @@ private void showStartupInfo( ) { } if (generateNotEmptyAnnotationForMultiValuedProperties) { - lLog.info("Generate NotNull annotation for "); + lLog.info("Generate NotEmpty annotation for "); lLog.info( "multi valued properties: " + generateNotEmptyAnnotationForMultiValuedProperties); lLog.info("NotEmpty annotation name: " + notEmptyAnnotationNameForMultiValuedProperties); } + if (generateNotNullAnnotationForSingleValuedServiceParameters) { + lLog.info("Generate NotNull annotation for "); + lLog.info("single valued service parameters: " + + generateNotNullAnnotationForSingleValuedServiceParameters); + lLog.info( + "NotNull annotation name: " + notNullAnnotationNameForSingleValuedServiceParameters); + } + + if (generateNotEmptyAnnotationForMultiValuedServiceParameters) { + lLog.info("Generate NotEmpty annotation for "); + lLog.info("multi valued service parameters: " + + generateNotEmptyAnnotationForMultiValuedServiceParameters); + lLog.info( + "NotEmpty annotation name: " + notEmptyAnnotationNameForMultiValuedServiceParameters); + } + + if (generateNotNullAnnotationForSingleValuedRESTParameters) { + lLog.info("Generate NotNull annotation for "); + lLog.info( + "single valued REST parameters: " + + generateNotNullAnnotationForSingleValuedRESTParameters); + lLog.info( + "NotNull annotation name: " + notNullAnnotationNameForSingleValuedRESTParameters); + } + + if (generateNotEmptyAnnotationForMultiValuedRESTParameters) { + lLog.info("Generate NotEmpty annotation for "); + lLog.info("multi valued REST parameters: " + + generateNotEmptyAnnotationForMultiValuedRESTParameters); + lLog.info( + "NotEmpty annotation name: " + notEmptyAnnotationNameForMultiValuedRESTParameters); + } + if (generateDomainObjects) { lLog.info("Generate Domain Objects: " + generateDomainObjects); lLog.info("Generate Constants for Attribute Names: " + generateConstantsForAttributeNames); @@ -1884,6 +1971,7 @@ private boolean runUMLGenerator( ) throws MojoFailureException { System.setProperty("switch.gen.equalsAndHashCode.openapi.datatype", generateEqualsAndHashCodeForOpenAPIDataTypes.toString()); + // NotNull / NotEmpty annotations for properties / POJOs / ServiceObjects System.setProperty(PROPERTY_PREFIX + "generateNotNullAnnotationForSingleValuedProperties", generateNotNullAnnotationForSingleValuedProperties.toString()); System.setProperty(PROPERTY_PREFIX + "notNullAnnotationNameForSingleValuedProperties", @@ -1893,6 +1981,26 @@ private boolean runUMLGenerator( ) throws MojoFailureException { System.setProperty(PROPERTY_PREFIX + "notEmptyAnnotationNameForMultiValuedProperties", notEmptyAnnotationNameForMultiValuedProperties.toString()); + // NotNull / NotEmpty annotations for services + System.setProperty(PROPERTY_PREFIX + "generateNotNullAnnotationForSingleValuedServiceParameters", + generateNotNullAnnotationForSingleValuedServiceParameters.toString()); + System.setProperty(PROPERTY_PREFIX + "notNullAnnotationNameForSingleValuedServiceParameters", + notNullAnnotationNameForSingleValuedServiceParameters); + System.setProperty(PROPERTY_PREFIX + "generateNotEmptyAnnotationForMultiValuedServiceParameters", + generateNotEmptyAnnotationForMultiValuedServiceParameters.toString()); + System.setProperty(PROPERTY_PREFIX + "notEmptyAnnotationNameForMultiValuedServiceParameters", + notEmptyAnnotationNameForMultiValuedServiceParameters.toString()); + + // NotNull / NotEmpty annotations for REST parameters + System.setProperty(PROPERTY_PREFIX + "generateNotNullAnnotationForSingleValuedRESTParameters", + generateNotNullAnnotationForSingleValuedRESTParameters.toString()); + System.setProperty(PROPERTY_PREFIX + "notNullAnnotationNameForSingleValuedRESTParameters", + notNullAnnotationNameForSingleValuedRESTParameters); + System.setProperty(PROPERTY_PREFIX + "generateNotEmptyAnnotationForMultiValuedRESTParameters", + generateNotEmptyAnnotationForMultiValuedRESTParameters.toString()); + System.setProperty(PROPERTY_PREFIX + "notEmptyAnnotationNameForMultiValuedRESTParameters", + notEmptyAnnotationNameForMultiValuedRESTParameters.toString()); + System.setProperty("switch.gen.immutable.classes", generateImmutableClasses.toString()); System.setProperty("switch.gen.serializable.pojos", makePOJOsSerializable.toString()); System.setProperty("switch.gen.heavy.extensible.enums", generateHeavyExtensibleEnums.toString()); diff --git a/jeaf-generator-test-open-api-service-objects/pom.xml b/jeaf-generator-test-open-api-service-objects/pom.xml index c6f13345a..9e9d2127f 100644 --- a/jeaf-generator-test-open-api-service-objects/pom.xml +++ b/jeaf-generator-test-open-api-service-objects/pom.xml @@ -155,11 +155,23 @@ com.anaptecs.jeaf.junit.openapi.base.SoftLink ID + true - com.anaptecs.annotations.MyNotNull - + com.anaptecs.annotations.MyNotNullProperty true - com.anaptecs.annotations.MyNotEmpty + com.anaptecs.annotations.MyNotEmptyProperty + + + true + com.anaptecs.annotations.MyNotNullServiceParam + true + com.anaptecs.annotations.MyNotEmptyServiceParam + + + true + com.anaptecs.annotations.MyNotNullRESTParam + true + com.anaptecs.annotations.MyNotEmptyRESTParam anaptecs GmbH, Ricarda-Huch-Str. 71, 72760 Reutlingen, Germany diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BankAccount.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BankAccount.java index b0b72d693..135dd7a72 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BankAccount.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BankAccount.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -94,7 +94,7 @@ protected Builder( BankAccount pObject ) { * @param pIban Value to which {@link #iban} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setIban( @MyNotNull String pIban ) { + public Builder setIban( @MyNotNullProperty String pIban ) { // Assign value to attribute iban = pIban; return this; @@ -129,7 +129,7 @@ public BankAccount buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #iban} is set. */ - @MyNotNull + @MyNotNullProperty public String getIban( ) { return iban; } @@ -139,7 +139,7 @@ public String getIban( ) { * * @param pIban Value to which {@link #iban} should be set. */ - public void setIban( @MyNotNull String pIban ) { + public void setIban( @MyNotNullProperty String pIban ) { // Assign value to attribute iban = pIban; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BeanParameter.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BeanParameter.java index ada12f2c4..521756ec4 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BeanParameter.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BeanParameter.java @@ -13,7 +13,7 @@ import javax.ws.rs.HeaderParam; import javax.ws.rs.QueryParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -123,7 +123,7 @@ protected Builder( BeanParameter pObject ) { * @param pAccessToken Value to which {@link #accessToken} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAccessToken( @MyNotNull String pAccessToken ) { + public Builder setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; return this; @@ -135,7 +135,7 @@ public Builder setAccessToken( @MyNotNull String pAccessToken ) { * @param pLanguage Value to which {@link #language} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLanguage( @MyNotNull Locale pLanguage ) { + public Builder setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; return this; @@ -148,7 +148,7 @@ public Builder setLanguage( @MyNotNull Locale pLanguage ) { * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ @Deprecated - public Builder setOldStyle( @MyNotNull String pOldStyle ) { + public Builder setOldStyle( @MyNotNullProperty String pOldStyle ) { // Assign value to attribute oldStyle = pOldStyle; return this; @@ -183,7 +183,7 @@ public BeanParameter buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #accessToken} is set. */ - @MyNotNull + @MyNotNullProperty public String getAccessToken( ) { return accessToken; } @@ -193,7 +193,7 @@ public String getAccessToken( ) { * * @param pAccessToken Value to which {@link #accessToken} should be set. */ - public void setAccessToken( @MyNotNull String pAccessToken ) { + public void setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; } @@ -203,7 +203,7 @@ public void setAccessToken( @MyNotNull String pAccessToken ) { * * @return {@link Locale} Value to which {@link #language} is set. */ - @MyNotNull + @MyNotNullProperty public Locale getLanguage( ) { return language; } @@ -213,7 +213,7 @@ public Locale getLanguage( ) { * * @param pLanguage Value to which {@link #language} should be set. */ - public void setLanguage( @MyNotNull Locale pLanguage ) { + public void setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; } @@ -224,7 +224,7 @@ public void setLanguage( @MyNotNull Locale pLanguage ) { * @return {@link String} Value to which {@link #oldStyle} is set. */ @Deprecated - @MyNotNull + @MyNotNullProperty public String getOldStyle( ) { return oldStyle; } @@ -235,7 +235,7 @@ public String getOldStyle( ) { * @param pOldStyle Value to which {@link #oldStyle} should be set. */ @Deprecated - public void setOldStyle( @MyNotNull String pOldStyle ) { + public void setOldStyle( @MyNotNullProperty String pOldStyle ) { // Assign value to attribute oldStyle = pOldStyle; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BidirectA.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BidirectA.java index 6621051bd..b28e6ff22 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BidirectA.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BidirectA.java @@ -14,7 +14,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -118,7 +118,7 @@ protected Builder( BidirectA pObject ) { * @param pParent Value to which {@link #parent} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setParent( @MyNotNull BidirectA pParent ) { + public Builder setParent( @MyNotNullProperty BidirectA pParent ) { parent = pParent; return this; } @@ -214,7 +214,7 @@ void clearTransientBs( ) { * * @return {@link BidirectA} Value to which {@link #parent} is set. */ - @MyNotNull + @MyNotNullProperty public BidirectA getParent( ) { // Due to restrictions in JSON serialization / deserialization bi-directional associations need a special handling // after an object was deserialized. @@ -230,7 +230,7 @@ public BidirectA getParent( ) { * * @param pParent Value to which {@link #parent} should be set. */ - public void setParent( @MyNotNull BidirectA pParent ) { + public void setParent( @MyNotNullProperty BidirectA pParent ) { // Release already referenced object before setting a new association. if (parent != null) { parent.unsetTransientChild(); @@ -261,7 +261,7 @@ public final void unsetParent( ) { * * @return {@link BidirectA} Value to which {@link #transientChild} is set. */ - @MyNotNull + @MyNotNullProperty public BidirectA getTransientChild( ) { return transientChild; } @@ -271,7 +271,7 @@ public BidirectA getTransientChild( ) { * * @param pTransientChild Value to which {@link #transientChild} should be set. */ - void setTransientChild( @MyNotNull BidirectA pTransientChild ) { + void setTransientChild( @MyNotNullProperty BidirectA pTransientChild ) { // Release already referenced object before setting a new association. if (transientChild != null) { transientChild.unsetParent(); diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BidirectB.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BidirectB.java index 9ac7e8641..2205869b8 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BidirectB.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BidirectB.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -113,7 +113,7 @@ protected Builder( BidirectB pObject ) { * @param pA Value to which {@link #a} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setA( @MyNotNull BidirectA pA ) { + public Builder setA( @MyNotNullProperty BidirectA pA ) { a = pA; return this; } @@ -147,7 +147,7 @@ public BidirectB buildValidated( ) throws ConstraintViolationException { * * @return {@link BidirectA} Value to which {@link #a} is set. */ - @MyNotNull + @MyNotNullProperty public BidirectA getA( ) { // Due to restrictions in JSON serialization / deserialization bi-directional associations need a special handling // after an object was deserialized. @@ -164,7 +164,7 @@ public BidirectA getA( ) { * * @param pA Value to which {@link #a} should be set. */ - public void setA( @MyNotNull BidirectA pA ) { + public void setA( @MyNotNullProperty BidirectA pA ) { // Release already referenced object before setting a new association. if (a != null) { a.removeFromTransientBs((BidirectB) this); diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BigDecimalCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BigDecimalCode.java index 15addd163..86d9fd736 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BigDecimalCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BigDecimalCode.java @@ -12,7 +12,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -83,7 +83,7 @@ protected Builder( BigDecimalCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull BigDecimal pCode ) { + public Builder setCode( @MyNotNullProperty BigDecimal pCode ) { // Assign value to attribute code = pCode; return this; @@ -118,7 +118,7 @@ public BigDecimalCode buildValidated( ) throws ConstraintViolationException { * * @return {@link BigDecimal} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public BigDecimal getCode( ) { return code; } @@ -128,7 +128,7 @@ public BigDecimal getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull BigDecimal pCode ) { + public void setCode( @MyNotNullProperty BigDecimal pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BigIntegerCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BigIntegerCode.java index e8c2db52a..2cf8a6079 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BigIntegerCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BigIntegerCode.java @@ -13,7 +13,7 @@ import javax.validation.constraints.Max; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -86,7 +86,7 @@ protected Builder( BigIntegerCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull BigInteger pCode ) { + public Builder setCode( @MyNotNullProperty BigInteger pCode ) { // Assign value to attribute code = pCode; return this; @@ -121,7 +121,7 @@ public BigIntegerCode buildValidated( ) throws ConstraintViolationException { * * @return {@link BigInteger} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public BigInteger getCode( ) { return code; } @@ -131,7 +131,7 @@ public BigInteger getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull BigInteger pCode ) { + public void setCode( @MyNotNullProperty BigInteger pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Booking.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Booking.java index 9b4ecd8e7..c160cd0b2 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Booking.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Booking.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -106,7 +106,7 @@ protected Builder( Booking pObject ) { * @param pBookingID Value to which {@link #bookingID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBookingID( @MyNotNull BookingID pBookingID ) { + public Builder setBookingID( @MyNotNullProperty BookingID pBookingID ) { bookingID = pBookingID; return this; } @@ -140,7 +140,7 @@ public Booking buildValidated( ) throws ConstraintViolationException { * * @return {@link BookingID} Value to which {@link #bookingID} is set. */ - @MyNotNull + @MyNotNullProperty public BookingID getBookingID( ) { return bookingID; } @@ -151,7 +151,7 @@ public BookingID getBookingID( ) { * * @param pBookingID Value to which {@link #bookingID} should be set. */ - public void setBookingID( @MyNotNull BookingID pBookingID ) { + public void setBookingID( @MyNotNullProperty BookingID pBookingID ) { bookingID = pBookingID; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BookingCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BookingCode.java index ab897d897..0a89e51b8 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BookingCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/BookingCode.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -85,7 +85,7 @@ protected Builder( BookingCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -120,7 +120,7 @@ public BookingCode buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -130,7 +130,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ByteCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ByteCode.java index f495fe57e..b41b8bc94 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ByteCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ByteCode.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -82,7 +82,7 @@ protected Builder( ByteCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Byte pCode ) { + public Builder setCode( @MyNotNullProperty Byte pCode ) { // Assign value to attribute code = pCode; return this; @@ -116,7 +116,7 @@ public ByteCode buildValidated( ) throws ConstraintViolationException { * * @return {@link Byte} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Byte getCode( ) { return code; } @@ -126,7 +126,7 @@ public Byte getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Byte pCode ) { + public void setCode( @MyNotNullProperty Byte pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Campaign.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Campaign.java index f67cfc172..24845d86a 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Campaign.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Campaign.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; +import com.anaptecs.annotations.MyNotEmptyProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -193,7 +193,7 @@ public Builder setTheLinkID( long pTheLink ) { * @deprecated No good any more (since: 1.2, removed with: 3.0) */ @Deprecated - public Builder setMoreLinkIDs( @MyNotEmpty Set pMoreLinks ) { + public Builder setMoreLinkIDs( @MyNotEmptyProperty Set pMoreLinks ) { // To ensure immutability we have to copy the content of the passed collection. if (pMoreLinks != null) { moreLinkIDs = new HashSet(pMoreLinks); @@ -283,7 +283,7 @@ public void setTheLinkID( long pTheLink ) { * @deprecated No good any more (since: 1.2, removed with: 3.0) */ @Deprecated - @MyNotEmpty + @MyNotEmptyProperty public Set getMoreLinkIDs( ) { // Return all LinkObject objects directly without any protection against modification. return moreLinkIDs; diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Channel.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Channel.java index 624c91d9f..df03104fe 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Channel.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Channel.java @@ -7,7 +7,7 @@ import javax.validation.Valid; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; @Valid public class Channel extends ChannelBase { @@ -63,7 +63,7 @@ protected Builder( Channel pObject ) { * * @return {@link String} Value to which {@link #derivedSomething} is set. */ - @MyNotNull + @MyNotNullProperty @Override public String getDerivedSomething( ) { // TODO Implement method for derived property "derivedSomething". diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelBase.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelBase.java index bc6f12163..cc643cc24 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelBase.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelBase.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -115,7 +115,7 @@ protected BuilderBase( ChannelBase pObject ) { * @param pChannelType Value to which {@link #channelType} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setChannelType( @MyNotNull ChannelType pChannelType ) { + public BuilderBase setChannelType( @MyNotNullProperty ChannelType pChannelType ) { channelType = pChannelType; return this; } @@ -126,7 +126,7 @@ public BuilderBase setChannelType( @MyNotNull ChannelType pChannelType ) { * @param pChannelCode Value to which {@link #channelCode} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setChannelCode( @MyNotNull ChannelCode pChannelCode ) { + public BuilderBase setChannelCode( @MyNotNullProperty ChannelCode pChannelCode ) { channelCode = pChannelCode; return this; } @@ -184,7 +184,7 @@ public Channel buildValidated( ) throws ConstraintViolationException { * * @return {@link ChannelType} Value to which {@link #channelType} is set. */ - @MyNotNull + @MyNotNullProperty public ChannelType getChannelType( ) { return channelType; } @@ -195,7 +195,7 @@ public ChannelType getChannelType( ) { * * @param pChannelType Value to which {@link #channelType} should be set. */ - public void setChannelType( @MyNotNull ChannelType pChannelType ) { + public void setChannelType( @MyNotNullProperty ChannelType pChannelType ) { channelType = pChannelType; } @@ -212,7 +212,7 @@ public final void unsetChannelType( ) { * * @return {@link ChannelCode} Value to which {@link #channelCode} is set. */ - @MyNotNull + @MyNotNullProperty public ChannelCode getChannelCode( ) { return channelCode; } @@ -223,7 +223,7 @@ public ChannelCode getChannelCode( ) { * * @param pChannelCode Value to which {@link #channelCode} should be set. */ - public void setChannelCode( @MyNotNull ChannelCode pChannelCode ) { + public void setChannelCode( @MyNotNullProperty ChannelCode pChannelCode ) { channelCode = pChannelCode; } @@ -267,7 +267,7 @@ public boolean isSelfServiceChannel( ) { * * @return {@link Reseller} Value to which {@link #reseller} is set. */ - @MyNotNull + @MyNotNullProperty public Reseller getReseller( ) { return reseller; } @@ -277,7 +277,7 @@ public Reseller getReseller( ) { * * @param pReseller Value to which {@link #reseller} should be set. */ - void setReseller( @MyNotNull Reseller pReseller ) { + void setReseller( @MyNotNullProperty Reseller pReseller ) { // Release already referenced object before setting a new association. if (reseller != null) { reseller.removeFromChannels((Channel) this); @@ -321,7 +321,7 @@ public static Channel of( ChannelType pChannelType, ChannelCode pChannelCode, in * * @return {@link String} Value to which {@link #derivedSomething} is set. */ - @MyNotNull + @MyNotNullProperty public abstract String getDerivedSomething( ); /** diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelCode.java index 8672e4aaf..2cd1b7d93 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelCode.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -102,7 +102,7 @@ protected Builder( ChannelCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -137,7 +137,7 @@ public ChannelCode buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -147,7 +147,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelType.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelType.java index 2b17aa021..1f7f65369 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelType.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChannelType.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; /** *

@@ -49,7 +49,7 @@ private ChannelType( String pCode ) { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChildAA.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChildAA.java index f91e60169..1a93b1744 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChildAA.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChildAA.java @@ -14,8 +14,8 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; /** @@ -286,7 +286,7 @@ public Builder setSizedArray( int[] pSizedArray ) { * @param pRequiredArray Collection to which {@link #requiredArray} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setRequiredArray( @MyNotEmpty String[] pRequiredArray ) { + public Builder setRequiredArray( @MyNotEmptyProperty String[] pRequiredArray ) { // Assign value to attribute if (pRequiredArray != null) { requiredArray = pRequiredArray; @@ -303,7 +303,7 @@ public Builder setRequiredArray( @MyNotEmpty String[] pRequiredArray ) { * @param pBigIntegerCode Value to which {@link #bigIntegerCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBigIntegerCode( @MyNotNull BigIntegerCode pBigIntegerCode ) { + public Builder setBigIntegerCode( @MyNotNullProperty BigIntegerCode pBigIntegerCode ) { // Assign value to attribute bigIntegerCode = pBigIntegerCode; return this; @@ -421,7 +421,7 @@ public void setSizedArray( int[] pSizedArray ) { * * @return {@link String[]} Value to which {@link #requiredArray} is set. */ - @MyNotEmpty + @MyNotEmptyProperty public String[] getRequiredArray( ) { String[] lReturnValue; if (requiredArray != null) { @@ -438,7 +438,7 @@ public String[] getRequiredArray( ) { * * @param pRequiredArray Value to which {@link #requiredArray} should be set. */ - public void setRequiredArray( @MyNotEmpty String[] pRequiredArray ) { + public void setRequiredArray( @MyNotEmptyProperty String[] pRequiredArray ) { // Assign value to attribute if (pRequiredArray != null) { requiredArray = pRequiredArray; @@ -453,7 +453,7 @@ public void setRequiredArray( @MyNotEmpty String[] pRequiredArray ) { * * @return {@link BigIntegerCode} Value to which {@link #bigIntegerCode} is set. */ - @MyNotNull + @MyNotNullProperty public BigIntegerCode getBigIntegerCode( ) { return bigIntegerCode; } @@ -463,7 +463,7 @@ public BigIntegerCode getBigIntegerCode( ) { * * @param pBigIntegerCode Value to which {@link #bigIntegerCode} should be set. */ - public void setBigIntegerCode( @MyNotNull BigIntegerCode pBigIntegerCode ) { + public void setBigIntegerCode( @MyNotNullProperty BigIntegerCode pBigIntegerCode ) { // Assign value to attribute bigIntegerCode = pBigIntegerCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChildBB.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChildBB.java index d7d78d6bc..49e354cd9 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChildBB.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ChildBB.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; import com.fasterxml.jackson.annotation.JsonSetter; @@ -275,7 +275,7 @@ public Builder addToComposition( ParentClass... pComposition ) { * @param pChildBBAttribute Value to which {@link #childBBAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setChildBBAttribute( @MyNotNull Long pChildBBAttribute ) { + public Builder setChildBBAttribute( @MyNotNullProperty Long pChildBBAttribute ) { // Assign value to attribute childBBAttribute = pChildBBAttribute; return this; @@ -388,7 +388,7 @@ public ChildBB buildValidated( ) throws ConstraintViolationException { * * @return {@link Long} Value to which {@link #childBBAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public Long getChildBBAttribute( ) { return childBBAttribute; } @@ -398,7 +398,7 @@ public Long getChildBBAttribute( ) { * * @param pChildBBAttribute Value to which {@link #childBBAttribute} should be set. */ - public void setChildBBAttribute( @MyNotNull Long pChildBBAttribute ) { + public void setChildBBAttribute( @MyNotNullProperty Long pChildBBAttribute ) { // Assign value to attribute childBBAttribute = pChildBBAttribute; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/CodeTypeUsageTest.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/CodeTypeUsageTest.java index eb1a6bb17..339e85678 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/CodeTypeUsageTest.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/CodeTypeUsageTest.java @@ -15,8 +15,8 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -156,7 +156,7 @@ protected Builder( CodeTypeUsageTest pObject ) { * @param pBooleanCode Value to which {@link #booleanCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBooleanCode( @MyNotNull BooleanCodeType pBooleanCode ) { + public Builder setBooleanCode( @MyNotNullProperty BooleanCodeType pBooleanCode ) { // Assign value to attribute booleanCode = pBooleanCode; return this; @@ -202,7 +202,7 @@ public Builder addToBooleanCodeAssociation( BooleanCodeType... pBooleanCodeAssoc * @param pShortCodeTypeAssociation Collection to which {@link #shortCodeTypeAssociation} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setShortCodeTypeAssociation( @MyNotEmpty Set pShortCodeTypeAssociation ) { + public Builder setShortCodeTypeAssociation( @MyNotEmptyProperty Set pShortCodeTypeAssociation ) { // To ensure immutability we have to copy the content of the passed collection. if (pShortCodeTypeAssociation != null) { shortCodeTypeAssociation = new HashSet(pShortCodeTypeAssociation); @@ -220,7 +220,7 @@ public Builder setShortCodeTypeAssociation( @MyNotEmpty Set pShor * parameter may be null. * @return {@link Builder} Instance of this builder to support chaining. Method never returns null. */ - public Builder addToShortCodeTypeAssociation( @MyNotEmpty ShortCodeType... pShortCodeTypeAssociation ) { + public Builder addToShortCodeTypeAssociation( @MyNotEmptyProperty ShortCodeType... pShortCodeTypeAssociation ) { if (pShortCodeTypeAssociation != null) { if (shortCodeTypeAssociation == null) { shortCodeTypeAssociation = new HashSet(); @@ -236,7 +236,7 @@ public Builder addToShortCodeTypeAssociation( @MyNotEmpty ShortCodeType... pShor * @param pStringCode Value to which {@link #stringCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStringCode( @MyNotNull StringCodeType pStringCode ) { + public Builder setStringCode( @MyNotNullProperty StringCodeType pStringCode ) { // Assign value to attribute stringCode = pStringCode; return this; @@ -248,7 +248,7 @@ public Builder setStringCode( @MyNotNull StringCodeType pStringCode ) { * @param pShortCode Value to which {@link #shortCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setShortCode( @MyNotNull ShortCode pShortCode ) { + public Builder setShortCode( @MyNotNullProperty ShortCode pShortCode ) { shortCode = pShortCode; return this; } @@ -282,7 +282,7 @@ public CodeTypeUsageTest buildValidated( ) throws ConstraintViolationException { * * @return {@link BooleanCodeType} Value to which {@link #booleanCode} is set. */ - @MyNotNull + @MyNotNullProperty public BooleanCodeType getBooleanCode( ) { return booleanCode; } @@ -292,7 +292,7 @@ public BooleanCodeType getBooleanCode( ) { * * @param pBooleanCode Value to which {@link #booleanCode} should be set. */ - public void setBooleanCode( @MyNotNull BooleanCodeType pBooleanCode ) { + public void setBooleanCode( @MyNotNullProperty BooleanCodeType pBooleanCode ) { // Assign value to attribute booleanCode = pBooleanCode; } @@ -363,7 +363,7 @@ public void clearBooleanCodeAssociation( ) { * @return {@link Set} Value to which {@link #shortCodeTypeAssociation} is set. The method never * returns null and the returned collection is modifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getShortCodeTypeAssociation( ) { // Return all ShortCodeType objects directly without any protection against modification. return shortCodeTypeAssociation; @@ -423,7 +423,7 @@ public void clearShortCodeTypeAssociation( ) { * * @return {@link StringCodeType} Value to which {@link #stringCode} is set. */ - @MyNotNull + @MyNotNullProperty public StringCodeType getStringCode( ) { return stringCode; } @@ -433,7 +433,7 @@ public StringCodeType getStringCode( ) { * * @param pStringCode Value to which {@link #stringCode} should be set. */ - public void setStringCode( @MyNotNull StringCodeType pStringCode ) { + public void setStringCode( @MyNotNullProperty StringCodeType pStringCode ) { // Assign value to attribute stringCode = pStringCode; } @@ -443,7 +443,7 @@ public void setStringCode( @MyNotNull StringCodeType pStringCode ) { * * @return {@link ShortCode} Value to which {@link #shortCode} is set. */ - @MyNotNull + @MyNotNullProperty public ShortCode getShortCode( ) { return shortCode; } @@ -453,7 +453,7 @@ public ShortCode getShortCode( ) { * * @param pShortCode Value to which {@link #shortCode} should be set. */ - public void setShortCode( @MyNotNull ShortCode pShortCode ) { + public void setShortCode( @MyNotNullProperty ShortCode pShortCode ) { shortCode = pShortCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Company.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Company.java index db20c7ba9..59b0cde45 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Company.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Company.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.common.ObjectIdentity; @@ -139,7 +139,7 @@ public Builder addToPostalAddresses( PostalAddress... pPostalAddresses ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -184,7 +184,7 @@ public Company buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -194,7 +194,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Context.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Context.java index 1153a1854..a014e03e1 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Context.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Context.java @@ -19,7 +19,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.QueryParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -175,7 +175,7 @@ protected Builder( Context pObject ) { * @param pAccessToken Value to which {@link #accessToken} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAccessToken( @MyNotNull String pAccessToken ) { + public Builder setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; return this; @@ -187,7 +187,7 @@ public Builder setAccessToken( @MyNotNull String pAccessToken ) { * @param pLanguage Value to which {@link #language} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLanguage( @MyNotNull Locale pLanguage ) { + public Builder setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; return this; @@ -223,7 +223,7 @@ public Builder setPathParam( long pPathParam ) { * @param pQueryParam Value to which {@link #queryParam} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setQueryParam( @MyNotNull String pQueryParam ) { + public Builder setQueryParam( @MyNotNullProperty String pQueryParam ) { // Assign value to attribute queryParam = pQueryParam; return this; @@ -269,7 +269,7 @@ public Context buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #accessToken} is set. */ - @MyNotNull + @MyNotNullProperty public String getAccessToken( ) { return accessToken; } @@ -279,7 +279,7 @@ public String getAccessToken( ) { * * @param pAccessToken Value to which {@link #accessToken} should be set. */ - public void setAccessToken( @MyNotNull String pAccessToken ) { + public void setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; } @@ -289,7 +289,7 @@ public void setAccessToken( @MyNotNull String pAccessToken ) { * * @return {@link Locale} Value to which {@link #language} is set. */ - @MyNotNull + @MyNotNullProperty public Locale getLanguage( ) { return language; } @@ -299,7 +299,7 @@ public Locale getLanguage( ) { * * @param pLanguage Value to which {@link #language} should be set. */ - public void setLanguage( @MyNotNull Locale pLanguage ) { + public void setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; } @@ -347,7 +347,7 @@ public void setPathParam( long pPathParam ) { * * @return {@link String} Value to which {@link #queryParam} is set. */ - @MyNotNull + @MyNotNullProperty public String getQueryParam( ) { return queryParam; } @@ -357,7 +357,7 @@ public String getQueryParam( ) { * * @param pQueryParam Value to which {@link #queryParam} should be set. */ - public void setQueryParam( @MyNotNull String pQueryParam ) { + public void setQueryParam( @MyNotNullProperty String pQueryParam ) { // Assign value to attribute queryParam = pQueryParam; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/CurrencyCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/CurrencyCode.java index 3e730df88..1a13150ec 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/CurrencyCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/CurrencyCode.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -102,7 +102,7 @@ protected Builder( CurrencyCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -138,7 +138,7 @@ public CurrencyCode buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -149,7 +149,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DataUnit.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DataUnit.java index fa24e573f..cb897a5fe 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DataUnit.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DataUnit.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.xfun.api.checks.Check; public final class DataUnit { @@ -36,7 +36,7 @@ private DataUnitType( String pDataUnitID ) { * * @return {@link String} Value to which {@link #dataUnitID} is set. */ - @MyNotNull + @MyNotNullProperty public String getDataUnitID( ) { return dataUnitID; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DeprecatedContext.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DeprecatedContext.java index 07b0786a4..b68df32c8 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DeprecatedContext.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DeprecatedContext.java @@ -15,7 +15,7 @@ import javax.ws.rs.HeaderParam; import javax.ws.rs.QueryParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -150,7 +150,7 @@ protected Builder( DeprecatedContext pObject ) { * @param pAccessToken Value to which {@link #accessToken} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAccessToken( @MyNotNull String pAccessToken ) { + public Builder setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; return this; @@ -162,7 +162,7 @@ public Builder setAccessToken( @MyNotNull String pAccessToken ) { * @param pLanguage Value to which {@link #language} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLanguage( @MyNotNull Locale pLanguage ) { + public Builder setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; return this; @@ -186,7 +186,7 @@ public Builder setResellerID( long pResellerID ) { * @param pQueryParam Value to which {@link #queryParam} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setQueryParam( @MyNotNull String pQueryParam ) { + public Builder setQueryParam( @MyNotNullProperty String pQueryParam ) { // Assign value to attribute queryParam = pQueryParam; return this; @@ -221,7 +221,7 @@ public DeprecatedContext buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #accessToken} is set. */ - @MyNotNull + @MyNotNullProperty public String getAccessToken( ) { return accessToken; } @@ -231,7 +231,7 @@ public String getAccessToken( ) { * * @param pAccessToken Value to which {@link #accessToken} should be set. */ - public void setAccessToken( @MyNotNull String pAccessToken ) { + public void setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; } @@ -241,7 +241,7 @@ public void setAccessToken( @MyNotNull String pAccessToken ) { * * @return {@link Locale} Value to which {@link #language} is set. */ - @MyNotNull + @MyNotNullProperty public Locale getLanguage( ) { return language; } @@ -251,7 +251,7 @@ public Locale getLanguage( ) { * * @param pLanguage Value to which {@link #language} should be set. */ - public void setLanguage( @MyNotNull Locale pLanguage ) { + public void setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; } @@ -280,7 +280,7 @@ public void setResellerID( long pResellerID ) { * * @return {@link String} Value to which {@link #queryParam} is set. */ - @MyNotNull + @MyNotNullProperty public String getQueryParam( ) { return queryParam; } @@ -290,7 +290,7 @@ public String getQueryParam( ) { * * @param pQueryParam Value to which {@link #queryParam} should be set. */ - public void setQueryParam( @MyNotNull String pQueryParam ) { + public void setQueryParam( @MyNotNullProperty String pQueryParam ) { // Assign value to attribute queryParam = pQueryParam; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DeprecatedType.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DeprecatedType.java index 83a440b56..a730d481a 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DeprecatedType.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DeprecatedType.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -84,7 +84,7 @@ protected Builder( DeprecatedType pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Integer pCode ) { + public Builder setCode( @MyNotNullProperty Integer pCode ) { // Assign value to attribute code = pCode; return this; @@ -119,7 +119,7 @@ public DeprecatedType buildValidated( ) throws ConstraintViolationException { * * @return {@link Integer} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getCode( ) { return code; } @@ -129,7 +129,7 @@ public Integer getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Integer pCode ) { + public void setCode( @MyNotNullProperty Integer pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DirectedEdge.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DirectedEdge.java index 8e3df516c..73e8014e2 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DirectedEdge.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/DirectedEdge.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -147,7 +147,7 @@ public Builder setStart( Stop pStart ) { * @param pEnd Value to which {@link #end} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setEnd( @MyNotNull Stop pEnd ) { + public Builder setEnd( @MyNotNullProperty Stop pEnd ) { end = pEnd; return this; } @@ -158,7 +158,7 @@ public Builder setEnd( @MyNotNull Stop pEnd ) { * @param pLink Value to which {@link #link} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLink( @MyNotNull String pLink ) { + public Builder setLink( @MyNotNullProperty String pLink ) { // Assign value to attribute link = pLink; return this; @@ -221,7 +221,7 @@ public final void unsetStart( ) { * * @return {@link Stop} Value to which {@link #end} is set. */ - @MyNotNull + @MyNotNullProperty public Stop getEnd( ) { return end; } @@ -232,7 +232,7 @@ public Stop getEnd( ) { * * @param pEnd Value to which {@link #end} should be set. */ - public void setEnd( @MyNotNull Stop pEnd ) { + public void setEnd( @MyNotNullProperty Stop pEnd ) { end = pEnd; } @@ -249,7 +249,7 @@ public final void unsetEnd( ) { * * @return {@link String} Value to which {@link #link} is set. */ - @MyNotNull + @MyNotNullProperty public String getLink( ) { return link; } @@ -260,7 +260,7 @@ public String getLink( ) { * * @param pLink Value to which {@link #link} should be set. */ - public void setLink( @MyNotNull String pLink ) { + public void setLink( @MyNotNullProperty String pLink ) { // Assign value to attribute link = pLink; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/EnumTest.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/EnumTest.java index c322b770e..1dff9d224 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/EnumTest.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/EnumTest.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -122,7 +122,7 @@ protected Builder( EnumTest pObject ) { * @param pProperty Value to which {@link #property} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setProperty( @MyNotNull ExtensibleEnum pProperty ) { + public Builder setProperty( @MyNotNullProperty ExtensibleEnum pProperty ) { // Assign value to attribute property = pProperty; return this; @@ -134,7 +134,7 @@ public Builder setProperty( @MyNotNull ExtensibleEnum pProperty ) { * @param pEnumRef Value to which {@link #enumRef} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setEnumRef( @MyNotNull ExtensibleEnum pEnumRef ) { + public Builder setEnumRef( @MyNotNullProperty ExtensibleEnum pEnumRef ) { enumRef = pEnumRef; return this; } @@ -167,7 +167,7 @@ public EnumTest buildValidated( ) throws ConstraintViolationException { * * @return {@link ExtensibleEnum} Value to which {@link #property} is set. */ - @MyNotNull + @MyNotNullProperty public ExtensibleEnum getProperty( ) { return property; } @@ -177,7 +177,7 @@ public ExtensibleEnum getProperty( ) { * * @param pProperty Value to which {@link #property} should be set. */ - public void setProperty( @MyNotNull ExtensibleEnum pProperty ) { + public void setProperty( @MyNotNullProperty ExtensibleEnum pProperty ) { // Assign value to attribute property = pProperty; } @@ -187,7 +187,7 @@ public void setProperty( @MyNotNull ExtensibleEnum pProperty ) { * * @return {@link ExtensibleEnum} Value to which {@link #enumRef} is set. */ - @MyNotNull + @MyNotNullProperty public ExtensibleEnum getEnumRef( ) { return enumRef; } @@ -197,7 +197,7 @@ public ExtensibleEnum getEnumRef( ) { * * @param pEnumRef Value to which {@link #enumRef} should be set. */ - public void setEnumRef( @MyNotNull ExtensibleEnum pEnumRef ) { + public void setEnumRef( @MyNotNullProperty ExtensibleEnum pEnumRef ) { enumRef = pEnumRef; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/FloatCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/FloatCode.java index f141242e6..de0bf335e 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/FloatCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/FloatCode.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -82,7 +82,7 @@ protected Builder( FloatCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Float pCode ) { + public Builder setCode( @MyNotNullProperty Float pCode ) { // Assign value to attribute code = pCode; return this; @@ -116,7 +116,7 @@ public FloatCode buildValidated( ) throws ConstraintViolationException { * * @return {@link Float} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Float getCode( ) { return code; } @@ -126,7 +126,7 @@ public Float getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Float pCode ) { + public void setCode( @MyNotNullProperty Float pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/HeavyDataTypeUser.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/HeavyDataTypeUser.java index 528060b20..b591e3331 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/HeavyDataTypeUser.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/HeavyDataTypeUser.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -166,7 +166,7 @@ protected Builder( HeavyDataTypeUser pObject ) { * @param pBooleanCode Value to which {@link #booleanCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBooleanCode( @MyNotNull BooleanCode pBooleanCode ) { + public Builder setBooleanCode( @MyNotNullProperty BooleanCode pBooleanCode ) { // Assign value to attribute booleanCode = pBooleanCode; return this; @@ -178,7 +178,7 @@ public Builder setBooleanCode( @MyNotNull BooleanCode pBooleanCode ) { * @param pByteCode Value to which {@link #byteCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setByteCode( @MyNotNull ByteCode pByteCode ) { + public Builder setByteCode( @MyNotNullProperty ByteCode pByteCode ) { // Assign value to attribute byteCode = pByteCode; return this; @@ -190,7 +190,7 @@ public Builder setByteCode( @MyNotNull ByteCode pByteCode ) { * @param pShortCode Value to which {@link #shortCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setShortCode( @MyNotNull ShortCode pShortCode ) { + public Builder setShortCode( @MyNotNullProperty ShortCode pShortCode ) { // Assign value to attribute shortCode = pShortCode; return this; @@ -202,7 +202,7 @@ public Builder setShortCode( @MyNotNull ShortCode pShortCode ) { * @param pIntegerCode Value to which {@link #integerCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setIntegerCode( @MyNotNull IntegerCode pIntegerCode ) { + public Builder setIntegerCode( @MyNotNullProperty IntegerCode pIntegerCode ) { // Assign value to attribute integerCode = pIntegerCode; return this; @@ -214,7 +214,7 @@ public Builder setIntegerCode( @MyNotNull IntegerCode pIntegerCode ) { * @param pFloatCode Value to which {@link #floatCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setFloatCode( @MyNotNull FloatCode pFloatCode ) { + public Builder setFloatCode( @MyNotNullProperty FloatCode pFloatCode ) { // Assign value to attribute floatCode = pFloatCode; return this; @@ -226,7 +226,7 @@ public Builder setFloatCode( @MyNotNull FloatCode pFloatCode ) { * @param pDoubleCode Value to which {@link #doubleCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { + public Builder setDoubleCode( @MyNotNullProperty DoubleCode pDoubleCode ) { // Assign value to attribute doubleCode = pDoubleCode; return this; @@ -238,7 +238,7 @@ public Builder setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { * @param pBigInegerCode Value to which {@link #bigInegerCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBigInegerCode( @MyNotNull BigIntegerCode pBigInegerCode ) { + public Builder setBigInegerCode( @MyNotNullProperty BigIntegerCode pBigInegerCode ) { // Assign value to attribute bigInegerCode = pBigInegerCode; return this; @@ -250,7 +250,7 @@ public Builder setBigInegerCode( @MyNotNull BigIntegerCode pBigInegerCode ) { * @param pBigDecimalCode Value to which {@link #bigDecimalCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBigDecimalCode( @MyNotNull BigDecimalCode pBigDecimalCode ) { + public Builder setBigDecimalCode( @MyNotNullProperty BigDecimalCode pBigDecimalCode ) { // Assign value to attribute bigDecimalCode = pBigDecimalCode; return this; @@ -285,7 +285,7 @@ public HeavyDataTypeUser buildValidated( ) throws ConstraintViolationException { * * @return {@link BooleanCode} Value to which {@link #booleanCode} is set. */ - @MyNotNull + @MyNotNullProperty public BooleanCode getBooleanCode( ) { return booleanCode; } @@ -295,7 +295,7 @@ public BooleanCode getBooleanCode( ) { * * @param pBooleanCode Value to which {@link #booleanCode} should be set. */ - public void setBooleanCode( @MyNotNull BooleanCode pBooleanCode ) { + public void setBooleanCode( @MyNotNullProperty BooleanCode pBooleanCode ) { // Assign value to attribute booleanCode = pBooleanCode; } @@ -305,7 +305,7 @@ public void setBooleanCode( @MyNotNull BooleanCode pBooleanCode ) { * * @return {@link ByteCode} Value to which {@link #byteCode} is set. */ - @MyNotNull + @MyNotNullProperty public ByteCode getByteCode( ) { return byteCode; } @@ -315,7 +315,7 @@ public ByteCode getByteCode( ) { * * @param pByteCode Value to which {@link #byteCode} should be set. */ - public void setByteCode( @MyNotNull ByteCode pByteCode ) { + public void setByteCode( @MyNotNullProperty ByteCode pByteCode ) { // Assign value to attribute byteCode = pByteCode; } @@ -325,7 +325,7 @@ public void setByteCode( @MyNotNull ByteCode pByteCode ) { * * @return {@link ShortCode} Value to which {@link #shortCode} is set. */ - @MyNotNull + @MyNotNullProperty public ShortCode getShortCode( ) { return shortCode; } @@ -335,7 +335,7 @@ public ShortCode getShortCode( ) { * * @param pShortCode Value to which {@link #shortCode} should be set. */ - public void setShortCode( @MyNotNull ShortCode pShortCode ) { + public void setShortCode( @MyNotNullProperty ShortCode pShortCode ) { // Assign value to attribute shortCode = pShortCode; } @@ -345,7 +345,7 @@ public void setShortCode( @MyNotNull ShortCode pShortCode ) { * * @return {@link IntegerCode} Value to which {@link #integerCode} is set. */ - @MyNotNull + @MyNotNullProperty public IntegerCode getIntegerCode( ) { return integerCode; } @@ -355,7 +355,7 @@ public IntegerCode getIntegerCode( ) { * * @param pIntegerCode Value to which {@link #integerCode} should be set. */ - public void setIntegerCode( @MyNotNull IntegerCode pIntegerCode ) { + public void setIntegerCode( @MyNotNullProperty IntegerCode pIntegerCode ) { // Assign value to attribute integerCode = pIntegerCode; } @@ -365,7 +365,7 @@ public void setIntegerCode( @MyNotNull IntegerCode pIntegerCode ) { * * @return {@link FloatCode} Value to which {@link #floatCode} is set. */ - @MyNotNull + @MyNotNullProperty public FloatCode getFloatCode( ) { return floatCode; } @@ -375,7 +375,7 @@ public FloatCode getFloatCode( ) { * * @param pFloatCode Value to which {@link #floatCode} should be set. */ - public void setFloatCode( @MyNotNull FloatCode pFloatCode ) { + public void setFloatCode( @MyNotNullProperty FloatCode pFloatCode ) { // Assign value to attribute floatCode = pFloatCode; } @@ -385,7 +385,7 @@ public void setFloatCode( @MyNotNull FloatCode pFloatCode ) { * * @return {@link DoubleCode} Value to which {@link #doubleCode} is set. */ - @MyNotNull + @MyNotNullProperty public DoubleCode getDoubleCode( ) { return doubleCode; } @@ -395,7 +395,7 @@ public DoubleCode getDoubleCode( ) { * * @param pDoubleCode Value to which {@link #doubleCode} should be set. */ - public void setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { + public void setDoubleCode( @MyNotNullProperty DoubleCode pDoubleCode ) { // Assign value to attribute doubleCode = pDoubleCode; } @@ -405,7 +405,7 @@ public void setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { * * @return {@link BigIntegerCode} Value to which {@link #bigInegerCode} is set. */ - @MyNotNull + @MyNotNullProperty public BigIntegerCode getBigInegerCode( ) { return bigInegerCode; } @@ -415,7 +415,7 @@ public BigIntegerCode getBigInegerCode( ) { * * @param pBigInegerCode Value to which {@link #bigInegerCode} should be set. */ - public void setBigInegerCode( @MyNotNull BigIntegerCode pBigInegerCode ) { + public void setBigInegerCode( @MyNotNullProperty BigIntegerCode pBigInegerCode ) { // Assign value to attribute bigInegerCode = pBigInegerCode; } @@ -425,7 +425,7 @@ public void setBigInegerCode( @MyNotNull BigIntegerCode pBigInegerCode ) { * * @return {@link BigDecimalCode} Value to which {@link #bigDecimalCode} is set. */ - @MyNotNull + @MyNotNullProperty public BigDecimalCode getBigDecimalCode( ) { return bigDecimalCode; } @@ -435,7 +435,7 @@ public BigDecimalCode getBigDecimalCode( ) { * * @param pBigDecimalCode Value to which {@link #bigDecimalCode} should be set. */ - public void setBigDecimalCode( @MyNotNull BigDecimalCode pBigDecimalCode ) { + public void setBigDecimalCode( @MyNotNullProperty BigDecimalCode pBigDecimalCode ) { // Assign value to attribute bigDecimalCode = pBigDecimalCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IBAN.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IBAN.java index 6cc5bd62f..ce642b606 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IBAN.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IBAN.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -82,7 +82,7 @@ protected Builder( IBAN pObject ) { * @param pValue Value to which {@link #value} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setValue( @MyNotNull String pValue ) { + public Builder setValue( @MyNotNullProperty String pValue ) { // Assign value to attribute value = pValue; return this; @@ -116,7 +116,7 @@ public IBAN buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #value} is set. */ - @MyNotNull + @MyNotNullProperty public String getValue( ) { return value; } @@ -126,7 +126,7 @@ public String getValue( ) { * * @param pValue Value to which {@link #value} should be set. */ - public void setValue( @MyNotNull String pValue ) { + public void setValue( @MyNotNullProperty String pValue ) { // Assign value to attribute value = pValue; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IgnoringClass.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IgnoringClass.java index 9f45f8964..7ca21b2ef 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IgnoringClass.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IgnoringClass.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -94,7 +94,7 @@ protected Builder( IgnoringClass pObject ) { * @param pAge Value to which {@link #age} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAge( @MyNotNull Integer pAge ) { + public Builder setAge( @MyNotNullProperty Integer pAge ) { // Assign value to attribute age = pAge; return this; @@ -129,7 +129,7 @@ public IgnoringClass buildValidated( ) throws ConstraintViolationException { * * @return {@link Integer} Value to which {@link #age} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getAge( ) { return age; } @@ -139,7 +139,7 @@ public Integer getAge( ) { * * @param pAge Value to which {@link #age} should be set. */ - public void setAge( @MyNotNull Integer pAge ) { + public void setAge( @MyNotNullProperty Integer pAge ) { // Assign value to attribute age = pAge; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IntegerCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IntegerCode.java index a8d54c783..5b1b810a4 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IntegerCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/IntegerCode.java @@ -12,7 +12,7 @@ import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -85,7 +85,7 @@ protected Builder( IntegerCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Integer pCode ) { + public Builder setCode( @MyNotNullProperty Integer pCode ) { // Assign value to attribute code = pCode; return this; @@ -120,7 +120,7 @@ public IntegerCode buildValidated( ) throws ConstraintViolationException { * * @return {@link Integer} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getCode( ) { return code; } @@ -130,7 +130,7 @@ public Integer getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Integer pCode ) { + public void setCode( @MyNotNullProperty Integer pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Leg.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Leg.java index b6726dc93..deafa21d2 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Leg.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Leg.java @@ -14,7 +14,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -124,7 +124,7 @@ protected Builder( Leg pObject ) { * @param pStart Value to which {@link #start} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStart( @MyNotNull PlaceRef pStart ) { + public Builder setStart( @MyNotNullProperty PlaceRef pStart ) { start = pStart; return this; } @@ -135,7 +135,7 @@ public Builder setStart( @MyNotNull PlaceRef pStart ) { * @param pStop Value to which {@link #stop} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStop( @MyNotNull PlaceRef pStop ) { + public Builder setStop( @MyNotNullProperty PlaceRef pStop ) { stop = pStop; return this; } @@ -201,7 +201,7 @@ public Leg buildValidated( ) throws ConstraintViolationException { * * @return {@link PlaceRef} Value to which {@link #start} is set. */ - @MyNotNull + @MyNotNullProperty public PlaceRef getStart( ) { return start; } @@ -211,7 +211,7 @@ public PlaceRef getStart( ) { * * @param pStart Value to which {@link #start} should be set. */ - public void setStart( @MyNotNull PlaceRef pStart ) { + public void setStart( @MyNotNullProperty PlaceRef pStart ) { start = pStart; } @@ -227,7 +227,7 @@ public final void unsetStart( ) { * * @return {@link PlaceRef} Value to which {@link #stop} is set. */ - @MyNotNull + @MyNotNullProperty public PlaceRef getStop( ) { return stop; } @@ -237,7 +237,7 @@ public PlaceRef getStop( ) { * * @param pStop Value to which {@link #stop} should be set. */ - public void setStop( @MyNotNull PlaceRef pStop ) { + public void setStop( @MyNotNullProperty PlaceRef pStop ) { stop = pStop; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/LinkObject.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/LinkObject.java index 106bddb2b..a9b86c59b 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/LinkObject.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/LinkObject.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -94,7 +94,7 @@ protected Builder( LinkObject pObject ) { * @param pHref Value to which {@link #href} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setHref( @MyNotNull String pHref ) { + public Builder setHref( @MyNotNullProperty String pHref ) { // Assign value to attribute href = pHref; return this; @@ -128,7 +128,7 @@ public LinkObject buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #href} is set. */ - @MyNotNull + @MyNotNullProperty public String getHref( ) { return href; } @@ -138,7 +138,7 @@ public String getHref( ) { * * @param pHref Value to which {@link #href} should be set. */ - public void setHref( @MyNotNull String pHref ) { + public void setHref( @MyNotNullProperty String pHref ) { // Assign value to attribute href = pHref; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/LongCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/LongCode.java index 94183aaa2..0a5d64d61 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/LongCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/LongCode.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -82,7 +82,7 @@ protected Builder( LongCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Long pCode ) { + public Builder setCode( @MyNotNullProperty Long pCode ) { // Assign value to attribute code = pCode; return this; @@ -116,7 +116,7 @@ public LongCode buildValidated( ) throws ConstraintViolationException { * * @return {@link Long} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Long getCode( ) { return code; } @@ -126,7 +126,7 @@ public Long getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Long pCode ) { + public void setCode( @MyNotNullProperty Long pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/MultiValuedDataType.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/MultiValuedDataType.java index fce6c692d..b33fc44fa 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/MultiValuedDataType.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/MultiValuedDataType.java @@ -19,8 +19,8 @@ import javax.ws.rs.HeaderParam; import javax.ws.rs.QueryParam; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -261,7 +261,7 @@ public Builder addToLongCodeQueryParam( LongCode... pLongCodeQueryParam ) { * @param pLiterals Collection to which {@link #literals} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLiterals( @MyNotEmpty List pLiterals ) { + public Builder setLiterals( @MyNotEmptyProperty List pLiterals ) { // To ensure immutability we have to copy the content of the passed collection. if (pLiterals != null) { literals = new ArrayList(pLiterals); @@ -278,7 +278,7 @@ public Builder setLiterals( @MyNotEmpty List pLiterals ) { * @param pLiterals Array of objects that should be added to {@link #literals}. The parameter may be null. * @return {@link Builder} Instance of this builder to support chaining. Method never returns null. */ - public Builder addToLiterals( @MyNotEmpty BooleanLiteralsEnum... pLiterals ) { + public Builder addToLiterals( @MyNotEmptyProperty BooleanLiteralsEnum... pLiterals ) { if (pLiterals != null) { if (literals == null) { literals = new ArrayList(); @@ -294,7 +294,7 @@ public Builder addToLiterals( @MyNotEmpty BooleanLiteralsEnum... pLiterals ) { * @param pLiterals Array with objects to which {@link #literals} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLiterals( @MyNotEmpty BooleanLiteralsEnum... pLiterals ) { + public Builder setLiterals( @MyNotEmptyProperty BooleanLiteralsEnum... pLiterals ) { // To ensure immutability we have to copy the content of the passed array. if (pLiterals != null) { literals = new ArrayList(Arrays.asList(pLiterals)); @@ -311,7 +311,7 @@ public Builder setLiterals( @MyNotEmpty BooleanLiteralsEnum... pLiterals ) { * @param pStringProperty Value to which {@link #stringProperty} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStringProperty( @MyNotNull String pStringProperty ) { + public Builder setStringProperty( @MyNotNullProperty String pStringProperty ) { // Assign value to attribute stringProperty = pStringProperty; return this; @@ -486,7 +486,7 @@ public void clearLongCodeQueryParam( ) { * @return {@link List} Value to which {@link #literals} is set. The method never returns null * and the returned collection is modifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public List getLiterals( ) { // Return all BooleanLiteralsEnum objects directly without any protection against modification. return literals; @@ -544,7 +544,7 @@ public void clearLiterals( ) { * * @return {@link String} Value to which {@link #stringProperty} is set. */ - @MyNotNull + @MyNotNullProperty public String getStringProperty( ) { return stringProperty; } @@ -554,7 +554,7 @@ public String getStringProperty( ) { * * @param pStringProperty Value to which {@link #stringProperty} should be set. */ - public void setStringProperty( @MyNotNull String pStringProperty ) { + public void setStringProperty( @MyNotNullProperty String pStringProperty ) { // Assign value to attribute stringProperty = pStringProperty; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/NotInlinedBeanParam.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/NotInlinedBeanParam.java index 40bc48046..ed57191f5 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/NotInlinedBeanParam.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/NotInlinedBeanParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; import javax.ws.rs.HeaderParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -131,7 +131,7 @@ protected Builder( NotInlinedBeanParam pObject ) { * @param pHeader Value to which {@link #header} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setHeader( @MyNotNull String pHeader ) { + public Builder setHeader( @MyNotNullProperty String pHeader ) { // Assign value to attribute header = pHeader; return this; @@ -143,7 +143,7 @@ public Builder setHeader( @MyNotNull String pHeader ) { * @param pDoubleCode Value to which {@link #doubleCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { + public Builder setDoubleCode( @MyNotNullProperty DoubleCode pDoubleCode ) { // Assign value to attribute doubleCode = pDoubleCode; return this; @@ -155,7 +155,7 @@ public Builder setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { * @param pExtensibleEnum Value to which {@link #extensibleEnum} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setExtensibleEnum( @MyNotNull ExtensibleEnum pExtensibleEnum ) { + public Builder setExtensibleEnum( @MyNotNullProperty ExtensibleEnum pExtensibleEnum ) { // Assign value to attribute extensibleEnum = pExtensibleEnum; return this; @@ -167,7 +167,7 @@ public Builder setExtensibleEnum( @MyNotNull ExtensibleEnum pExtensibleEnum ) { * @param pBookingID Value to which {@link #bookingID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBookingID( @MyNotNull BookingID pBookingID ) { + public Builder setBookingID( @MyNotNullProperty BookingID pBookingID ) { // Assign value to attribute bookingID = pBookingID; return this; @@ -202,7 +202,7 @@ public NotInlinedBeanParam buildValidated( ) throws ConstraintViolationException * * @return {@link String} Value to which {@link #header} is set. */ - @MyNotNull + @MyNotNullProperty public String getHeader( ) { return header; } @@ -212,7 +212,7 @@ public String getHeader( ) { * * @param pHeader Value to which {@link #header} should be set. */ - public void setHeader( @MyNotNull String pHeader ) { + public void setHeader( @MyNotNullProperty String pHeader ) { // Assign value to attribute header = pHeader; } @@ -222,7 +222,7 @@ public void setHeader( @MyNotNull String pHeader ) { * * @return {@link DoubleCode} Value to which {@link #doubleCode} is set. */ - @MyNotNull + @MyNotNullProperty public DoubleCode getDoubleCode( ) { return doubleCode; } @@ -232,7 +232,7 @@ public DoubleCode getDoubleCode( ) { * * @param pDoubleCode Value to which {@link #doubleCode} should be set. */ - public void setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { + public void setDoubleCode( @MyNotNullProperty DoubleCode pDoubleCode ) { // Assign value to attribute doubleCode = pDoubleCode; } @@ -242,7 +242,7 @@ public void setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { * * @return {@link ExtensibleEnum} Value to which {@link #extensibleEnum} is set. */ - @MyNotNull + @MyNotNullProperty public ExtensibleEnum getExtensibleEnum( ) { return extensibleEnum; } @@ -252,7 +252,7 @@ public ExtensibleEnum getExtensibleEnum( ) { * * @param pExtensibleEnum Value to which {@link #extensibleEnum} should be set. */ - public void setExtensibleEnum( @MyNotNull ExtensibleEnum pExtensibleEnum ) { + public void setExtensibleEnum( @MyNotNullProperty ExtensibleEnum pExtensibleEnum ) { // Assign value to attribute extensibleEnum = pExtensibleEnum; } @@ -262,7 +262,7 @@ public void setExtensibleEnum( @MyNotNull ExtensibleEnum pExtensibleEnum ) { * * @return {@link BookingID} Value to which {@link #bookingID} is set. */ - @MyNotNull + @MyNotNullProperty public BookingID getBookingID( ) { return bookingID; } @@ -272,7 +272,7 @@ public BookingID getBookingID( ) { * * @param pBookingID Value to which {@link #bookingID} should be set. */ - public void setBookingID( @MyNotNull BookingID pBookingID ) { + public void setBookingID( @MyNotNullProperty BookingID pBookingID ) { // Assign value to attribute bookingID = pBookingID; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/POI.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/POI.java index 3ca9c5ea5..b2877e04a 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/POI.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/POI.java @@ -16,8 +16,8 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; import com.fasterxml.jackson.annotation.JsonSetter; @@ -271,7 +271,7 @@ public Builder setTheSoftLinkID( SoftLink pTheSoftLink ) { * @param pDescription Value to which {@link #description} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setDescription( @MyNotNull String pDescription ) { + public Builder setDescription( @MyNotNullProperty String pDescription ) { // Assign value to attribute description = pDescription; return this; @@ -284,7 +284,7 @@ public Builder setDescription( @MyNotNull String pDescription ) { * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ @Deprecated - public Builder setTheLinkID( @MyNotNull Long pTheLink ) { + public Builder setTheLinkID( @MyNotNullProperty Long pTheLink ) { theLinkID = pTheLink; return this; } @@ -315,7 +315,7 @@ public Builder setEvenMoreLinkIDs( Set pEvenMoreLinks ) { * @param pStops Collection to which {@link #stops} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStops( @MyNotEmpty Set pStops ) { + public Builder setStops( @MyNotEmptyProperty Set pStops ) { // To ensure immutability we have to copy the content of the passed collection. if (pStops != null) { stops = new HashSet(pStops); @@ -334,7 +334,7 @@ public Builder setStops( @MyNotEmpty Set pStops ) { * @param pStops Array of objects that should be added to {@link #stops}. The parameter may be null. * @return {@link Builder} Instance of this builder to support chaining. Method never returns null. */ - public Builder addToStops( @MyNotEmpty UICStop... pStops ) { + public Builder addToStops( @MyNotEmptyProperty UICStop... pStops ) { if (pStops != null) { if (stops == null) { stops = new HashSet(); @@ -350,7 +350,7 @@ public Builder addToStops( @MyNotEmpty UICStop... pStops ) { * @param pBookingCodes Collection to which {@link #bookingCodes} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBookingCodes( @MyNotEmpty Set pBookingCodes ) { + public Builder setBookingCodes( @MyNotEmptyProperty Set pBookingCodes ) { // To ensure immutability we have to copy the content of the passed collection. if (pBookingCodes != null) { bookingCodes = new HashSet(pBookingCodes); @@ -367,7 +367,7 @@ public Builder setBookingCodes( @MyNotEmpty Set pBookingCodes ) { * @param pBookingCodes Array of objects that should be added to {@link #bookingCodes}. The parameter may be null. * @return {@link Builder} Instance of this builder to support chaining. Method never returns null. */ - public Builder addToBookingCodes( @MyNotEmpty BookingCode... pBookingCodes ) { + public Builder addToBookingCodes( @MyNotEmptyProperty BookingCode... pBookingCodes ) { if (pBookingCodes != null) { if (bookingCodes == null) { bookingCodes = new HashSet(); @@ -405,7 +405,7 @@ public POI buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #description} is set. */ - @MyNotNull + @MyNotNullProperty public String getDescription( ) { return description; } @@ -415,7 +415,7 @@ public String getDescription( ) { * * @param pDescription Value to which {@link #description} should be set. */ - public void setDescription( @MyNotNull String pDescription ) { + public void setDescription( @MyNotNullProperty String pDescription ) { // Assign value to attribute description = pDescription; } @@ -429,7 +429,7 @@ public void setDescription( @MyNotNull String pDescription ) { * @return {@link Long} Value to which {@link #theLink} is set. */ @Deprecated - @MyNotNull + @MyNotNullProperty public Long getTheLinkID( ) { return theLinkID; } @@ -440,7 +440,7 @@ public Long getTheLinkID( ) { * @param pTheLink Value to which {@link #theLink} should be set. */ @Deprecated - public void setTheLinkID( @MyNotNull Long pTheLink ) { + public void setTheLinkID( @MyNotNullProperty Long pTheLink ) { theLinkID = pTheLink; } @@ -526,7 +526,7 @@ public void clearEvenMoreLinkIDs( ) { * @return {@link Set} Value to which {@link #stops} is set. The method never returns null and the returned * collection is modifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getStops( ) { // Return all UICStop objects directly without any protection against modification. return stops; @@ -588,7 +588,7 @@ public void clearStops( ) { * @return {@link Set} Value to which {@link #bookingCodes} is set. The method never returns null and the * returned collection is modifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getBookingCodes( ) { // Return all BookingCode objects directly without any protection against modification. return bookingCodes; diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ParentBeanParamType.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ParentBeanParamType.java index 4fe7055be..424acecba 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ParentBeanParamType.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ParentBeanParamType.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; import javax.ws.rs.HeaderParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -108,7 +108,7 @@ protected Builder( ParentBeanParamType pObject ) { * @param pNovaKey Value to which {@link #novaKey} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setNovaKey( @MyNotNull String pNovaKey ) { + public Builder setNovaKey( @MyNotNullProperty String pNovaKey ) { // Assign value to attribute novaKey = pNovaKey; return this; @@ -120,7 +120,7 @@ public Builder setNovaKey( @MyNotNull String pNovaKey ) { * @param pTkID Value to which {@link #tkID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setTkID( @MyNotNull String pTkID ) { + public Builder setTkID( @MyNotNullProperty String pTkID ) { // Assign value to attribute tkID = pTkID; return this; @@ -155,7 +155,7 @@ public ParentBeanParamType buildValidated( ) throws ConstraintViolationException * * @return {@link String} Value to which {@link #novaKey} is set. */ - @MyNotNull + @MyNotNullProperty public String getNovaKey( ) { return novaKey; } @@ -165,7 +165,7 @@ public String getNovaKey( ) { * * @param pNovaKey Value to which {@link #novaKey} should be set. */ - public void setNovaKey( @MyNotNull String pNovaKey ) { + public void setNovaKey( @MyNotNullProperty String pNovaKey ) { // Assign value to attribute novaKey = pNovaKey; } @@ -175,7 +175,7 @@ public void setNovaKey( @MyNotNull String pNovaKey ) { * * @return {@link String} Value to which {@link #tkID} is set. */ - @MyNotNull + @MyNotNullProperty public String getTkID( ) { return tkID; } @@ -185,7 +185,7 @@ public String getTkID( ) { * * @param pTkID Value to which {@link #tkID} should be set. */ - public void setTkID( @MyNotNull String pTkID ) { + public void setTkID( @MyNotNullProperty String pTkID ) { // Assign value to attribute tkID = pTkID; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ParentClass.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ParentClass.java index 42fbb755a..d7ad9507b 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ParentClass.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ParentClass.java @@ -16,7 +16,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -160,7 +160,7 @@ protected Builder( ParentClass pObject ) { * @param pParentAttribute Value to which {@link #parentAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setParentAttribute( @MyNotNull String pParentAttribute ) { + public Builder setParentAttribute( @MyNotNullProperty String pParentAttribute ) { // Assign value to attribute parentAttribute = pParentAttribute; return this; @@ -276,7 +276,7 @@ public ParentClass buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #parentAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public String getParentAttribute( ) { return parentAttribute; } @@ -286,7 +286,7 @@ public String getParentAttribute( ) { * * @param pParentAttribute Value to which {@link #parentAttribute} should be set. */ - public void setParentAttribute( @MyNotNull String pParentAttribute ) { + public void setParentAttribute( @MyNotNullProperty String pParentAttribute ) { // Assign value to attribute parentAttribute = pParentAttribute; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Person.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Person.java index cdc02bfd3..63714605a 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Person.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Person.java @@ -7,7 +7,7 @@ import javax.validation.Valid; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; @Valid public class Person extends PersonBase { @@ -61,7 +61,7 @@ protected Builder( Person pObject ) { /** * @return {@link String} */ - @MyNotNull + @MyNotNullProperty @Override public String getDisplayName( ) { // TODO: Implement business logic for method. diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PersonBase.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PersonBase.java index 89e3fd146..ab274a45b 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PersonBase.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PersonBase.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.common.ObjectIdentity; @@ -126,7 +126,7 @@ public BuilderBase addToPostalAddresses( PostalAddress... pPostalAddresses ) { * @param pSurname Value to which {@link #surname} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setSurname( @MyNotNull String pSurname ) { + public BuilderBase setSurname( @MyNotNullProperty String pSurname ) { // Assign value to attribute surname = pSurname; return this; @@ -138,7 +138,7 @@ public BuilderBase setSurname( @MyNotNull String pSurname ) { * @param pFirstName Value to which {@link #firstName} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setFirstName( @MyNotNull String pFirstName ) { + public BuilderBase setFirstName( @MyNotNullProperty String pFirstName ) { // Assign value to attribute firstName = pFirstName; return this; @@ -172,7 +172,7 @@ public Person buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #surname} is set. */ - @MyNotNull + @MyNotNullProperty public String getSurname( ) { return surname; } @@ -182,7 +182,7 @@ public String getSurname( ) { * * @param pSurname Value to which {@link #surname} should be set. */ - public void setSurname( @MyNotNull String pSurname ) { + public void setSurname( @MyNotNullProperty String pSurname ) { // Assign value to attribute surname = pSurname; } @@ -192,7 +192,7 @@ public void setSurname( @MyNotNull String pSurname ) { * * @return {@link String} Value to which {@link #firstName} is set. */ - @MyNotNull + @MyNotNullProperty public String getFirstName( ) { return firstName; } @@ -202,7 +202,7 @@ public String getFirstName( ) { * * @param pFirstName Value to which {@link #firstName} should be set. */ - public void setFirstName( @MyNotNull String pFirstName ) { + public void setFirstName( @MyNotNullProperty String pFirstName ) { // Assign value to attribute firstName = pFirstName; } @@ -227,7 +227,7 @@ public static Person of( String pSurname, String pFirstName ) { /** * @return {@link String} */ - @MyNotNull + @MyNotNullProperty public abstract String getDisplayName( ); /** diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PlaceRef.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PlaceRef.java index ee159a375..90c44d2e6 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PlaceRef.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PlaceRef.java @@ -8,7 +8,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.xfun.api.checks.Check; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -80,7 +80,7 @@ protected Builder( PlaceRef pObject ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -92,7 +92,7 @@ public Builder setName( @MyNotNull String pName ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -102,7 +102,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PostalAddress.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PostalAddress.java index 3740c9aef..c6983c109 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PostalAddress.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PostalAddress.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -123,7 +123,7 @@ protected Builder( PostalAddress pObject ) { * @param pStreet Value to which {@link #street} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStreet( @MyNotNull String pStreet ) { + public Builder setStreet( @MyNotNullProperty String pStreet ) { // Assign value to attribute street = pStreet; return this; @@ -135,7 +135,7 @@ public Builder setStreet( @MyNotNull String pStreet ) { * @param pHouseNumber Value to which {@link #houseNumber} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setHouseNumber( @MyNotNull String pHouseNumber ) { + public Builder setHouseNumber( @MyNotNullProperty String pHouseNumber ) { // Assign value to attribute houseNumber = pHouseNumber; return this; @@ -147,7 +147,7 @@ public Builder setHouseNumber( @MyNotNull String pHouseNumber ) { * @param pCity Value to which {@link #city} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCity( @MyNotNull String pCity ) { + public Builder setCity( @MyNotNullProperty String pCity ) { // Assign value to attribute city = pCity; return this; @@ -194,7 +194,7 @@ public PostalAddress buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #street} is set. */ - @MyNotNull + @MyNotNullProperty public String getStreet( ) { return street; } @@ -204,7 +204,7 @@ public String getStreet( ) { * * @param pStreet Value to which {@link #street} should be set. */ - public void setStreet( @MyNotNull String pStreet ) { + public void setStreet( @MyNotNullProperty String pStreet ) { // Assign value to attribute street = pStreet; } @@ -214,7 +214,7 @@ public void setStreet( @MyNotNull String pStreet ) { * * @return {@link String} Value to which {@link #houseNumber} is set. */ - @MyNotNull + @MyNotNullProperty public String getHouseNumber( ) { return houseNumber; } @@ -224,7 +224,7 @@ public String getHouseNumber( ) { * * @param pHouseNumber Value to which {@link #houseNumber} should be set. */ - public void setHouseNumber( @MyNotNull String pHouseNumber ) { + public void setHouseNumber( @MyNotNullProperty String pHouseNumber ) { // Assign value to attribute houseNumber = pHouseNumber; } @@ -234,7 +234,7 @@ public void setHouseNumber( @MyNotNull String pHouseNumber ) { * * @return {@link String} Value to which {@link #city} is set. */ - @MyNotNull + @MyNotNullProperty public String getCity( ) { return city; } @@ -244,7 +244,7 @@ public String getCity( ) { * * @param pCity Value to which {@link #city} should be set. */ - public void setCity( @MyNotNull String pCity ) { + public void setCity( @MyNotNullProperty String pCity ) { // Assign value to attribute city = pCity; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PrimitiveObjectWithRestrictions.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PrimitiveObjectWithRestrictions.java index 75b773a9f..e0cb54ddc 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PrimitiveObjectWithRestrictions.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/PrimitiveObjectWithRestrictions.java @@ -22,7 +22,7 @@ import javax.validation.constraints.PositiveOrZero; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -380,7 +380,7 @@ public Builder setABoolean( boolean pABoolean ) { * @param pBBoolean Value to which {@link #bBoolean} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBBoolean( @MyNotNull Boolean pBBoolean ) { + public Builder setBBoolean( @MyNotNullProperty Boolean pBBoolean ) { // Assign value to attribute bBoolean = pBBoolean; return this; @@ -416,7 +416,7 @@ public Builder setAByte( byte pAByte ) { * @param pBByte Value to which {@link #bByte} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBByte( @MyNotNull Byte pBByte ) { + public Builder setBByte( @MyNotNullProperty Byte pBByte ) { // Assign value to attribute bByte = pBByte; return this; @@ -440,7 +440,7 @@ public Builder setAShort( short pAShort ) { * @param pBShort Value to which {@link #bShort} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBShort( @MyNotNull Short pBShort ) { + public Builder setBShort( @MyNotNullProperty Short pBShort ) { // Assign value to attribute bShort = pBShort; return this; @@ -464,7 +464,7 @@ public Builder setAInteger( int pAInteger ) { * @param pBInteger Value to which {@link #bInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBInteger( @MyNotNull Integer pBInteger ) { + public Builder setBInteger( @MyNotNullProperty Integer pBInteger ) { // Assign value to attribute bInteger = pBInteger; return this; @@ -476,7 +476,7 @@ public Builder setBInteger( @MyNotNull Integer pBInteger ) { * @param pCInteger Value to which {@link #cInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCInteger( @MyNotNull Integer pCInteger ) { + public Builder setCInteger( @MyNotNullProperty Integer pCInteger ) { // Assign value to attribute cInteger = pCInteger; return this; @@ -500,7 +500,7 @@ public Builder setALong( long pALong ) { * @param pBLong Value to which {@link #bLong} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBLong( @MyNotNull Long pBLong ) { + public Builder setBLong( @MyNotNullProperty Long pBLong ) { // Assign value to attribute bLong = pBLong; return this; @@ -512,7 +512,7 @@ public Builder setBLong( @MyNotNull Long pBLong ) { * @param pABigInteger Value to which {@link #aBigInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setABigInteger( @MyNotNull BigInteger pABigInteger ) { + public Builder setABigInteger( @MyNotNullProperty BigInteger pABigInteger ) { // Assign value to attribute aBigInteger = pABigInteger; return this; @@ -536,7 +536,7 @@ public Builder setACharacter( char pACharacter ) { * @param pBCharacter Value to which {@link #bCharacter} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBCharacter( @MyNotNull Character pBCharacter ) { + public Builder setBCharacter( @MyNotNullProperty Character pBCharacter ) { // Assign value to attribute bCharacter = pBCharacter; return this; @@ -560,7 +560,7 @@ public Builder setAFloat( float pAFloat ) { * @param pBFloat Value to which {@link #bFloat} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBFloat( @MyNotNull Float pBFloat ) { + public Builder setBFloat( @MyNotNullProperty Float pBFloat ) { // Assign value to attribute bFloat = pBFloat; return this; @@ -584,7 +584,7 @@ public Builder setADouble( double pADouble ) { * @param pBDouble Value to which {@link #bDouble} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBDouble( @MyNotNull Double pBDouble ) { + public Builder setBDouble( @MyNotNullProperty Double pBDouble ) { // Assign value to attribute bDouble = pBDouble; return this; @@ -596,7 +596,7 @@ public Builder setBDouble( @MyNotNull Double pBDouble ) { * @param pABigDecimal Value to which {@link #aBigDecimal} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { + public Builder setABigDecimal( @MyNotNullProperty BigDecimal pABigDecimal ) { // Assign value to attribute aBigDecimal = pABigDecimal; return this; @@ -608,7 +608,7 @@ public Builder setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { * @param pAString Value to which {@link #aString} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAString( @MyNotNull String pAString ) { + public Builder setAString( @MyNotNullProperty String pAString ) { // Assign value to attribute aString = pAString; return this; @@ -620,7 +620,7 @@ public Builder setAString( @MyNotNull String pAString ) { * @param pBString Value to which {@link #bString} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBString( @MyNotNull String pBString ) { + public Builder setBString( @MyNotNullProperty String pBString ) { // Assign value to attribute bString = pBString; return this; @@ -684,7 +684,7 @@ public void setABoolean( boolean pABoolean ) { * * @return {@link Boolean} Value to which {@link #bBoolean} is set. */ - @MyNotNull + @MyNotNullProperty public Boolean getBBoolean( ) { return bBoolean; } @@ -694,7 +694,7 @@ public Boolean getBBoolean( ) { * * @param pBBoolean Value to which {@link #bBoolean} should be set. */ - public void setBBoolean( @MyNotNull Boolean pBBoolean ) { + public void setBBoolean( @MyNotNullProperty Boolean pBBoolean ) { // Assign value to attribute bBoolean = pBBoolean; } @@ -752,7 +752,7 @@ public void setAByte( byte pAByte ) { * * @return {@link Byte} Value to which {@link #bByte} is set. */ - @MyNotNull + @MyNotNullProperty public Byte getBByte( ) { return bByte; } @@ -762,7 +762,7 @@ public Byte getBByte( ) { * * @param pBByte Value to which {@link #bByte} should be set. */ - public void setBByte( @MyNotNull Byte pBByte ) { + public void setBByte( @MyNotNullProperty Byte pBByte ) { // Assign value to attribute bByte = pBByte; } @@ -791,7 +791,7 @@ public void setAShort( short pAShort ) { * * @return {@link Short} Value to which {@link #bShort} is set. */ - @MyNotNull + @MyNotNullProperty public Short getBShort( ) { return bShort; } @@ -801,7 +801,7 @@ public Short getBShort( ) { * * @param pBShort Value to which {@link #bShort} should be set. */ - public void setBShort( @MyNotNull Short pBShort ) { + public void setBShort( @MyNotNullProperty Short pBShort ) { // Assign value to attribute bShort = pBShort; } @@ -830,7 +830,7 @@ public void setAInteger( int pAInteger ) { * * @return {@link Integer} Value to which {@link #bInteger} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getBInteger( ) { return bInteger; } @@ -840,7 +840,7 @@ public Integer getBInteger( ) { * * @param pBInteger Value to which {@link #bInteger} should be set. */ - public void setBInteger( @MyNotNull Integer pBInteger ) { + public void setBInteger( @MyNotNullProperty Integer pBInteger ) { // Assign value to attribute bInteger = pBInteger; } @@ -850,7 +850,7 @@ public void setBInteger( @MyNotNull Integer pBInteger ) { * * @return {@link Integer} Value to which {@link #cInteger} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getCInteger( ) { return cInteger; } @@ -860,7 +860,7 @@ public Integer getCInteger( ) { * * @param pCInteger Value to which {@link #cInteger} should be set. */ - public void setCInteger( @MyNotNull Integer pCInteger ) { + public void setCInteger( @MyNotNullProperty Integer pCInteger ) { // Assign value to attribute cInteger = pCInteger; } @@ -889,7 +889,7 @@ public void setALong( long pALong ) { * * @return {@link Long} Value to which {@link #bLong} is set. */ - @MyNotNull + @MyNotNullProperty public Long getBLong( ) { return bLong; } @@ -899,7 +899,7 @@ public Long getBLong( ) { * * @param pBLong Value to which {@link #bLong} should be set. */ - public void setBLong( @MyNotNull Long pBLong ) { + public void setBLong( @MyNotNullProperty Long pBLong ) { // Assign value to attribute bLong = pBLong; } @@ -909,7 +909,7 @@ public void setBLong( @MyNotNull Long pBLong ) { * * @return {@link BigInteger} Value to which {@link #aBigInteger} is set. */ - @MyNotNull + @MyNotNullProperty public BigInteger getABigInteger( ) { return aBigInteger; } @@ -919,7 +919,7 @@ public BigInteger getABigInteger( ) { * * @param pABigInteger Value to which {@link #aBigInteger} should be set. */ - public void setABigInteger( @MyNotNull BigInteger pABigInteger ) { + public void setABigInteger( @MyNotNullProperty BigInteger pABigInteger ) { // Assign value to attribute aBigInteger = pABigInteger; } @@ -948,7 +948,7 @@ public void setACharacter( char pACharacter ) { * * @return {@link Character} Value to which {@link #bCharacter} is set. */ - @MyNotNull + @MyNotNullProperty public Character getBCharacter( ) { return bCharacter; } @@ -958,7 +958,7 @@ public Character getBCharacter( ) { * * @param pBCharacter Value to which {@link #bCharacter} should be set. */ - public void setBCharacter( @MyNotNull Character pBCharacter ) { + public void setBCharacter( @MyNotNullProperty Character pBCharacter ) { // Assign value to attribute bCharacter = pBCharacter; } @@ -987,7 +987,7 @@ public void setAFloat( float pAFloat ) { * * @return {@link Float} Value to which {@link #bFloat} is set. */ - @MyNotNull + @MyNotNullProperty public Float getBFloat( ) { return bFloat; } @@ -997,7 +997,7 @@ public Float getBFloat( ) { * * @param pBFloat Value to which {@link #bFloat} should be set. */ - public void setBFloat( @MyNotNull Float pBFloat ) { + public void setBFloat( @MyNotNullProperty Float pBFloat ) { // Assign value to attribute bFloat = pBFloat; } @@ -1026,7 +1026,7 @@ public void setADouble( double pADouble ) { * * @return {@link Double} Value to which {@link #bDouble} is set. */ - @MyNotNull + @MyNotNullProperty public Double getBDouble( ) { return bDouble; } @@ -1036,7 +1036,7 @@ public Double getBDouble( ) { * * @param pBDouble Value to which {@link #bDouble} should be set. */ - public void setBDouble( @MyNotNull Double pBDouble ) { + public void setBDouble( @MyNotNullProperty Double pBDouble ) { // Assign value to attribute bDouble = pBDouble; } @@ -1046,7 +1046,7 @@ public void setBDouble( @MyNotNull Double pBDouble ) { * * @return {@link BigDecimal} Value to which {@link #aBigDecimal} is set. */ - @MyNotNull + @MyNotNullProperty public BigDecimal getABigDecimal( ) { return aBigDecimal; } @@ -1056,7 +1056,7 @@ public BigDecimal getABigDecimal( ) { * * @param pABigDecimal Value to which {@link #aBigDecimal} should be set. */ - public void setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { + public void setABigDecimal( @MyNotNullProperty BigDecimal pABigDecimal ) { // Assign value to attribute aBigDecimal = pABigDecimal; } @@ -1066,7 +1066,7 @@ public void setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { * * @return {@link String} Value to which {@link #aString} is set. */ - @MyNotNull + @MyNotNullProperty public String getAString( ) { return aString; } @@ -1076,7 +1076,7 @@ public String getAString( ) { * * @param pAString Value to which {@link #aString} should be set. */ - public void setAString( @MyNotNull String pAString ) { + public void setAString( @MyNotNullProperty String pAString ) { // Assign value to attribute aString = pAString; } @@ -1086,7 +1086,7 @@ public void setAString( @MyNotNull String pAString ) { * * @return {@link String} Value to which {@link #bString} is set. */ - @MyNotNull + @MyNotNullProperty public String getBString( ) { return bString; } @@ -1096,7 +1096,7 @@ public String getBString( ) { * * @param pBString Value to which {@link #bString} should be set. */ - public void setBString( @MyNotNull String pBString ) { + public void setBString( @MyNotNullProperty String pBString ) { // Assign value to attribute bString = pBString; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ProductBase.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ProductBase.java index eec7a1a3b..7e3c236f7 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ProductBase.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ProductBase.java @@ -18,8 +18,8 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.core.api.ServiceObjectID; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; @@ -285,7 +285,7 @@ public BuilderBase addToResellers( Reseller... pResellers ) { * @param pName Value to which {@link #name} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setName( @MyNotNull String pName ) { + public BuilderBase setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -314,7 +314,7 @@ public BuilderBase setImage( byte[] pImage ) { * @param pLink Value to which {@link #link} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setLink( @MyNotNull URL pLink ) { + public BuilderBase setLink( @MyNotNullProperty URL pLink ) { // Assign value to attribute link = pLink; return this; @@ -326,7 +326,7 @@ public BuilderBase setLink( @MyNotNull URL pLink ) { * @param pProductID Value to which {@link #productID} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setProductID( @MyNotNull UUID pProductID ) { + public BuilderBase setProductID( @MyNotNullProperty UUID pProductID ) { // Assign value to attribute productID = pProductID; return this; @@ -338,7 +338,7 @@ public BuilderBase setProductID( @MyNotNull UUID pProductID ) { * @param pSupportedCurrencies Collection to which {@link #supportedCurrencies} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setSupportedCurrencies( @MyNotEmpty Set pSupportedCurrencies ) { + public BuilderBase setSupportedCurrencies( @MyNotEmptyProperty Set pSupportedCurrencies ) { // To ensure immutability we have to copy the content of the passed collection. if (pSupportedCurrencies != null) { supportedCurrencies = new HashSet(pSupportedCurrencies); @@ -356,7 +356,7 @@ public BuilderBase setSupportedCurrencies( @MyNotEmpty Set pSuppor * may be null. * @return {@link BuilderBase} Instance of this builder to support chaining. Method never returns null. */ - public BuilderBase addToSupportedCurrencies( @MyNotEmpty CurrencyCode... pSupportedCurrencies ) { + public BuilderBase addToSupportedCurrencies( @MyNotEmptyProperty CurrencyCode... pSupportedCurrencies ) { if (pSupportedCurrencies != null) { if (supportedCurrencies == null) { supportedCurrencies = new HashSet(); @@ -372,7 +372,7 @@ public BuilderBase addToSupportedCurrencies( @MyNotEmpty CurrencyCode... pSuppor * @param pProductCodes Collection to which {@link #productCodes} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setProductCodes( @MyNotEmpty Set pProductCodes ) { + public BuilderBase setProductCodes( @MyNotEmptyProperty Set pProductCodes ) { // To ensure immutability we have to copy the content of the passed collection. if (pProductCodes != null) { productCodes = new HashSet(pProductCodes); @@ -389,7 +389,7 @@ public BuilderBase setProductCodes( @MyNotEmpty Set pProductCodes ) * @param pProductCodes Array of objects that should be added to {@link #productCodes}. The parameter may be null. * @return {@link BuilderBase} Instance of this builder to support chaining. Method never returns null. */ - public BuilderBase addToProductCodes( @MyNotEmpty ProductCode... pProductCodes ) { + public BuilderBase addToProductCodes( @MyNotEmptyProperty ProductCode... pProductCodes ) { if (pProductCodes != null) { if (productCodes == null) { productCodes = new HashSet(); @@ -406,7 +406,7 @@ public BuilderBase addToProductCodes( @MyNotEmpty ProductCode... pProductCodes ) * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ @Deprecated - public BuilderBase setDescription( @MyNotNull String pDescription ) { + public BuilderBase setDescription( @MyNotNullProperty String pDescription ) { // Assign value to attribute description = pDescription; return this; @@ -418,7 +418,7 @@ public BuilderBase setDescription( @MyNotNull String pDescription ) { * @param pUri Value to which {@link #uri} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setUri( @MyNotNull String pUri ) { + public BuilderBase setUri( @MyNotNullProperty String pUri ) { // Assign value to attribute uri = pUri; return this; @@ -562,7 +562,7 @@ public void clearResellers( ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -572,7 +572,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } @@ -615,7 +615,7 @@ public void setImage( byte[] pImage ) { * * @return {@link URL} Value to which {@link #link} is set. */ - @MyNotNull + @MyNotNullProperty public URL getLink( ) { return link; } @@ -625,7 +625,7 @@ public URL getLink( ) { * * @param pLink Value to which {@link #link} should be set. */ - public void setLink( @MyNotNull URL pLink ) { + public void setLink( @MyNotNullProperty URL pLink ) { // Assign value to attribute link = pLink; } @@ -635,7 +635,7 @@ public void setLink( @MyNotNull URL pLink ) { * * @return {@link UUID} Value to which {@link #productID} is set. */ - @MyNotNull + @MyNotNullProperty public UUID getProductID( ) { return productID; } @@ -646,7 +646,7 @@ public UUID getProductID( ) { * @return {@link Set} Value to which {@link #supportedCurrencies} is set. The method never returns null * and the returned collection is modifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getSupportedCurrencies( ) { // Return all CurrencyCode objects directly without any protection against modification. return supportedCurrencies; @@ -707,7 +707,7 @@ public void clearSupportedCurrencies( ) { * @return {@link Set} Value to which {@link #productCodes} is set. The method never returns null and the * returned collection is modifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getProductCodes( ) { // Return all ProductCode objects directly without any protection against modification. return productCodes; @@ -766,7 +766,7 @@ public void clearProductCodes( ) { * @return {@link String} Value to which {@link #description} is set. */ @Deprecated - @MyNotNull + @MyNotNullProperty public String getDescription( ) { return description; } @@ -777,7 +777,7 @@ public String getDescription( ) { * @param pDescription Value to which {@link #description} should be set. */ @Deprecated - public void setDescription( @MyNotNull String pDescription ) { + public void setDescription( @MyNotNullProperty String pDescription ) { // Assign value to attribute description = pDescription; } @@ -850,7 +850,7 @@ void clearSortiments( ) { * * @return {@link String} Value to which {@link #uri} is set. */ - @MyNotNull + @MyNotNullProperty public String getUri( ) { return uri; } @@ -860,7 +860,7 @@ public String getUri( ) { * * @param pUri Value to which {@link #uri} should be set. */ - public void setUri( @MyNotNull String pUri ) { + public void setUri( @MyNotNullProperty String pUri ) { // Assign value to attribute uri = pUri; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Reseller.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Reseller.java index 5ca97ae98..57013332c 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Reseller.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Reseller.java @@ -7,7 +7,7 @@ import javax.validation.Valid; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.fasterxml.jackson.annotation.JsonIdentityInfo; import com.fasterxml.jackson.annotation.ObjectIdGenerators.PropertyGenerator; @@ -64,7 +64,7 @@ protected Builder( Reseller pObject ) { /** * @return {@link Integer} */ - @MyNotNull + @MyNotNullProperty @Override public Integer doSomething( ) { // TODO: Implement business logic for method. diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ResellerBase.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ResellerBase.java index bcf79df3f..3d898a74d 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ResellerBase.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/ResellerBase.java @@ -20,8 +20,8 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.core.api.ServiceObjectID; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; @@ -168,7 +168,7 @@ public BuilderBase setID( ObjectIdentity pObjectID ) { * @param pChannels Collection to which {@link #channels} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setChannels( @MyNotEmpty List pChannels ) { + public BuilderBase setChannels( @MyNotEmptyProperty List pChannels ) { // To ensure immutability we have to copy the content of the passed collection. if (pChannels != null) { channels = new ArrayList(pChannels); @@ -185,7 +185,7 @@ public BuilderBase setChannels( @MyNotEmpty List pChannels ) { * @param pChannels Array of objects that should be added to {@link #channels}. The parameter may be null. * @return {@link BuilderBase} Instance of this builder to support chaining. Method never returns null. */ - public BuilderBase addToChannels( @MyNotEmpty Channel... pChannels ) { + public BuilderBase addToChannels( @MyNotEmptyProperty Channel... pChannels ) { if (pChannels != null) { if (channels == null) { channels = new ArrayList(); @@ -203,7 +203,7 @@ public BuilderBase addToChannels( @MyNotEmpty Channel... pChannels ) { * @param pName Value to which {@link #name} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setName( @MyNotNull String pName ) { + public BuilderBase setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -215,7 +215,7 @@ public BuilderBase setName( @MyNotNull String pName ) { * @param pLanguage Value to which {@link #language} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setLanguage( @MyNotNull Locale pLanguage ) { + public BuilderBase setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; return this; @@ -279,7 +279,7 @@ public final ServiceObjectID getUnversionedID( ) { * @return {@link List} Value to which {@link #channels} is set. The method never returns null and the * returned collection is modifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public List getChannels( ) { // Due to restrictions in JSON serialization / deserialization bi-directional associations need a special handling // after an object was deserialized. @@ -364,7 +364,7 @@ public void clearChannels( ) { * @return {@link Set} Value to which {@link #products} is set. The method never returns null and the * returned collection is modifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getProducts( ) { // Return all Product objects directly without any protection against modification. return products; @@ -429,7 +429,7 @@ void clearProducts( ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -441,7 +441,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } @@ -451,7 +451,7 @@ public void setName( @MyNotNull String pName ) { * * @return {@link Locale} Value to which {@link #language} is set. */ - @MyNotNull + @MyNotNullProperty public Locale getLanguage( ) { return language; } @@ -461,7 +461,7 @@ public Locale getLanguage( ) { * * @param pLanguage Value to which {@link #language} should be set. */ - public void setLanguage( @MyNotNull Locale pLanguage ) { + public void setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; } @@ -489,7 +489,7 @@ public static Reseller of( List pChannels, String pName, Locale pLangua /** * @return {@link Integer} */ - @MyNotNull + @MyNotNullProperty public abstract Integer doSomething( ); /** diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Sortiment.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Sortiment.java index efcc9c455..4ad7eaea3 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Sortiment.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Sortiment.java @@ -15,7 +15,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -170,7 +170,7 @@ public Builder addToProducts( Product... pProducts ) { * @param pValue Value to which {@link #value} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setValue( @MyNotNull Integer pValue ) { + public Builder setValue( @MyNotNullProperty Integer pValue ) { // Assign value to attribute value = pValue; return this; @@ -285,7 +285,7 @@ public void clearProducts( ) { * * @return {@link Integer} Value to which {@link #value} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getValue( ) { return value; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/SpecialContext.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/SpecialContext.java index a34562300..1c4d71091 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/SpecialContext.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/SpecialContext.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; import javax.ws.rs.HeaderParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; @Valid @@ -216,7 +216,7 @@ public Builder setIntCode( IntegerCodeType pIntCode ) { * @param pSpecificHeader Value to which {@link #specificHeader} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSpecificHeader( @MyNotNull String pSpecificHeader ) { + public Builder setSpecificHeader( @MyNotNullProperty String pSpecificHeader ) { // Assign value to attribute specificHeader = pSpecificHeader; return this; @@ -229,7 +229,7 @@ public Builder setSpecificHeader( @MyNotNull String pSpecificHeader ) { * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ @Deprecated - public Builder setDeprecatedHeader( @MyNotNull IntegerCode pDeprecatedHeader ) { + public Builder setDeprecatedHeader( @MyNotNullProperty IntegerCode pDeprecatedHeader ) { // Assign value to attribute deprecatedHeader = pDeprecatedHeader; return this; @@ -241,7 +241,7 @@ public Builder setDeprecatedHeader( @MyNotNull IntegerCode pDeprecatedHeader ) { * @param pDeprecatedType Value to which {@link #deprecatedType} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setDeprecatedType( @MyNotNull DeprecatedType pDeprecatedType ) { + public Builder setDeprecatedType( @MyNotNullProperty DeprecatedType pDeprecatedType ) { // Assign value to attribute deprecatedType = pDeprecatedType; return this; @@ -276,7 +276,7 @@ public SpecialContext buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #specificHeader} is set. */ - @MyNotNull + @MyNotNullProperty public String getSpecificHeader( ) { return specificHeader; } @@ -286,7 +286,7 @@ public String getSpecificHeader( ) { * * @param pSpecificHeader Value to which {@link #specificHeader} should be set. */ - public void setSpecificHeader( @MyNotNull String pSpecificHeader ) { + public void setSpecificHeader( @MyNotNullProperty String pSpecificHeader ) { // Assign value to attribute specificHeader = pSpecificHeader; } @@ -297,7 +297,7 @@ public void setSpecificHeader( @MyNotNull String pSpecificHeader ) { * @return {@link IntegerCode} Value to which {@link #deprecatedHeader} is set. */ @Deprecated - @MyNotNull + @MyNotNullProperty public IntegerCode getDeprecatedHeader( ) { return deprecatedHeader; } @@ -308,7 +308,7 @@ public IntegerCode getDeprecatedHeader( ) { * @param pDeprecatedHeader Value to which {@link #deprecatedHeader} should be set. */ @Deprecated - public void setDeprecatedHeader( @MyNotNull IntegerCode pDeprecatedHeader ) { + public void setDeprecatedHeader( @MyNotNullProperty IntegerCode pDeprecatedHeader ) { // Assign value to attribute deprecatedHeader = pDeprecatedHeader; } @@ -318,7 +318,7 @@ public void setDeprecatedHeader( @MyNotNull IntegerCode pDeprecatedHeader ) { * * @return {@link DeprecatedType} Value to which {@link #deprecatedType} is set. */ - @MyNotNull + @MyNotNullProperty public DeprecatedType getDeprecatedType( ) { return deprecatedType; } @@ -328,7 +328,7 @@ public DeprecatedType getDeprecatedType( ) { * * @param pDeprecatedType Value to which {@link #deprecatedType} should be set. */ - public void setDeprecatedType( @MyNotNull DeprecatedType pDeprecatedType ) { + public void setDeprecatedType( @MyNotNullProperty DeprecatedType pDeprecatedType ) { // Assign value to attribute deprecatedType = pDeprecatedType; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Stop.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Stop.java index fe1cd6f41..ef3a9d17e 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Stop.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/Stop.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.PositiveOrZero; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -159,7 +159,7 @@ protected Builder( Stop pObject ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -216,7 +216,7 @@ public Builder setIndex( byte pIndex ) { * @param pTheSoftLink Value to which {@link #theSoftLink} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setTheSoftLinkID( @MyNotNull SoftLink pTheSoftLink ) { + public Builder setTheSoftLinkID( @MyNotNullProperty SoftLink pTheSoftLink ) { theSoftLinkID = pTheSoftLink; return this; } @@ -249,7 +249,7 @@ public Stop buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -259,7 +259,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } @@ -348,7 +348,7 @@ public void setIndex( byte pIndex ) { * * @return {@link SoftLink} Value to which {@link #theSoftLink} is set. */ - @MyNotNull + @MyNotNullProperty public SoftLink getTheSoftLinkID( ) { return theSoftLinkID; } @@ -358,7 +358,7 @@ public SoftLink getTheSoftLinkID( ) { * * @param pTheSoftLink Value to which {@link #theSoftLink} should be set. */ - public void setTheSoftLinkID( @MyNotNull SoftLink pTheSoftLink ) { + public void setTheSoftLinkID( @MyNotNullProperty SoftLink pTheSoftLink ) { theSoftLinkID = pTheSoftLink; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/StringCode.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/StringCode.java index d79219709..7a4089cee 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/StringCode.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/StringCode.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -85,7 +85,7 @@ protected Builder( StringCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -119,7 +119,7 @@ public StringCode buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -129,7 +129,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/StringCodeType.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/StringCodeType.java index ee2964da7..6e3ac4993 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/StringCodeType.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/StringCodeType.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -85,7 +85,7 @@ protected Builder( StringCodeType pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -120,7 +120,7 @@ public StringCodeType buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -130,7 +130,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/TheReadOnlyServiceObject.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/TheReadOnlyServiceObject.java index f630ca3d3..0a1a6289a 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/TheReadOnlyServiceObject.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/TheReadOnlyServiceObject.java @@ -13,7 +13,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -145,7 +145,7 @@ protected Builder( TheReadOnlyServiceObject pObject ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -245,7 +245,7 @@ public TheReadOnlyServiceObject buildValidated( ) throws ConstraintViolationExce * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/UICStop.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/UICStop.java index 5e2026b5a..10b7e70f2 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/UICStop.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/UICStop.java @@ -17,7 +17,7 @@ import javax.validation.constraints.Positive; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; /** @@ -222,7 +222,7 @@ public Builder setTheSoftLinkID( SoftLink pTheSoftLink ) { * @param pUicCode Value to which {@link #uicCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setUicCode( @MyNotNull String pUicCode ) { + public Builder setUicCode( @MyNotNullProperty String pUicCode ) { // Assign value to attribute uicCode = pUicCode; return this; @@ -292,7 +292,7 @@ public UICStop buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #uicCode} is set. */ - @MyNotNull + @MyNotNullProperty public String getUicCode( ) { return uicCode; } @@ -302,7 +302,7 @@ public String getUicCode( ) { * * @param pUicCode Value to which {@link #uicCode} should be set. */ - public void setUicCode( @MyNotNull String pUicCode ) { + public void setUicCode( @MyNotNullProperty String pUicCode ) { // Assign value to attribute uicCode = pUicCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/WeirdBooking.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/WeirdBooking.java index 950a42de2..402aeedca 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/WeirdBooking.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/WeirdBooking.java @@ -16,7 +16,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.junit.openapi.composite.ComplexBookingID; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -253,7 +253,7 @@ public Builder addToComplexBookings( ComplexBookingID... pComplexBookings ) { * @param pBooking Value to which {@link #booking} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBooking( @MyNotNull ComplexBookingID pBooking ) { + public Builder setBooking( @MyNotNullProperty ComplexBookingID pBooking ) { booking = pBooking; return this; } @@ -298,7 +298,7 @@ public Builder addToAdditionalBookings( ComplexBookingID... pAdditionalBookings * @param pVersionedObjectSoftLink Value to which {@link #versionedObjectSoftLink} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setVersionedObjectSoftLink( @MyNotNull VersionedObjectSoftLink pVersionedObjectSoftLink ) { + public Builder setVersionedObjectSoftLink( @MyNotNullProperty VersionedObjectSoftLink pVersionedObjectSoftLink ) { versionedObjectSoftLink = pVersionedObjectSoftLink; return this; } @@ -413,7 +413,7 @@ public WeirdBooking buildValidated( ) throws ConstraintViolationException { * * @return {@link ComplexBookingID} Value to which {@link #booking} is set. */ - @MyNotNull + @MyNotNullProperty public ComplexBookingID getBooking( ) { return booking; } @@ -423,7 +423,7 @@ public ComplexBookingID getBooking( ) { * * @param pBooking Value to which {@link #booking} should be set. */ - public void setBooking( @MyNotNull ComplexBookingID pBooking ) { + public void setBooking( @MyNotNullProperty ComplexBookingID pBooking ) { booking = pBooking; } @@ -503,7 +503,7 @@ public void clearAdditionalBookings( ) { * * @return {@link VersionedObjectSoftLink} Value to which {@link #versionedObjectSoftLink} is set. */ - @MyNotNull + @MyNotNullProperty public VersionedObjectSoftLink getVersionedObjectSoftLink( ) { return versionedObjectSoftLink; } @@ -516,7 +516,7 @@ public VersionedObjectSoftLink getVersionedObjectSoftLink( ) { * * @param pVersionedObjectSoftLink Value to which {@link #versionedObjectSoftLink} should be set. */ - public void setVersionedObjectSoftLink( @MyNotNull VersionedObjectSoftLink pVersionedObjectSoftLink ) { + public void setVersionedObjectSoftLink( @MyNotNullProperty VersionedObjectSoftLink pVersionedObjectSoftLink ) { versionedObjectSoftLink = pVersionedObjectSoftLink; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/WeirdParent.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/WeirdParent.java index a9608a0b3..970e52018 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/WeirdParent.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/base/WeirdParent.java @@ -15,8 +15,8 @@ import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.junit.openapi.composite.ComplexBookingID; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; @@ -139,7 +139,7 @@ protected Builder( WeirdParent pObject ) { * @param pSomeProperty Value to which {@link #someProperty} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSomeProperty( @MyNotNull String pSomeProperty ) { + public Builder setSomeProperty( @MyNotNullProperty String pSomeProperty ) { // Assign value to attribute someProperty = pSomeProperty; return this; @@ -151,7 +151,7 @@ public Builder setSomeProperty( @MyNotNull String pSomeProperty ) { * @param pComplexBooking Value to which {@link #complexBooking} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setComplexBooking( @MyNotNull ComplexBookingID pComplexBooking ) { + public Builder setComplexBooking( @MyNotNullProperty ComplexBookingID pComplexBooking ) { complexBooking = pComplexBooking; return this; } @@ -162,7 +162,7 @@ public Builder setComplexBooking( @MyNotNull ComplexBookingID pComplexBooking ) * @param pComplexBookings Collection to which {@link #complexBookings} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setComplexBookings( @MyNotEmpty Set pComplexBookings ) { + public Builder setComplexBookings( @MyNotEmptyProperty Set pComplexBookings ) { // To ensure immutability we have to copy the content of the passed collection. if (pComplexBookings != null) { complexBookings = new HashSet(pComplexBookings); @@ -180,7 +180,7 @@ public Builder setComplexBookings( @MyNotEmpty Set pComplexBoo * null. * @return {@link Builder} Instance of this builder to support chaining. Method never returns null. */ - public Builder addToComplexBookings( @MyNotEmpty ComplexBookingID... pComplexBookings ) { + public Builder addToComplexBookings( @MyNotEmptyProperty ComplexBookingID... pComplexBookings ) { if (pComplexBookings != null) { if (complexBookings == null) { complexBookings = new HashSet(); @@ -219,7 +219,7 @@ public WeirdParent buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #someProperty} is set. */ - @MyNotNull + @MyNotNullProperty public String getSomeProperty( ) { return someProperty; } @@ -229,7 +229,7 @@ public String getSomeProperty( ) { * * @param pSomeProperty Value to which {@link #someProperty} should be set. */ - public void setSomeProperty( @MyNotNull String pSomeProperty ) { + public void setSomeProperty( @MyNotNullProperty String pSomeProperty ) { // Assign value to attribute someProperty = pSomeProperty; } @@ -239,7 +239,7 @@ public void setSomeProperty( @MyNotNull String pSomeProperty ) { * * @return {@link ComplexBookingID} Value to which {@link #complexBooking} is set. */ - @MyNotNull + @MyNotNullProperty public ComplexBookingID getComplexBooking( ) { return complexBooking; } @@ -249,7 +249,7 @@ public ComplexBookingID getComplexBooking( ) { * * @param pComplexBooking Value to which {@link #complexBooking} should be set. */ - public void setComplexBooking( @MyNotNull ComplexBookingID pComplexBooking ) { + public void setComplexBooking( @MyNotNullProperty ComplexBookingID pComplexBooking ) { complexBooking = pComplexBooking; } @@ -266,7 +266,7 @@ public final void unsetComplexBooking( ) { * @return {@link Set} Value to which {@link #complexBookings} is set. The method never returns null * and the returned collection is modifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getComplexBookings( ) { // Return all ComplexBookingID objects directly without any protection against modification. return complexBookings; diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/datatypes/MyDataType.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/datatypes/MyDataType.java index 8ca6e39da..4431ae02d 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/datatypes/MyDataType.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/datatypes/MyDataType.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -82,7 +82,7 @@ protected Builder( MyDataType pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -116,7 +116,7 @@ public MyDataType buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -126,7 +126,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/datatypeusage/DataTypeUsage.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/datatypeusage/DataTypeUsage.java index ae99fc755..dc6916d48 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/datatypeusage/DataTypeUsage.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/datatypeusage/DataTypeUsage.java @@ -14,7 +14,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.junit.openapi.datatypes.MyDataType; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; @@ -115,7 +115,7 @@ protected Builder( DataTypeUsage pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull MyDataType pCode ) { + public Builder setCode( @MyNotNullProperty MyDataType pCode ) { code = pCode; return this; } @@ -182,7 +182,7 @@ public DataTypeUsage buildValidated( ) throws ConstraintViolationException { * * @return {@link MyDataType} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public MyDataType getCode( ) { return code; } @@ -192,7 +192,7 @@ public MyDataType getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull MyDataType pCode ) { + public void setCode( @MyNotNullProperty MyDataType pCode ) { code = pCode; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/ChildBeanParameterType.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/ChildBeanParameterType.java index 8d5f0c1fe..ec6d98b54 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/ChildBeanParameterType.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/ChildBeanParameterType.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; import javax.ws.rs.HeaderParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.junit.openapi.base.ParentBeanParamType; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; @@ -130,7 +130,7 @@ public Builder setTkID( String pTkID ) { * @param pChildProperty Value to which {@link #childProperty} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setChildProperty( @MyNotNull String pChildProperty ) { + public Builder setChildProperty( @MyNotNullProperty String pChildProperty ) { // Assign value to attribute childProperty = pChildProperty; return this; @@ -165,7 +165,7 @@ public ChildBeanParameterType buildValidated( ) throws ConstraintViolationExcept * * @return {@link String} Value to which {@link #childProperty} is set. */ - @MyNotNull + @MyNotNullProperty public String getChildProperty( ) { return childProperty; } @@ -175,7 +175,7 @@ public String getChildProperty( ) { * * @param pChildProperty Value to which {@link #childProperty} should be set. */ - public void setChildProperty( @MyNotNull String pChildProperty ) { + public void setChildProperty( @MyNotNullProperty String pChildProperty ) { // Assign value to attribute childProperty = pChildProperty; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/DateQueryParamsBean.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/DateQueryParamsBean.java index d9cddfd28..b7ee33457 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/DateQueryParamsBean.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/DateQueryParamsBean.java @@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull; import javax.ws.rs.QueryParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -216,7 +216,7 @@ protected Builder( DateQueryParamsBean pObject ) { * @param pOffsetDateTime Value to which {@link #offsetDateTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { + public Builder setOffsetDateTime( @MyNotNullProperty OffsetDateTime pOffsetDateTime ) { // Assign value to attribute offsetDateTime = pOffsetDateTime; return this; @@ -228,7 +228,7 @@ public Builder setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { * @param pOffsetTime Value to which {@link #offsetTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { + public Builder setOffsetTime( @MyNotNullProperty OffsetTime pOffsetTime ) { // Assign value to attribute offsetTime = pOffsetTime; return this; @@ -242,7 +242,7 @@ public Builder setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { * @param pLocalDateTime Value to which {@link #localDateTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public Builder setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; return this; @@ -254,7 +254,7 @@ public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * @param pLocalTime Value to which {@link #localTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public Builder setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; return this; @@ -266,7 +266,7 @@ public Builder setLocalTime( @MyNotNull LocalTime pLocalTime ) { * @param pLocalDate Value to which {@link #localDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalDate( @MyNotNull LocalDate pLocalDate ) { + public Builder setLocalDate( @MyNotNullProperty LocalDate pLocalDate ) { // Assign value to attribute localDate = pLocalDate; return this; @@ -278,7 +278,7 @@ public Builder setLocalDate( @MyNotNull LocalDate pLocalDate ) { * @param pUtilDate Value to which {@link #utilDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setUtilDate( @MyNotNull java.util.Date pUtilDate ) { + public Builder setUtilDate( @MyNotNullProperty java.util.Date pUtilDate ) { // Assign value to attribute utilDate = pUtilDate; return this; @@ -290,7 +290,7 @@ public Builder setUtilDate( @MyNotNull java.util.Date pUtilDate ) { * @param pCalendar Value to which {@link #calendar} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCalendar( @MyNotNull Calendar pCalendar ) { + public Builder setCalendar( @MyNotNullProperty Calendar pCalendar ) { // Assign value to attribute calendar = pCalendar; return this; @@ -302,7 +302,7 @@ public Builder setCalendar( @MyNotNull Calendar pCalendar ) { * @param pSqlTimestamp Value to which {@link #sqlTimestamp} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { + public Builder setSqlTimestamp( @MyNotNullProperty Timestamp pSqlTimestamp ) { // Assign value to attribute sqlTimestamp = pSqlTimestamp; return this; @@ -314,7 +314,7 @@ public Builder setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { * @param pSqlTime Value to which {@link #sqlTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlTime( @MyNotNull Time pSqlTime ) { + public Builder setSqlTime( @MyNotNullProperty Time pSqlTime ) { // Assign value to attribute sqlTime = pSqlTime; return this; @@ -326,7 +326,7 @@ public Builder setSqlTime( @MyNotNull Time pSqlTime ) { * @param pSqlDate Value to which {@link #sqlDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlDate( @MyNotNull Date pSqlDate ) { + public Builder setSqlDate( @MyNotNullProperty Date pSqlDate ) { // Assign value to attribute sqlDate = pSqlDate; return this; @@ -361,7 +361,7 @@ public DateQueryParamsBean buildValidated( ) throws ConstraintViolationException * * @return {@link OffsetDateTime} Value to which {@link #offsetDateTime} is set. */ - @MyNotNull + @MyNotNullProperty public OffsetDateTime getOffsetDateTime( ) { return offsetDateTime; } @@ -371,7 +371,7 @@ public OffsetDateTime getOffsetDateTime( ) { * * @param pOffsetDateTime Value to which {@link #offsetDateTime} should be set. */ - public void setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { + public void setOffsetDateTime( @MyNotNullProperty OffsetDateTime pOffsetDateTime ) { // Assign value to attribute offsetDateTime = pOffsetDateTime; } @@ -381,7 +381,7 @@ public void setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { * * @return {@link OffsetTime} Value to which {@link #offsetTime} is set. */ - @MyNotNull + @MyNotNullProperty public OffsetTime getOffsetTime( ) { return offsetTime; } @@ -391,7 +391,7 @@ public OffsetTime getOffsetTime( ) { * * @param pOffsetTime Value to which {@link #offsetTime} should be set. */ - public void setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { + public void setOffsetTime( @MyNotNullProperty OffsetTime pOffsetTime ) { // Assign value to attribute offsetTime = pOffsetTime; } @@ -403,7 +403,7 @@ public void setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { * * @return {@link LocalDateTime} Value to which {@link #localDateTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalDateTime getLocalDateTime( ) { return localDateTime; } @@ -415,7 +415,7 @@ public LocalDateTime getLocalDateTime( ) { * * @param pLocalDateTime Value to which {@link #localDateTime} should be set. */ - public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public void setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; } @@ -425,7 +425,7 @@ public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * * @return {@link LocalTime} Value to which {@link #localTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalTime getLocalTime( ) { return localTime; } @@ -435,7 +435,7 @@ public LocalTime getLocalTime( ) { * * @param pLocalTime Value to which {@link #localTime} should be set. */ - public void setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public void setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; } @@ -445,7 +445,7 @@ public void setLocalTime( @MyNotNull LocalTime pLocalTime ) { * * @return {@link LocalDate} Value to which {@link #localDate} is set. */ - @MyNotNull + @MyNotNullProperty public LocalDate getLocalDate( ) { return localDate; } @@ -455,7 +455,7 @@ public LocalDate getLocalDate( ) { * * @param pLocalDate Value to which {@link #localDate} should be set. */ - public void setLocalDate( @MyNotNull LocalDate pLocalDate ) { + public void setLocalDate( @MyNotNullProperty LocalDate pLocalDate ) { // Assign value to attribute localDate = pLocalDate; } @@ -465,7 +465,7 @@ public void setLocalDate( @MyNotNull LocalDate pLocalDate ) { * * @return {@link java.util.Date} Value to which {@link #utilDate} is set. */ - @MyNotNull + @MyNotNullProperty public java.util.Date getUtilDate( ) { return utilDate; } @@ -475,7 +475,7 @@ public java.util.Date getUtilDate( ) { * * @param pUtilDate Value to which {@link #utilDate} should be set. */ - public void setUtilDate( @MyNotNull java.util.Date pUtilDate ) { + public void setUtilDate( @MyNotNullProperty java.util.Date pUtilDate ) { // Assign value to attribute utilDate = pUtilDate; } @@ -485,7 +485,7 @@ public void setUtilDate( @MyNotNull java.util.Date pUtilDate ) { * * @return {@link Calendar} Value to which {@link #calendar} is set. */ - @MyNotNull + @MyNotNullProperty public Calendar getCalendar( ) { return calendar; } @@ -495,7 +495,7 @@ public Calendar getCalendar( ) { * * @param pCalendar Value to which {@link #calendar} should be set. */ - public void setCalendar( @MyNotNull Calendar pCalendar ) { + public void setCalendar( @MyNotNullProperty Calendar pCalendar ) { // Assign value to attribute calendar = pCalendar; } @@ -505,7 +505,7 @@ public void setCalendar( @MyNotNull Calendar pCalendar ) { * * @return {@link Timestamp} Value to which {@link #sqlTimestamp} is set. */ - @MyNotNull + @MyNotNullProperty public Timestamp getSqlTimestamp( ) { return sqlTimestamp; } @@ -515,7 +515,7 @@ public Timestamp getSqlTimestamp( ) { * * @param pSqlTimestamp Value to which {@link #sqlTimestamp} should be set. */ - public void setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { + public void setSqlTimestamp( @MyNotNullProperty Timestamp pSqlTimestamp ) { // Assign value to attribute sqlTimestamp = pSqlTimestamp; } @@ -525,7 +525,7 @@ public void setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { * * @return {@link Time} Value to which {@link #sqlTime} is set. */ - @MyNotNull + @MyNotNullProperty public Time getSqlTime( ) { return sqlTime; } @@ -535,7 +535,7 @@ public Time getSqlTime( ) { * * @param pSqlTime Value to which {@link #sqlTime} should be set. */ - public void setSqlTime( @MyNotNull Time pSqlTime ) { + public void setSqlTime( @MyNotNullProperty Time pSqlTime ) { // Assign value to attribute sqlTime = pSqlTime; } @@ -545,7 +545,7 @@ public void setSqlTime( @MyNotNull Time pSqlTime ) { * * @return {@link Date} Value to which {@link #sqlDate} is set. */ - @MyNotNull + @MyNotNullProperty public Date getSqlDate( ) { return sqlDate; } @@ -555,7 +555,7 @@ public Date getSqlDate( ) { * * @param pSqlDate Value to which {@link #sqlDate} should be set. */ - public void setSqlDate( @MyNotNull Date pSqlDate ) { + public void setSqlDate( @MyNotNullProperty Date pSqlDate ) { // Assign value to attribute sqlDate = pSqlDate; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/LocalBeanParamType.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/LocalBeanParamType.java index 1a79ca2d2..12fa793f5 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/LocalBeanParamType.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/LocalBeanParamType.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; import javax.ws.rs.HeaderParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -118,7 +118,7 @@ protected Builder( LocalBeanParamType pObject ) { * @param pLocalKey Value to which {@link #localKey} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalKey( @MyNotNull String pLocalKey ) { + public Builder setLocalKey( @MyNotNullProperty String pLocalKey ) { // Assign value to attribute localKey = pLocalKey; return this; @@ -130,7 +130,7 @@ public Builder setLocalKey( @MyNotNull String pLocalKey ) { * @param pLocalID Value to which {@link #localID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalID( @MyNotNull String pLocalID ) { + public Builder setLocalID( @MyNotNullProperty String pLocalID ) { // Assign value to attribute localID = pLocalID; return this; @@ -142,7 +142,7 @@ public Builder setLocalID( @MyNotNull String pLocalID ) { * @param pAuthorization Value to which {@link #authorization} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAuthorization( @MyNotNull String pAuthorization ) { + public Builder setAuthorization( @MyNotNullProperty String pAuthorization ) { // Assign value to attribute authorization = pAuthorization; return this; @@ -177,7 +177,7 @@ public LocalBeanParamType buildValidated( ) throws ConstraintViolationException * * @return {@link String} Value to which {@link #localKey} is set. */ - @MyNotNull + @MyNotNullProperty public String getLocalKey( ) { return localKey; } @@ -187,7 +187,7 @@ public String getLocalKey( ) { * * @param pLocalKey Value to which {@link #localKey} should be set. */ - public void setLocalKey( @MyNotNull String pLocalKey ) { + public void setLocalKey( @MyNotNullProperty String pLocalKey ) { // Assign value to attribute localKey = pLocalKey; } @@ -197,7 +197,7 @@ public void setLocalKey( @MyNotNull String pLocalKey ) { * * @return {@link String} Value to which {@link #localID} is set. */ - @MyNotNull + @MyNotNullProperty public String getLocalID( ) { return localID; } @@ -207,7 +207,7 @@ public String getLocalID( ) { * * @param pLocalID Value to which {@link #localID} should be set. */ - public void setLocalID( @MyNotNull String pLocalID ) { + public void setLocalID( @MyNotNullProperty String pLocalID ) { // Assign value to attribute localID = pLocalID; } @@ -217,7 +217,7 @@ public void setLocalID( @MyNotNull String pLocalID ) { * * @return {@link String} Value to which {@link #authorization} is set. */ - @MyNotNull + @MyNotNullProperty public String getAuthorization( ) { return authorization; } @@ -227,7 +227,7 @@ public String getAuthorization( ) { * * @param pAuthorization Value to which {@link #authorization} should be set. */ - public void setAuthorization( @MyNotNull String pAuthorization ) { + public void setAuthorization( @MyNotNullProperty String pAuthorization ) { // Assign value to attribute authorization = pAuthorization; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/ProductService.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/ProductService.java index fc1675268..0186587e7 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/ProductService.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/ProductService.java @@ -21,8 +21,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyServiceParam; +import com.anaptecs.annotations.MyNotNullServiceParam; import com.anaptecs.jeaf.core.api.Service; import com.anaptecs.jeaf.junit.openapi.base.BeanParameter; import com.anaptecs.jeaf.junit.openapi.base.BigDecimalCode; @@ -62,21 +62,21 @@ public interface ProductService extends Service { * @param pProductID * @return {@link Product} */ - @MyNotNull - Product getProduct( @NotEmpty @MyNotNull String pProductID ); + @MyNotNullServiceParam + Product getProduct( @NotEmpty @MyNotNullServiceParam String pProductID ); /** * @param pProduct * @return boolean */ - boolean createProduct( @MyNotNull Product pProduct ); + boolean createProduct( @MyNotNullServiceParam Product pProduct ); /** * @param pContext * @return {@link Sortiment} */ - @MyNotNull - Sortiment getSortiment( @MyNotNull Context pContext ); + @MyNotNullServiceParam + Sortiment getSortiment( @MyNotNullServiceParam Context pContext ); /** * @param pChannelCode @@ -84,12 +84,12 @@ public interface ProductService extends Service { * Breaking Change with 2.0: Parameter will be mandatory * @return {@link ChannelCode} */ - @MyNotNull - ChannelCode createChannelCode( @NotBlank @MyNotNull String pChannelCode ); + @MyNotNullServiceParam + ChannelCode createChannelCode( @NotBlank @MyNotNullServiceParam String pChannelCode ); /** */ - @MyNotNull + @MyNotNullServiceParam void ping( ); /** @@ -97,21 +97,21 @@ public interface ProductService extends Service { * @deprecated This request is no longer supported. (since: 1.1.1, removed with: 2.3) */ @Deprecated - @MyNotNull + @MyNotNullServiceParam String deprecatedOperation( ); /** * @param pContext * @return {@link String} */ - @MyNotNull - String deprecatedContext( @MyNotNull DeprecatedContext pContext ); + @MyNotNullServiceParam + String deprecatedContext( @MyNotNullServiceParam DeprecatedContext pContext ); /** * @param pBeanParam */ - @MyNotNull - void deprecatedBeanParam( @MyNotNull BeanParameter pBeanParam ); + @MyNotNullServiceParam + void deprecatedBeanParam( @MyNotNullServiceParam BeanParameter pBeanParam ); /** * @param pParam1
@@ -120,7 +120,7 @@ public interface ProductService extends Service { * Deprecated. (since: , removed with: ) */ @Deprecated - @MyNotNull + @MyNotNullServiceParam String deprecatedParams( @Deprecated int pParam1 ); /** @@ -128,8 +128,8 @@ public interface ProductService extends Service { * Deprecated. (since: , removed with: ) * @return {@link String} */ - @MyNotNull - String deprecatedBody( @Deprecated @MyNotNull String pBody ); + @MyNotNullServiceParam + String deprecatedBody( @Deprecated @MyNotNullServiceParam String pBody ); /** * Please be aware that deprecations on complex bodies are not supported. Instead the whole operation needs to be set @@ -138,77 +138,77 @@ public interface ProductService extends Service { * @param pProduct
* Deprecated. (since: , removed with: ) */ - @MyNotNull - void deprectedComplexRequestBody( @Deprecated @MyNotNull Product pProduct ); + @MyNotNullServiceParam + void deprectedComplexRequestBody( @Deprecated @MyNotNullServiceParam Product pProduct ); /** * @return {@link Product}
* Deprecated. (since: , removed with: ) */ @Deprecated - @MyNotNull + @MyNotNullServiceParam Product deprecatedComplexReturn( ); /** * @param pContext */ - @MyNotNull - void loadSpecificThings( @MyNotNull SpecialContext pContext ); + @MyNotNullServiceParam + void loadSpecificThings( @MyNotNullServiceParam SpecialContext pContext ); /** * @param pChannelCode Channel Code that should be created. * @return {@link ChannelCode} Created channel code */ - @MyNotNull - ChannelCode createChannelCodeFromObject( @MyNotNull ChannelCode pChannelCode ); + @MyNotNullServiceParam + ChannelCode createChannelCodeFromObject( @MyNotNullServiceParam ChannelCode pChannelCode ); /** * @param pCurrencies * @return {@link List} */ - @MyNotEmpty - List addCurrencies( @MyNotEmpty List pCurrencies ); + @MyNotEmptyServiceParam + List addCurrencies( @MyNotEmptyServiceParam List pCurrencies ); /** * @param pCurrency * @return {@link CurrencyCode} */ - @MyNotNull - CurrencyCode isCurrencySupported( @MyNotNull CurrencyCode pCurrency ); + @MyNotNullServiceParam + CurrencyCode isCurrencySupported( @MyNotNullServiceParam CurrencyCode pCurrency ); /** * @param pStringCode * @return {@link IntegerCodeType} */ - @MyNotNull - IntegerCodeType testCodeTypeUsage( @MyNotNull StringCodeType pStringCode ); + @MyNotNullServiceParam + IntegerCodeType testCodeTypeUsage( @MyNotNullServiceParam StringCodeType pStringCode ); /** * @param pBeanParam * @return {@link String} */ - @MyNotNull - String testLocalBeanParamType( @MyNotNull LocalBeanParamType pBeanParam ); + @MyNotNullServiceParam + String testLocalBeanParamType( @MyNotNullServiceParam LocalBeanParamType pBeanParam ); /** * @param pParent * @return {@link String} */ - @MyNotNull - String testExternalBeanParameterType( @MyNotNull ParentBeanParamType pParent ); + @MyNotNullServiceParam + String testExternalBeanParameterType( @MyNotNullServiceParam ParentBeanParamType pParent ); /** * @param pChild * @return {@link String} */ - @MyNotNull - String testChildBeanParameter( @MyNotNull ChildBeanParameterType pChild ); + @MyNotNullServiceParam + String testChildBeanParameter( @MyNotNullServiceParam ChildBeanParameterType pChild ); /** * @param pIBAN * @return boolean */ - boolean checkIBAN( @MyNotNull String pIBAN ); + boolean checkIBAN( @MyNotNullServiceParam String pIBAN ); /** * @param pChannelTypes @@ -220,20 +220,20 @@ public interface ProductService extends Service { * @param pChannelType * @return {@link Channel} */ - @MyNotNull - Channel getDefaultChannel( @MyNotNull ChannelType pChannelType ); + @MyNotNullServiceParam + Channel getDefaultChannel( @MyNotNullServiceParam ChannelType pChannelType ); /** * @param pChannelCode * @return {@link List} */ - List getSupportedCurrencies( @MyNotNull ChannelCode pChannelCode ); + List getSupportedCurrencies( @MyNotNullServiceParam ChannelCode pChannelCode ); /** * @param pChannelCode * @return {@link List} */ - List getSupportedCurrenciesAsync( @MyNotNull ChannelCode pChannelCode ); + List getSupportedCurrenciesAsync( @MyNotNullServiceParam ChannelCode pChannelCode ); /** * @param pPath @@ -248,26 +248,28 @@ public interface ProductService extends Service { * @param pSQLTime * @param pSQLDate */ - @MyNotNull - void testDateQueryParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pStartTimestamp, - @MyNotNull OffsetTime pStartTime, @MyNotNull LocalDateTime pLocalStartTimestamp, - @MyNotNull LocalTime pLocalStartTime, @MyNotNull LocalDate pLocalStartDate, @MyNotNull Calendar pCalendar, - @MyNotNull java.util.Date pUtilDate, @MyNotNull Timestamp pSQLTimestamp, @MyNotNull Time pSQLTime, - @MyNotNull Date pSQLDate ); + @MyNotNullServiceParam + void testDateQueryParams( @MyNotNullServiceParam String pPath, @MyNotNullServiceParam OffsetDateTime pStartTimestamp, + @MyNotNullServiceParam OffsetTime pStartTime, @MyNotNullServiceParam LocalDateTime pLocalStartTimestamp, + @MyNotNullServiceParam LocalTime pLocalStartTime, @MyNotNullServiceParam LocalDate pLocalStartDate, + @MyNotNullServiceParam Calendar pCalendar, @MyNotNullServiceParam java.util.Date pUtilDate, + @MyNotNullServiceParam Timestamp pSQLTimestamp, @MyNotNullServiceParam Time pSQLTime, + @MyNotNullServiceParam Date pSQLDate ); /** * @param pPath * @param pQueryParams */ - @MyNotNull - void testDateQueryParamsBean( @MyNotNull String pPath, @MyNotNull DateQueryParamsBean pQueryParams ); + @MyNotNullServiceParam + void testDateQueryParamsBean( @MyNotNullServiceParam String pPath, + @MyNotNullServiceParam DateQueryParamsBean pQueryParams ); /** * @param query1 * @param query2 * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String testOptionalQueryParams( String query1, int query2 ); /** @@ -275,49 +277,49 @@ void testDateQueryParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pSt * @param pContentType * @param pAccept */ - @MyNotNull - void testSpecialHeaderParams( @MyNotNull String authorization, @MyNotNull String pContentType, - @MyNotNull String pAccept ); + @MyNotNullServiceParam + void testSpecialHeaderParams( @MyNotNullServiceParam String authorization, @MyNotNullServiceParam String pContentType, + @MyNotNullServiceParam String pAccept ); /** * @param pContext * @return {@link String} */ - @MyNotNull - String testTechnicalHeaderBean( @MyNotNull TechnicalHeaderContext pContext ); + @MyNotNullServiceParam + String testTechnicalHeaderBean( @MyNotNullServiceParam TechnicalHeaderContext pContext ); /** * @param pReseller * @param pAuthenticationToken * @return {@link String} */ - @MyNotNull - String testTechnicalHeaderParam( @MyNotNull String pReseller ); + @MyNotNullServiceParam + String testTechnicalHeaderParam( @MyNotNullServiceParam String pReseller ); /** * @param pInlinedBeanParam */ - @MyNotNull - void testNotInlinedBeanParam( @MyNotNull NotInlinedBeanParam pInlinedBeanParam ); + @MyNotNullServiceParam + void testNotInlinedBeanParam( @MyNotNullServiceParam NotInlinedBeanParam pInlinedBeanParam ); /** * @param pIntegerArray */ - @MyNotNull - void testPrimitiveArray( @MyNotEmpty int[] pIntegerArray ); + @MyNotNullServiceParam + void testPrimitiveArray( @MyNotEmptyServiceParam int[] pIntegerArray ); /** * @param pIntValues * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String testPrimitiveArrayAsQueryParam( int[] pIntValues ); /** * @param pCodes * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String testMultivaluedHeader( List pCodes ); /** @@ -325,7 +327,7 @@ void testSpecialHeaderParams( @MyNotNull String authorization, @MyNotNull String * @param pEnums * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String testMultivaluedQueryParams( List pCodes, List pEnums ); /** @@ -333,33 +335,33 @@ void testSpecialHeaderParams( @MyNotNull String authorization, @MyNotNull String * @param pTheEnum * @return {@link String} */ - @MyNotNull - String testMulitValuedBeanParams( @MyNotNull MultiValuedDataType pBeanParam, - @MyNotNull BooleanLiteralsEnum pTheEnum ); + @MyNotNullServiceParam + String testMulitValuedBeanParams( @MyNotNullServiceParam MultiValuedDataType pBeanParam, + @MyNotNullServiceParam BooleanLiteralsEnum pTheEnum ); /** * @param pHeader * @param pContext */ - @MyNotNull - void noReturnType( @MyNotNull String pHeader, @MyNotNull MultiValuedDataType pContext ); + @MyNotNullServiceParam + void noReturnType( @MyNotNullServiceParam String pHeader, @MyNotNullServiceParam MultiValuedDataType pContext ); /** * @param pID */ - @MyNotNull - void deleteSomething( @MyNotNull String pID ); + @MyNotNullServiceParam + void deleteSomething( @MyNotNullServiceParam String pID ); /** * @return {@link GenericSingleValuedReponse} */ - @MyNotNull + @MyNotNullServiceParam GenericSingleValuedReponse genericSingleValueResponse( ); /** * @return {@link GenericPageableResponse} */ - @MyNotNull + @MyNotNullServiceParam GenericPageableResponse genericMultiValueResponse( ); /** @@ -367,37 +369,37 @@ String testMulitValuedBeanParams( @MyNotNull MultiValuedDataType pBeanParam, * @param pShortCodes * @param pJustAByte */ - @MyNotNull - void testDataTypeWithRestrition( @MyNotNull StringCode pStringCode, Set pShortCodes, - @Min(value = 32) @MyNotNull Byte pJustAByte ); + @MyNotNullServiceParam + void testDataTypeWithRestrition( @MyNotNullServiceParam StringCode pStringCode, Set pShortCodes, + @Min(value = 32) @MyNotNullServiceParam Byte pJustAByte ); /** * @param pContext */ - @MyNotNull - void testContext( @MyNotNull Context pContext ); + @MyNotNullServiceParam + void testContext( @MyNotNullServiceParam Context pContext ); /** * @return {@link Response>} */ - @MyNotNull + @MyNotNullServiceParam Response> testNestedGenericsResponse( ); /** * @return {@link Response>} */ - @MyNotNull + @MyNotNullServiceParam Response> testNestedMultivaluedResponse( ); /** * @return {@link Response} */ - @MyNotNull + @MyNotNullServiceParam Response testDuplicateGenerics1( ); /** * @return {@link Response} */ - @MyNotNull + @MyNotNullServiceParam Response testDuplicateGenerics2( ); } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/Sale.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/Sale.java index ee643cea2..52307f676 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/Sale.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/Sale.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.junit.openapi.base.Channel; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; @@ -111,7 +111,7 @@ protected Builder( Sale pObject ) { * @param pTransactionAmount Value to which {@link #transactionAmount} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setTransactionAmount( @MyNotNull BigDecimal pTransactionAmount ) { + public Builder setTransactionAmount( @MyNotNullProperty BigDecimal pTransactionAmount ) { // Assign value to attribute transactionAmount = pTransactionAmount; return this; @@ -156,7 +156,7 @@ public Sale buildValidated( ) throws ConstraintViolationException { * * @return {@link BigDecimal} Value to which {@link #transactionAmount} is set. */ - @MyNotNull + @MyNotNullProperty public BigDecimal getTransactionAmount( ) { return transactionAmount; } @@ -166,7 +166,7 @@ public BigDecimal getTransactionAmount( ) { * * @param pTransactionAmount Value to which {@link #transactionAmount} should be set. */ - public void setTransactionAmount( @MyNotNull BigDecimal pTransactionAmount ) { + public void setTransactionAmount( @MyNotNullProperty BigDecimal pTransactionAmount ) { // Assign value to attribute transactionAmount = pTransactionAmount; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/TechnicalHeaderContext.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/TechnicalHeaderContext.java index 87551c13f..21762c9b8 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/TechnicalHeaderContext.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/TechnicalHeaderContext.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull; import javax.ws.rs.HeaderParam; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -106,7 +106,7 @@ protected Builder( TechnicalHeaderContext pObject ) { * @param pReseller Value to which {@link #reseller} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setReseller( @MyNotNull String pReseller ) { + public Builder setReseller( @MyNotNullProperty String pReseller ) { // Assign value to attribute reseller = pReseller; return this; @@ -141,7 +141,7 @@ public TechnicalHeaderContext buildValidated( ) throws ConstraintViolationExcept * * @return {@link String} Value to which {@link #reseller} is set. */ - @MyNotNull + @MyNotNullProperty public String getReseller( ) { return reseller; } @@ -151,7 +151,7 @@ public String getReseller( ) { * * @param pReseller Value to which {@link #reseller} should be set. */ - public void setReseller( @MyNotNull String pReseller ) { + public void setReseller( @MyNotNullProperty String pReseller ) { // Assign value to attribute reseller = pReseller; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/resource/ProductServiceResource.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/resource/ProductServiceResource.java index e10c303ad..a723a4033 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/resource/ProductServiceResource.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/service1/resource/ProductServiceResource.java @@ -41,6 +41,8 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; +import com.anaptecs.annotations.MyNotEmptyRESTParam; +import com.anaptecs.annotations.MyNotNullRESTParam; import com.anaptecs.jeaf.core.api.JEAF; import com.anaptecs.jeaf.junit.openapi.base.BeanParameter; import com.anaptecs.jeaf.junit.openapi.base.BigDecimalCode; @@ -121,7 +123,9 @@ public void run( ) { */ @Path("{id}") @GET - public javax.ws.rs.core.Response getProduct( @PathParam("id") @DefaultValue("4711") String pProductID ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response getProduct( + @PathParam("id") @DefaultValue("4711") @MyNotNullRESTParam String pProductID ) { // Delegate request to service. ProductService lService = this.getProductService(); Product lResult = lService.getProduct(pProductID); @@ -132,7 +136,7 @@ public javax.ws.rs.core.Response getProduct( @PathParam("id") @DefaultValue("471 * {@link ProductService#createProduct()} */ @POST - public javax.ws.rs.core.Response createProduct( Product pProduct ) { + public javax.ws.rs.core.Response createProduct( @MyNotNullRESTParam Product pProduct ) { // Delegate request to service. ProductService lService = this.getProductService(); boolean lResult = lService.createProduct(pProduct); @@ -144,7 +148,8 @@ public javax.ws.rs.core.Response createProduct( Product pProduct ) { */ @Path("sortiment/{id}") @GET - public javax.ws.rs.core.Response getSortiment( @BeanParam Context pContext, + @MyNotNullRESTParam + public javax.ws.rs.core.Response getSortiment( @BeanParam @MyNotNullRESTParam Context pContext, @javax.ws.rs.core.Context HttpHeaders pHeaders ) { // Add custom headers. for (Map.Entry> lNextEntry : pHeaders.getRequestHeaders().entrySet()) { @@ -163,7 +168,8 @@ public javax.ws.rs.core.Response getSortiment( @BeanParam Context pContext, @POST @Consumes(MediaType.APPLICATION_XML) @Produces(MediaType.APPLICATION_XML) - public javax.ws.rs.core.Response createChannelCode( String pChannelCode ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response createChannelCode( @MyNotNullRESTParam String pChannelCode ) { // Delegate request to service. ProductService lService = this.getProductService(); ChannelCode lResult = lService.createChannelCode(pChannelCode); @@ -174,6 +180,7 @@ public javax.ws.rs.core.Response createChannelCode( String pChannelCode ) { * {@link ProductService#ping()} */ @HEAD + @MyNotNullRESTParam public javax.ws.rs.core.Response ping( ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -187,6 +194,7 @@ public javax.ws.rs.core.Response ping( ) { @Path("deprecated/operation") @GET @Deprecated + @MyNotNullRESTParam public javax.ws.rs.core.Response deprecatedOperation( ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -199,7 +207,8 @@ public javax.ws.rs.core.Response deprecatedOperation( ) { */ @Path("deprecated/context") @POST - public javax.ws.rs.core.Response deprecatedContext( @BeanParam DeprecatedContext pContext ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response deprecatedContext( @BeanParam @MyNotNullRESTParam DeprecatedContext pContext ) { // Delegate request to service. ProductService lService = this.getProductService(); String lResult = lService.deprecatedContext(pContext); @@ -211,7 +220,8 @@ public javax.ws.rs.core.Response deprecatedContext( @BeanParam DeprecatedContext */ @Path("deprecated/beanParams") @POST - public javax.ws.rs.core.Response deprecatedBeanParam( @BeanParam BeanParameter pBeanParam ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response deprecatedBeanParam( @BeanParam @MyNotNullRESTParam BeanParameter pBeanParam ) { // Delegate request to service. ProductService lService = this.getProductService(); lService.deprecatedBeanParam(pBeanParam); @@ -224,6 +234,7 @@ public javax.ws.rs.core.Response deprecatedBeanParam( @BeanParam BeanParameter p @Path("deprecated/params") @POST @Deprecated + @MyNotNullRESTParam public javax.ws.rs.core.Response deprecatedParams( @HeaderParam("param1") @Deprecated int pParam1 ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -236,7 +247,9 @@ public javax.ws.rs.core.Response deprecatedParams( @HeaderParam("param1") @Depre */ @Path("deprecated/body") @POST - public javax.ws.rs.core.Response deprecatedBody( @DefaultValue("Hello World!") @Deprecated String pBody ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response deprecatedBody( + @DefaultValue("Hello World!") @Deprecated @MyNotNullRESTParam String pBody ) { // Delegate request to service. ProductService lService = this.getProductService(); String lResult = lService.deprecatedBody(pBody); @@ -248,7 +261,8 @@ public javax.ws.rs.core.Response deprecatedBody( @DefaultValue("Hello World!") @ */ @Path("deprecated/complexBody") @POST - public javax.ws.rs.core.Response deprectedComplexRequestBody( @Deprecated Product pProduct ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response deprectedComplexRequestBody( @Deprecated @MyNotNullRESTParam Product pProduct ) { // Delegate request to service. ProductService lService = this.getProductService(); lService.deprectedComplexRequestBody(pProduct); @@ -261,6 +275,7 @@ public javax.ws.rs.core.Response deprectedComplexRequestBody( @Deprecated Produc @Path("deprecated/complexReturn") @GET @Deprecated + @MyNotNullRESTParam public javax.ws.rs.core.Response deprecatedComplexReturn( ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -273,7 +288,8 @@ public javax.ws.rs.core.Response deprecatedComplexReturn( ) { */ @Path("specific/{id}") @PATCH - public javax.ws.rs.core.Response loadSpecificThings( @BeanParam SpecialContext pContext, + @MyNotNullRESTParam + public javax.ws.rs.core.Response loadSpecificThings( @BeanParam @MyNotNullRESTParam SpecialContext pContext, @javax.ws.rs.core.Context HttpHeaders pHeaders ) { // Add custom headers. for (Map.Entry> lNextEntry : pHeaders.getRequestHeaders().entrySet()) { @@ -290,7 +306,8 @@ public javax.ws.rs.core.Response loadSpecificThings( @BeanParam SpecialContext p */ @Path("ChannelCodeObject") @POST - public javax.ws.rs.core.Response createChannelCodeFromObject( ChannelCode pChannelCode ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response createChannelCodeFromObject( @MyNotNullRESTParam ChannelCode pChannelCode ) { // Delegate request to service. ProductService lService = this.getProductService(); ChannelCode lResult = lService.createChannelCodeFromObject(pChannelCode); @@ -302,7 +319,8 @@ public javax.ws.rs.core.Response createChannelCodeFromObject( ChannelCode pChann */ @Path("currencies") @POST - public javax.ws.rs.core.Response addCurrencies( List pCurrencies ) { + @MyNotEmptyRESTParam + public javax.ws.rs.core.Response addCurrencies( @MyNotEmptyRESTParam List pCurrencies ) { // Delegate request to service. ProductService lService = this.getProductService(); List lResult = lService.addCurrencies(pCurrencies); @@ -314,7 +332,8 @@ public javax.ws.rs.core.Response addCurrencies( List pCurrencies ) */ @Path("currencies/valid") @POST - public javax.ws.rs.core.Response isCurrencySupported( CurrencyCode pCurrency ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response isCurrencySupported( @MyNotNullRESTParam CurrencyCode pCurrency ) { // Delegate request to service. ProductService lService = this.getProductService(); CurrencyCode lResult = lService.isCurrencySupported(pCurrency); @@ -326,7 +345,8 @@ public javax.ws.rs.core.Response isCurrencySupported( CurrencyCode pCurrency ) { */ @Path("codeTypeUsages") @POST - public javax.ws.rs.core.Response testCodeTypeUsage( StringCodeType pStringCode ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testCodeTypeUsage( @MyNotNullRESTParam StringCodeType pStringCode ) { // Delegate request to service. ProductService lService = this.getProductService(); IntegerCodeType lResult = lService.testCodeTypeUsage(pStringCode); @@ -338,7 +358,9 @@ public javax.ws.rs.core.Response testCodeTypeUsage( StringCodeType pStringCode ) */ @Path("LocalBeanParam") @GET - public javax.ws.rs.core.Response testLocalBeanParamType( @BeanParam LocalBeanParamType pBeanParam ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testLocalBeanParamType( + @BeanParam @MyNotNullRESTParam LocalBeanParamType pBeanParam ) { // Delegate request to service. ProductService lService = this.getProductService(); String lResult = lService.testLocalBeanParamType(pBeanParam); @@ -350,7 +372,9 @@ public javax.ws.rs.core.Response testLocalBeanParamType( @BeanParam LocalBeanPar */ @Path("ExternalBeanParam") @GET - public javax.ws.rs.core.Response testExternalBeanParameterType( @BeanParam ParentBeanParamType pParent ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testExternalBeanParameterType( + @BeanParam @MyNotNullRESTParam ParentBeanParamType pParent ) { // Delegate request to service. ProductService lService = this.getProductService(); String lResult = lService.testExternalBeanParameterType(pParent); @@ -362,7 +386,9 @@ public javax.ws.rs.core.Response testExternalBeanParameterType( @BeanParam Paren */ @Path("ChildBeanParam") @GET - public javax.ws.rs.core.Response testChildBeanParameter( @BeanParam ChildBeanParameterType pChild ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testChildBeanParameter( + @BeanParam @MyNotNullRESTParam ChildBeanParameterType pChild ) { // Delegate request to service. ProductService lService = this.getProductService(); String lResult = lService.testChildBeanParameter(pChild); @@ -374,7 +400,7 @@ public javax.ws.rs.core.Response testChildBeanParameter( @BeanParam ChildBeanPar */ @Path("IBAN") @POST - public javax.ws.rs.core.Response checkIBAN( String pIBAN ) { + public javax.ws.rs.core.Response checkIBAN( @MyNotNullRESTParam String pIBAN ) { // Delegate request to service. ProductService lService = this.getProductService(); boolean lResult = lService.checkIBAN(pIBAN); @@ -399,8 +425,9 @@ public javax.ws.rs.core.Response getChannels( */ @Path("DefaultChannel") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response getDefaultChannel( - @QueryParam("channelType") @DefaultValue("COUNTER") ChannelType pChannelType ) { + @QueryParam("channelType") @DefaultValue("COUNTER") @MyNotNullRESTParam ChannelType pChannelType ) { // Delegate request to service. ProductService lService = this.getProductService(); Channel lResult = lService.getDefaultChannel(pChannelType); @@ -412,7 +439,8 @@ public javax.ws.rs.core.Response getDefaultChannel( */ @Path("currencies/{channelCode}") @GET - public javax.ws.rs.core.Response getSupportedCurrencies( @PathParam("channelCode") String pChannelCodeAsBasicType ) { + public javax.ws.rs.core.Response getSupportedCurrencies( + @PathParam("channelCode") @MyNotNullRESTParam String pChannelCodeAsBasicType ) { // Convert basic type parameters into "real" objects. ChannelCode pChannelCode; if (pChannelCodeAsBasicType != null) { @@ -434,7 +462,7 @@ public javax.ws.rs.core.Response getSupportedCurrencies( @PathParam("channelCode @GET public void getSupportedCurrenciesAsync( @Suspended AsyncResponse pAsyncResponse, @javax.ws.rs.core.Context HttpServletRequest pRequest, - @PathParam("channelCode") String pChannelCodeAsBasicType ) { + @PathParam("channelCode") @MyNotNullRESTParam String pChannelCodeAsBasicType ) { // Lookup workload manager that takes care that the system will have an optimal throughput. WorkloadManager lWorkloadManager = Workload.getWorkloadManager(); // Prepare meta information about the request. @@ -471,13 +499,18 @@ public void run( ) { */ @Path("test-date-query-params/{path}") @GET - public javax.ws.rs.core.Response testDateQueryParams( @PathParam("path") String pPath, - @QueryParam("startTimestamp") OffsetDateTime pStartTimestamp, @QueryParam("startTime") OffsetTime pStartTime, - @QueryParam("localStartTimestamp") LocalDateTime pLocalStartTimestamp, - @QueryParam("localStartTime") LocalTime pLocalStartTime, @QueryParam("localStartDate") LocalDate pLocalStartDate, - @QueryParam("calendar") Calendar pCalendar, @QueryParam("utilDate") java.util.Date pUtilDate, - @QueryParam("sqlTimestamp") Timestamp pSQLTimestamp, @QueryParam("sqlTime") Time pSQLTime, - @QueryParam("sqlDate") Date pSQLDate ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testDateQueryParams( @PathParam("path") @MyNotNullRESTParam String pPath, + @QueryParam("startTimestamp") @MyNotNullRESTParam OffsetDateTime pStartTimestamp, + @QueryParam("startTime") @MyNotNullRESTParam OffsetTime pStartTime, + @QueryParam("localStartTimestamp") @MyNotNullRESTParam LocalDateTime pLocalStartTimestamp, + @QueryParam("localStartTime") @MyNotNullRESTParam LocalTime pLocalStartTime, + @QueryParam("localStartDate") @MyNotNullRESTParam LocalDate pLocalStartDate, + @QueryParam("calendar") @MyNotNullRESTParam Calendar pCalendar, + @QueryParam("utilDate") @MyNotNullRESTParam java.util.Date pUtilDate, + @QueryParam("sqlTimestamp") @MyNotNullRESTParam Timestamp pSQLTimestamp, + @QueryParam("sqlTime") @MyNotNullRESTParam Time pSQLTime, + @QueryParam("sqlDate") @MyNotNullRESTParam Date pSQLDate ) { // Delegate request to service. ProductService lService = this.getProductService(); lService.testDateQueryParams(pPath, pStartTimestamp, pStartTime, pLocalStartTimestamp, pLocalStartTime, @@ -490,8 +523,9 @@ public javax.ws.rs.core.Response testDateQueryParams( @PathParam("path") String */ @Path("test-date-query-params-beans/{path}") @GET - public javax.ws.rs.core.Response testDateQueryParamsBean( @PathParam("path") String pPath, - @BeanParam DateQueryParamsBean pQueryParams ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testDateQueryParamsBean( @PathParam("path") @MyNotNullRESTParam String pPath, + @BeanParam @MyNotNullRESTParam DateQueryParamsBean pQueryParams ) { // Delegate request to service. ProductService lService = this.getProductService(); lService.testDateQueryParamsBean(pPath, pQueryParams); @@ -503,6 +537,7 @@ public javax.ws.rs.core.Response testDateQueryParamsBean( @PathParam("path") Str */ @Path("test-optional-query-params") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response testOptionalQueryParams( @QueryParam("query1") @DefaultValue("Just a default value") String query1, @QueryParam("query2") int query2 ) { // Delegate request to service. @@ -516,8 +551,11 @@ public javax.ws.rs.core.Response testOptionalQueryParams( */ @Path("special-header-params") @GET - public javax.ws.rs.core.Response testSpecialHeaderParams( @HeaderParam("authorization") String authorization, - @HeaderParam("content-type") String pContentType, @HeaderParam("ACCEPT") String pAccept ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testSpecialHeaderParams( + @HeaderParam("authorization") @MyNotNullRESTParam String authorization, + @HeaderParam("content-type") @MyNotNullRESTParam String pContentType, + @HeaderParam("ACCEPT") @MyNotNullRESTParam String pAccept ) { // Delegate request to service. ProductService lService = this.getProductService(); lService.testSpecialHeaderParams(authorization, pContentType, pAccept); @@ -529,8 +567,9 @@ public javax.ws.rs.core.Response testSpecialHeaderParams( @HeaderParam("authoriz */ @Path("technicalHeaderBeanParam") @GET - public javax.ws.rs.core.Response testTechnicalHeaderBean( @BeanParam TechnicalHeaderContext pContext, - @javax.ws.rs.core.Context HttpHeaders pHeaders ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testTechnicalHeaderBean( + @BeanParam @MyNotNullRESTParam TechnicalHeaderContext pContext, @javax.ws.rs.core.Context HttpHeaders pHeaders ) { // Add custom headers. for (Map.Entry> lNextEntry : pHeaders.getRequestHeaders().entrySet()) { pContext.addCustomHeader(lNextEntry.getKey(), lNextEntry.getValue().get(0)); @@ -546,7 +585,9 @@ public javax.ws.rs.core.Response testTechnicalHeaderBean( @BeanParam TechnicalHe */ @Path("technicalHeaderParam") @GET - public javax.ws.rs.core.Response testTechnicalHeaderParam( @HeaderParam("Reseller") String pReseller ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testTechnicalHeaderParam( + @HeaderParam("Reseller") @MyNotNullRESTParam String pReseller ) { // Delegate request to service. ProductService lService = this.getProductService(); String lResult = lService.testTechnicalHeaderParam(pReseller); @@ -558,7 +599,9 @@ public javax.ws.rs.core.Response testTechnicalHeaderParam( @HeaderParam("Reselle */ @Path("testNotInlinedBeanParam") @POST - public javax.ws.rs.core.Response testNotInlinedBeanParam( @BeanParam NotInlinedBeanParam pInlinedBeanParam ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testNotInlinedBeanParam( + @BeanParam @MyNotNullRESTParam NotInlinedBeanParam pInlinedBeanParam ) { // Delegate request to service. ProductService lService = this.getProductService(); lService.testNotInlinedBeanParam(pInlinedBeanParam); @@ -570,7 +613,8 @@ public javax.ws.rs.core.Response testNotInlinedBeanParam( @BeanParam NotInlinedB */ @Path("testStringArray") @POST - public javax.ws.rs.core.Response testPrimitiveArray( int[] pIntegerArray ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testPrimitiveArray( @MyNotEmptyRESTParam int[] pIntegerArray ) { // Delegate request to service. ProductService lService = this.getProductService(); lService.testPrimitiveArray(pIntegerArray); @@ -582,6 +626,7 @@ public javax.ws.rs.core.Response testPrimitiveArray( int[] pIntegerArray ) { */ @Path("testPrimitiveArrayAsQueryParam") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response testPrimitiveArrayAsQueryParam( @QueryParam("intValues") int[] pIntValues ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -594,6 +639,7 @@ public javax.ws.rs.core.Response testPrimitiveArrayAsQueryParam( @QueryParam("in */ @Path("big-decimal-codes-header") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response testMultivaluedHeader( @HeaderParam("pCodes") BigDecimal[] pCodesAsBasicType ) { // Convert basic type parameters into "real" objects. List pCodes; @@ -617,6 +663,7 @@ public javax.ws.rs.core.Response testMultivaluedHeader( @HeaderParam("pCodes") B */ @Path("big-decimal-codes-query") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response testMultivaluedQueryParams( @QueryParam("pCodes") BigDecimal[] pCodesAsBasicType, @QueryParam("pEnums") List pEnums ) { // Convert basic type parameters into "real" objects. @@ -641,8 +688,10 @@ public javax.ws.rs.core.Response testMultivaluedQueryParams( @QueryParam("pCodes */ @Path("testMulitValuedBeanParams") @GET - public javax.ws.rs.core.Response testMulitValuedBeanParams( @BeanParam MultiValuedDataType pBeanParam, - @QueryParam("pTheEnum") BooleanLiteralsEnum pTheEnum ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testMulitValuedBeanParams( + @BeanParam @MyNotNullRESTParam MultiValuedDataType pBeanParam, + @QueryParam("pTheEnum") @MyNotNullRESTParam BooleanLiteralsEnum pTheEnum ) { // Delegate request to service. ProductService lService = this.getProductService(); String lResult = lService.testMulitValuedBeanParams(pBeanParam, pTheEnum); @@ -654,8 +703,9 @@ public javax.ws.rs.core.Response testMulitValuedBeanParams( @BeanParam MultiValu */ @Path("no-return-type") @POST - public javax.ws.rs.core.Response noReturnType( @HeaderParam("The-Header") String pHeader, - @BeanParam MultiValuedDataType pContext ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response noReturnType( @HeaderParam("The-Header") @MyNotNullRESTParam String pHeader, + @BeanParam @MyNotNullRESTParam MultiValuedDataType pContext ) { // Delegate request to service. ProductService lService = this.getProductService(); lService.noReturnType(pHeader, pContext); @@ -667,7 +717,8 @@ public javax.ws.rs.core.Response noReturnType( @HeaderParam("The-Header") String */ @Path("delete-something/{id}") @DELETE - public javax.ws.rs.core.Response deleteSomething( @PathParam("id") String pID ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response deleteSomething( @PathParam("id") @MyNotNullRESTParam String pID ) { // Delegate request to service. ProductService lService = this.getProductService(); lService.deleteSomething(pID); @@ -679,6 +730,7 @@ public javax.ws.rs.core.Response deleteSomething( @PathParam("id") String pID ) */ @Path("generic-single-value") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response genericSingleValueResponse( ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -691,6 +743,7 @@ public javax.ws.rs.core.Response genericSingleValueResponse( ) { */ @Path("generic-multi-value") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response genericMultiValueResponse( ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -703,8 +756,11 @@ public javax.ws.rs.core.Response genericMultiValueResponse( ) { */ @Path("test-string-code-with-restriction/{string-code}") @POST - public javax.ws.rs.core.Response testDataTypeWithRestrition( @PathParam("string-code") String pStringCodeAsBasicType, - @QueryParam("short-codes") short[] pShortCodesAsBasicType, @QueryParam("byte-code") Byte pJustAByte ) { + @MyNotNullRESTParam + public javax.ws.rs.core.Response testDataTypeWithRestrition( + @PathParam("string-code") @MyNotNullRESTParam String pStringCodeAsBasicType, + @QueryParam("short-codes") short[] pShortCodesAsBasicType, + @QueryParam("byte-code") @MyNotNullRESTParam Byte pJustAByte ) { // Convert basic type parameters into "real" objects. StringCode pStringCode; if (pStringCodeAsBasicType != null) { @@ -734,7 +790,8 @@ public javax.ws.rs.core.Response testDataTypeWithRestrition( @PathParam("string- */ @Path("testContext") @GET - public javax.ws.rs.core.Response testContext( @BeanParam Context pContext, + @MyNotNullRESTParam + public javax.ws.rs.core.Response testContext( @BeanParam @MyNotNullRESTParam Context pContext, @javax.ws.rs.core.Context HttpHeaders pHeaders ) { // Add custom headers. for (Map.Entry> lNextEntry : pHeaders.getRequestHeaders().entrySet()) { @@ -751,6 +808,7 @@ public javax.ws.rs.core.Response testContext( @BeanParam Context pContext, */ @Path("nested-generics") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response testNestedGenericsResponse( ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -763,6 +821,7 @@ public javax.ws.rs.core.Response testNestedGenericsResponse( ) { */ @Path("multivalued-generics") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response testNestedMultivaluedResponse( ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -775,6 +834,7 @@ public javax.ws.rs.core.Response testNestedMultivaluedResponse( ) { */ @Path("testDuplicateGenerics1") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response testDuplicateGenerics1( ) { // Delegate request to service. ProductService lService = this.getProductService(); @@ -787,6 +847,7 @@ public javax.ws.rs.core.Response testDuplicateGenerics1( ) { */ @Path("testDuplicateGenerics2") @GET + @MyNotNullRESTParam public javax.ws.rs.core.Response testDuplicateGenerics2( ) { // Delegate request to service. ProductService lService = this.getProductService(); diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/techbase/BusinessChild.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/techbase/BusinessChild.java index 60898c40f..569fe147a 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/techbase/BusinessChild.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/techbase/BusinessChild.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; @Valid @@ -126,7 +126,7 @@ public Builder setParentAttribute( long pParentAttribute ) { * @param pChildAttribute Value to which {@link #childAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setChildAttribute( @MyNotNull String pChildAttribute ) { + public Builder setChildAttribute( @MyNotNullProperty String pChildAttribute ) { // Assign value to attribute childAttribute = pChildAttribute; return this; @@ -161,7 +161,7 @@ public BusinessChild buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #childAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public String getChildAttribute( ) { return childAttribute; } @@ -171,7 +171,7 @@ public String getChildAttribute( ) { * * @param pChildAttribute Value to which {@link #childAttribute} should be set. */ - public void setChildAttribute( @MyNotNull String pChildAttribute ) { + public void setChildAttribute( @MyNotNullProperty String pChildAttribute ) { // Assign value to attribute childAttribute = pChildAttribute; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/techbase/TechParent.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/techbase/TechParent.java index a2dbe0bd8..c99771222 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/techbase/TechParent.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/techbase/TechParent.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -94,7 +94,7 @@ protected Builder( TechParent pObject ) { * @param pTechAttribute Value to which {@link #techAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setTechAttribute( @MyNotNull String pTechAttribute ) { + public Builder setTechAttribute( @MyNotNullProperty String pTechAttribute ) { // Assign value to attribute techAttribute = pTechAttribute; return this; @@ -128,7 +128,7 @@ public TechParent buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #techAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public String getTechAttribute( ) { return techAttribute; } @@ -138,7 +138,7 @@ public String getTechAttribute( ) { * * @param pTechAttribute Value to which {@link #techAttribute} should be set. */ - public void setTechAttribute( @MyNotNull String pTechAttribute ) { + public void setTechAttribute( @MyNotNullProperty String pTechAttribute ) { // Assign value to attribute techAttribute = pTechAttribute; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ClientClass.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ClientClass.java index aecf8d3da..c71ecb8aa 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ClientClass.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ClientClass.java @@ -15,7 +15,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -106,7 +106,7 @@ protected Builder( ClientClass pObject ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -170,7 +170,7 @@ final void unsetTransientMaster( ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -180,7 +180,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/MasterClass.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/MasterClass.java index e3ea7f677..4ecbd6750 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/MasterClass.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/MasterClass.java @@ -16,7 +16,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -181,7 +181,7 @@ public Builder addToClients( ClientClass... pClients ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -311,7 +311,7 @@ public void clearClients( ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -321,7 +321,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ReadOnlyClientBase.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ReadOnlyClientBase.java index 4fb4b9d5c..c42736606 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ReadOnlyClientBase.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ReadOnlyClientBase.java @@ -9,7 +9,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -76,7 +76,7 @@ protected BuilderBase( ReadOnlyClientBase pObject ) { * @param pName Value to which {@link #name} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setName( @MyNotNull String pName ) { + public BuilderBase setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -111,7 +111,7 @@ public ReadOnlyClient buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ReadOnlyMaster.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ReadOnlyMaster.java index f38c6cc6a..95a2aa283 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ReadOnlyMaster.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/openapi/transientback/ReadOnlyMaster.java @@ -13,7 +13,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.core.api.ServiceObject; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; import com.anaptecs.jeaf.xfun.api.checks.Check; @@ -127,7 +127,7 @@ protected Builder( ReadOnlyMaster pObject ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -195,7 +195,7 @@ public ReadOnlyMaster buildValidated( ) throws ConstraintViolationException { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } diff --git a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/rest/generics/GenericSingleValuedReponse.java b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/rest/generics/GenericSingleValuedReponse.java index 8b4a6609a..008ca8283 100644 --- a/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/rest/generics/GenericSingleValuedReponse.java +++ b/jeaf-generator-test-open-api-service-objects/src-gen/main/java/com/anaptecs/jeaf/junit/rest/generics/GenericSingleValuedReponse.java @@ -11,7 +11,7 @@ import javax.validation.Valid; import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.tools.api.validation.ValidationTools; @Valid @@ -142,7 +142,7 @@ public Builder addToWarnings( Message... pWarnings ) { * @param pValue Value to which {@link #value} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setValue( @MyNotNull T pValue ) { + public Builder setValue( @MyNotNullProperty T pValue ) { // Assign value to attribute value = pValue; return this; @@ -177,7 +177,7 @@ public GenericSingleValuedReponse buildValidated( ) throws ConstraintViolatio * * @return {@link T} Value to which {@link #value} is set. */ - @MyNotNull + @MyNotNullProperty public T getValue( ) { return value; } @@ -187,7 +187,7 @@ public T getValue( ) { * * @param pValue Value to which {@link #value} should be set. */ - public void setValue( @MyNotNull T pValue ) { + public void setValue( @MyNotNullProperty T pValue ) { // Assign value to attribute value = pValue; } diff --git a/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyProperty.java b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyProperty.java new file mode 100644 index 000000000..469178f93 --- /dev/null +++ b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyProperty.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotEmptyProperty { + +} diff --git a/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyRESTParam.java b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyRESTParam.java new file mode 100644 index 000000000..33c87c458 --- /dev/null +++ b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyRESTParam.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotEmptyRESTParam { + +} diff --git a/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyServiceParam.java b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyServiceParam.java new file mode 100644 index 000000000..2af055ab5 --- /dev/null +++ b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmptyServiceParam.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotEmptyServiceParam { + +} diff --git a/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmpty.java b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullProperty.java similarity index 85% rename from jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmpty.java rename to jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullProperty.java index f5a2d86bb..71227cf7f 100644 --- a/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotEmpty.java +++ b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullProperty.java @@ -6,6 +6,6 @@ import java.lang.annotation.Target; @Target({ METHOD, PARAMETER }) -public @interface MyNotEmpty { +public @interface MyNotNullProperty { } diff --git a/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullRESTParam.java b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullRESTParam.java new file mode 100644 index 000000000..c7d6d8b5a --- /dev/null +++ b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullRESTParam.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotNullRESTParam { + +} diff --git a/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullServiceParam.java b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullServiceParam.java new file mode 100644 index 000000000..28318f883 --- /dev/null +++ b/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNullServiceParam.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotNullServiceParam { + +} diff --git a/jeaf-generator-test-spring/pom.xml b/jeaf-generator-test-spring/pom.xml index 9688ad8e5..89863bf1e 100644 --- a/jeaf-generator-test-spring/pom.xml +++ b/jeaf-generator-test-spring/pom.xml @@ -183,14 +183,23 @@ true true + true - com.anaptecs.annotations.MyNotNull - + com.anaptecs.annotations.MyNotNullProperty true - com.anaptecs.annotations.MyNotEmpty - - + com.anaptecs.annotations.MyNotEmptyProperty + + true + com.anaptecs.annotations.MyNotNullServiceParam + true + com.anaptecs.annotations.MyNotEmptyServiceParam + + + true + com.anaptecs.annotations.MyNotNullRESTParam + true + com.anaptecs.annotations.MyNotEmptyRESTParam true true diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/AnotherDataType.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/AnotherDataType.java index 3834f3316..1cd3a2f64 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/AnotherDataType.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/AnotherDataType.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( AnotherDataType pObject ) { * @param pData Value to which {@link #data} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setData( @MyNotNull String pData ) { + public Builder setData( @MyNotNullProperty String pData ) { // Assign value to attribute data = pData; return this; @@ -138,7 +138,7 @@ public AnotherDataType build( ) { * * @return {@link String} Value to which {@link #data} is set. */ - @MyNotNull + @MyNotNullProperty public String getData( ) { return data; } @@ -148,7 +148,7 @@ public String getData( ) { * * @param pData Value to which {@link #data} should be set. */ - public void setData( @MyNotNull String pData ) { + public void setData( @MyNotNullProperty String pData ) { // Assign value to attribute data = pData; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BeanParameter.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BeanParameter.java index 0565b58d6..e17e7b425 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BeanParameter.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BeanParameter.java @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -146,7 +146,7 @@ public static Builder newBuilder( BeanParameter pObject ) { * @param pAccessToken Value to which {@link #accessToken} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAccessToken( @MyNotNull String pAccessToken ) { + public Builder setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; return this; @@ -158,7 +158,7 @@ public Builder setAccessToken( @MyNotNull String pAccessToken ) { * @param pLanguage Value to which {@link #language} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLanguage( @MyNotNull Locale pLanguage ) { + public Builder setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; return this; @@ -171,7 +171,7 @@ public Builder setLanguage( @MyNotNull Locale pLanguage ) { * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ @Deprecated - public Builder setOldStyle( @MyNotNull String pOldStyle ) { + public Builder setOldStyle( @MyNotNullProperty String pOldStyle ) { // Assign value to attribute oldStyle = pOldStyle; return this; @@ -195,7 +195,7 @@ public BeanParameter build( ) { * * @return {@link String} Value to which {@link #accessToken} is set. */ - @MyNotNull + @MyNotNullProperty public String getAccessToken( ) { return accessToken; } @@ -205,7 +205,7 @@ public String getAccessToken( ) { * * @param pAccessToken Value to which {@link #accessToken} should be set. */ - public void setAccessToken( @MyNotNull String pAccessToken ) { + public void setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; } @@ -215,7 +215,7 @@ public void setAccessToken( @MyNotNull String pAccessToken ) { * * @return {@link Locale} Value to which {@link #language} is set. */ - @MyNotNull + @MyNotNullProperty public Locale getLanguage( ) { return language; } @@ -225,7 +225,7 @@ public Locale getLanguage( ) { * * @param pLanguage Value to which {@link #language} should be set. */ - public void setLanguage( @MyNotNull Locale pLanguage ) { + public void setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; } @@ -236,7 +236,7 @@ public void setLanguage( @MyNotNull Locale pLanguage ) { * @return {@link String} Value to which {@link #oldStyle} is set. */ @Deprecated - @MyNotNull + @MyNotNullProperty public String getOldStyle( ) { return oldStyle; } @@ -247,7 +247,7 @@ public String getOldStyle( ) { * @param pOldStyle Value to which {@link #oldStyle} should be set. */ @Deprecated - public void setOldStyle( @MyNotNull String pOldStyle ) { + public void setOldStyle( @MyNotNullProperty String pOldStyle ) { // Assign value to attribute oldStyle = pOldStyle; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BidirectA.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BidirectA.java index ad7d30d62..e17d5d420 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BidirectA.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BidirectA.java @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.Set; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -148,7 +148,7 @@ public static Builder newBuilder( BidirectA pObject ) { * @param pParent Value to which {@link #parent} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setParent( @MyNotNull BidirectA pParent ) { + public Builder setParent( @MyNotNullProperty BidirectA pParent ) { parent = pParent; return this; } @@ -227,7 +227,7 @@ void clearTransientBs( ) { * * @return {@link BidirectA} Value to which {@link #parent} is set. */ - @MyNotNull + @MyNotNullProperty public BidirectA getParent( ) { // Due to restrictions in JSON serialization / deserialization bi-directional associations need a special handling // after an object was deserialized. @@ -243,7 +243,7 @@ public BidirectA getParent( ) { * * @param pParent Value to which {@link #parent} should be set. */ - public void setParent( @MyNotNull BidirectA pParent ) { + public void setParent( @MyNotNullProperty BidirectA pParent ) { // Release already referenced object before setting a new association. if (parent != null) { parent.unsetTransientChild(); @@ -274,7 +274,7 @@ public final void unsetParent( ) { * * @return {@link BidirectA} Value to which {@link #transientChild} is set. */ - @MyNotNull + @MyNotNullProperty public BidirectA getTransientChild( ) { return transientChild; } @@ -284,7 +284,7 @@ public BidirectA getTransientChild( ) { * * @param pTransientChild Value to which {@link #transientChild} should be set. */ - void setTransientChild( @MyNotNull BidirectA pTransientChild ) { + void setTransientChild( @MyNotNullProperty BidirectA pTransientChild ) { // Release already referenced object before setting a new association. if (transientChild != null) { transientChild.unsetParent(); diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BidirectB.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BidirectB.java index 273410409..b84aa7134 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BidirectB.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BidirectB.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -133,7 +133,7 @@ public static Builder newBuilder( BidirectB pObject ) { * @param pA Value to which {@link #a} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setA( @MyNotNull BidirectA pA ) { + public Builder setA( @MyNotNullProperty BidirectA pA ) { a = pA; return this; } @@ -156,7 +156,7 @@ public BidirectB build( ) { * * @return {@link BidirectA} Value to which {@link #a} is set. */ - @MyNotNull + @MyNotNullProperty public BidirectA getA( ) { // Due to restrictions in JSON serialization / deserialization bi-directional associations need a special handling // after an object was deserialized. @@ -173,7 +173,7 @@ public BidirectA getA( ) { * * @param pA Value to which {@link #a} should be set. */ - public void setA( @MyNotNull BidirectA pA ) { + public void setA( @MyNotNullProperty BidirectA pA ) { // Release already referenced object before setting a new association. if (a != null) { a.removeFromTransientBs((BidirectB) this); diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Booking.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Booking.java index 61a5539fd..0919b5ab3 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Booking.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Booking.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -156,7 +156,7 @@ public static Builder newBuilder( Booking pObject ) { * @param pBookingID Value to which {@link #bookingID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBookingID( @MyNotNull BookingID pBookingID ) { + public Builder setBookingID( @MyNotNullProperty BookingID pBookingID ) { bookingID = pBookingID; return this; } @@ -167,7 +167,7 @@ public Builder setBookingID( @MyNotNull BookingID pBookingID ) { * @param pCustomerName Value to which {@link #customerName} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCustomerName( @MyNotNull String pCustomerName ) { + public Builder setCustomerName( @MyNotNullProperty String pCustomerName ) { // Assign value to attribute customerName = pCustomerName; return this; @@ -240,7 +240,7 @@ public Booking build( ) { * * @return {@link BookingID} Value to which {@link #bookingID} is set. */ - @MyNotNull + @MyNotNullProperty public BookingID getBookingID( ) { return bookingID; } @@ -250,7 +250,7 @@ public BookingID getBookingID( ) { * * @param pBookingID Value to which {@link #bookingID} should be set. */ - public void setBookingID( @MyNotNull BookingID pBookingID ) { + public void setBookingID( @MyNotNullProperty BookingID pBookingID ) { bookingID = pBookingID; } @@ -266,7 +266,7 @@ public final void unsetBookingID( ) { * * @return {@link String} Value to which {@link #customerName} is set. */ - @MyNotNull + @MyNotNullProperty public String getCustomerName( ) { return customerName; } @@ -276,7 +276,7 @@ public String getCustomerName( ) { * * @param pCustomerName Value to which {@link #customerName} should be set. */ - public void setCustomerName( @MyNotNull String pCustomerName ) { + public void setCustomerName( @MyNotNullProperty String pCustomerName ) { // Assign value to attribute customerName = pCustomerName; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BookingCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BookingCode.java index 8712bdd0b..c23237c14 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BookingCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BookingCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( BookingCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -138,7 +138,7 @@ public BookingCode build( ) { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -148,7 +148,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BookingID.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BookingID.java index 744923ce9..e63f2455a 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BookingID.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BookingID.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -182,7 +182,7 @@ public static Builder newBuilder( BookingID pObject ) { * @param pPublicBookingID Value to which {@link #publicBookingID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setPublicBookingID( @MyNotNull String pPublicBookingID ) { + public Builder setPublicBookingID( @MyNotNullProperty String pPublicBookingID ) { // Assign value to attribute publicBookingID = pPublicBookingID; return this; @@ -194,7 +194,7 @@ public Builder setPublicBookingID( @MyNotNull String pPublicBookingID ) { * @param pReferenceID Value to which {@link #referenceID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setReferenceID( @MyNotNull String pReferenceID ) { + public Builder setReferenceID( @MyNotNullProperty String pReferenceID ) { // Assign value to attribute referenceID = pReferenceID; return this; @@ -206,7 +206,7 @@ public Builder setReferenceID( @MyNotNull String pReferenceID ) { * @param pExternalRefID Value to which {@link #externalRefID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setExternalRefID( @MyNotNull String pExternalRefID ) { + public Builder setExternalRefID( @MyNotNullProperty String pExternalRefID ) { // Assign value to attribute externalRefID = pExternalRefID; return this; @@ -218,7 +218,7 @@ public Builder setExternalRefID( @MyNotNull String pExternalRefID ) { * @param pInventory Value to which {@link #inventory} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setInventory( @MyNotNull InventoryType pInventory ) { + public Builder setInventory( @MyNotNullProperty InventoryType pInventory ) { inventory = pInventory; return this; } @@ -229,7 +229,7 @@ public Builder setInventory( @MyNotNull InventoryType pInventory ) { * @param pBookingCode Value to which {@link #bookingCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBookingCode( @MyNotNull BookingCode pBookingCode ) { + public Builder setBookingCode( @MyNotNullProperty BookingCode pBookingCode ) { bookingCode = pBookingCode; return this; } @@ -251,7 +251,7 @@ public BookingID build( ) { * * @return {@link String} Value to which {@link #publicBookingID} is set. */ - @MyNotNull + @MyNotNullProperty public String getPublicBookingID( ) { return publicBookingID; } @@ -261,7 +261,7 @@ public String getPublicBookingID( ) { * * @return {@link String} Value to which {@link #referenceID} is set. */ - @MyNotNull + @MyNotNullProperty public String getReferenceID( ) { return referenceID; } @@ -271,7 +271,7 @@ public String getReferenceID( ) { * * @return {@link String} Value to which {@link #externalRefID} is set. */ - @MyNotNull + @MyNotNullProperty public String getExternalRefID( ) { return externalRefID; } @@ -281,7 +281,7 @@ public String getExternalRefID( ) { * * @return {@link InventoryType} Value to which {@link #inventory} is set. */ - @MyNotNull + @MyNotNullProperty public InventoryType getInventory( ) { return inventory; } @@ -291,7 +291,7 @@ public InventoryType getInventory( ) { * * @return {@link BookingCode} Value to which {@link #bookingCode} is set. */ - @MyNotNull + @MyNotNullProperty public BookingCode getBookingCode( ) { return bookingCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BooleanCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BooleanCode.java index 2dbafa62b..f364cfd39 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BooleanCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/BooleanCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( BooleanCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Boolean pCode ) { + public Builder setCode( @MyNotNullProperty Boolean pCode ) { // Assign value to attribute code = pCode; return this; @@ -138,7 +138,7 @@ public BooleanCode build( ) { * * @return {@link Boolean} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Boolean getCode( ) { return code; } @@ -148,7 +148,7 @@ public Boolean getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Boolean pCode ) { + public void setCode( @MyNotNullProperty Boolean pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ByteCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ByteCode.java index 5bac595e2..d2014ac75 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ByteCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ByteCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( ByteCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Byte pCode ) { + public Builder setCode( @MyNotNullProperty Byte pCode ) { // Assign value to attribute code = pCode; return this; @@ -137,7 +137,7 @@ public ByteCode build( ) { * * @return {@link Byte} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Byte getCode( ) { return code; } @@ -147,7 +147,7 @@ public Byte getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Byte pCode ) { + public void setCode( @MyNotNullProperty Byte pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Channel.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Channel.java index 52f9b2812..552f2d263 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Channel.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Channel.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -189,7 +189,7 @@ public static Builder newBuilder( Channel pObject ) { * @param pChannelType Value to which {@link #channelType} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setChannelType( @MyNotNull ChannelType pChannelType ) { + public Builder setChannelType( @MyNotNullProperty ChannelType pChannelType ) { channelType = pChannelType; return this; } @@ -200,7 +200,7 @@ public Builder setChannelType( @MyNotNull ChannelType pChannelType ) { * @param pChannelCode Value to which {@link #channelCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setChannelCode( @MyNotNull ChannelCode pChannelCode ) { + public Builder setChannelCode( @MyNotNullProperty ChannelCode pChannelCode ) { channelCode = pChannelCode; return this; } @@ -248,7 +248,7 @@ public Channel build( ) { * * @return {@link ChannelType} Value to which {@link #channelType} is set. */ - @MyNotNull + @MyNotNullProperty public ChannelType getChannelType( ) { return channelType; } @@ -259,7 +259,7 @@ public ChannelType getChannelType( ) { * * @param pChannelType Value to which {@link #channelType} should be set. */ - public void setChannelType( @MyNotNull ChannelType pChannelType ) { + public void setChannelType( @MyNotNullProperty ChannelType pChannelType ) { channelType = pChannelType; } @@ -276,7 +276,7 @@ public final void unsetChannelType( ) { * * @return {@link ChannelCode} Value to which {@link #channelCode} is set. */ - @MyNotNull + @MyNotNullProperty public ChannelCode getChannelCode( ) { return channelCode; } @@ -287,7 +287,7 @@ public ChannelCode getChannelCode( ) { * * @param pChannelCode Value to which {@link #channelCode} should be set. */ - public void setChannelCode( @MyNotNull ChannelCode pChannelCode ) { + public void setChannelCode( @MyNotNullProperty ChannelCode pChannelCode ) { channelCode = pChannelCode; } @@ -332,7 +332,7 @@ public boolean isSelfServiceChannel( ) { * * @return {@link Reseller} Value to which {@link #reseller} is set. */ - @MyNotNull + @MyNotNullProperty public Reseller getReseller( ) { return reseller; } @@ -342,7 +342,7 @@ public Reseller getReseller( ) { * * @param pReseller Value to which {@link #reseller} should be set. */ - void setReseller( @MyNotNull Reseller pReseller ) { + void setReseller( @MyNotNullProperty Reseller pReseller ) { // Release already referenced object before setting a new association. if (reseller != null) { reseller.removeFromChannels((Channel) this); diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChannelCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChannelCode.java index e41e328b0..531e201bb 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChannelCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChannelCode.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -141,7 +141,7 @@ public static Builder newBuilder( ChannelCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -166,7 +166,7 @@ public ChannelCode build( ) { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -177,7 +177,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CharacterCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CharacterCode.java index 6a9147de1..c54f150dd 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CharacterCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CharacterCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -120,7 +120,7 @@ public static Builder newBuilder( CharacterCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Character pCode ) { + public Builder setCode( @MyNotNullProperty Character pCode ) { // Assign value to attribute code = pCode; return this; @@ -145,7 +145,7 @@ public CharacterCode build( ) { * * @return {@link Character} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Character getCode( ) { return code; } @@ -156,7 +156,7 @@ public Character getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Character pCode ) { + public void setCode( @MyNotNullProperty Character pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChildAA.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChildAA.java index e2b43729d..c34180702 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChildAA.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChildAA.java @@ -9,7 +9,7 @@ import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; +import com.anaptecs.annotations.MyNotEmptyProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -222,7 +222,7 @@ public Builder setSizedArray( int[] pSizedArray ) { * @param pRequiredArray Collection to which {@link #requiredArray} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setRequiredArray( @MyNotEmpty String[] pRequiredArray ) { + public Builder setRequiredArray( @MyNotEmptyProperty String[] pRequiredArray ) { // Assign value to attribute if (pRequiredArray != null) { requiredArray = new String[pRequiredArray.length]; @@ -309,7 +309,7 @@ public void setSizedArray( int[] pSizedArray ) { * * @return {@link String[]} Value to which {@link #requiredArray} is set. */ - @MyNotEmpty + @MyNotEmptyProperty public String[] getRequiredArray( ) { String[] lReturnValue; if (requiredArray != null) { @@ -327,7 +327,7 @@ public String[] getRequiredArray( ) { * * @param pRequiredArray Value to which {@link #requiredArray} should be set. */ - public void setRequiredArray( @MyNotEmpty String[] pRequiredArray ) { + public void setRequiredArray( @MyNotEmptyProperty String[] pRequiredArray ) { // Assign value to attribute if (pRequiredArray != null) { requiredArray = new String[pRequiredArray.length]; diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChildBB.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChildBB.java index 1f9da5365..996c525a0 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChildBB.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ChildBB.java @@ -14,7 +14,7 @@ import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -249,7 +249,7 @@ public Builder addToComposition( ParentClass... pComposition ) { * @param pChildBBAttribute Value to which {@link #childBBAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setChildBBAttribute( @MyNotNull Long pChildBBAttribute ) { + public Builder setChildBBAttribute( @MyNotNullProperty Long pChildBBAttribute ) { // Assign value to attribute childBBAttribute = pChildBBAttribute; return this; @@ -351,7 +351,7 @@ public ChildBB build( ) { * * @return {@link Long} Value to which {@link #childBBAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public Long getChildBBAttribute( ) { return childBBAttribute; } @@ -361,7 +361,7 @@ public Long getChildBBAttribute( ) { * * @param pChildBBAttribute Value to which {@link #childBBAttribute} should be set. */ - public void setChildBBAttribute( @MyNotNull Long pChildBBAttribute ) { + public void setChildBBAttribute( @MyNotNullProperty Long pChildBBAttribute ) { // Assign value to attribute childBBAttribute = pChildBBAttribute; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CodeTypeUsageTest.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CodeTypeUsageTest.java index b78afc3da..58429b9c0 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CodeTypeUsageTest.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CodeTypeUsageTest.java @@ -12,8 +12,8 @@ import java.util.Objects; import java.util.Set; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -187,7 +187,7 @@ public static Builder newBuilder( CodeTypeUsageTest pObject ) { * @param pBooleanCode Value to which {@link #booleanCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBooleanCode( @MyNotNull BooleanCodeType pBooleanCode ) { + public Builder setBooleanCode( @MyNotNullProperty BooleanCodeType pBooleanCode ) { // Assign value to attribute booleanCode = pBooleanCode; return this; @@ -233,7 +233,7 @@ public Builder addToBooleanCodeAssociation( BooleanCodeType... pBooleanCodeAssoc * @param pShortCodeTypeAssociation Collection to which {@link #shortCodeTypeAssociation} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setShortCodeTypeAssociation( @MyNotEmpty Set pShortCodeTypeAssociation ) { + public Builder setShortCodeTypeAssociation( @MyNotEmptyProperty Set pShortCodeTypeAssociation ) { // To ensure immutability we have to copy the content of the passed collection. if (pShortCodeTypeAssociation != null) { shortCodeTypeAssociation = new HashSet(pShortCodeTypeAssociation); @@ -251,7 +251,7 @@ public Builder setShortCodeTypeAssociation( @MyNotEmpty Set pShor * parameter may be null. * @return {@link Builder} Instance of this builder to support chaining. Method never returns null. */ - public Builder addToShortCodeTypeAssociation( @MyNotEmpty ShortCodeType... pShortCodeTypeAssociation ) { + public Builder addToShortCodeTypeAssociation( @MyNotEmptyProperty ShortCodeType... pShortCodeTypeAssociation ) { if (pShortCodeTypeAssociation != null) { if (shortCodeTypeAssociation == null) { shortCodeTypeAssociation = new HashSet(); @@ -267,7 +267,7 @@ public Builder addToShortCodeTypeAssociation( @MyNotEmpty ShortCodeType... pShor * @param pStringCode Value to which {@link #stringCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStringCode( @MyNotNull StringCodeType pStringCode ) { + public Builder setStringCode( @MyNotNullProperty StringCodeType pStringCode ) { // Assign value to attribute stringCode = pStringCode; return this; @@ -302,7 +302,7 @@ public CodeTypeUsageTest build( ) { * * @return {@link BooleanCodeType} Value to which {@link #booleanCode} is set. */ - @MyNotNull + @MyNotNullProperty public BooleanCodeType getBooleanCode( ) { return booleanCode; } @@ -312,7 +312,7 @@ public BooleanCodeType getBooleanCode( ) { * * @param pBooleanCode Value to which {@link #booleanCode} should be set. */ - public void setBooleanCode( @MyNotNull BooleanCodeType pBooleanCode ) { + public void setBooleanCode( @MyNotNullProperty BooleanCodeType pBooleanCode ) { // Assign value to attribute booleanCode = pBooleanCode; } @@ -377,7 +377,7 @@ public void clearBooleanCodeAssociation( ) { * @return {@link Set} Value to which {@link #shortCodeTypeAssociation} is set. The method never * returns null and the returned collection is unmodifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getShortCodeTypeAssociation( ) { // Return all ShortCodeType objects as unmodifiable collection. return Collections.unmodifiableSet(shortCodeTypeAssociation); @@ -431,7 +431,7 @@ public void clearShortCodeTypeAssociation( ) { * * @return {@link StringCodeType} Value to which {@link #stringCode} is set. */ - @MyNotNull + @MyNotNullProperty public StringCodeType getStringCode( ) { return stringCode; } @@ -441,7 +441,7 @@ public StringCodeType getStringCode( ) { * * @param pStringCode Value to which {@link #stringCode} should be set. */ - public void setStringCode( @MyNotNull StringCodeType pStringCode ) { + public void setStringCode( @MyNotNullProperty StringCodeType pStringCode ) { // Assign value to attribute stringCode = pStringCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Company.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Company.java index c183ca2f6..1cf460cdf 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Company.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Company.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -148,7 +148,7 @@ public Builder addToPostalAddresses( PostalAddress... pPostalAddresses ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -171,7 +171,7 @@ public Company build( ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -181,7 +181,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Context.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Context.java index b21a4b2ad..912096eaf 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Context.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Context.java @@ -13,7 +13,7 @@ import javax.validation.constraints.NotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; /** @@ -230,7 +230,7 @@ public static Builder newBuilder( Context pObject ) { * @param pAccessToken Value to which {@link #accessToken} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAccessToken( @MyNotNull String pAccessToken ) { + public Builder setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; return this; @@ -242,7 +242,7 @@ public Builder setAccessToken( @MyNotNull String pAccessToken ) { * @param pLanguage Value to which {@link #language} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLanguage( @MyNotNull Locale pLanguage ) { + public Builder setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; return this; @@ -278,7 +278,7 @@ public Builder setPathParam( long pPathParam ) { * @param pQueryParam Value to which {@link #queryParam} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setQueryParam( @MyNotNull String pQueryParam ) { + public Builder setQueryParam( @MyNotNullProperty String pQueryParam ) { // Assign value to attribute queryParam = pQueryParam; return this; @@ -290,7 +290,7 @@ public Builder setQueryParam( @MyNotNull String pQueryParam ) { * @param pLang Value to which {@link #lang} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLang( @MyNotNull String pLang ) { + public Builder setLang( @MyNotNullProperty String pLang ) { // Assign value to attribute lang = pLang; return this; @@ -302,7 +302,7 @@ public Builder setLang( @MyNotNull String pLang ) { * @param pIntCode Value to which {@link #intCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setIntCode( @MyNotNull IntegerCodeType pIntCode ) { + public Builder setIntCode( @MyNotNullProperty IntegerCodeType pIntCode ) { // Assign value to attribute intCode = pIntCode; return this; @@ -325,7 +325,7 @@ public Context build( ) { * * @return {@link String} Value to which {@link #accessToken} is set. */ - @MyNotNull + @MyNotNullProperty public String getAccessToken( ) { return accessToken; } @@ -335,7 +335,7 @@ public String getAccessToken( ) { * * @param pAccessToken Value to which {@link #accessToken} should be set. */ - public void setAccessToken( @MyNotNull String pAccessToken ) { + public void setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; } @@ -345,7 +345,7 @@ public void setAccessToken( @MyNotNull String pAccessToken ) { * * @return {@link Locale} Value to which {@link #language} is set. */ - @MyNotNull + @MyNotNullProperty public Locale getLanguage( ) { return language; } @@ -355,7 +355,7 @@ public Locale getLanguage( ) { * * @param pLanguage Value to which {@link #language} should be set. */ - public void setLanguage( @MyNotNull Locale pLanguage ) { + public void setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; } @@ -403,7 +403,7 @@ public void setPathParam( long pPathParam ) { * * @return {@link String} Value to which {@link #queryParam} is set. */ - @MyNotNull + @MyNotNullProperty public String getQueryParam( ) { return queryParam; } @@ -413,7 +413,7 @@ public String getQueryParam( ) { * * @param pQueryParam Value to which {@link #queryParam} should be set. */ - public void setQueryParam( @MyNotNull String pQueryParam ) { + public void setQueryParam( @MyNotNullProperty String pQueryParam ) { // Assign value to attribute queryParam = pQueryParam; } @@ -423,7 +423,7 @@ public void setQueryParam( @MyNotNull String pQueryParam ) { * * @return {@link String} Value to which {@link #lang} is set. */ - @MyNotNull + @MyNotNullProperty public String getLang( ) { return lang; } @@ -433,7 +433,7 @@ public String getLang( ) { * * @param pLang Value to which {@link #lang} should be set. */ - public void setLang( @MyNotNull String pLang ) { + public void setLang( @MyNotNullProperty String pLang ) { // Assign value to attribute lang = pLang; } @@ -443,7 +443,7 @@ public void setLang( @MyNotNull String pLang ) { * * @return {@link IntegerCodeType} Value to which {@link #intCode} is set. */ - @MyNotNull + @MyNotNullProperty public IntegerCodeType getIntCode( ) { return intCode; } @@ -453,7 +453,7 @@ public IntegerCodeType getIntCode( ) { * * @param pIntCode Value to which {@link #intCode} should be set. */ - public void setIntCode( @MyNotNull IntegerCodeType pIntCode ) { + public void setIntCode( @MyNotNullProperty IntegerCodeType pIntCode ) { // Assign value to attribute intCode = pIntCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CurrencyCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CurrencyCode.java index ee11a639c..40bfebb46 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CurrencyCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/CurrencyCode.java @@ -9,7 +9,7 @@ import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -135,7 +135,7 @@ public static Builder newBuilder( CurrencyCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -160,7 +160,7 @@ public CurrencyCode build( ) { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -171,7 +171,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DataUnit.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DataUnit.java index cf0a33b1e..35374bcbd 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DataUnit.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DataUnit.java @@ -5,7 +5,7 @@ */ package com.anaptecs.spring.base; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; public enum DataUnit { COUPON("CMP"), UNKNOWN("N/A"); @@ -24,7 +24,7 @@ private DataUnit( String pDataUnitID ) { * * @return {@link String} Value to which {@link #dataUnitID} is set. */ - @MyNotNull + @MyNotNullProperty public String getDataUnitID( ) { return dataUnitID; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DateObject.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DateObject.java index a02962f34..3b09add55 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DateObject.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DateObject.java @@ -12,7 +12,7 @@ import java.util.Calendar; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -204,7 +204,7 @@ public static Builder newBuilder( DateObject pObject ) { * @param pLocalTime Value to which {@link #localTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public Builder setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; return this; @@ -216,7 +216,7 @@ public Builder setLocalTime( @MyNotNull LocalTime pLocalTime ) { * @param pLocalDate Value to which {@link #localDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalDate( @MyNotNull LocalDate pLocalDate ) { + public Builder setLocalDate( @MyNotNullProperty LocalDate pLocalDate ) { // Assign value to attribute localDate = pLocalDate; return this; @@ -228,7 +228,7 @@ public Builder setLocalDate( @MyNotNull LocalDate pLocalDate ) { * @param pLocalDateTime Value to which {@link #localDateTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public Builder setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; return this; @@ -240,7 +240,7 @@ public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * @param pCalendar Value to which {@link #calendar} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCalendar( @MyNotNull Calendar pCalendar ) { + public Builder setCalendar( @MyNotNullProperty Calendar pCalendar ) { // Assign value to attribute calendar = pCalendar; return this; @@ -252,7 +252,7 @@ public Builder setCalendar( @MyNotNull Calendar pCalendar ) { * @param pSqlDate Value to which {@link #sqlDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlDate( @MyNotNull Date pSqlDate ) { + public Builder setSqlDate( @MyNotNullProperty Date pSqlDate ) { // Assign value to attribute sqlDate = pSqlDate; return this; @@ -264,7 +264,7 @@ public Builder setSqlDate( @MyNotNull Date pSqlDate ) { * @param pUtilDate Value to which {@link #utilDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setUtilDate( @MyNotNull java.util.Date pUtilDate ) { + public Builder setUtilDate( @MyNotNullProperty java.util.Date pUtilDate ) { // Assign value to attribute utilDate = pUtilDate; return this; @@ -287,7 +287,7 @@ public DateObject build( ) { * * @return {@link LocalTime} Value to which {@link #localTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalTime getLocalTime( ) { return localTime; } @@ -297,7 +297,7 @@ public LocalTime getLocalTime( ) { * * @param pLocalTime Value to which {@link #localTime} should be set. */ - public void setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public void setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; } @@ -307,7 +307,7 @@ public void setLocalTime( @MyNotNull LocalTime pLocalTime ) { * * @return {@link LocalDate} Value to which {@link #localDate} is set. */ - @MyNotNull + @MyNotNullProperty public LocalDate getLocalDate( ) { return localDate; } @@ -317,7 +317,7 @@ public LocalDate getLocalDate( ) { * * @param pLocalDate Value to which {@link #localDate} should be set. */ - public void setLocalDate( @MyNotNull LocalDate pLocalDate ) { + public void setLocalDate( @MyNotNullProperty LocalDate pLocalDate ) { // Assign value to attribute localDate = pLocalDate; } @@ -327,7 +327,7 @@ public void setLocalDate( @MyNotNull LocalDate pLocalDate ) { * * @return {@link LocalDateTime} Value to which {@link #localDateTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalDateTime getLocalDateTime( ) { return localDateTime; } @@ -337,7 +337,7 @@ public LocalDateTime getLocalDateTime( ) { * * @param pLocalDateTime Value to which {@link #localDateTime} should be set. */ - public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public void setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; } @@ -347,7 +347,7 @@ public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * * @return {@link Calendar} Value to which {@link #calendar} is set. */ - @MyNotNull + @MyNotNullProperty public Calendar getCalendar( ) { return calendar; } @@ -357,7 +357,7 @@ public Calendar getCalendar( ) { * * @param pCalendar Value to which {@link #calendar} should be set. */ - public void setCalendar( @MyNotNull Calendar pCalendar ) { + public void setCalendar( @MyNotNullProperty Calendar pCalendar ) { // Assign value to attribute calendar = pCalendar; } @@ -367,7 +367,7 @@ public void setCalendar( @MyNotNull Calendar pCalendar ) { * * @return {@link Date} Value to which {@link #sqlDate} is set. */ - @MyNotNull + @MyNotNullProperty public Date getSqlDate( ) { return sqlDate; } @@ -377,7 +377,7 @@ public Date getSqlDate( ) { * * @param pSqlDate Value to which {@link #sqlDate} should be set. */ - public void setSqlDate( @MyNotNull Date pSqlDate ) { + public void setSqlDate( @MyNotNullProperty Date pSqlDate ) { // Assign value to attribute sqlDate = pSqlDate; } @@ -387,7 +387,7 @@ public void setSqlDate( @MyNotNull Date pSqlDate ) { * * @return {@link java.util.Date} Value to which {@link #utilDate} is set. */ - @MyNotNull + @MyNotNullProperty public java.util.Date getUtilDate( ) { return utilDate; } @@ -397,7 +397,7 @@ public java.util.Date getUtilDate( ) { * * @param pUtilDate Value to which {@link #utilDate} should be set. */ - public void setUtilDate( @MyNotNull java.util.Date pUtilDate ) { + public void setUtilDate( @MyNotNullProperty java.util.Date pUtilDate ) { // Assign value to attribute utilDate = pUtilDate; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DeprecatedContext.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DeprecatedContext.java index d4522d2d4..47faf577c 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DeprecatedContext.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DeprecatedContext.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; @Deprecated @@ -173,7 +173,7 @@ public static Builder newBuilder( DeprecatedContext pObject ) { * @param pAccessToken Value to which {@link #accessToken} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAccessToken( @MyNotNull String pAccessToken ) { + public Builder setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; return this; @@ -185,7 +185,7 @@ public Builder setAccessToken( @MyNotNull String pAccessToken ) { * @param pLanguage Value to which {@link #language} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLanguage( @MyNotNull Locale pLanguage ) { + public Builder setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; return this; @@ -209,7 +209,7 @@ public Builder setResellerID( long pResellerID ) { * @param pQueryParam Value to which {@link #queryParam} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setQueryParam( @MyNotNull String pQueryParam ) { + public Builder setQueryParam( @MyNotNullProperty String pQueryParam ) { // Assign value to attribute queryParam = pQueryParam; return this; @@ -233,7 +233,7 @@ public DeprecatedContext build( ) { * * @return {@link String} Value to which {@link #accessToken} is set. */ - @MyNotNull + @MyNotNullProperty public String getAccessToken( ) { return accessToken; } @@ -243,7 +243,7 @@ public String getAccessToken( ) { * * @param pAccessToken Value to which {@link #accessToken} should be set. */ - public void setAccessToken( @MyNotNull String pAccessToken ) { + public void setAccessToken( @MyNotNullProperty String pAccessToken ) { // Assign value to attribute accessToken = pAccessToken; } @@ -253,7 +253,7 @@ public void setAccessToken( @MyNotNull String pAccessToken ) { * * @return {@link Locale} Value to which {@link #language} is set. */ - @MyNotNull + @MyNotNullProperty public Locale getLanguage( ) { return language; } @@ -263,7 +263,7 @@ public Locale getLanguage( ) { * * @param pLanguage Value to which {@link #language} should be set. */ - public void setLanguage( @MyNotNull Locale pLanguage ) { + public void setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; } @@ -292,7 +292,7 @@ public void setResellerID( long pResellerID ) { * * @return {@link String} Value to which {@link #queryParam} is set. */ - @MyNotNull + @MyNotNullProperty public String getQueryParam( ) { return queryParam; } @@ -302,7 +302,7 @@ public String getQueryParam( ) { * * @param pQueryParam Value to which {@link #queryParam} should be set. */ - public void setQueryParam( @MyNotNull String pQueryParam ) { + public void setQueryParam( @MyNotNullProperty String pQueryParam ) { // Assign value to attribute queryParam = pQueryParam; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DirectedEdge.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DirectedEdge.java index 2e22420b4..b39aede14 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DirectedEdge.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DirectedEdge.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -164,7 +164,7 @@ public Builder setStart( Stop pStart ) { * @param pEnd Value to which {@link #end} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setEnd( @MyNotNull Stop pEnd ) { + public Builder setEnd( @MyNotNullProperty Stop pEnd ) { end = pEnd; return this; } @@ -175,7 +175,7 @@ public Builder setEnd( @MyNotNull Stop pEnd ) { * @param pLink Value to which {@link #link} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLink( @MyNotNull String pLink ) { + public Builder setLink( @MyNotNullProperty String pLink ) { // Assign value to attribute link = pLink; return this; @@ -227,7 +227,7 @@ public final void unsetStart( ) { * * @return {@link Stop} Value to which {@link #end} is set. */ - @MyNotNull + @MyNotNullProperty public Stop getEnd( ) { return end; } @@ -238,7 +238,7 @@ public Stop getEnd( ) { * * @param pEnd Value to which {@link #end} should be set. */ - public void setEnd( @MyNotNull Stop pEnd ) { + public void setEnd( @MyNotNullProperty Stop pEnd ) { end = pEnd; } @@ -254,7 +254,7 @@ public final void unsetEnd( ) { * * @return {@link String} Value to which {@link #link} is set. */ - @MyNotNull + @MyNotNullProperty public String getLink( ) { return link; } @@ -264,7 +264,7 @@ public String getLink( ) { * * @param pLink Value to which {@link #link} should be set. */ - public void setLink( @MyNotNull String pLink ) { + public void setLink( @MyNotNullProperty String pLink ) { // Assign value to attribute link = pLink; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DoubleCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DoubleCode.java index 8880d7347..edb7836f5 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DoubleCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/DoubleCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( DoubleCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Double pCode ) { + public Builder setCode( @MyNotNullProperty Double pCode ) { // Assign value to attribute code = pCode; return this; @@ -137,7 +137,7 @@ public DoubleCode build( ) { * * @return {@link Double} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Double getCode( ) { return code; } @@ -147,7 +147,7 @@ public Double getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Double pCode ) { + public void setCode( @MyNotNullProperty Double pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Duration.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Duration.java index 36b3dc291..524fb6888 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Duration.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Duration.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -161,7 +161,7 @@ public Builder setValue( int pValue ) { * @param pTimeUnit Value to which {@link #timeUnit} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setTimeUnit( @MyNotNull TimeUnit pTimeUnit ) { + public Builder setTimeUnit( @MyNotNullProperty TimeUnit pTimeUnit ) { // Assign value to attribute timeUnit = pTimeUnit; return this; @@ -203,7 +203,7 @@ public void setValue( int pValue ) { * * @return {@link TimeUnit} Value to which {@link #timeUnit} is set. */ - @MyNotNull + @MyNotNullProperty public TimeUnit getTimeUnit( ) { return timeUnit; } @@ -213,7 +213,7 @@ public TimeUnit getTimeUnit( ) { * * @param pTimeUnit Value to which {@link #timeUnit} should be set. */ - public void setTimeUnit( @MyNotNull TimeUnit pTimeUnit ) { + public void setTimeUnit( @MyNotNullProperty TimeUnit pTimeUnit ) { // Assign value to attribute timeUnit = pTimeUnit; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/EnumTest.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/EnumTest.java index 5aafab33a..6eca7d61f 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/EnumTest.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/EnumTest.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -146,7 +146,7 @@ public static Builder newBuilder( EnumTest pObject ) { * @param pProperty Value to which {@link #property} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setProperty( @MyNotNull ExtensibleEnum pProperty ) { + public Builder setProperty( @MyNotNullProperty ExtensibleEnum pProperty ) { // Assign value to attribute property = pProperty; return this; @@ -158,7 +158,7 @@ public Builder setProperty( @MyNotNull ExtensibleEnum pProperty ) { * @param pEnumRef Value to which {@link #enumRef} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setEnumRef( @MyNotNull ExtensibleEnum pEnumRef ) { + public Builder setEnumRef( @MyNotNullProperty ExtensibleEnum pEnumRef ) { enumRef = pEnumRef; return this; } @@ -180,7 +180,7 @@ public EnumTest build( ) { * * @return {@link ExtensibleEnum} Value to which {@link #property} is set. */ - @MyNotNull + @MyNotNullProperty public ExtensibleEnum getProperty( ) { return property; } @@ -190,7 +190,7 @@ public ExtensibleEnum getProperty( ) { * * @param pProperty Value to which {@link #property} should be set. */ - public void setProperty( @MyNotNull ExtensibleEnum pProperty ) { + public void setProperty( @MyNotNullProperty ExtensibleEnum pProperty ) { // Assign value to attribute property = pProperty; } @@ -200,7 +200,7 @@ public void setProperty( @MyNotNull ExtensibleEnum pProperty ) { * * @return {@link ExtensibleEnum} Value to which {@link #enumRef} is set. */ - @MyNotNull + @MyNotNullProperty public ExtensibleEnum getEnumRef( ) { return enumRef; } @@ -210,7 +210,7 @@ public ExtensibleEnum getEnumRef( ) { * * @param pEnumRef Value to which {@link #enumRef} should be set. */ - public void setEnumRef( @MyNotNull ExtensibleEnum pEnumRef ) { + public void setEnumRef( @MyNotNullProperty ExtensibleEnum pEnumRef ) { enumRef = pEnumRef; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/FloatCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/FloatCode.java index 12eba5839..b76d8a9e2 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/FloatCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/FloatCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( FloatCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Float pCode ) { + public Builder setCode( @MyNotNullProperty Float pCode ) { // Assign value to attribute code = pCode; return this; @@ -137,7 +137,7 @@ public FloatCode build( ) { * * @return {@link Float} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Float getCode( ) { return code; } @@ -147,7 +147,7 @@ public Float getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Float pCode ) { + public void setCode( @MyNotNullProperty Float pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/IgnoringClass.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/IgnoringClass.java index 3af001266..5edeb009a 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/IgnoringClass.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/IgnoringClass.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( IgnoringClass pObject ) { * @param pAge Value to which {@link #age} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAge( @MyNotNull Integer pAge ) { + public Builder setAge( @MyNotNullProperty Integer pAge ) { // Assign value to attribute age = pAge; return this; @@ -138,7 +138,7 @@ public IgnoringClass build( ) { * * @return {@link Integer} Value to which {@link #age} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getAge( ) { return age; } @@ -148,7 +148,7 @@ public Integer getAge( ) { * * @param pAge Value to which {@link #age} should be set. */ - public void setAge( @MyNotNull Integer pAge ) { + public void setAge( @MyNotNullProperty Integer pAge ) { // Assign value to attribute age = pAge; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/IntegerCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/IntegerCode.java index e8778779c..309cc1deb 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/IntegerCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/IntegerCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( IntegerCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Integer pCode ) { + public Builder setCode( @MyNotNullProperty Integer pCode ) { // Assign value to attribute code = pCode; return this; @@ -138,7 +138,7 @@ public IntegerCode build( ) { * * @return {@link Integer} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getCode( ) { return code; } @@ -148,7 +148,7 @@ public Integer getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Integer pCode ) { + public void setCode( @MyNotNullProperty Integer pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Leg.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Leg.java index 34b9a3bca..8690d1247 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Leg.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Leg.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -152,7 +152,7 @@ public static Builder newBuilder( Leg pObject ) { * @param pStart Value to which {@link #start} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStart( @MyNotNull PlaceRef pStart ) { + public Builder setStart( @MyNotNullProperty PlaceRef pStart ) { start = pStart; return this; } @@ -163,7 +163,7 @@ public Builder setStart( @MyNotNull PlaceRef pStart ) { * @param pStop Value to which {@link #stop} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStop( @MyNotNull PlaceRef pStop ) { + public Builder setStop( @MyNotNullProperty PlaceRef pStop ) { stop = pStop; return this; } @@ -218,7 +218,7 @@ public Leg build( ) { * * @return {@link PlaceRef} Value to which {@link #start} is set. */ - @MyNotNull + @MyNotNullProperty public PlaceRef getStart( ) { return start; } @@ -228,7 +228,7 @@ public PlaceRef getStart( ) { * * @param pStart Value to which {@link #start} should be set. */ - public void setStart( @MyNotNull PlaceRef pStart ) { + public void setStart( @MyNotNullProperty PlaceRef pStart ) { start = pStart; } @@ -244,7 +244,7 @@ public final void unsetStart( ) { * * @return {@link PlaceRef} Value to which {@link #stop} is set. */ - @MyNotNull + @MyNotNullProperty public PlaceRef getStop( ) { return stop; } @@ -254,7 +254,7 @@ public PlaceRef getStop( ) { * * @param pStop Value to which {@link #stop} should be set. */ - public void setStop( @MyNotNull PlaceRef pStop ) { + public void setStop( @MyNotNullProperty PlaceRef pStop ) { stop = pStop; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/LinkObject.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/LinkObject.java index dab3c8637..cb64fcd63 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/LinkObject.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/LinkObject.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( LinkObject pObject ) { * @param pHref Value to which {@link #href} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setHref( @MyNotNull String pHref ) { + public Builder setHref( @MyNotNullProperty String pHref ) { // Assign value to attribute href = pHref; return this; @@ -137,7 +137,7 @@ public LinkObject build( ) { * * @return {@link String} Value to which {@link #href} is set. */ - @MyNotNull + @MyNotNullProperty public String getHref( ) { return href; } @@ -147,7 +147,7 @@ public String getHref( ) { * * @param pHref Value to which {@link #href} should be set. */ - public void setHref( @MyNotNull String pHref ) { + public void setHref( @MyNotNullProperty String pHref ) { // Assign value to attribute href = pHref; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/LongCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/LongCode.java index 911a5d0c8..6276547c8 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/LongCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/LongCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( LongCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Long pCode ) { + public Builder setCode( @MyNotNullProperty Long pCode ) { // Assign value to attribute code = pCode; return this; @@ -137,7 +137,7 @@ public LongCode build( ) { * * @return {@link Long} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Long getCode( ) { return code; } @@ -147,7 +147,7 @@ public Long getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Long pCode ) { + public void setCode( @MyNotNullProperty Long pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MasterDataObject.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MasterDataObject.java index 20001845e..01ba94a20 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MasterDataObject.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MasterDataObject.java @@ -7,7 +7,7 @@ import java.util.List; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.fasterxml.jackson.annotation.JsonGetter; public class MasterDataObject extends MasterDataObjectBase { @@ -78,7 +78,7 @@ public static Builder newBuilder( MasterDataObject pObject ) { * * @return {@link String} Value to which {@link #derivedProperty} is set. */ - @MyNotNull + @MyNotNullProperty @Override public String getDerivedProperty( ) { // TODO Implement method for derived property "derivedProperty". @@ -148,7 +148,7 @@ public int getDerivedInt( ) { * * @return {@link String} Value to which {@link #derivedString} is set. */ - @MyNotNull + @MyNotNullProperty @Override public String getDerivedString( ) { // TODO Implement method for derived property "derivedString". diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MasterDataObjectBase.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MasterDataObjectBase.java index 8466f5933..0360117d8 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MasterDataObjectBase.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MasterDataObjectBase.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonGetter; @@ -174,7 +174,7 @@ public BuilderBase setDataUnits( DataUnit... pDataUnits ) { * @param pEntity Value to which {@link #entity} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setEntity( @MyNotNull Entity pEntity ) { + public BuilderBase setEntity( @MyNotNullProperty Entity pEntity ) { entity = pEntity; return this; } @@ -185,7 +185,7 @@ public BuilderBase setEntity( @MyNotNull Entity pEntity ) { * @param pObjectID Value to which {@link #objectID} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setObjectID( @MyNotNull String pObjectID ) { + public BuilderBase setObjectID( @MyNotNullProperty String pObjectID ) { // Assign value to attribute objectID = pObjectID; return this; @@ -197,7 +197,7 @@ public BuilderBase setObjectID( @MyNotNull String pObjectID ) { * @param pInternalProperty Value to which {@link #internalProperty} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setInternalProperty( @MyNotNull String pInternalProperty ) { + public BuilderBase setInternalProperty( @MyNotNullProperty String pInternalProperty ) { // Assign value to attribute internalProperty = pInternalProperty; return this; @@ -273,7 +273,7 @@ void clearDataUnits( ) { * * @return {@link Entity} Value to which {@link #entity} is set. */ - @MyNotNull + @MyNotNullProperty Entity getEntity( ) { return entity; } @@ -283,7 +283,7 @@ Entity getEntity( ) { * * @param pEntity Value to which {@link #entity} should be set. */ - void setEntity( @MyNotNull Entity pEntity ) { + void setEntity( @MyNotNullProperty Entity pEntity ) { entity = pEntity; } @@ -299,7 +299,7 @@ final void unsetEntity( ) { * * @return {@link String} Value to which {@link #objectID} is set. */ - @MyNotNull + @MyNotNullProperty public String getObjectID( ) { return objectID; } @@ -309,7 +309,7 @@ public String getObjectID( ) { * * @param pObjectID Value to which {@link #objectID} should be set. */ - public void setObjectID( @MyNotNull String pObjectID ) { + public void setObjectID( @MyNotNullProperty String pObjectID ) { // Assign value to attribute objectID = pObjectID; } @@ -319,7 +319,7 @@ public void setObjectID( @MyNotNull String pObjectID ) { * * @return {@link String} Value to which {@link #internalProperty} is set. */ - @MyNotNull + @MyNotNullProperty String getInternalProperty( ) { return internalProperty; } @@ -329,7 +329,7 @@ String getInternalProperty( ) { * * @param pInternalProperty Value to which {@link #internalProperty} should be set. */ - void setInternalProperty( @MyNotNull String pInternalProperty ) { + void setInternalProperty( @MyNotNullProperty String pInternalProperty ) { // Assign value to attribute internalProperty = pInternalProperty; } @@ -359,7 +359,7 @@ public static MasterDataObject of( Entity pEntity, String pObjectID, String pInt * * @return {@link String} Value to which {@link #derivedProperty} is set. */ - @MyNotNull + @MyNotNullProperty public abstract String getDerivedProperty( ); /** @@ -411,7 +411,7 @@ private void setDerivedDataUnits( List pDerivedDataUnits ) { * * @return {@link String} Value to which {@link #derivedString} is set. */ - @MyNotNull + @MyNotNullProperty public abstract String getDerivedString( ); @Override diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MoneyAmount.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MoneyAmount.java index 6a6216adb..c069086c4 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MoneyAmount.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/MoneyAmount.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -155,7 +155,7 @@ public static Builder newBuilder( MoneyAmount pObject ) { * @param pAmount Value to which {@link #amount} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAmount( @MyNotNull BigDecimal pAmount ) { + public Builder setAmount( @MyNotNullProperty BigDecimal pAmount ) { // Assign value to attribute amount = pAmount; return this; @@ -167,7 +167,7 @@ public Builder setAmount( @MyNotNull BigDecimal pAmount ) { * @param pCurrencyCode Value to which {@link #currencyCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCurrencyCode( @MyNotNull CurrencyCode pCurrencyCode ) { + public Builder setCurrencyCode( @MyNotNullProperty CurrencyCode pCurrencyCode ) { // Assign value to attribute currencyCode = pCurrencyCode; return this; @@ -192,7 +192,7 @@ public MoneyAmount build( ) { * * @return {@link BigDecimal} Value to which {@link #amount} is set. */ - @MyNotNull + @MyNotNullProperty public BigDecimal getAmount( ) { return amount; } @@ -202,7 +202,7 @@ public BigDecimal getAmount( ) { * * @return {@link CurrencyCode} Value to which {@link #currencyCode} is set. */ - @MyNotNull + @MyNotNullProperty public CurrencyCode getCurrencyCode( ) { return currencyCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/NoSubTypesChild.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/NoSubTypesChild.java index ada272195..0870cebd2 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/NoSubTypesChild.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/NoSubTypesChild.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -176,7 +176,7 @@ public static Builder newBuilder( NoSubTypesChild pObject ) { * @param pMyProperty Value to which {@link #myProperty} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setMyProperty( @MyNotNull String pMyProperty ) { + public Builder setMyProperty( @MyNotNullProperty String pMyProperty ) { // Assign value to attribute myProperty = pMyProperty; return this; @@ -227,7 +227,7 @@ public NoSubTypesChild build( ) { * * @return {@link String} Value to which {@link #myProperty} is set. */ - @MyNotNull + @MyNotNullProperty public String getMyProperty( ) { return myProperty; } @@ -264,7 +264,7 @@ public String getMyProperty( ) { * * @param pMyProperty Value to which {@link #myProperty} should be set. */ - public void setMyProperty( @MyNotNull String pMyProperty ) { + public void setMyProperty( @MyNotNullProperty String pMyProperty ) { // Assign value to attribute myProperty = pMyProperty; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/OpenAPITestObject.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/OpenAPITestObject.java index 09d16b1a5..4e30298c5 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/OpenAPITestObject.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/OpenAPITestObject.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -242,7 +242,7 @@ public static Builder newBuilder( OpenAPITestObject pObject ) { * @param pReadOnlyAttribute Value to which {@link #readOnlyAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setReadOnlyAttribute( @MyNotNull String pReadOnlyAttribute ) { + public Builder setReadOnlyAttribute( @MyNotNullProperty String pReadOnlyAttribute ) { // Assign value to attribute readOnlyAttribute = pReadOnlyAttribute; return this; @@ -254,7 +254,7 @@ public Builder setReadOnlyAttribute( @MyNotNull String pReadOnlyAttribute ) { * @param pReadWriteAttribute Value to which {@link #readWriteAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setReadWriteAttribute( @MyNotNull String pReadWriteAttribute ) { + public Builder setReadWriteAttribute( @MyNotNullProperty String pReadWriteAttribute ) { // Assign value to attribute readWriteAttribute = pReadWriteAttribute; return this; @@ -278,7 +278,7 @@ public Builder setWriteOnlyAttribute( int pWriteOnlyAttribute ) { * @param pNullableAttribute Value to which {@link #nullableAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setNullableAttribute( @MyNotNull Boolean pNullableAttribute ) { + public Builder setNullableAttribute( @MyNotNullProperty Boolean pNullableAttribute ) { // Assign value to attribute nullableAttribute = pNullableAttribute; return this; @@ -302,7 +302,7 @@ public Builder setNotNullableAttribute( double pNotNullableAttribute ) { * @param pReadOnlyArray Value to which {@link #readOnlyArray} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setReadOnlyArray( @MyNotNull String pReadOnlyArray ) { + public Builder setReadOnlyArray( @MyNotNullProperty String pReadOnlyArray ) { // Assign value to attribute readOnlyArray = pReadOnlyArray; return this; @@ -314,7 +314,7 @@ public Builder setReadOnlyArray( @MyNotNull String pReadOnlyArray ) { * @param pReadWriteArray Value to which {@link #readWriteArray} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setReadWriteArray( @MyNotNull String pReadWriteArray ) { + public Builder setReadWriteArray( @MyNotNullProperty String pReadWriteArray ) { // Assign value to attribute readWriteArray = pReadWriteArray; return this; @@ -374,7 +374,7 @@ public OpenAPITestObject build( ) { * * @return {@link String} Value to which {@link #readOnlyAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public String getReadOnlyAttribute( ) { return readOnlyAttribute; } @@ -384,7 +384,7 @@ public String getReadOnlyAttribute( ) { * * @param pReadOnlyAttribute Value to which {@link #readOnlyAttribute} should be set. */ - public void setReadOnlyAttribute( @MyNotNull String pReadOnlyAttribute ) { + public void setReadOnlyAttribute( @MyNotNullProperty String pReadOnlyAttribute ) { // Assign value to attribute readOnlyAttribute = pReadOnlyAttribute; } @@ -394,7 +394,7 @@ public void setReadOnlyAttribute( @MyNotNull String pReadOnlyAttribute ) { * * @return {@link String} Value to which {@link #readWriteAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public String getReadWriteAttribute( ) { return readWriteAttribute; } @@ -404,7 +404,7 @@ public String getReadWriteAttribute( ) { * * @param pReadWriteAttribute Value to which {@link #readWriteAttribute} should be set. */ - public void setReadWriteAttribute( @MyNotNull String pReadWriteAttribute ) { + public void setReadWriteAttribute( @MyNotNullProperty String pReadWriteAttribute ) { // Assign value to attribute readWriteAttribute = pReadWriteAttribute; } @@ -433,7 +433,7 @@ public void setWriteOnlyAttribute( int pWriteOnlyAttribute ) { * * @return {@link Boolean} Value to which {@link #nullableAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public Boolean getNullableAttribute( ) { return nullableAttribute; } @@ -443,7 +443,7 @@ public Boolean getNullableAttribute( ) { * * @param pNullableAttribute Value to which {@link #nullableAttribute} should be set. */ - public void setNullableAttribute( @MyNotNull Boolean pNullableAttribute ) { + public void setNullableAttribute( @MyNotNullProperty Boolean pNullableAttribute ) { // Assign value to attribute nullableAttribute = pNullableAttribute; } @@ -472,7 +472,7 @@ public void setNotNullableAttribute( double pNotNullableAttribute ) { * * @return {@link String} Value to which {@link #readOnlyArray} is set. */ - @MyNotNull + @MyNotNullProperty public String getReadOnlyArray( ) { return readOnlyArray; } @@ -482,7 +482,7 @@ public String getReadOnlyArray( ) { * * @param pReadOnlyArray Value to which {@link #readOnlyArray} should be set. */ - public void setReadOnlyArray( @MyNotNull String pReadOnlyArray ) { + public void setReadOnlyArray( @MyNotNullProperty String pReadOnlyArray ) { // Assign value to attribute readOnlyArray = pReadOnlyArray; } @@ -492,7 +492,7 @@ public void setReadOnlyArray( @MyNotNull String pReadOnlyArray ) { * * @return {@link String} Value to which {@link #readWriteArray} is set. */ - @MyNotNull + @MyNotNullProperty public String getReadWriteArray( ) { return readWriteArray; } @@ -502,7 +502,7 @@ public String getReadWriteArray( ) { * * @param pReadWriteArray Value to which {@link #readWriteArray} should be set. */ - public void setReadWriteArray( @MyNotNull String pReadWriteArray ) { + public void setReadWriteArray( @MyNotNullProperty String pReadWriteArray ) { // Assign value to attribute readWriteArray = pReadWriteArray; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/POI.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/POI.java index 58a309a8b..c96860ae1 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/POI.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/POI.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -159,7 +159,7 @@ public Builder addToLinks( LinkObject... pLinks ) { * @param pDescription Value to which {@link #description} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setDescription( @MyNotNull String pDescription ) { + public Builder setDescription( @MyNotNullProperty String pDescription ) { // Assign value to attribute description = pDescription; return this; @@ -182,7 +182,7 @@ public POI build( ) { * * @return {@link String} Value to which {@link #description} is set. */ - @MyNotNull + @MyNotNullProperty public String getDescription( ) { return description; } @@ -192,7 +192,7 @@ public String getDescription( ) { * * @param pDescription Value to which {@link #description} should be set. */ - public void setDescription( @MyNotNull String pDescription ) { + public void setDescription( @MyNotNullProperty String pDescription ) { // Assign value to attribute description = pDescription; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ParentBeanParamType.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ParentBeanParamType.java index 54ba71d27..617a41ea5 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ParentBeanParamType.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ParentBeanParamType.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; public class ParentBeanParamType { @@ -121,7 +121,7 @@ public static Builder newBuilder( ParentBeanParamType pObject ) { * @param pNovaKey Value to which {@link #novaKey} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setNovaKey( @MyNotNull String pNovaKey ) { + public Builder setNovaKey( @MyNotNullProperty String pNovaKey ) { // Assign value to attribute novaKey = pNovaKey; return this; @@ -133,7 +133,7 @@ public Builder setNovaKey( @MyNotNull String pNovaKey ) { * @param pTkID Value to which {@link #tkID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setTkID( @MyNotNull String pTkID ) { + public Builder setTkID( @MyNotNullProperty String pTkID ) { // Assign value to attribute tkID = pTkID; return this; @@ -157,7 +157,7 @@ public ParentBeanParamType build( ) { * * @return {@link String} Value to which {@link #novaKey} is set. */ - @MyNotNull + @MyNotNullProperty public String getNovaKey( ) { return novaKey; } @@ -167,7 +167,7 @@ public String getNovaKey( ) { * * @param pNovaKey Value to which {@link #novaKey} should be set. */ - public void setNovaKey( @MyNotNull String pNovaKey ) { + public void setNovaKey( @MyNotNullProperty String pNovaKey ) { // Assign value to attribute novaKey = pNovaKey; } @@ -177,7 +177,7 @@ public void setNovaKey( @MyNotNull String pNovaKey ) { * * @return {@link String} Value to which {@link #tkID} is set. */ - @MyNotNull + @MyNotNullProperty public String getTkID( ) { return tkID; } @@ -187,7 +187,7 @@ public String getTkID( ) { * * @param pTkID Value to which {@link #tkID} should be set. */ - public void setTkID( @MyNotNull String pTkID ) { + public void setTkID( @MyNotNullProperty String pTkID ) { // Assign value to attribute tkID = pTkID; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ParentClass.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ParentClass.java index 48796f6d8..23f6c03f9 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ParentClass.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ParentClass.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -121,7 +121,7 @@ public static Builder newBuilder( ParentClass pObject ) { * @param pParentAttribute Value to which {@link #parentAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setParentAttribute( @MyNotNull String pParentAttribute ) { + public Builder setParentAttribute( @MyNotNullProperty String pParentAttribute ) { // Assign value to attribute parentAttribute = pParentAttribute; return this; @@ -145,7 +145,7 @@ public ParentClass build( ) { * * @return {@link String} Value to which {@link #parentAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public String getParentAttribute( ) { return parentAttribute; } @@ -155,7 +155,7 @@ public String getParentAttribute( ) { * * @param pParentAttribute Value to which {@link #parentAttribute} should be set. */ - public void setParentAttribute( @MyNotNull String pParentAttribute ) { + public void setParentAttribute( @MyNotNullProperty String pParentAttribute ) { // Assign value to attribute parentAttribute = pParentAttribute; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Person.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Person.java index 6c1213d40..a843680e1 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Person.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Person.java @@ -7,7 +7,7 @@ import javax.validation.Valid; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; @Valid public class Person extends PersonBase { @@ -76,7 +76,7 @@ public static Builder newBuilder( Person pObject ) { /** * @return {@link String} */ - @MyNotNull + @MyNotNullProperty @Override public String getDisplayName( ) { // TODO: Implement business logic for method. diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PersonBase.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PersonBase.java index d6018eaa9..5d5e2b07e 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PersonBase.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PersonBase.java @@ -10,7 +10,7 @@ import javax.validation.Valid; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -115,7 +115,7 @@ public BuilderBase addToPostalAddresses( PostalAddress... pPostalAddresses ) { * @param pSurname Value to which {@link #surname} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setSurname( @MyNotNull String pSurname ) { + public BuilderBase setSurname( @MyNotNullProperty String pSurname ) { // Assign value to attribute surname = pSurname; return this; @@ -127,7 +127,7 @@ public BuilderBase setSurname( @MyNotNull String pSurname ) { * @param pFirstName Value to which {@link #firstName} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setFirstName( @MyNotNull String pFirstName ) { + public BuilderBase setFirstName( @MyNotNullProperty String pFirstName ) { // Assign value to attribute firstName = pFirstName; return this; @@ -150,7 +150,7 @@ public Person build( ) { * * @return {@link String} Value to which {@link #surname} is set. */ - @MyNotNull + @MyNotNullProperty public String getSurname( ) { return surname; } @@ -160,7 +160,7 @@ public String getSurname( ) { * * @param pSurname Value to which {@link #surname} should be set. */ - public void setSurname( @MyNotNull String pSurname ) { + public void setSurname( @MyNotNullProperty String pSurname ) { // Assign value to attribute surname = pSurname; } @@ -170,7 +170,7 @@ public void setSurname( @MyNotNull String pSurname ) { * * @return {@link String} Value to which {@link #firstName} is set. */ - @MyNotNull + @MyNotNullProperty public String getFirstName( ) { return firstName; } @@ -180,7 +180,7 @@ public String getFirstName( ) { * * @param pFirstName Value to which {@link #firstName} should be set. */ - public void setFirstName( @MyNotNull String pFirstName ) { + public void setFirstName( @MyNotNullProperty String pFirstName ) { // Assign value to attribute firstName = pFirstName; } @@ -205,7 +205,7 @@ public static Person of( String pSurname, String pFirstName ) { /** * @return {@link String} */ - @MyNotNull + @MyNotNullProperty public abstract String getDisplayName( ); @Override diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PlaceRef.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PlaceRef.java index dd188d784..50613977d 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PlaceRef.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PlaceRef.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; @@ -79,7 +79,7 @@ protected Builder( PlaceRef pObject ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -91,7 +91,7 @@ public Builder setName( @MyNotNull String pName ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -101,7 +101,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PostalAddress.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PostalAddress.java index 4360330cd..634f698a8 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PostalAddress.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PostalAddress.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -180,7 +180,7 @@ public static Builder newBuilder( PostalAddress pObject ) { * @param pStreet Value to which {@link #street} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setStreet( @MyNotNull String pStreet ) { + public Builder setStreet( @MyNotNullProperty String pStreet ) { // Assign value to attribute street = pStreet; return this; @@ -192,7 +192,7 @@ public Builder setStreet( @MyNotNull String pStreet ) { * @param pHouseNumber Value to which {@link #houseNumber} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setHouseNumber( @MyNotNull String pHouseNumber ) { + public Builder setHouseNumber( @MyNotNullProperty String pHouseNumber ) { // Assign value to attribute houseNumber = pHouseNumber; return this; @@ -204,7 +204,7 @@ public Builder setHouseNumber( @MyNotNull String pHouseNumber ) { * @param pCity Value to which {@link #city} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCity( @MyNotNull String pCity ) { + public Builder setCity( @MyNotNullProperty String pCity ) { // Assign value to attribute city = pCity; return this; @@ -228,7 +228,7 @@ public Builder setPostalCode( int pPostalCode ) { * @param pCountry Value to which {@link #country} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCountry( @MyNotNull String pCountry ) { + public Builder setCountry( @MyNotNullProperty String pCountry ) { // Assign value to attribute country = pCountry; return this; @@ -252,7 +252,7 @@ public PostalAddress build( ) { * * @return {@link String} Value to which {@link #street} is set. */ - @MyNotNull + @MyNotNullProperty public String getStreet( ) { return street; } @@ -262,7 +262,7 @@ public String getStreet( ) { * * @param pStreet Value to which {@link #street} should be set. */ - public void setStreet( @MyNotNull String pStreet ) { + public void setStreet( @MyNotNullProperty String pStreet ) { // Assign value to attribute street = pStreet; } @@ -272,7 +272,7 @@ public void setStreet( @MyNotNull String pStreet ) { * * @return {@link String} Value to which {@link #houseNumber} is set. */ - @MyNotNull + @MyNotNullProperty public String getHouseNumber( ) { return houseNumber; } @@ -282,7 +282,7 @@ public String getHouseNumber( ) { * * @param pHouseNumber Value to which {@link #houseNumber} should be set. */ - public void setHouseNumber( @MyNotNull String pHouseNumber ) { + public void setHouseNumber( @MyNotNullProperty String pHouseNumber ) { // Assign value to attribute houseNumber = pHouseNumber; } @@ -292,7 +292,7 @@ public void setHouseNumber( @MyNotNull String pHouseNumber ) { * * @return {@link String} Value to which {@link #city} is set. */ - @MyNotNull + @MyNotNullProperty public String getCity( ) { return city; } @@ -302,7 +302,7 @@ public String getCity( ) { * * @param pCity Value to which {@link #city} should be set. */ - public void setCity( @MyNotNull String pCity ) { + public void setCity( @MyNotNullProperty String pCity ) { // Assign value to attribute city = pCity; } @@ -331,7 +331,7 @@ public void setPostalCode( int pPostalCode ) { * * @return {@link String} Value to which {@link #country} is set. */ - @MyNotNull + @MyNotNullProperty public String getCountry( ) { return country; } @@ -341,7 +341,7 @@ public String getCountry( ) { * * @param pCountry Value to which {@link #country} should be set. */ - public void setCountry( @MyNotNull String pCountry ) { + public void setCountry( @MyNotNullProperty String pCountry ) { // Assign value to attribute country = pCountry; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveArraysObject.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveArraysObject.java index 84369c9f1..c3b57ba80 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveArraysObject.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveArraysObject.java @@ -9,7 +9,7 @@ import java.math.BigInteger; import java.util.Arrays; -import com.anaptecs.annotations.MyNotEmpty; +import com.anaptecs.annotations.MyNotEmptyProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -755,7 +755,7 @@ public Builder setBStringArray( String[] pBStringArray ) { * @param pCStringArray Collection to which {@link #cStringArray} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCStringArray( @MyNotEmpty String[] pCStringArray ) { + public Builder setCStringArray( @MyNotEmptyProperty String[] pCStringArray ) { // Assign value to attribute if (pCStringArray != null) { cStringArray = new String[pCStringArray.length]; @@ -1511,7 +1511,7 @@ public void setBStringArray( String[] pBStringArray ) { * * @return {@link String[]} Value to which {@link #cStringArray} is set. */ - @MyNotEmpty + @MyNotEmptyProperty public String[] getCStringArray( ) { String[] lReturnValue; if (cStringArray != null) { @@ -1529,7 +1529,7 @@ public String[] getCStringArray( ) { * * @param pCStringArray Value to which {@link #cStringArray} should be set. */ - public void setCStringArray( @MyNotEmpty String[] pCStringArray ) { + public void setCStringArray( @MyNotEmptyProperty String[] pCStringArray ) { // Assign value to attribute if (pCStringArray != null) { cStringArray = new String[pCStringArray.length]; diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveObject.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveObject.java index 4fcbecdb1..24a874b07 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveObject.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveObject.java @@ -9,7 +9,7 @@ import java.math.BigInteger; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -425,7 +425,7 @@ public Builder setABoolean( boolean pABoolean ) { * @param pBBoolean Value to which {@link #bBoolean} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBBoolean( @MyNotNull Boolean pBBoolean ) { + public Builder setBBoolean( @MyNotNullProperty Boolean pBBoolean ) { // Assign value to attribute bBoolean = pBBoolean; return this; @@ -461,7 +461,7 @@ public Builder setAByte( byte pAByte ) { * @param pBByte Value to which {@link #bByte} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBByte( @MyNotNull Byte pBByte ) { + public Builder setBByte( @MyNotNullProperty Byte pBByte ) { // Assign value to attribute bByte = pBByte; return this; @@ -485,7 +485,7 @@ public Builder setAShort( short pAShort ) { * @param pBShort Value to which {@link #bShort} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBShort( @MyNotNull Short pBShort ) { + public Builder setBShort( @MyNotNullProperty Short pBShort ) { // Assign value to attribute bShort = pBShort; return this; @@ -509,7 +509,7 @@ public Builder setAInteger( int pAInteger ) { * @param pBInteger Value to which {@link #bInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBInteger( @MyNotNull Integer pBInteger ) { + public Builder setBInteger( @MyNotNullProperty Integer pBInteger ) { // Assign value to attribute bInteger = pBInteger; return this; @@ -521,7 +521,7 @@ public Builder setBInteger( @MyNotNull Integer pBInteger ) { * @param pCInteger Value to which {@link #cInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCInteger( @MyNotNull Integer pCInteger ) { + public Builder setCInteger( @MyNotNullProperty Integer pCInteger ) { // Assign value to attribute cInteger = pCInteger; return this; @@ -545,7 +545,7 @@ public Builder setALong( long pALong ) { * @param pBLong Value to which {@link #bLong} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBLong( @MyNotNull Long pBLong ) { + public Builder setBLong( @MyNotNullProperty Long pBLong ) { // Assign value to attribute bLong = pBLong; return this; @@ -557,7 +557,7 @@ public Builder setBLong( @MyNotNull Long pBLong ) { * @param pABigInteger Value to which {@link #aBigInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setABigInteger( @MyNotNull BigInteger pABigInteger ) { + public Builder setABigInteger( @MyNotNullProperty BigInteger pABigInteger ) { // Assign value to attribute aBigInteger = pABigInteger; return this; @@ -581,7 +581,7 @@ public Builder setACharacter( char pACharacter ) { * @param pBCharacter Value to which {@link #bCharacter} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBCharacter( @MyNotNull Character pBCharacter ) { + public Builder setBCharacter( @MyNotNullProperty Character pBCharacter ) { // Assign value to attribute bCharacter = pBCharacter; return this; @@ -605,7 +605,7 @@ public Builder setAFloat( float pAFloat ) { * @param pBFloat Value to which {@link #bFloat} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBFloat( @MyNotNull Float pBFloat ) { + public Builder setBFloat( @MyNotNullProperty Float pBFloat ) { // Assign value to attribute bFloat = pBFloat; return this; @@ -629,7 +629,7 @@ public Builder setADouble( double pADouble ) { * @param pBDouble Value to which {@link #bDouble} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBDouble( @MyNotNull Double pBDouble ) { + public Builder setBDouble( @MyNotNullProperty Double pBDouble ) { // Assign value to attribute bDouble = pBDouble; return this; @@ -641,7 +641,7 @@ public Builder setBDouble( @MyNotNull Double pBDouble ) { * @param pABigDecimal Value to which {@link #aBigDecimal} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { + public Builder setABigDecimal( @MyNotNullProperty BigDecimal pABigDecimal ) { // Assign value to attribute aBigDecimal = pABigDecimal; return this; @@ -653,7 +653,7 @@ public Builder setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { * @param pAString Value to which {@link #aString} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAString( @MyNotNull String pAString ) { + public Builder setAString( @MyNotNullProperty String pAString ) { // Assign value to attribute aString = pAString; return this; @@ -665,7 +665,7 @@ public Builder setAString( @MyNotNull String pAString ) { * @param pBString Value to which {@link #bString} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBString( @MyNotNull String pBString ) { + public Builder setBString( @MyNotNullProperty String pBString ) { // Assign value to attribute bString = pBString; return this; @@ -718,7 +718,7 @@ public void setABoolean( boolean pABoolean ) { * * @return {@link Boolean} Value to which {@link #bBoolean} is set. */ - @MyNotNull + @MyNotNullProperty public Boolean getBBoolean( ) { return bBoolean; } @@ -728,7 +728,7 @@ public Boolean getBBoolean( ) { * * @param pBBoolean Value to which {@link #bBoolean} should be set. */ - public void setBBoolean( @MyNotNull Boolean pBBoolean ) { + public void setBBoolean( @MyNotNullProperty Boolean pBBoolean ) { // Assign value to attribute bBoolean = pBBoolean; } @@ -786,7 +786,7 @@ public void setAByte( byte pAByte ) { * * @return {@link Byte} Value to which {@link #bByte} is set. */ - @MyNotNull + @MyNotNullProperty public Byte getBByte( ) { return bByte; } @@ -796,7 +796,7 @@ public Byte getBByte( ) { * * @param pBByte Value to which {@link #bByte} should be set. */ - public void setBByte( @MyNotNull Byte pBByte ) { + public void setBByte( @MyNotNullProperty Byte pBByte ) { // Assign value to attribute bByte = pBByte; } @@ -825,7 +825,7 @@ public void setAShort( short pAShort ) { * * @return {@link Short} Value to which {@link #bShort} is set. */ - @MyNotNull + @MyNotNullProperty public Short getBShort( ) { return bShort; } @@ -835,7 +835,7 @@ public Short getBShort( ) { * * @param pBShort Value to which {@link #bShort} should be set. */ - public void setBShort( @MyNotNull Short pBShort ) { + public void setBShort( @MyNotNullProperty Short pBShort ) { // Assign value to attribute bShort = pBShort; } @@ -864,7 +864,7 @@ public void setAInteger( int pAInteger ) { * * @return {@link Integer} Value to which {@link #bInteger} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getBInteger( ) { return bInteger; } @@ -874,7 +874,7 @@ public Integer getBInteger( ) { * * @param pBInteger Value to which {@link #bInteger} should be set. */ - public void setBInteger( @MyNotNull Integer pBInteger ) { + public void setBInteger( @MyNotNullProperty Integer pBInteger ) { // Assign value to attribute bInteger = pBInteger; } @@ -884,7 +884,7 @@ public void setBInteger( @MyNotNull Integer pBInteger ) { * * @return {@link Integer} Value to which {@link #cInteger} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getCInteger( ) { return cInteger; } @@ -894,7 +894,7 @@ public Integer getCInteger( ) { * * @param pCInteger Value to which {@link #cInteger} should be set. */ - public void setCInteger( @MyNotNull Integer pCInteger ) { + public void setCInteger( @MyNotNullProperty Integer pCInteger ) { // Assign value to attribute cInteger = pCInteger; } @@ -923,7 +923,7 @@ public void setALong( long pALong ) { * * @return {@link Long} Value to which {@link #bLong} is set. */ - @MyNotNull + @MyNotNullProperty public Long getBLong( ) { return bLong; } @@ -933,7 +933,7 @@ public Long getBLong( ) { * * @param pBLong Value to which {@link #bLong} should be set. */ - public void setBLong( @MyNotNull Long pBLong ) { + public void setBLong( @MyNotNullProperty Long pBLong ) { // Assign value to attribute bLong = pBLong; } @@ -943,7 +943,7 @@ public void setBLong( @MyNotNull Long pBLong ) { * * @return {@link BigInteger} Value to which {@link #aBigInteger} is set. */ - @MyNotNull + @MyNotNullProperty public BigInteger getABigInteger( ) { return aBigInteger; } @@ -953,7 +953,7 @@ public BigInteger getABigInteger( ) { * * @param pABigInteger Value to which {@link #aBigInteger} should be set. */ - public void setABigInteger( @MyNotNull BigInteger pABigInteger ) { + public void setABigInteger( @MyNotNullProperty BigInteger pABigInteger ) { // Assign value to attribute aBigInteger = pABigInteger; } @@ -982,7 +982,7 @@ public void setACharacter( char pACharacter ) { * * @return {@link Character} Value to which {@link #bCharacter} is set. */ - @MyNotNull + @MyNotNullProperty public Character getBCharacter( ) { return bCharacter; } @@ -992,7 +992,7 @@ public Character getBCharacter( ) { * * @param pBCharacter Value to which {@link #bCharacter} should be set. */ - public void setBCharacter( @MyNotNull Character pBCharacter ) { + public void setBCharacter( @MyNotNullProperty Character pBCharacter ) { // Assign value to attribute bCharacter = pBCharacter; } @@ -1021,7 +1021,7 @@ public void setAFloat( float pAFloat ) { * * @return {@link Float} Value to which {@link #bFloat} is set. */ - @MyNotNull + @MyNotNullProperty public Float getBFloat( ) { return bFloat; } @@ -1031,7 +1031,7 @@ public Float getBFloat( ) { * * @param pBFloat Value to which {@link #bFloat} should be set. */ - public void setBFloat( @MyNotNull Float pBFloat ) { + public void setBFloat( @MyNotNullProperty Float pBFloat ) { // Assign value to attribute bFloat = pBFloat; } @@ -1060,7 +1060,7 @@ public void setADouble( double pADouble ) { * * @return {@link Double} Value to which {@link #bDouble} is set. */ - @MyNotNull + @MyNotNullProperty public Double getBDouble( ) { return bDouble; } @@ -1070,7 +1070,7 @@ public Double getBDouble( ) { * * @param pBDouble Value to which {@link #bDouble} should be set. */ - public void setBDouble( @MyNotNull Double pBDouble ) { + public void setBDouble( @MyNotNullProperty Double pBDouble ) { // Assign value to attribute bDouble = pBDouble; } @@ -1080,7 +1080,7 @@ public void setBDouble( @MyNotNull Double pBDouble ) { * * @return {@link BigDecimal} Value to which {@link #aBigDecimal} is set. */ - @MyNotNull + @MyNotNullProperty public BigDecimal getABigDecimal( ) { return aBigDecimal; } @@ -1090,7 +1090,7 @@ public BigDecimal getABigDecimal( ) { * * @param pABigDecimal Value to which {@link #aBigDecimal} should be set. */ - public void setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { + public void setABigDecimal( @MyNotNullProperty BigDecimal pABigDecimal ) { // Assign value to attribute aBigDecimal = pABigDecimal; } @@ -1100,7 +1100,7 @@ public void setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { * * @return {@link String} Value to which {@link #aString} is set. */ - @MyNotNull + @MyNotNullProperty public String getAString( ) { return aString; } @@ -1110,7 +1110,7 @@ public String getAString( ) { * * @param pAString Value to which {@link #aString} should be set. */ - public void setAString( @MyNotNull String pAString ) { + public void setAString( @MyNotNullProperty String pAString ) { // Assign value to attribute aString = pAString; } @@ -1120,7 +1120,7 @@ public void setAString( @MyNotNull String pAString ) { * * @return {@link String} Value to which {@link #bString} is set. */ - @MyNotNull + @MyNotNullProperty public String getBString( ) { return bString; } @@ -1130,7 +1130,7 @@ public String getBString( ) { * * @param pBString Value to which {@link #bString} should be set. */ - public void setBString( @MyNotNull String pBString ) { + public void setBString( @MyNotNullProperty String pBString ) { // Assign value to attribute bString = pBString; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveObjectWithRestrictions.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveObjectWithRestrictions.java index b38178efb..5074a84e9 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveObjectWithRestrictions.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/PrimitiveObjectWithRestrictions.java @@ -20,7 +20,7 @@ import javax.validation.constraints.PositiveOrZero; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -494,7 +494,7 @@ public Builder setABoolean( boolean pABoolean ) { * @param pBBoolean Value to which {@link #bBoolean} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBBoolean( @MyNotNull Boolean pBBoolean ) { + public Builder setBBoolean( @MyNotNullProperty Boolean pBBoolean ) { // Assign value to attribute bBoolean = pBBoolean; return this; @@ -530,7 +530,7 @@ public Builder setAByte( byte pAByte ) { * @param pBByte Value to which {@link #bByte} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBByte( @MyNotNull Byte pBByte ) { + public Builder setBByte( @MyNotNullProperty Byte pBByte ) { // Assign value to attribute bByte = pBByte; return this; @@ -554,7 +554,7 @@ public Builder setAShort( short pAShort ) { * @param pBShort Value to which {@link #bShort} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBShort( @MyNotNull Short pBShort ) { + public Builder setBShort( @MyNotNullProperty Short pBShort ) { // Assign value to attribute bShort = pBShort; return this; @@ -578,7 +578,7 @@ public Builder setAInteger( int pAInteger ) { * @param pBInteger Value to which {@link #bInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBInteger( @MyNotNull Integer pBInteger ) { + public Builder setBInteger( @MyNotNullProperty Integer pBInteger ) { // Assign value to attribute bInteger = pBInteger; return this; @@ -590,7 +590,7 @@ public Builder setBInteger( @MyNotNull Integer pBInteger ) { * @param pCInteger Value to which {@link #cInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCInteger( @MyNotNull Integer pCInteger ) { + public Builder setCInteger( @MyNotNullProperty Integer pCInteger ) { // Assign value to attribute cInteger = pCInteger; return this; @@ -614,7 +614,7 @@ public Builder setALong( long pALong ) { * @param pBLong Value to which {@link #bLong} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBLong( @MyNotNull Long pBLong ) { + public Builder setBLong( @MyNotNullProperty Long pBLong ) { // Assign value to attribute bLong = pBLong; return this; @@ -626,7 +626,7 @@ public Builder setBLong( @MyNotNull Long pBLong ) { * @param pABigInteger Value to which {@link #aBigInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setABigInteger( @MyNotNull BigInteger pABigInteger ) { + public Builder setABigInteger( @MyNotNullProperty BigInteger pABigInteger ) { // Assign value to attribute aBigInteger = pABigInteger; return this; @@ -650,7 +650,7 @@ public Builder setACharacter( char pACharacter ) { * @param pBCharacter Value to which {@link #bCharacter} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBCharacter( @MyNotNull Character pBCharacter ) { + public Builder setBCharacter( @MyNotNullProperty Character pBCharacter ) { // Assign value to attribute bCharacter = pBCharacter; return this; @@ -674,7 +674,7 @@ public Builder setAFloat( float pAFloat ) { * @param pBFloat Value to which {@link #bFloat} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBFloat( @MyNotNull Float pBFloat ) { + public Builder setBFloat( @MyNotNullProperty Float pBFloat ) { // Assign value to attribute bFloat = pBFloat; return this; @@ -698,7 +698,7 @@ public Builder setADouble( double pADouble ) { * @param pBDouble Value to which {@link #bDouble} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBDouble( @MyNotNull Double pBDouble ) { + public Builder setBDouble( @MyNotNullProperty Double pBDouble ) { // Assign value to attribute bDouble = pBDouble; return this; @@ -710,7 +710,7 @@ public Builder setBDouble( @MyNotNull Double pBDouble ) { * @param pABigDecimal Value to which {@link #aBigDecimal} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { + public Builder setABigDecimal( @MyNotNullProperty BigDecimal pABigDecimal ) { // Assign value to attribute aBigDecimal = pABigDecimal; return this; @@ -722,7 +722,7 @@ public Builder setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { * @param pAString Value to which {@link #aString} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAString( @MyNotNull String pAString ) { + public Builder setAString( @MyNotNullProperty String pAString ) { // Assign value to attribute aString = pAString; return this; @@ -734,7 +734,7 @@ public Builder setAString( @MyNotNull String pAString ) { * @param pBString Value to which {@link #bString} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBString( @MyNotNull String pBString ) { + public Builder setBString( @MyNotNullProperty String pBString ) { // Assign value to attribute bString = pBString; return this; @@ -787,7 +787,7 @@ public void setABoolean( boolean pABoolean ) { * * @return {@link Boolean} Value to which {@link #bBoolean} is set. */ - @MyNotNull + @MyNotNullProperty public Boolean getBBoolean( ) { return bBoolean; } @@ -797,7 +797,7 @@ public Boolean getBBoolean( ) { * * @param pBBoolean Value to which {@link #bBoolean} should be set. */ - public void setBBoolean( @MyNotNull Boolean pBBoolean ) { + public void setBBoolean( @MyNotNullProperty Boolean pBBoolean ) { // Assign value to attribute bBoolean = pBBoolean; } @@ -855,7 +855,7 @@ public void setAByte( byte pAByte ) { * * @return {@link Byte} Value to which {@link #bByte} is set. */ - @MyNotNull + @MyNotNullProperty public Byte getBByte( ) { return bByte; } @@ -865,7 +865,7 @@ public Byte getBByte( ) { * * @param pBByte Value to which {@link #bByte} should be set. */ - public void setBByte( @MyNotNull Byte pBByte ) { + public void setBByte( @MyNotNullProperty Byte pBByte ) { // Assign value to attribute bByte = pBByte; } @@ -894,7 +894,7 @@ public void setAShort( short pAShort ) { * * @return {@link Short} Value to which {@link #bShort} is set. */ - @MyNotNull + @MyNotNullProperty public Short getBShort( ) { return bShort; } @@ -904,7 +904,7 @@ public Short getBShort( ) { * * @param pBShort Value to which {@link #bShort} should be set. */ - public void setBShort( @MyNotNull Short pBShort ) { + public void setBShort( @MyNotNullProperty Short pBShort ) { // Assign value to attribute bShort = pBShort; } @@ -933,7 +933,7 @@ public void setAInteger( int pAInteger ) { * * @return {@link Integer} Value to which {@link #bInteger} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getBInteger( ) { return bInteger; } @@ -943,7 +943,7 @@ public Integer getBInteger( ) { * * @param pBInteger Value to which {@link #bInteger} should be set. */ - public void setBInteger( @MyNotNull Integer pBInteger ) { + public void setBInteger( @MyNotNullProperty Integer pBInteger ) { // Assign value to attribute bInteger = pBInteger; } @@ -953,7 +953,7 @@ public void setBInteger( @MyNotNull Integer pBInteger ) { * * @return {@link Integer} Value to which {@link #cInteger} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getCInteger( ) { return cInteger; } @@ -963,7 +963,7 @@ public Integer getCInteger( ) { * * @param pCInteger Value to which {@link #cInteger} should be set. */ - public void setCInteger( @MyNotNull Integer pCInteger ) { + public void setCInteger( @MyNotNullProperty Integer pCInteger ) { // Assign value to attribute cInteger = pCInteger; } @@ -992,7 +992,7 @@ public void setALong( long pALong ) { * * @return {@link Long} Value to which {@link #bLong} is set. */ - @MyNotNull + @MyNotNullProperty public Long getBLong( ) { return bLong; } @@ -1002,7 +1002,7 @@ public Long getBLong( ) { * * @param pBLong Value to which {@link #bLong} should be set. */ - public void setBLong( @MyNotNull Long pBLong ) { + public void setBLong( @MyNotNullProperty Long pBLong ) { // Assign value to attribute bLong = pBLong; } @@ -1012,7 +1012,7 @@ public void setBLong( @MyNotNull Long pBLong ) { * * @return {@link BigInteger} Value to which {@link #aBigInteger} is set. */ - @MyNotNull + @MyNotNullProperty public BigInteger getABigInteger( ) { return aBigInteger; } @@ -1022,7 +1022,7 @@ public BigInteger getABigInteger( ) { * * @param pABigInteger Value to which {@link #aBigInteger} should be set. */ - public void setABigInteger( @MyNotNull BigInteger pABigInteger ) { + public void setABigInteger( @MyNotNullProperty BigInteger pABigInteger ) { // Assign value to attribute aBigInteger = pABigInteger; } @@ -1051,7 +1051,7 @@ public void setACharacter( char pACharacter ) { * * @return {@link Character} Value to which {@link #bCharacter} is set. */ - @MyNotNull + @MyNotNullProperty public Character getBCharacter( ) { return bCharacter; } @@ -1061,7 +1061,7 @@ public Character getBCharacter( ) { * * @param pBCharacter Value to which {@link #bCharacter} should be set. */ - public void setBCharacter( @MyNotNull Character pBCharacter ) { + public void setBCharacter( @MyNotNullProperty Character pBCharacter ) { // Assign value to attribute bCharacter = pBCharacter; } @@ -1090,7 +1090,7 @@ public void setAFloat( float pAFloat ) { * * @return {@link Float} Value to which {@link #bFloat} is set. */ - @MyNotNull + @MyNotNullProperty public Float getBFloat( ) { return bFloat; } @@ -1100,7 +1100,7 @@ public Float getBFloat( ) { * * @param pBFloat Value to which {@link #bFloat} should be set. */ - public void setBFloat( @MyNotNull Float pBFloat ) { + public void setBFloat( @MyNotNullProperty Float pBFloat ) { // Assign value to attribute bFloat = pBFloat; } @@ -1129,7 +1129,7 @@ public void setADouble( double pADouble ) { * * @return {@link Double} Value to which {@link #bDouble} is set. */ - @MyNotNull + @MyNotNullProperty public Double getBDouble( ) { return bDouble; } @@ -1139,7 +1139,7 @@ public Double getBDouble( ) { * * @param pBDouble Value to which {@link #bDouble} should be set. */ - public void setBDouble( @MyNotNull Double pBDouble ) { + public void setBDouble( @MyNotNullProperty Double pBDouble ) { // Assign value to attribute bDouble = pBDouble; } @@ -1149,7 +1149,7 @@ public void setBDouble( @MyNotNull Double pBDouble ) { * * @return {@link BigDecimal} Value to which {@link #aBigDecimal} is set. */ - @MyNotNull + @MyNotNullProperty public BigDecimal getABigDecimal( ) { return aBigDecimal; } @@ -1159,7 +1159,7 @@ public BigDecimal getABigDecimal( ) { * * @param pABigDecimal Value to which {@link #aBigDecimal} should be set. */ - public void setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { + public void setABigDecimal( @MyNotNullProperty BigDecimal pABigDecimal ) { // Assign value to attribute aBigDecimal = pABigDecimal; } @@ -1169,7 +1169,7 @@ public void setABigDecimal( @MyNotNull BigDecimal pABigDecimal ) { * * @return {@link String} Value to which {@link #aString} is set. */ - @MyNotNull + @MyNotNullProperty public String getAString( ) { return aString; } @@ -1179,7 +1179,7 @@ public String getAString( ) { * * @param pAString Value to which {@link #aString} should be set. */ - public void setAString( @MyNotNull String pAString ) { + public void setAString( @MyNotNullProperty String pAString ) { // Assign value to attribute aString = pAString; } @@ -1189,7 +1189,7 @@ public void setAString( @MyNotNull String pAString ) { * * @return {@link String} Value to which {@link #bString} is set. */ - @MyNotNull + @MyNotNullProperty public String getBString( ) { return bString; } @@ -1199,7 +1199,7 @@ public String getBString( ) { * * @param pBString Value to which {@link #bString} should be set. */ - public void setBString( @MyNotNull String pBString ) { + public void setBString( @MyNotNullProperty String pBString ) { // Assign value to attribute bString = pBString; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Problem.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Problem.java index b30527833..71aaeb813 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Problem.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Problem.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -183,7 +183,7 @@ public static Builder newBuilder( Problem pObject ) { * @param pTitle Value to which {@link #title} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setTitle( @MyNotNull String pTitle ) { + public Builder setTitle( @MyNotNullProperty String pTitle ) { // Assign value to attribute title = pTitle; return this; @@ -207,7 +207,7 @@ public Builder setStatus( int pStatus ) { * @param pType Value to which {@link #type} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setType( @MyNotNull String pType ) { + public Builder setType( @MyNotNullProperty String pType ) { // Assign value to attribute type = pType; return this; @@ -219,7 +219,7 @@ public Builder setType( @MyNotNull String pType ) { * @param pDetail Value to which {@link #detail} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setDetail( @MyNotNull String pDetail ) { + public Builder setDetail( @MyNotNullProperty String pDetail ) { // Assign value to attribute detail = pDetail; return this; @@ -231,7 +231,7 @@ public Builder setDetail( @MyNotNull String pDetail ) { * @param pInstance Value to which {@link #instance} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setInstance( @MyNotNull String pInstance ) { + public Builder setInstance( @MyNotNullProperty String pInstance ) { // Assign value to attribute instance = pInstance; return this; @@ -254,7 +254,7 @@ public Problem build( ) { * * @return {@link String} Value to which {@link #title} is set. */ - @MyNotNull + @MyNotNullProperty public String getTitle( ) { return title; } @@ -273,7 +273,7 @@ public int getStatus( ) { * * @return {@link String} Value to which {@link #type} is set. */ - @MyNotNull + @MyNotNullProperty public String getType( ) { return type; } @@ -283,7 +283,7 @@ public String getType( ) { * * @return {@link String} Value to which {@link #detail} is set. */ - @MyNotNull + @MyNotNullProperty public String getDetail( ) { return detail; } @@ -293,7 +293,7 @@ public String getDetail( ) { * * @return {@link String} Value to which {@link #instance} is set. */ - @MyNotNull + @MyNotNullProperty public String getInstance( ) { return instance; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Product.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Product.java index cf4516646..28c2b1fab 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Product.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Product.java @@ -17,8 +17,8 @@ import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -352,7 +352,7 @@ public Builder addToResellers( Reseller... pResellers ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -382,7 +382,7 @@ public Builder setImage( byte[] pImage ) { * @param pLink Value to which {@link #link} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLink( @MyNotNull URL pLink ) { + public Builder setLink( @MyNotNullProperty URL pLink ) { // Assign value to attribute link = pLink; return this; @@ -394,7 +394,7 @@ public Builder setLink( @MyNotNull URL pLink ) { * @param pProductID Value to which {@link #productID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setProductID( @MyNotNull UUID pProductID ) { + public Builder setProductID( @MyNotNullProperty UUID pProductID ) { // Assign value to attribute productID = pProductID; return this; @@ -406,7 +406,7 @@ public Builder setProductID( @MyNotNull UUID pProductID ) { * @param pSupportedCurrencies Collection to which {@link #supportedCurrencies} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSupportedCurrencies( @MyNotEmpty Set pSupportedCurrencies ) { + public Builder setSupportedCurrencies( @MyNotEmptyProperty Set pSupportedCurrencies ) { // To ensure immutability we have to copy the content of the passed collection. if (pSupportedCurrencies != null) { supportedCurrencies = new HashSet(pSupportedCurrencies); @@ -424,7 +424,7 @@ public Builder setSupportedCurrencies( @MyNotEmpty Set pSupportedC * may be null. * @return {@link Builder} Instance of this builder to support chaining. Method never returns null. */ - public Builder addToSupportedCurrencies( @MyNotEmpty CurrencyCode... pSupportedCurrencies ) { + public Builder addToSupportedCurrencies( @MyNotEmptyProperty CurrencyCode... pSupportedCurrencies ) { if (pSupportedCurrencies != null) { if (supportedCurrencies == null) { supportedCurrencies = new HashSet(); @@ -440,7 +440,7 @@ public Builder addToSupportedCurrencies( @MyNotEmpty CurrencyCode... pSupportedC * @param pProductCodes Collection to which {@link #productCodes} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setProductCodes( @MyNotEmpty Set pProductCodes ) { + public Builder setProductCodes( @MyNotEmptyProperty Set pProductCodes ) { // To ensure immutability we have to copy the content of the passed collection. if (pProductCodes != null) { productCodes = new HashSet(pProductCodes); @@ -457,7 +457,7 @@ public Builder setProductCodes( @MyNotEmpty Set pProductCodes ) { * @param pProductCodes Array of objects that should be added to {@link #productCodes}. The parameter may be null. * @return {@link Builder} Instance of this builder to support chaining. Method never returns null. */ - public Builder addToProductCodes( @MyNotEmpty ProductCode... pProductCodes ) { + public Builder addToProductCodes( @MyNotEmptyProperty ProductCode... pProductCodes ) { if (pProductCodes != null) { if (productCodes == null) { productCodes = new HashSet(); @@ -474,7 +474,7 @@ public Builder addToProductCodes( @MyNotEmpty ProductCode... pProductCodes ) { * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ @Deprecated - public Builder setDescription( @MyNotNull String pDescription ) { + public Builder setDescription( @MyNotNullProperty String pDescription ) { // Assign value to attribute description = pDescription; return this; @@ -486,7 +486,7 @@ public Builder setDescription( @MyNotNull String pDescription ) { * @param pUri Value to which {@link #uri} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setUri( @MyNotNull String pUri ) { + public Builder setUri( @MyNotNullProperty String pUri ) { // Assign value to attribute uri = pUri; return this; @@ -584,7 +584,7 @@ public void clearResellers( ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -594,7 +594,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } @@ -639,7 +639,7 @@ public void setImage( byte[] pImage ) { * * @return {@link URL} Value to which {@link #link} is set. */ - @MyNotNull + @MyNotNullProperty public URL getLink( ) { return link; } @@ -649,7 +649,7 @@ public URL getLink( ) { * * @param pLink Value to which {@link #link} should be set. */ - public void setLink( @MyNotNull URL pLink ) { + public void setLink( @MyNotNullProperty URL pLink ) { // Assign value to attribute link = pLink; } @@ -659,7 +659,7 @@ public void setLink( @MyNotNull URL pLink ) { * * @return {@link UUID} Value to which {@link #productID} is set. */ - @MyNotNull + @MyNotNullProperty public UUID getProductID( ) { return productID; } @@ -670,7 +670,7 @@ public UUID getProductID( ) { * @return {@link Set} Value to which {@link #supportedCurrencies} is set. The method never returns null * and the returned collection is unmodifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getSupportedCurrencies( ) { // Return all CurrencyCode objects as unmodifiable collection. return Collections.unmodifiableSet(supportedCurrencies); @@ -725,7 +725,7 @@ public void clearSupportedCurrencies( ) { * @return {@link Set} Value to which {@link #productCodes} is set. The method never returns null and the * returned collection is unmodifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getProductCodes( ) { // Return all ProductCode objects as unmodifiable collection. return Collections.unmodifiableSet(productCodes); @@ -778,7 +778,7 @@ public void clearProductCodes( ) { * @return {@link String} Value to which {@link #description} is set. */ @Deprecated - @MyNotNull + @MyNotNullProperty public String getDescription( ) { return description; } @@ -789,7 +789,7 @@ public String getDescription( ) { * @param pDescription Value to which {@link #description} should be set. */ @Deprecated - public void setDescription( @MyNotNull String pDescription ) { + public void setDescription( @MyNotNullProperty String pDescription ) { // Assign value to attribute description = pDescription; } @@ -856,7 +856,7 @@ void clearSortiments( ) { * * @return {@link String} Value to which {@link #uri} is set. */ - @MyNotNull + @MyNotNullProperty public String getUri( ) { return uri; } @@ -866,7 +866,7 @@ public String getUri( ) { * * @param pUri Value to which {@link #uri} should be set. */ - public void setUri( @MyNotNull String pUri ) { + public void setUri( @MyNotNullProperty String pUri ) { // Assign value to attribute uri = pUri; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Reseller.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Reseller.java index 279b462a4..0550f57e4 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Reseller.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Reseller.java @@ -7,7 +7,7 @@ import javax.validation.Valid; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; @Valid public class Reseller extends ResellerBase { @@ -76,7 +76,7 @@ public static Builder newBuilder( Reseller pObject ) { /** * @return {@link Integer} */ - @MyNotNull + @MyNotNullProperty @Override public Integer doSomething( ) { // TODO: Implement business logic for method. diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ResellerBase.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ResellerBase.java index 34c115ee2..175f1e8e9 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ResellerBase.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ResellerBase.java @@ -20,8 +20,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -150,7 +150,7 @@ protected BuilderBase( ResellerBase pObject ) { * @param pChannels Collection to which {@link #channels} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setChannels( @MyNotEmpty List pChannels ) { + public BuilderBase setChannels( @MyNotEmptyProperty List pChannels ) { // To ensure immutability we have to copy the content of the passed collection. if (pChannels != null) { channels = new ArrayList(pChannels); @@ -167,7 +167,7 @@ public BuilderBase setChannels( @MyNotEmpty List pChannels ) { * @param pChannels Array of objects that should be added to {@link #channels}. The parameter may be null. * @return {@link BuilderBase} Instance of this builder to support chaining. Method never returns null. */ - public BuilderBase addToChannels( @MyNotEmpty Channel... pChannels ) { + public BuilderBase addToChannels( @MyNotEmptyProperty Channel... pChannels ) { if (pChannels != null) { if (channels == null) { channels = new ArrayList(); @@ -183,7 +183,7 @@ public BuilderBase addToChannels( @MyNotEmpty Channel... pChannels ) { * @param pName Value to which {@link #name} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setName( @MyNotNull String pName ) { + public BuilderBase setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -195,7 +195,7 @@ public BuilderBase setName( @MyNotNull String pName ) { * @param pLanguage Value to which {@link #language} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setLanguage( @MyNotNull Locale pLanguage ) { + public BuilderBase setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; return this; @@ -219,7 +219,7 @@ public Reseller build( ) { * @return {@link List} Value to which {@link #channels} is set. The method never returns null and the * returned collection is unmodifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public List getChannels( ) { // Due to restrictions in JSON serialization / deserialization bi-directional associations need a special handling // after an object was deserialized. @@ -298,7 +298,7 @@ public void clearChannels( ) { * @return {@link Set} Value to which {@link #products} is set. The method never returns null and the * returned collection is unmodifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public Set getProducts( ) { // Return all Product objects as unmodifiable collection. return Collections.unmodifiableSet(products); @@ -355,7 +355,7 @@ void clearProducts( ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -365,7 +365,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } @@ -375,7 +375,7 @@ public void setName( @MyNotNull String pName ) { * * @return {@link Locale} Value to which {@link #language} is set. */ - @MyNotNull + @MyNotNullProperty public Locale getLanguage( ) { return language; } @@ -385,7 +385,7 @@ public Locale getLanguage( ) { * * @param pLanguage Value to which {@link #language} should be set. */ - public void setLanguage( @MyNotNull Locale pLanguage ) { + public void setLanguage( @MyNotNullProperty Locale pLanguage ) { // Assign value to attribute language = pLanguage; } @@ -413,7 +413,7 @@ public static Reseller of( List pChannels, String pName, Locale pLangua /** * @return {@link Integer} */ - @MyNotNull + @MyNotNullProperty public abstract Integer doSomething( ); /** diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ShortCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ShortCode.java index 8d463d1b7..879674d69 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ShortCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/ShortCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( ShortCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull Short pCode ) { + public Builder setCode( @MyNotNullProperty Short pCode ) { // Assign value to attribute code = pCode; return this; @@ -137,7 +137,7 @@ public ShortCode build( ) { * * @return {@link Short} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public Short getCode( ) { return code; } @@ -147,7 +147,7 @@ public Short getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull Short pCode ) { + public void setCode( @MyNotNullProperty Short pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/SoftLinkBase.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/SoftLinkBase.java index b4d068d90..dbd930278 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/SoftLinkBase.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/SoftLinkBase.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -119,7 +119,7 @@ public BuilderBase setObjectID( long pObjectID ) { * @param pDataUnit Value to which {@link #dataUnit} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setDataUnit( @MyNotNull DataUnit pDataUnit ) { + public BuilderBase setDataUnit( @MyNotNullProperty DataUnit pDataUnit ) { dataUnit = pDataUnit; return this; } @@ -130,7 +130,7 @@ public BuilderBase setDataUnit( @MyNotNull DataUnit pDataUnit ) { * @param pEntity Value to which {@link #entity} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setEntity( @MyNotNull Entity pEntity ) { + public BuilderBase setEntity( @MyNotNullProperty Entity pEntity ) { entity = pEntity; return this; } @@ -141,7 +141,7 @@ public BuilderBase setEntity( @MyNotNull Entity pEntity ) { * @param pRefrenceID Value to which {@link #refrenceID} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setRefrenceID( @MyNotNull String pRefrenceID ) { + public BuilderBase setRefrenceID( @MyNotNullProperty String pRefrenceID ) { // Assign value to attribute refrenceID = pRefrenceID; return this; @@ -173,7 +173,7 @@ public long getObjectID( ) { * * @return {@link DataUnit} Value to which {@link #dataUnit} is set. */ - @MyNotNull + @MyNotNullProperty public DataUnit getDataUnit( ) { return dataUnit; } @@ -183,7 +183,7 @@ public DataUnit getDataUnit( ) { * * @param pDataUnit Value to which {@link #dataUnit} should be set. */ - public void setDataUnit( @MyNotNull DataUnit pDataUnit ) { + public void setDataUnit( @MyNotNullProperty DataUnit pDataUnit ) { dataUnit = pDataUnit; } @@ -199,7 +199,7 @@ public final void unsetDataUnit( ) { * * @return {@link Entity} Value to which {@link #entity} is set. */ - @MyNotNull + @MyNotNullProperty public Entity getEntity( ) { return entity; } @@ -209,7 +209,7 @@ public Entity getEntity( ) { * * @param pEntity Value to which {@link #entity} should be set. */ - public void setEntity( @MyNotNull Entity pEntity ) { + public void setEntity( @MyNotNullProperty Entity pEntity ) { entity = pEntity; } @@ -225,7 +225,7 @@ public final void unsetEntity( ) { * * @return {@link String} Value to which {@link #refrenceID} is set. */ - @MyNotNull + @MyNotNullProperty public String getRefrenceID( ) { return refrenceID; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/SpecialContext.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/SpecialContext.java index bd5d6a0e0..c7a477e9c 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/SpecialContext.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/SpecialContext.java @@ -8,7 +8,7 @@ import java.util.Locale; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; public class SpecialContext extends Context { @@ -238,7 +238,7 @@ public Builder setIntCode( IntegerCodeType pIntCode ) { * @param pSpecificHeader Value to which {@link #specificHeader} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSpecificHeader( @MyNotNull String pSpecificHeader ) { + public Builder setSpecificHeader( @MyNotNullProperty String pSpecificHeader ) { // Assign value to attribute specificHeader = pSpecificHeader; return this; @@ -250,7 +250,7 @@ public Builder setSpecificHeader( @MyNotNull String pSpecificHeader ) { * @param pChannelType Value to which {@link #channelType} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setChannelType( @MyNotNull ChannelType pChannelType ) { + public Builder setChannelType( @MyNotNullProperty ChannelType pChannelType ) { // Assign value to attribute channelType = pChannelType; return this; @@ -274,7 +274,7 @@ public SpecialContext build( ) { * * @return {@link String} Value to which {@link #specificHeader} is set. */ - @MyNotNull + @MyNotNullProperty public String getSpecificHeader( ) { return specificHeader; } @@ -284,7 +284,7 @@ public String getSpecificHeader( ) { * * @param pSpecificHeader Value to which {@link #specificHeader} should be set. */ - public void setSpecificHeader( @MyNotNull String pSpecificHeader ) { + public void setSpecificHeader( @MyNotNullProperty String pSpecificHeader ) { // Assign value to attribute specificHeader = pSpecificHeader; } @@ -294,7 +294,7 @@ public void setSpecificHeader( @MyNotNull String pSpecificHeader ) { * * @return {@link ChannelType} Value to which {@link #channelType} is set. */ - @MyNotNull + @MyNotNullProperty public ChannelType getChannelType( ) { return channelType; } @@ -304,7 +304,7 @@ public ChannelType getChannelType( ) { * * @param pChannelType Value to which {@link #channelType} should be set. */ - public void setChannelType( @MyNotNull ChannelType pChannelType ) { + public void setChannelType( @MyNotNullProperty ChannelType pChannelType ) { // Assign value to attribute channelType = pChannelType; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Stop.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Stop.java index 4f2f0af64..39f3e4b39 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Stop.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/Stop.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -147,7 +147,7 @@ public static Builder newBuilder( Stop pObject ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -203,7 +203,7 @@ public Stop build( ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } @@ -213,7 +213,7 @@ public String getName( ) { * * @param pName Value to which {@link #name} should be set. */ - public void setName( @MyNotNull String pName ) { + public void setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/StringCode.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/StringCode.java index 13bac529d..5d57e521d 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/StringCode.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/StringCode.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( StringCode pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -137,7 +137,7 @@ public StringCode build( ) { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -147,7 +147,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/StringCodeType.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/StringCodeType.java index 7c0c22fd0..aba5244d8 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/StringCodeType.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/StringCodeType.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( StringCodeType pObject ) { * @param pCode Value to which {@link #code} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCode( @MyNotNull String pCode ) { + public Builder setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; return this; @@ -138,7 +138,7 @@ public StringCodeType build( ) { * * @return {@link String} Value to which {@link #code} is set. */ - @MyNotNull + @MyNotNullProperty public String getCode( ) { return code; } @@ -148,7 +148,7 @@ public String getCode( ) { * * @param pCode Value to which {@link #code} should be set. */ - public void setCode( @MyNotNull String pCode ) { + public void setCode( @MyNotNullProperty String pCode ) { // Assign value to attribute code = pCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/TechnicalHeaderContext.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/TechnicalHeaderContext.java index f3cc80c70..3642f6331 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/TechnicalHeaderContext.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/TechnicalHeaderContext.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; public class TechnicalHeaderContext { @@ -115,7 +115,7 @@ public static Builder newBuilder( TechnicalHeaderContext pObject ) { * @param pReseller Value to which {@link #reseller} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setReseller( @MyNotNull String pReseller ) { + public Builder setReseller( @MyNotNullProperty String pReseller ) { // Assign value to attribute reseller = pReseller; return this; @@ -139,7 +139,7 @@ public TechnicalHeaderContext build( ) { * * @return {@link String} Value to which {@link #reseller} is set. */ - @MyNotNull + @MyNotNullProperty public String getReseller( ) { return reseller; } @@ -149,7 +149,7 @@ public String getReseller( ) { * * @param pReseller Value to which {@link #reseller} should be set. */ - public void setReseller( @MyNotNull String pReseller ) { + public void setReseller( @MyNotNullProperty String pReseller ) { // Assign value to attribute reseller = pReseller; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/TheReadOnlyPOJO.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/TheReadOnlyPOJO.java index 3cc45973f..3755d1dcb 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/TheReadOnlyPOJO.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/TheReadOnlyPOJO.java @@ -11,7 +11,7 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -174,7 +174,7 @@ public Builder setDataUnit( DataUnit pDataUnit ) { * @param pName Value to which {@link #name} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setName( @MyNotNull String pName ) { + public Builder setName( @MyNotNullProperty String pName ) { // Assign value to attribute name = pName; return this; @@ -275,7 +275,7 @@ public DataUnit getDataUnit( ) { * * @return {@link String} Value to which {@link #name} is set. */ - @MyNotNull + @MyNotNullProperty public String getName( ) { return name; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/UICStop.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/UICStop.java index 7e764d0ea..39ad70505 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/UICStop.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/UICStop.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -160,7 +160,7 @@ public Builder addToLinks( LinkObject... pLinks ) { * @param pUicCode Value to which {@link #uicCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setUicCode( @MyNotNull String pUicCode ) { + public Builder setUicCode( @MyNotNullProperty String pUicCode ) { // Assign value to attribute uicCode = pUicCode; return this; @@ -183,7 +183,7 @@ public UICStop build( ) { * * @return {@link String} Value to which {@link #uicCode} is set. */ - @MyNotNull + @MyNotNullProperty public String getUicCode( ) { return uicCode; } @@ -193,7 +193,7 @@ public String getUicCode( ) { * * @param pUicCode Value to which {@link #uicCode} should be set. */ - public void setUicCode( @MyNotNull String pUicCode ) { + public void setUicCode( @MyNotNullProperty String pUicCode ) { // Assign value to attribute uicCode = pUicCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/WeirdBooking.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/WeirdBooking.java index 73f49dcf8..ee941ad9b 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/WeirdBooking.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/WeirdBooking.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.anaptecs.spring.composite.ComplexBookingID; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -140,7 +140,7 @@ public static Builder newBuilder( WeirdBooking pObject ) { * @param pBooking Value to which {@link #booking} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBooking( @MyNotNull ComplexBookingID pBooking ) { + public Builder setBooking( @MyNotNullProperty ComplexBookingID pBooking ) { booking = pBooking; return this; } @@ -197,7 +197,7 @@ public WeirdBooking build( ) { * * @return {@link ComplexBookingID} Value to which {@link #booking} is set. */ - @MyNotNull + @MyNotNullProperty public ComplexBookingID getBooking( ) { return booking; } @@ -207,7 +207,7 @@ public ComplexBookingID getBooking( ) { * * @param pBooking Value to which {@link #booking} should be set. */ - public void setBooking( @MyNotNull ComplexBookingID pBooking ) { + public void setBooking( @MyNotNullProperty ComplexBookingID pBooking ) { booking = pBooking; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/backward/SimpleBackwardCompatibility.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/backward/SimpleBackwardCompatibility.java index 445c131eb..7f44e5489 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/backward/SimpleBackwardCompatibility.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/backward/SimpleBackwardCompatibility.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -127,7 +127,7 @@ public static Builder newBuilder( SimpleBackwardCompatibility pObject ) { * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ @Deprecated - public Builder setDeprecatedProperty( @MyNotNull String pDeprecatedProperty ) { + public Builder setDeprecatedProperty( @MyNotNullProperty String pDeprecatedProperty ) { // Delegate call to setSuccessorProperty(...) this.setSuccessorProperty(pDeprecatedProperty); return this; @@ -139,7 +139,7 @@ public Builder setDeprecatedProperty( @MyNotNull String pDeprecatedProperty ) { * @param pSuccessorProperty Value to which {@link #successorProperty} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSuccessorProperty( @MyNotNull String pSuccessorProperty ) { + public Builder setSuccessorProperty( @MyNotNullProperty String pSuccessorProperty ) { // Assign value to attribute successorProperty = pSuccessorProperty; return this; @@ -165,7 +165,7 @@ public SimpleBackwardCompatibility build( ) { * @return {@link String} Value to which {@link #deprecatedProperty} is set. */ @Deprecated - @MyNotNull + @MyNotNullProperty public String getDeprecatedProperty( ) { // Delegate call to getSuccessorProperty(...) return this.getSuccessorProperty(); @@ -178,7 +178,7 @@ public String getDeprecatedProperty( ) { * @param pDeprecatedProperty Value to which {@link #deprecatedProperty} should be set. */ @Deprecated - public void setDeprecatedProperty( @MyNotNull String pDeprecatedProperty ) { + public void setDeprecatedProperty( @MyNotNullProperty String pDeprecatedProperty ) { // Delegate call to setSuccessorProperty(...) this.setSuccessorProperty(pDeprecatedProperty); } @@ -188,7 +188,7 @@ public void setDeprecatedProperty( @MyNotNull String pDeprecatedProperty ) { * * @return {@link String} Value to which {@link #successorProperty} is set. */ - @MyNotNull + @MyNotNullProperty public String getSuccessorProperty( ) { return successorProperty; } @@ -198,7 +198,7 @@ public String getSuccessorProperty( ) { * * @param pSuccessorProperty Value to which {@link #successorProperty} should be set. */ - public void setSuccessorProperty( @MyNotNull String pSuccessorProperty ) { + public void setSuccessorProperty( @MyNotNullProperty String pSuccessorProperty ) { // Assign value to attribute successorProperty = pSuccessorProperty; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/techbase/BusinessChild.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/techbase/BusinessChild.java index d535a0931..f597aac9b 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/techbase/BusinessChild.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/techbase/BusinessChild.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -150,7 +150,7 @@ public Builder setParentAttribute( long pParentAttribute ) { * @param pChildAttribute Value to which {@link #childAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setChildAttribute( @MyNotNull String pChildAttribute ) { + public Builder setChildAttribute( @MyNotNullProperty String pChildAttribute ) { // Assign value to attribute childAttribute = pChildAttribute; return this; @@ -174,7 +174,7 @@ public BusinessChild build( ) { * * @return {@link String} Value to which {@link #childAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public String getChildAttribute( ) { return childAttribute; } @@ -184,7 +184,7 @@ public String getChildAttribute( ) { * * @param pChildAttribute Value to which {@link #childAttribute} should be set. */ - public void setChildAttribute( @MyNotNull String pChildAttribute ) { + public void setChildAttribute( @MyNotNullProperty String pChildAttribute ) { // Assign value to attribute childAttribute = pChildAttribute; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/techbase/TechParent.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/techbase/TechParent.java index dd833a61c..148e9d458 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/techbase/TechParent.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/base/techbase/TechParent.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -114,7 +114,7 @@ public static Builder newBuilder( TechParent pObject ) { * @param pTechAttribute Value to which {@link #techAttribute} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setTechAttribute( @MyNotNull String pTechAttribute ) { + public Builder setTechAttribute( @MyNotNullProperty String pTechAttribute ) { // Assign value to attribute techAttribute = pTechAttribute; return this; @@ -137,7 +137,7 @@ public TechParent build( ) { * * @return {@link String} Value to which {@link #techAttribute} is set. */ - @MyNotNull + @MyNotNullProperty public String getTechAttribute( ) { return techAttribute; } @@ -147,7 +147,7 @@ public String getTechAttribute( ) { * * @param pTechAttribute Value to which {@link #techAttribute} should be set. */ - public void setTechAttribute( @MyNotNull String pTechAttribute ) { + public void setTechAttribute( @MyNotNullProperty String pTechAttribute ) { // Assign value to attribute techAttribute = pTechAttribute; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/composite/ComplexBookingIDBase.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/composite/ComplexBookingIDBase.java index a1a8d0672..f530e77ec 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/composite/ComplexBookingIDBase.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/composite/ComplexBookingIDBase.java @@ -12,8 +12,8 @@ import java.util.List; import java.util.Objects; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyProperty; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.anaptecs.spring.base.BookingID; import com.anaptecs.spring.base.ComplexBookingType; @@ -156,7 +156,7 @@ public BuilderBase setInternalID( long pInternalID ) { * @param pReferenceID Value to which {@link #referenceID} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setReferenceID( @MyNotNull String pReferenceID ) { + public BuilderBase setReferenceID( @MyNotNullProperty String pReferenceID ) { // Assign value to attribute referenceID = pReferenceID; return this; @@ -168,7 +168,7 @@ public BuilderBase setReferenceID( @MyNotNull String pReferenceID ) { * @param pBookingIDs Collection to which {@link #bookingIDs} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setBookingIDs( @MyNotEmpty List pBookingIDs ) { + public BuilderBase setBookingIDs( @MyNotEmptyProperty List pBookingIDs ) { // To ensure immutability we have to copy the content of the passed collection. if (pBookingIDs != null) { bookingIDs = new ArrayList(pBookingIDs); @@ -185,7 +185,7 @@ public BuilderBase setBookingIDs( @MyNotEmpty List pBookingIDs ) { * @param pBookingIDs Array of objects that should be added to {@link #bookingIDs}. The parameter may be null. * @return {@link BuilderBase} Instance of this builder to support chaining. Method never returns null. */ - public BuilderBase addToBookingIDs( @MyNotEmpty BookingID... pBookingIDs ) { + public BuilderBase addToBookingIDs( @MyNotEmptyProperty BookingID... pBookingIDs ) { if (pBookingIDs != null) { if (bookingIDs == null) { bookingIDs = new ArrayList(); @@ -201,7 +201,7 @@ public BuilderBase addToBookingIDs( @MyNotEmpty BookingID... pBookingIDs ) { * @param pComplexBookingType Value to which {@link #complexBookingType} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setComplexBookingType( @MyNotNull ComplexBookingType pComplexBookingType ) { + public BuilderBase setComplexBookingType( @MyNotNullProperty ComplexBookingType pComplexBookingType ) { complexBookingType = pComplexBookingType; return this; } @@ -212,7 +212,7 @@ public BuilderBase setComplexBookingType( @MyNotNull ComplexBookingType pComplex * @param pAnotherID Value to which {@link #anotherID} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setAnotherID( @MyNotNull Integer pAnotherID ) { + public BuilderBase setAnotherID( @MyNotNullProperty Integer pAnotherID ) { // Assign value to attribute anotherID = pAnotherID; return this; @@ -273,7 +273,7 @@ public void setInternalID( long pInternalID ) { * * @return {@link String} Value to which {@link #referenceID} is set. */ - @MyNotNull + @MyNotNullProperty public String getReferenceID( ) { return referenceID; } @@ -283,7 +283,7 @@ public String getReferenceID( ) { * * @param pReferenceID Value to which {@link #referenceID} should be set. */ - public void setReferenceID( @MyNotNull String pReferenceID ) { + public void setReferenceID( @MyNotNullProperty String pReferenceID ) { // Assign value to attribute referenceID = pReferenceID; } @@ -294,7 +294,7 @@ public void setReferenceID( @MyNotNull String pReferenceID ) { * @return {@link List} Value to which {@link #bookingIDs} is set. The method never returns null and the * returned collection is unmodifiable. */ - @MyNotEmpty + @MyNotEmptyProperty public List getBookingIDs( ) { // Return all BookingID objects as unmodifiable collection. return Collections.unmodifiableList(bookingIDs); @@ -346,7 +346,7 @@ public void clearBookingIDs( ) { * * @return {@link ComplexBookingType} Value to which {@link #complexBookingType} is set. */ - @MyNotNull + @MyNotNullProperty public ComplexBookingType getComplexBookingType( ) { return complexBookingType; } @@ -356,7 +356,7 @@ public ComplexBookingType getComplexBookingType( ) { * * @param pComplexBookingType Value to which {@link #complexBookingType} should be set. */ - public void setComplexBookingType( @MyNotNull ComplexBookingType pComplexBookingType ) { + public void setComplexBookingType( @MyNotNullProperty ComplexBookingType pComplexBookingType ) { complexBookingType = pComplexBookingType; } @@ -372,7 +372,7 @@ public final void unsetComplexBookingType( ) { * * @return {@link Integer} Value to which {@link #anotherID} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getAnotherID( ) { return anotherID; } @@ -382,7 +382,7 @@ public Integer getAnotherID( ) { * * @param pAnotherID Value to which {@link #anotherID} should be set. */ - public void setAnotherID( @MyNotNull Integer pAnotherID ) { + public void setAnotherID( @MyNotNullProperty Integer pAnotherID ) { // Assign value to attribute anotherID = pAnotherID; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/custom/DataTypeCustomSerializationBase.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/custom/DataTypeCustomSerializationBase.java index af0f9009c..7605aaab8 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/custom/DataTypeCustomSerializationBase.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/custom/DataTypeCustomSerializationBase.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -73,7 +73,7 @@ protected BuilderBase( DataTypeCustomSerializationBase pObject ) { * @param pProperty1 Value to which {@link #property1} should be set. * @return {@link BuilderBase} Instance of this builder to support chaining setters. Method never returns null. */ - public BuilderBase setProperty1( @MyNotNull String pProperty1 ) { + public BuilderBase setProperty1( @MyNotNullProperty String pProperty1 ) { // Assign value to attribute property1 = pProperty1; return this; @@ -97,7 +97,7 @@ public DataTypeCustomSerialization build( ) { * * @return {@link String} Value to which {@link #property1} is set. */ - @MyNotNull + @MyNotNullProperty public String getProperty1( ) { return property1; } @@ -107,7 +107,7 @@ public String getProperty1( ) { * * @param pProperty1 Value to which {@link #property1} should be set. */ - public void setProperty1( @MyNotNull String pProperty1 ) { + public void setProperty1( @MyNotNullProperty String pProperty1 ) { // Assign value to attribute property1 = pProperty1; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/AdvancedHeader.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/AdvancedHeader.java index 4353119bf..660249c25 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/AdvancedHeader.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/AdvancedHeader.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.anaptecs.spring.base.BookingCode; import com.anaptecs.spring.base.BookingID; @@ -137,7 +137,7 @@ public static Builder newBuilder( AdvancedHeader pObject ) { * @param pBookingID Value to which {@link #bookingID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBookingID( @MyNotNull BookingID pBookingID ) { + public Builder setBookingID( @MyNotNullProperty BookingID pBookingID ) { // Assign value to attribute bookingID = pBookingID; return this; @@ -149,7 +149,7 @@ public Builder setBookingID( @MyNotNull BookingID pBookingID ) { * @param pBookingCode Value to which {@link #bookingCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBookingCode( @MyNotNull BookingCode pBookingCode ) { + public Builder setBookingCode( @MyNotNullProperty BookingCode pBookingCode ) { // Assign value to attribute bookingCode = pBookingCode; return this; @@ -161,7 +161,7 @@ public Builder setBookingCode( @MyNotNull BookingCode pBookingCode ) { * @param pDoubleCode Value to which {@link #doubleCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { + public Builder setDoubleCode( @MyNotNullProperty DoubleCode pDoubleCode ) { // Assign value to attribute doubleCode = pDoubleCode; return this; @@ -185,7 +185,7 @@ public AdvancedHeader build( ) { * * @return {@link BookingID} Value to which {@link #bookingID} is set. */ - @MyNotNull + @MyNotNullProperty public BookingID getBookingID( ) { return bookingID; } @@ -195,7 +195,7 @@ public BookingID getBookingID( ) { * * @param pBookingID Value to which {@link #bookingID} should be set. */ - public void setBookingID( @MyNotNull BookingID pBookingID ) { + public void setBookingID( @MyNotNullProperty BookingID pBookingID ) { // Assign value to attribute bookingID = pBookingID; } @@ -205,7 +205,7 @@ public void setBookingID( @MyNotNull BookingID pBookingID ) { * * @return {@link BookingCode} Value to which {@link #bookingCode} is set. */ - @MyNotNull + @MyNotNullProperty public BookingCode getBookingCode( ) { return bookingCode; } @@ -215,7 +215,7 @@ public BookingCode getBookingCode( ) { * * @param pBookingCode Value to which {@link #bookingCode} should be set. */ - public void setBookingCode( @MyNotNull BookingCode pBookingCode ) { + public void setBookingCode( @MyNotNullProperty BookingCode pBookingCode ) { // Assign value to attribute bookingCode = pBookingCode; } @@ -225,7 +225,7 @@ public void setBookingCode( @MyNotNull BookingCode pBookingCode ) { * * @return {@link DoubleCode} Value to which {@link #doubleCode} is set. */ - @MyNotNull + @MyNotNullProperty public DoubleCode getDoubleCode( ) { return doubleCode; } @@ -235,7 +235,7 @@ public DoubleCode getDoubleCode( ) { * * @param pDoubleCode Value to which {@link #doubleCode} should be set. */ - public void setDoubleCode( @MyNotNull DoubleCode pDoubleCode ) { + public void setDoubleCode( @MyNotNullProperty DoubleCode pDoubleCode ) { // Assign value to attribute doubleCode = pDoubleCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ChildBeanParameterType.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ChildBeanParameterType.java index 23f18d307..7e5873167 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ChildBeanParameterType.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ChildBeanParameterType.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.anaptecs.spring.base.ParentBeanParamType; @@ -144,7 +144,7 @@ public Builder setTkID( String pTkID ) { * @param pChildProperty Value to which {@link #childProperty} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setChildProperty( @MyNotNull String pChildProperty ) { + public Builder setChildProperty( @MyNotNullProperty String pChildProperty ) { // Assign value to attribute childProperty = pChildProperty; return this; @@ -168,7 +168,7 @@ public ChildBeanParameterType build( ) { * * @return {@link String} Value to which {@link #childProperty} is set. */ - @MyNotNull + @MyNotNullProperty public String getChildProperty( ) { return childProperty; } @@ -178,7 +178,7 @@ public String getChildProperty( ) { * * @param pChildProperty Value to which {@link #childProperty} should be set. */ - public void setChildProperty( @MyNotNull String pChildProperty ) { + public void setChildProperty( @MyNotNullProperty String pChildProperty ) { // Assign value to attribute childProperty = pChildProperty; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ContextWithPrimitives.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ContextWithPrimitives.java index 5e2ac214d..14b62a6a4 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ContextWithPrimitives.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ContextWithPrimitives.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; public class ContextWithPrimitives { @@ -190,7 +190,7 @@ public Builder setABoolean( boolean pABoolean ) { * @param pABooleanWrapper Value to which {@link #aBooleanWrapper} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setABooleanWrapper( @MyNotNull Boolean pABooleanWrapper ) { + public Builder setABooleanWrapper( @MyNotNullProperty Boolean pABooleanWrapper ) { // Assign value to attribute aBooleanWrapper = pABooleanWrapper; return this; @@ -214,7 +214,7 @@ public Builder setAnInt( int pAnInt ) { * @param pAnInteger Value to which {@link #anInteger} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAnInteger( @MyNotNull Integer pAnInteger ) { + public Builder setAnInteger( @MyNotNullProperty Integer pAnInteger ) { // Assign value to attribute anInteger = pAnInteger; return this; @@ -238,7 +238,7 @@ public Builder setALong( long pALong ) { * @param pAVeryLong Value to which {@link #aVeryLong} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setAVeryLong( @MyNotNull Long pAVeryLong ) { + public Builder setAVeryLong( @MyNotNullProperty Long pAVeryLong ) { // Assign value to attribute aVeryLong = pAVeryLong; return this; @@ -291,7 +291,7 @@ public void setABoolean( boolean pABoolean ) { * * @return {@link Boolean} Value to which {@link #aBooleanWrapper} is set. */ - @MyNotNull + @MyNotNullProperty public Boolean getABooleanWrapper( ) { return aBooleanWrapper; } @@ -301,7 +301,7 @@ public Boolean getABooleanWrapper( ) { * * @param pABooleanWrapper Value to which {@link #aBooleanWrapper} should be set. */ - public void setABooleanWrapper( @MyNotNull Boolean pABooleanWrapper ) { + public void setABooleanWrapper( @MyNotNullProperty Boolean pABooleanWrapper ) { // Assign value to attribute aBooleanWrapper = pABooleanWrapper; } @@ -330,7 +330,7 @@ public void setAnInt( int pAnInt ) { * * @return {@link Integer} Value to which {@link #anInteger} is set. */ - @MyNotNull + @MyNotNullProperty public Integer getAnInteger( ) { return anInteger; } @@ -340,7 +340,7 @@ public Integer getAnInteger( ) { * * @param pAnInteger Value to which {@link #anInteger} should be set. */ - public void setAnInteger( @MyNotNull Integer pAnInteger ) { + public void setAnInteger( @MyNotNullProperty Integer pAnInteger ) { // Assign value to attribute anInteger = pAnInteger; } @@ -369,7 +369,7 @@ public void setALong( long pALong ) { * * @return {@link Long} Value to which {@link #aVeryLong} is set. */ - @MyNotNull + @MyNotNullProperty public Long getAVeryLong( ) { return aVeryLong; } @@ -379,7 +379,7 @@ public Long getAVeryLong( ) { * * @param pAVeryLong Value to which {@link #aVeryLong} should be set. */ - public void setAVeryLong( @MyNotNull Long pAVeryLong ) { + public void setAVeryLong( @MyNotNullProperty Long pAVeryLong ) { // Assign value to attribute aVeryLong = pAVeryLong; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DataTypesQueryBean.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DataTypesQueryBean.java index bd9ef82b1..4a382656c 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DataTypesQueryBean.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DataTypesQueryBean.java @@ -18,7 +18,7 @@ import java.util.Objects; import java.util.Set; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.anaptecs.spring.base.BookingID; import com.anaptecs.spring.base.DoubleCode; @@ -402,7 +402,7 @@ public Builder setBookingIDsArray( BookingID[] pBookingIDsArray ) { * @param pOffsetDateTime Value to which {@link #offsetDateTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { + public Builder setOffsetDateTime( @MyNotNullProperty OffsetDateTime pOffsetDateTime ) { // Assign value to attribute offsetDateTime = pOffsetDateTime; return this; @@ -414,7 +414,7 @@ public Builder setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { * @param pOffsetTime Value to which {@link #offsetTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { + public Builder setOffsetTime( @MyNotNullProperty OffsetTime pOffsetTime ) { offsetTime = pOffsetTime; return this; } @@ -425,7 +425,7 @@ public Builder setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { * @param pLocalDateTime Value to which {@link #localDateTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public Builder setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; return this; @@ -437,7 +437,7 @@ public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * @param pLocalTime Value to which {@link #localTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public Builder setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; return this; @@ -748,7 +748,7 @@ public void setBookingIDsArray( BookingID[] pBookingIDsArray ) { * * @return {@link OffsetDateTime} Value to which {@link #offsetDateTime} is set. */ - @MyNotNull + @MyNotNullProperty public OffsetDateTime getOffsetDateTime( ) { return offsetDateTime; } @@ -758,7 +758,7 @@ public OffsetDateTime getOffsetDateTime( ) { * * @param pOffsetDateTime Value to which {@link #offsetDateTime} should be set. */ - public void setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { + public void setOffsetDateTime( @MyNotNullProperty OffsetDateTime pOffsetDateTime ) { // Assign value to attribute offsetDateTime = pOffsetDateTime; } @@ -768,7 +768,7 @@ public void setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { * * @return {@link OffsetTime} Value to which {@link #offsetTime} is set. */ - @MyNotNull + @MyNotNullProperty public OffsetTime getOffsetTime( ) { return offsetTime; } @@ -778,7 +778,7 @@ public OffsetTime getOffsetTime( ) { * * @param pOffsetTime Value to which {@link #offsetTime} should be set. */ - public void setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { + public void setOffsetTime( @MyNotNullProperty OffsetTime pOffsetTime ) { offsetTime = pOffsetTime; } @@ -794,7 +794,7 @@ public final void unsetOffsetTime( ) { * * @return {@link LocalDateTime} Value to which {@link #localDateTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalDateTime getLocalDateTime( ) { return localDateTime; } @@ -804,7 +804,7 @@ public LocalDateTime getLocalDateTime( ) { * * @param pLocalDateTime Value to which {@link #localDateTime} should be set. */ - public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public void setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; } @@ -814,7 +814,7 @@ public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * * @return {@link LocalTime} Value to which {@link #localTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalTime getLocalTime( ) { return localTime; } @@ -824,7 +824,7 @@ public LocalTime getLocalTime( ) { * * @param pLocalTime Value to which {@link #localTime} should be set. */ - public void setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public void setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DateHeaderParamsBean.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DateHeaderParamsBean.java index 320e0a8c1..0c50723c6 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DateHeaderParamsBean.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DateHeaderParamsBean.java @@ -16,7 +16,7 @@ import java.util.Calendar; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; public class DateHeaderParamsBean { @@ -244,7 +244,7 @@ public static Builder newBuilder( DateHeaderParamsBean pObject ) { * @param pOffsetDateTime Value to which {@link #offsetDateTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { + public Builder setOffsetDateTime( @MyNotNullProperty OffsetDateTime pOffsetDateTime ) { // Assign value to attribute offsetDateTime = pOffsetDateTime; return this; @@ -256,7 +256,7 @@ public Builder setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { * @param pOffsetTime Value to which {@link #offsetTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { + public Builder setOffsetTime( @MyNotNullProperty OffsetTime pOffsetTime ) { // Assign value to attribute offsetTime = pOffsetTime; return this; @@ -268,7 +268,7 @@ public Builder setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { * @param pLocalDateTime Value to which {@link #localDateTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public Builder setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; return this; @@ -280,7 +280,7 @@ public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * @param pLocalTime Value to which {@link #localTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public Builder setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; return this; @@ -292,7 +292,7 @@ public Builder setLocalTime( @MyNotNull LocalTime pLocalTime ) { * @param pLocalDate Value to which {@link #localDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalDate( @MyNotNull LocalDate pLocalDate ) { + public Builder setLocalDate( @MyNotNullProperty LocalDate pLocalDate ) { // Assign value to attribute localDate = pLocalDate; return this; @@ -304,7 +304,7 @@ public Builder setLocalDate( @MyNotNull LocalDate pLocalDate ) { * @param pUtilDate Value to which {@link #utilDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setUtilDate( @MyNotNull java.util.Date pUtilDate ) { + public Builder setUtilDate( @MyNotNullProperty java.util.Date pUtilDate ) { // Assign value to attribute utilDate = pUtilDate; return this; @@ -316,7 +316,7 @@ public Builder setUtilDate( @MyNotNull java.util.Date pUtilDate ) { * @param pCalendar Value to which {@link #calendar} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCalendar( @MyNotNull Calendar pCalendar ) { + public Builder setCalendar( @MyNotNullProperty Calendar pCalendar ) { // Assign value to attribute calendar = pCalendar; return this; @@ -328,7 +328,7 @@ public Builder setCalendar( @MyNotNull Calendar pCalendar ) { * @param pSqlTimestamp Value to which {@link #sqlTimestamp} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { + public Builder setSqlTimestamp( @MyNotNullProperty Timestamp pSqlTimestamp ) { // Assign value to attribute sqlTimestamp = pSqlTimestamp; return this; @@ -340,7 +340,7 @@ public Builder setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { * @param pSqlTime Value to which {@link #sqlTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlTime( @MyNotNull Time pSqlTime ) { + public Builder setSqlTime( @MyNotNullProperty Time pSqlTime ) { // Assign value to attribute sqlTime = pSqlTime; return this; @@ -352,7 +352,7 @@ public Builder setSqlTime( @MyNotNull Time pSqlTime ) { * @param pSqlDate Value to which {@link #sqlDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlDate( @MyNotNull Date pSqlDate ) { + public Builder setSqlDate( @MyNotNullProperty Date pSqlDate ) { // Assign value to attribute sqlDate = pSqlDate; return this; @@ -376,7 +376,7 @@ public DateHeaderParamsBean build( ) { * * @return {@link OffsetDateTime} Value to which {@link #offsetDateTime} is set. */ - @MyNotNull + @MyNotNullProperty public OffsetDateTime getOffsetDateTime( ) { return offsetDateTime; } @@ -386,7 +386,7 @@ public OffsetDateTime getOffsetDateTime( ) { * * @param pOffsetDateTime Value to which {@link #offsetDateTime} should be set. */ - public void setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { + public void setOffsetDateTime( @MyNotNullProperty OffsetDateTime pOffsetDateTime ) { // Assign value to attribute offsetDateTime = pOffsetDateTime; } @@ -396,7 +396,7 @@ public void setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { * * @return {@link OffsetTime} Value to which {@link #offsetTime} is set. */ - @MyNotNull + @MyNotNullProperty public OffsetTime getOffsetTime( ) { return offsetTime; } @@ -406,7 +406,7 @@ public OffsetTime getOffsetTime( ) { * * @param pOffsetTime Value to which {@link #offsetTime} should be set. */ - public void setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { + public void setOffsetTime( @MyNotNullProperty OffsetTime pOffsetTime ) { // Assign value to attribute offsetTime = pOffsetTime; } @@ -416,7 +416,7 @@ public void setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { * * @return {@link LocalDateTime} Value to which {@link #localDateTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalDateTime getLocalDateTime( ) { return localDateTime; } @@ -426,7 +426,7 @@ public LocalDateTime getLocalDateTime( ) { * * @param pLocalDateTime Value to which {@link #localDateTime} should be set. */ - public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public void setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; } @@ -436,7 +436,7 @@ public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * * @return {@link LocalTime} Value to which {@link #localTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalTime getLocalTime( ) { return localTime; } @@ -446,7 +446,7 @@ public LocalTime getLocalTime( ) { * * @param pLocalTime Value to which {@link #localTime} should be set. */ - public void setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public void setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; } @@ -456,7 +456,7 @@ public void setLocalTime( @MyNotNull LocalTime pLocalTime ) { * * @return {@link LocalDate} Value to which {@link #localDate} is set. */ - @MyNotNull + @MyNotNullProperty public LocalDate getLocalDate( ) { return localDate; } @@ -466,7 +466,7 @@ public LocalDate getLocalDate( ) { * * @param pLocalDate Value to which {@link #localDate} should be set. */ - public void setLocalDate( @MyNotNull LocalDate pLocalDate ) { + public void setLocalDate( @MyNotNullProperty LocalDate pLocalDate ) { // Assign value to attribute localDate = pLocalDate; } @@ -476,7 +476,7 @@ public void setLocalDate( @MyNotNull LocalDate pLocalDate ) { * * @return {@link java.util.Date} Value to which {@link #utilDate} is set. */ - @MyNotNull + @MyNotNullProperty public java.util.Date getUtilDate( ) { return utilDate; } @@ -486,7 +486,7 @@ public java.util.Date getUtilDate( ) { * * @param pUtilDate Value to which {@link #utilDate} should be set. */ - public void setUtilDate( @MyNotNull java.util.Date pUtilDate ) { + public void setUtilDate( @MyNotNullProperty java.util.Date pUtilDate ) { // Assign value to attribute utilDate = pUtilDate; } @@ -496,7 +496,7 @@ public void setUtilDate( @MyNotNull java.util.Date pUtilDate ) { * * @return {@link Calendar} Value to which {@link #calendar} is set. */ - @MyNotNull + @MyNotNullProperty public Calendar getCalendar( ) { return calendar; } @@ -506,7 +506,7 @@ public Calendar getCalendar( ) { * * @param pCalendar Value to which {@link #calendar} should be set. */ - public void setCalendar( @MyNotNull Calendar pCalendar ) { + public void setCalendar( @MyNotNullProperty Calendar pCalendar ) { // Assign value to attribute calendar = pCalendar; } @@ -516,7 +516,7 @@ public void setCalendar( @MyNotNull Calendar pCalendar ) { * * @return {@link Timestamp} Value to which {@link #sqlTimestamp} is set. */ - @MyNotNull + @MyNotNullProperty public Timestamp getSqlTimestamp( ) { return sqlTimestamp; } @@ -526,7 +526,7 @@ public Timestamp getSqlTimestamp( ) { * * @param pSqlTimestamp Value to which {@link #sqlTimestamp} should be set. */ - public void setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { + public void setSqlTimestamp( @MyNotNullProperty Timestamp pSqlTimestamp ) { // Assign value to attribute sqlTimestamp = pSqlTimestamp; } @@ -536,7 +536,7 @@ public void setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { * * @return {@link Time} Value to which {@link #sqlTime} is set. */ - @MyNotNull + @MyNotNullProperty public Time getSqlTime( ) { return sqlTime; } @@ -546,7 +546,7 @@ public Time getSqlTime( ) { * * @param pSqlTime Value to which {@link #sqlTime} should be set. */ - public void setSqlTime( @MyNotNull Time pSqlTime ) { + public void setSqlTime( @MyNotNullProperty Time pSqlTime ) { // Assign value to attribute sqlTime = pSqlTime; } @@ -556,7 +556,7 @@ public void setSqlTime( @MyNotNull Time pSqlTime ) { * * @return {@link Date} Value to which {@link #sqlDate} is set. */ - @MyNotNull + @MyNotNullProperty public Date getSqlDate( ) { return sqlDate; } @@ -566,7 +566,7 @@ public Date getSqlDate( ) { * * @param pSqlDate Value to which {@link #sqlDate} should be set. */ - public void setSqlDate( @MyNotNull Date pSqlDate ) { + public void setSqlDate( @MyNotNullProperty Date pSqlDate ) { // Assign value to attribute sqlDate = pSqlDate; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DateQueryParamsBean.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DateQueryParamsBean.java index 3cb253621..00dd98ca8 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DateQueryParamsBean.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/DateQueryParamsBean.java @@ -16,7 +16,7 @@ import java.util.Calendar; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; public class DateQueryParamsBean { @@ -244,7 +244,7 @@ public static Builder newBuilder( DateQueryParamsBean pObject ) { * @param pOffsetDateTime Value to which {@link #offsetDateTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { + public Builder setOffsetDateTime( @MyNotNullProperty OffsetDateTime pOffsetDateTime ) { // Assign value to attribute offsetDateTime = pOffsetDateTime; return this; @@ -256,7 +256,7 @@ public Builder setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { * @param pOffsetTime Value to which {@link #offsetTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { + public Builder setOffsetTime( @MyNotNullProperty OffsetTime pOffsetTime ) { // Assign value to attribute offsetTime = pOffsetTime; return this; @@ -268,7 +268,7 @@ public Builder setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { * @param pLocalDateTime Value to which {@link #localDateTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public Builder setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; return this; @@ -280,7 +280,7 @@ public Builder setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * @param pLocalTime Value to which {@link #localTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public Builder setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; return this; @@ -292,7 +292,7 @@ public Builder setLocalTime( @MyNotNull LocalTime pLocalTime ) { * @param pLocalDate Value to which {@link #localDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalDate( @MyNotNull LocalDate pLocalDate ) { + public Builder setLocalDate( @MyNotNullProperty LocalDate pLocalDate ) { // Assign value to attribute localDate = pLocalDate; return this; @@ -304,7 +304,7 @@ public Builder setLocalDate( @MyNotNull LocalDate pLocalDate ) { * @param pUtilDate Value to which {@link #utilDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setUtilDate( @MyNotNull java.util.Date pUtilDate ) { + public Builder setUtilDate( @MyNotNullProperty java.util.Date pUtilDate ) { // Assign value to attribute utilDate = pUtilDate; return this; @@ -316,7 +316,7 @@ public Builder setUtilDate( @MyNotNull java.util.Date pUtilDate ) { * @param pCalendar Value to which {@link #calendar} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setCalendar( @MyNotNull Calendar pCalendar ) { + public Builder setCalendar( @MyNotNullProperty Calendar pCalendar ) { // Assign value to attribute calendar = pCalendar; return this; @@ -328,7 +328,7 @@ public Builder setCalendar( @MyNotNull Calendar pCalendar ) { * @param pSqlTimestamp Value to which {@link #sqlTimestamp} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { + public Builder setSqlTimestamp( @MyNotNullProperty Timestamp pSqlTimestamp ) { // Assign value to attribute sqlTimestamp = pSqlTimestamp; return this; @@ -340,7 +340,7 @@ public Builder setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { * @param pSqlTime Value to which {@link #sqlTime} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlTime( @MyNotNull Time pSqlTime ) { + public Builder setSqlTime( @MyNotNullProperty Time pSqlTime ) { // Assign value to attribute sqlTime = pSqlTime; return this; @@ -352,7 +352,7 @@ public Builder setSqlTime( @MyNotNull Time pSqlTime ) { * @param pSqlDate Value to which {@link #sqlDate} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setSqlDate( @MyNotNull Date pSqlDate ) { + public Builder setSqlDate( @MyNotNullProperty Date pSqlDate ) { // Assign value to attribute sqlDate = pSqlDate; return this; @@ -376,7 +376,7 @@ public DateQueryParamsBean build( ) { * * @return {@link OffsetDateTime} Value to which {@link #offsetDateTime} is set. */ - @MyNotNull + @MyNotNullProperty public OffsetDateTime getOffsetDateTime( ) { return offsetDateTime; } @@ -386,7 +386,7 @@ public OffsetDateTime getOffsetDateTime( ) { * * @param pOffsetDateTime Value to which {@link #offsetDateTime} should be set. */ - public void setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { + public void setOffsetDateTime( @MyNotNullProperty OffsetDateTime pOffsetDateTime ) { // Assign value to attribute offsetDateTime = pOffsetDateTime; } @@ -396,7 +396,7 @@ public void setOffsetDateTime( @MyNotNull OffsetDateTime pOffsetDateTime ) { * * @return {@link OffsetTime} Value to which {@link #offsetTime} is set. */ - @MyNotNull + @MyNotNullProperty public OffsetTime getOffsetTime( ) { return offsetTime; } @@ -406,7 +406,7 @@ public OffsetTime getOffsetTime( ) { * * @param pOffsetTime Value to which {@link #offsetTime} should be set. */ - public void setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { + public void setOffsetTime( @MyNotNullProperty OffsetTime pOffsetTime ) { // Assign value to attribute offsetTime = pOffsetTime; } @@ -416,7 +416,7 @@ public void setOffsetTime( @MyNotNull OffsetTime pOffsetTime ) { * * @return {@link LocalDateTime} Value to which {@link #localDateTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalDateTime getLocalDateTime( ) { return localDateTime; } @@ -426,7 +426,7 @@ public LocalDateTime getLocalDateTime( ) { * * @param pLocalDateTime Value to which {@link #localDateTime} should be set. */ - public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { + public void setLocalDateTime( @MyNotNullProperty LocalDateTime pLocalDateTime ) { // Assign value to attribute localDateTime = pLocalDateTime; } @@ -436,7 +436,7 @@ public void setLocalDateTime( @MyNotNull LocalDateTime pLocalDateTime ) { * * @return {@link LocalTime} Value to which {@link #localTime} is set. */ - @MyNotNull + @MyNotNullProperty public LocalTime getLocalTime( ) { return localTime; } @@ -446,7 +446,7 @@ public LocalTime getLocalTime( ) { * * @param pLocalTime Value to which {@link #localTime} should be set. */ - public void setLocalTime( @MyNotNull LocalTime pLocalTime ) { + public void setLocalTime( @MyNotNullProperty LocalTime pLocalTime ) { // Assign value to attribute localTime = pLocalTime; } @@ -456,7 +456,7 @@ public void setLocalTime( @MyNotNull LocalTime pLocalTime ) { * * @return {@link LocalDate} Value to which {@link #localDate} is set. */ - @MyNotNull + @MyNotNullProperty public LocalDate getLocalDate( ) { return localDate; } @@ -466,7 +466,7 @@ public LocalDate getLocalDate( ) { * * @param pLocalDate Value to which {@link #localDate} should be set. */ - public void setLocalDate( @MyNotNull LocalDate pLocalDate ) { + public void setLocalDate( @MyNotNullProperty LocalDate pLocalDate ) { // Assign value to attribute localDate = pLocalDate; } @@ -476,7 +476,7 @@ public void setLocalDate( @MyNotNull LocalDate pLocalDate ) { * * @return {@link java.util.Date} Value to which {@link #utilDate} is set. */ - @MyNotNull + @MyNotNullProperty public java.util.Date getUtilDate( ) { return utilDate; } @@ -486,7 +486,7 @@ public java.util.Date getUtilDate( ) { * * @param pUtilDate Value to which {@link #utilDate} should be set. */ - public void setUtilDate( @MyNotNull java.util.Date pUtilDate ) { + public void setUtilDate( @MyNotNullProperty java.util.Date pUtilDate ) { // Assign value to attribute utilDate = pUtilDate; } @@ -496,7 +496,7 @@ public void setUtilDate( @MyNotNull java.util.Date pUtilDate ) { * * @return {@link Calendar} Value to which {@link #calendar} is set. */ - @MyNotNull + @MyNotNullProperty public Calendar getCalendar( ) { return calendar; } @@ -506,7 +506,7 @@ public Calendar getCalendar( ) { * * @param pCalendar Value to which {@link #calendar} should be set. */ - public void setCalendar( @MyNotNull Calendar pCalendar ) { + public void setCalendar( @MyNotNullProperty Calendar pCalendar ) { // Assign value to attribute calendar = pCalendar; } @@ -516,7 +516,7 @@ public void setCalendar( @MyNotNull Calendar pCalendar ) { * * @return {@link Timestamp} Value to which {@link #sqlTimestamp} is set. */ - @MyNotNull + @MyNotNullProperty public Timestamp getSqlTimestamp( ) { return sqlTimestamp; } @@ -526,7 +526,7 @@ public Timestamp getSqlTimestamp( ) { * * @param pSqlTimestamp Value to which {@link #sqlTimestamp} should be set. */ - public void setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { + public void setSqlTimestamp( @MyNotNullProperty Timestamp pSqlTimestamp ) { // Assign value to attribute sqlTimestamp = pSqlTimestamp; } @@ -536,7 +536,7 @@ public void setSqlTimestamp( @MyNotNull Timestamp pSqlTimestamp ) { * * @return {@link Time} Value to which {@link #sqlTime} is set. */ - @MyNotNull + @MyNotNullProperty public Time getSqlTime( ) { return sqlTime; } @@ -546,7 +546,7 @@ public Time getSqlTime( ) { * * @param pSqlTime Value to which {@link #sqlTime} should be set. */ - public void setSqlTime( @MyNotNull Time pSqlTime ) { + public void setSqlTime( @MyNotNullProperty Time pSqlTime ) { // Assign value to attribute sqlTime = pSqlTime; } @@ -556,7 +556,7 @@ public void setSqlTime( @MyNotNull Time pSqlTime ) { * * @return {@link Date} Value to which {@link #sqlDate} is set. */ - @MyNotNull + @MyNotNullProperty public Date getSqlDate( ) { return sqlDate; } @@ -566,7 +566,7 @@ public Date getSqlDate( ) { * * @param pSqlDate Value to which {@link #sqlDate} should be set. */ - public void setSqlDate( @MyNotNull Date pSqlDate ) { + public void setSqlDate( @MyNotNullProperty Date pSqlDate ) { // Assign value to attribute sqlDate = pSqlDate; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/LocalBeanParamType.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/LocalBeanParamType.java index f5fd4d699..23b9cac82 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/LocalBeanParamType.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/LocalBeanParamType.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; public class LocalBeanParamType { @@ -120,7 +120,7 @@ public static Builder newBuilder( LocalBeanParamType pObject ) { * @param pLocalKey Value to which {@link #localKey} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalKey( @MyNotNull String pLocalKey ) { + public Builder setLocalKey( @MyNotNullProperty String pLocalKey ) { // Assign value to attribute localKey = pLocalKey; return this; @@ -132,7 +132,7 @@ public Builder setLocalKey( @MyNotNull String pLocalKey ) { * @param pLocalID Value to which {@link #localID} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setLocalID( @MyNotNull String pLocalID ) { + public Builder setLocalID( @MyNotNullProperty String pLocalID ) { // Assign value to attribute localID = pLocalID; return this; @@ -156,7 +156,7 @@ public LocalBeanParamType build( ) { * * @return {@link String} Value to which {@link #localKey} is set. */ - @MyNotNull + @MyNotNullProperty public String getLocalKey( ) { return localKey; } @@ -166,7 +166,7 @@ public String getLocalKey( ) { * * @param pLocalKey Value to which {@link #localKey} should be set. */ - public void setLocalKey( @MyNotNull String pLocalKey ) { + public void setLocalKey( @MyNotNullProperty String pLocalKey ) { // Assign value to attribute localKey = pLocalKey; } @@ -176,7 +176,7 @@ public void setLocalKey( @MyNotNull String pLocalKey ) { * * @return {@link String} Value to which {@link #localID} is set. */ - @MyNotNull + @MyNotNullProperty public String getLocalID( ) { return localID; } @@ -186,7 +186,7 @@ public String getLocalID( ) { * * @param pLocalID Value to which {@link #localID} should be set. */ - public void setLocalID( @MyNotNull String pLocalID ) { + public void setLocalID( @MyNotNullProperty String pLocalID ) { // Assign value to attribute localID = pLocalID; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/MultiValuedHeaderBeanParam.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/MultiValuedHeaderBeanParam.java index f4b9df95d..500cc5553 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/MultiValuedHeaderBeanParam.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/MultiValuedHeaderBeanParam.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.Set; -import com.anaptecs.annotations.MyNotEmpty; +import com.anaptecs.annotations.MyNotEmptyProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.anaptecs.spring.base.StringCode; import com.anaptecs.spring.base.TimeUnit; @@ -303,7 +303,7 @@ public Builder setNames( String[] pNames ) { * @param pInts Value to which {@link #ints} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setInts( @MyNotEmpty int[] pInts ) { + public Builder setInts( @MyNotEmptyProperty int[] pInts ) { // Assign value to attribute if (pInts != null) { ints = new int[pInts.length]; @@ -639,7 +639,7 @@ public void setNames( String[] pNames ) { * * @return int[] Value to which {@link #ints} is set. */ - @MyNotEmpty + @MyNotEmptyProperty public int[] getInts( ) { int[] lReturnValue; if (ints != null) { @@ -657,7 +657,7 @@ public int[] getInts( ) { * * @param pInts Value to which {@link #ints} should be set. */ - public void setInts( @MyNotEmpty int[] pInts ) { + public void setInts( @MyNotEmptyProperty int[] pInts ) { // Assign value to attribute if (pInts != null) { ints = new int[pInts.length]; diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/PathlessService.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/PathlessService.java index 680855f5f..aeec932c3 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/PathlessService.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/PathlessService.java @@ -5,7 +5,7 @@ */ package com.anaptecs.spring.service; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullServiceParam; public interface PathlessService { /** @@ -14,7 +14,7 @@ public interface PathlessService { * * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String getSomething( ); /** @@ -24,8 +24,8 @@ public interface PathlessService { * @param pHeaderBean * @param pTechContext */ - @MyNotNull - void processTechParam( @MyNotNull MultiValuedHeaderBeanParam pHeaderBean ); + @MyNotNullServiceParam + void processTechParam( @MyNotNullServiceParam MultiValuedHeaderBeanParam pHeaderBean ); /** *

@@ -34,6 +34,6 @@ public interface PathlessService { * @param pQuery * @return {@link String} */ - @MyNotNull - String testQueryBeanParam( @MyNotNull DataTypesQueryBean pQuery ); + @MyNotNullServiceParam + String testQueryBeanParam( @MyNotNullServiceParam DataTypesQueryBean pQuery ); } \ No newline at end of file diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ProductService.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ProductService.java index b204e7066..e36efc2a7 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ProductService.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/ProductService.java @@ -19,8 +19,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyServiceParam; +import com.anaptecs.annotations.MyNotNullServiceParam; import com.anaptecs.spring.base.AnotherDataType; import com.anaptecs.spring.base.BeanParameter; import com.anaptecs.spring.base.ChannelCode; @@ -53,8 +53,8 @@ public interface ProductService extends MonitoringService { * @param pProductID * @return {@link Product} */ - @MyNotNull - Product getProduct( @NotEmpty @MyNotNull String pProductID ); + @MyNotNullServiceParam + Product getProduct( @NotEmpty @MyNotNullServiceParam String pProductID ); /** *

@@ -63,7 +63,7 @@ public interface ProductService extends MonitoringService { * @param pProduct * @return boolean */ - boolean createProduct( @MyNotNull Product pProduct ); + boolean createProduct( @MyNotNullServiceParam Product pProduct ); /** *

@@ -72,8 +72,8 @@ public interface ProductService extends MonitoringService { * @param pContext * @return {@link Sortiment} */ - @MyNotNull - Sortiment getSortiment( @MyNotNull Context pContext ); + @MyNotNullServiceParam + Sortiment getSortiment( @MyNotNullServiceParam Context pContext ); /** *

@@ -82,14 +82,14 @@ public interface ProductService extends MonitoringService { * @param pChannelCode * @return {@link ChannelCode} */ - @MyNotNull - ChannelCode createChannelCode( @NotBlank @MyNotNull String pChannelCode ); + @MyNotNullServiceParam + ChannelCode createChannelCode( @NotBlank @MyNotNullServiceParam String pChannelCode ); /** *

* Authorized Roles: NO_ACCESS */ - @MyNotNull + @MyNotNullServiceParam void ping( ); /** @@ -99,7 +99,7 @@ public interface ProductService extends MonitoringService { * @return {@link String} */ @Deprecated - @MyNotNull + @MyNotNullServiceParam String deprecatedOperation( ); /** @@ -109,8 +109,8 @@ public interface ProductService extends MonitoringService { * @param pContext * @return {@link String} */ - @MyNotNull - String deprecatedContext( @MyNotNull DeprecatedContext pContext ); + @MyNotNullServiceParam + String deprecatedContext( @MyNotNullServiceParam DeprecatedContext pContext ); /** *

@@ -118,8 +118,8 @@ public interface ProductService extends MonitoringService { * * @param pBeanParam */ - @MyNotNull - void deprecatedBeanParam( @MyNotNull BeanParameter pBeanParam ); + @MyNotNullServiceParam + void deprecatedBeanParam( @MyNotNullServiceParam BeanParameter pBeanParam ); /** *

@@ -131,7 +131,7 @@ public interface ProductService extends MonitoringService { * Deprecated. (since: , removed with: ) */ @Deprecated - @MyNotNull + @MyNotNullServiceParam String deprecatedParams( @Deprecated int pParam1 ); /** @@ -142,8 +142,8 @@ public interface ProductService extends MonitoringService { * Deprecated. (since: , removed with: ) * @return {@link String} */ - @MyNotNull - String deprecatedBody( @Deprecated @MyNotNull String pBody ); + @MyNotNullServiceParam + String deprecatedBody( @Deprecated @MyNotNullServiceParam String pBody ); /** * Please be aware that deprecations on complex bodies are not supported. Instead the whole operation needs to be set @@ -154,8 +154,8 @@ public interface ProductService extends MonitoringService { * @param pProduct
* Deprecated. (since: , removed with: ) */ - @MyNotNull - void deprectedComplexRequestBody( @Deprecated @MyNotNull Product pProduct ); + @MyNotNullServiceParam + void deprectedComplexRequestBody( @Deprecated @MyNotNullServiceParam Product pProduct ); /** *

@@ -165,7 +165,7 @@ public interface ProductService extends MonitoringService { * Deprecated. (since: , removed with: ) */ @Deprecated - @MyNotNull + @MyNotNullServiceParam Product deprecatedComplexReturn( ); /** @@ -174,8 +174,8 @@ public interface ProductService extends MonitoringService { * * @param pContext */ - @MyNotNull - void loadSpecificThings( @MyNotNull SpecialContext pContext ); + @MyNotNullServiceParam + void loadSpecificThings( @MyNotNullServiceParam SpecialContext pContext ); /** *

@@ -184,8 +184,8 @@ public interface ProductService extends MonitoringService { * @param pChannelCode Channel Code that should be created. * @return {@link ChannelCode} Created channel code */ - @MyNotNull - ChannelCode createChannelCodeFromObject( @MyNotNull ChannelCode pChannelCode ); + @MyNotNullServiceParam + ChannelCode createChannelCodeFromObject( @MyNotNullServiceParam ChannelCode pChannelCode ); /** *

@@ -194,8 +194,8 @@ public interface ProductService extends MonitoringService { * @param pCurrencies * @return {@link List} */ - @MyNotEmpty - List addCurrencies( @MyNotEmpty List pCurrencies ); + @MyNotEmptyServiceParam + List addCurrencies( @MyNotEmptyServiceParam List pCurrencies ); /** *

@@ -204,8 +204,8 @@ public interface ProductService extends MonitoringService { * @param pCurrency * @return {@link CurrencyCode} */ - @MyNotNull - CurrencyCode isCurrencySupported( @MyNotNull CurrencyCode pCurrency ); + @MyNotNullServiceParam + CurrencyCode isCurrencySupported( @MyNotNullServiceParam CurrencyCode pCurrency ); /** *

@@ -214,8 +214,8 @@ public interface ProductService extends MonitoringService { * @param pStringCode * @return {@link IntegerCodeType} */ - @MyNotNull - IntegerCodeType testCodeTypeUsage( @MyNotNull StringCodeType pStringCode ); + @MyNotNullServiceParam + IntegerCodeType testCodeTypeUsage( @MyNotNullServiceParam StringCodeType pStringCode ); /** *

@@ -224,8 +224,8 @@ public interface ProductService extends MonitoringService { * @param pBeanParam * @return {@link String} */ - @MyNotNull - String testLocalBeanParamType( @MyNotNull LocalBeanParamType pBeanParam ); + @MyNotNullServiceParam + String testLocalBeanParamType( @MyNotNullServiceParam LocalBeanParamType pBeanParam ); /** *

@@ -234,8 +234,8 @@ public interface ProductService extends MonitoringService { * @param pParent * @return {@link String} */ - @MyNotNull - String testExternalBeanParameterType( @MyNotNull ParentBeanParamType pParent ); + @MyNotNullServiceParam + String testExternalBeanParameterType( @MyNotNullServiceParam ParentBeanParamType pParent ); /** *

@@ -244,8 +244,8 @@ public interface ProductService extends MonitoringService { * @param pChild * @return {@link String} */ - @MyNotNull - String testChildBeanParameter( @MyNotNull ChildBeanParameterType pChild ); + @MyNotNullServiceParam + String testChildBeanParameter( @MyNotNullServiceParam ChildBeanParameterType pChild ); /** *

@@ -263,12 +263,13 @@ public interface ProductService extends MonitoringService { * @param pSQLTime * @param pSQLDate */ - @MyNotNull - void testDateQueryParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pStartTimestamp, - @MyNotNull OffsetTime pStartTime, @MyNotNull LocalDateTime pLocalStartTimestamp, - @MyNotNull LocalTime pLocalStartTime, @MyNotNull LocalDate pLocalStartDate, @MyNotNull Calendar pCalendar, - @MyNotNull java.util.Date pUtilDate, @MyNotNull Timestamp pSQLTimestamp, @MyNotNull Time pSQLTime, - @MyNotNull Date pSQLDate ); + @MyNotNullServiceParam + void testDateQueryParams( @MyNotNullServiceParam String pPath, @MyNotNullServiceParam OffsetDateTime pStartTimestamp, + @MyNotNullServiceParam OffsetTime pStartTime, @MyNotNullServiceParam LocalDateTime pLocalStartTimestamp, + @MyNotNullServiceParam LocalTime pLocalStartTime, @MyNotNullServiceParam LocalDate pLocalStartDate, + @MyNotNullServiceParam Calendar pCalendar, @MyNotNullServiceParam java.util.Date pUtilDate, + @MyNotNullServiceParam Timestamp pSQLTimestamp, @MyNotNullServiceParam Time pSQLTime, + @MyNotNullServiceParam Date pSQLDate ); /** *

@@ -277,8 +278,9 @@ void testDateQueryParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pSt * @param pPath * @param pQueryParams */ - @MyNotNull - void testDateQueryParamsBean( @MyNotNull String pPath, @MyNotNull DateQueryParamsBean pQueryParams ); + @MyNotNullServiceParam + void testDateQueryParamsBean( @MyNotNullServiceParam String pPath, + @MyNotNullServiceParam DateQueryParamsBean pQueryParams ); /** *

@@ -296,11 +298,13 @@ void testDateQueryParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pSt * @param pSQLTime * @param pSQLDate */ - @MyNotNull - void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pOffsetDateTime, - @MyNotNull OffsetTime pOffsetTime, @MyNotNull LocalDateTime pLocalDateTime, @MyNotNull LocalTime pLocalTime, - @MyNotNull LocalDate pLocalDate, @MyNotNull Calendar pCalendar, @MyNotNull java.util.Date pUtilDate, - @MyNotNull Timestamp pSQLTimestamp, @MyNotNull Time pSQLTime, @MyNotNull Date pSQLDate ); + @MyNotNullServiceParam + void testDateHeaderParams( @MyNotNullServiceParam String pPath, @MyNotNullServiceParam OffsetDateTime pOffsetDateTime, + @MyNotNullServiceParam OffsetTime pOffsetTime, @MyNotNullServiceParam LocalDateTime pLocalDateTime, + @MyNotNullServiceParam LocalTime pLocalTime, @MyNotNullServiceParam LocalDate pLocalDate, + @MyNotNullServiceParam Calendar pCalendar, @MyNotNullServiceParam java.util.Date pUtilDate, + @MyNotNullServiceParam Timestamp pSQLTimestamp, @MyNotNullServiceParam Time pSQLTime, + @MyNotNullServiceParam Date pSQLDate ); /** *

@@ -309,8 +313,9 @@ void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pO * @param pPath * @param pHeaderParams */ - @MyNotNull - void testDateHeaderParamsBean( @MyNotNull String pPath, @MyNotNull DateHeaderParamsBean pHeaderParams ); + @MyNotNullServiceParam + void testDateHeaderParamsBean( @MyNotNullServiceParam String pPath, + @MyNotNullServiceParam DateHeaderParamsBean pHeaderParams ); /** *

@@ -320,8 +325,8 @@ void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pO * @param pAuthenticationToken * @return {@link String} */ - @MyNotNull - String testTechnicalHeaderParam( @MyNotNull String pReseller ); + @MyNotNullServiceParam + String testTechnicalHeaderParam( @MyNotNullServiceParam String pReseller ); /** *

@@ -330,8 +335,8 @@ void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pO * @param pContext * @return {@link String} */ - @MyNotNull - String testTechnicalHeaderBean( @MyNotNull TechnicalHeaderContext pContext ); + @MyNotNullServiceParam + String testTechnicalHeaderBean( @MyNotNullServiceParam TechnicalHeaderContext pContext ); /** *

@@ -340,6 +345,6 @@ void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pO * @param pCodes * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String processDataTypes( List pCodes ); } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/QueryBeanParam.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/QueryBeanParam.java index 74994763e..de7a2f478 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/QueryBeanParam.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/QueryBeanParam.java @@ -7,7 +7,7 @@ import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.anaptecs.spring.base.BookingCode; @@ -130,7 +130,7 @@ public static Builder newBuilder( QueryBeanParam pObject ) { * @param pBookingCode Value to which {@link #bookingCode} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setBookingCode( @MyNotNull BookingCode pBookingCode ) { + public Builder setBookingCode( @MyNotNullProperty BookingCode pBookingCode ) { // Assign value to attribute bookingCode = pBookingCode; return this; @@ -166,7 +166,7 @@ public QueryBeanParam build( ) { * * @return {@link BookingCode} Value to which {@link #bookingCode} is set. */ - @MyNotNull + @MyNotNullProperty public BookingCode getBookingCode( ) { return bookingCode; } @@ -176,7 +176,7 @@ public BookingCode getBookingCode( ) { * * @param pBookingCode Value to which {@link #bookingCode} should be set. */ - public void setBookingCode( @MyNotNull BookingCode pBookingCode ) { + public void setBookingCode( @MyNotNullProperty BookingCode pBookingCode ) { // Assign value to attribute bookingCode = pBookingCode; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/RESTProductService.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/RESTProductService.java index a667c253c..5bd29e6c4 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/RESTProductService.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/RESTProductService.java @@ -23,8 +23,8 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotEmpty; -import com.anaptecs.annotations.MyNotEmpty; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotEmptyServiceParam; +import com.anaptecs.annotations.MyNotNullServiceParam; import com.anaptecs.spring.base.BookingCode; import com.anaptecs.spring.base.BookingID; import com.anaptecs.spring.base.ChannelCode; @@ -60,8 +60,8 @@ public interface RESTProductService { * @param pProductID * @return {@link Product} */ - @MyNotNull - Product getProduct( @NotEmpty @MyNotNull String pProductID ); + @MyNotNullServiceParam + Product getProduct( @NotEmpty @MyNotNullServiceParam String pProductID ); /** *

@@ -70,7 +70,7 @@ public interface RESTProductService { * @param pProduct * @return boolean */ - boolean createProduct( @MyNotNull Product pProduct ); + boolean createProduct( @MyNotNullServiceParam Product pProduct ); /** *

@@ -79,8 +79,8 @@ public interface RESTProductService { * @param pContext * @return {@link Sortiment} */ - @MyNotNull - Sortiment getSortiment( @MyNotNull Context pContext ); + @MyNotNullServiceParam + Sortiment getSortiment( @MyNotNullServiceParam Context pContext ); /** *

@@ -89,21 +89,21 @@ public interface RESTProductService { * @param pChannelCode * @return {@link ChannelCode} */ - @MyNotNull - ChannelCode createChannelCode( @NotBlank @MyNotNull String pChannelCode ); + @MyNotNullServiceParam + ChannelCode createChannelCode( @NotBlank @MyNotNullServiceParam String pChannelCode ); /** *

* Authorized Roles: Customer, Sales Agent */ - @MyNotNull + @MyNotNullServiceParam void ping( ); /** *

* Authorized Roles: Sales Agent */ - @MyNotNull + @MyNotNullServiceParam void testInit( ); /** @@ -113,7 +113,7 @@ public interface RESTProductService { * @param pChannelCode * @return {@link List} */ - List getSupportedCurrencies( @MyNotNull ChannelCode pChannelCode ); + List getSupportedCurrencies( @MyNotNullServiceParam ChannelCode pChannelCode ); /** *

@@ -122,7 +122,7 @@ public interface RESTProductService { * @param pChannelCode * @return {@link List} */ - List getSupportedCurrenciesAsync( @MyNotNull ChannelCode pChannelCode ); + List getSupportedCurrenciesAsync( @MyNotNullServiceParam ChannelCode pChannelCode ); /** *

@@ -133,9 +133,9 @@ public interface RESTProductService { * @param pLocaleQueryParam * @return {@link String} */ - @MyNotNull - String testParams( @MyNotNull BigDecimal pBigDecimalHeader, int pIntCookieParam, - @MyNotNull Locale pLocaleQueryParam ); + @MyNotNullServiceParam + String testParams( @MyNotNullServiceParam BigDecimal pBigDecimalHeader, int pIntCookieParam, + @MyNotNullServiceParam Locale pLocaleQueryParam ); /** *

@@ -145,9 +145,9 @@ String testParams( @MyNotNull BigDecimal pBigDecimalHeader, int pIntCookieParam, * @param pTimeUnit * @param pExtensibleEnum */ - @MyNotNull - void testEnumParams( @MyNotNull ChannelType pChannelType, @MyNotNull TimeUnit pTimeUnit, - @MyNotNull ExtensibleEnum pExtensibleEnum ); + @MyNotNullServiceParam + void testEnumParams( @MyNotNullServiceParam ChannelType pChannelType, @MyNotNullServiceParam TimeUnit pTimeUnit, + @MyNotNullServiceParam ExtensibleEnum pExtensibleEnum ); /** *

@@ -157,9 +157,9 @@ void testEnumParams( @MyNotNull ChannelType pChannelType, @MyNotNull TimeUnit pT * @param pTimeUnit * @param pExtensibleEnum */ - @MyNotNull - void testEnumHeaderParams( @MyNotNull ChannelType pChannelType, @MyNotNull TimeUnit pTimeUnit, - @MyNotNull ExtensibleEnum pExtensibleEnum ); + @MyNotNullServiceParam + void testEnumHeaderParams( @MyNotNullServiceParam ChannelType pChannelType, @MyNotNullServiceParam TimeUnit pTimeUnit, + @MyNotNullServiceParam ExtensibleEnum pExtensibleEnum ); /** *

@@ -178,12 +178,13 @@ void testEnumHeaderParams( @MyNotNull ChannelType pChannelType, @MyNotNull TimeU * @param pSQLDate * @param pCalendars */ - @MyNotNull - void testDateQueryParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pStartTimestamp, - @MyNotNull OffsetTime pStartTime, @MyNotNull LocalDateTime pLocalStartTimestamp, - @MyNotNull LocalTime pLocalStartTime, @MyNotNull LocalDate pLocalStartDate, @MyNotNull Calendar pCalendar, - @MyNotNull java.util.Date pUtilDate, @MyNotNull Timestamp pSQLTimestamp, @MyNotNull Time pSQLTime, - @MyNotNull Date pSQLDate, Set pCalendars ); + @MyNotNullServiceParam + void testDateQueryParams( @MyNotNullServiceParam String pPath, @MyNotNullServiceParam OffsetDateTime pStartTimestamp, + @MyNotNullServiceParam OffsetTime pStartTime, @MyNotNullServiceParam LocalDateTime pLocalStartTimestamp, + @MyNotNullServiceParam LocalTime pLocalStartTime, @MyNotNullServiceParam LocalDate pLocalStartDate, + @MyNotNullServiceParam Calendar pCalendar, @MyNotNullServiceParam java.util.Date pUtilDate, + @MyNotNullServiceParam Timestamp pSQLTimestamp, @MyNotNullServiceParam Time pSQLTime, + @MyNotNullServiceParam Date pSQLDate, Set pCalendars ); /** *

@@ -192,8 +193,9 @@ void testDateQueryParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pSt * @param pPath * @param pQueryParams */ - @MyNotNull - void testDateQueryParamsBean( @MyNotNull String pPath, @MyNotNull DateQueryParamsBean pQueryParams ); + @MyNotNullServiceParam + void testDateQueryParamsBean( @MyNotNullServiceParam String pPath, + @MyNotNullServiceParam DateQueryParamsBean pQueryParams ); /** *

@@ -212,12 +214,13 @@ void testDateQueryParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pSt * @param pSQLDate * @param pUtilDates */ - @MyNotNull - void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pOffsetDateTime, - @MyNotNull OffsetTime pOffsetTime, @MyNotNull LocalDateTime pLocalDateTime, @MyNotNull LocalTime pLocalTime, - @MyNotNull LocalDate pLocalDate, @MyNotNull Calendar pCalendar, @MyNotNull java.util.Date pUtilDate, - @MyNotNull Timestamp pSQLTimestamp, @MyNotNull Time pSQLTime, @MyNotNull Date pSQLDate, - Set pUtilDates ); + @MyNotNullServiceParam + void testDateHeaderParams( @MyNotNullServiceParam String pPath, @MyNotNullServiceParam OffsetDateTime pOffsetDateTime, + @MyNotNullServiceParam OffsetTime pOffsetTime, @MyNotNullServiceParam LocalDateTime pLocalDateTime, + @MyNotNullServiceParam LocalTime pLocalTime, @MyNotNullServiceParam LocalDate pLocalDate, + @MyNotNullServiceParam Calendar pCalendar, @MyNotNullServiceParam java.util.Date pUtilDate, + @MyNotNullServiceParam Timestamp pSQLTimestamp, @MyNotNullServiceParam Time pSQLTime, + @MyNotNullServiceParam Date pSQLDate, Set pUtilDates ); /** *

@@ -226,8 +229,9 @@ void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pO * @param pPath * @param pHeaderParams */ - @MyNotNull - void testDateHeaderParamsBean( @MyNotNull String pPath, @MyNotNull DateHeaderParamsBean pHeaderParams ); + @MyNotNullServiceParam + void testDateHeaderParamsBean( @MyNotNullServiceParam String pPath, + @MyNotNullServiceParam DateHeaderParamsBean pHeaderParams ); /** *

@@ -236,8 +240,9 @@ void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pO * @param pChannelTypeParam * @param pContext */ - @MyNotNull - void testCookieParams( @MyNotNull ChannelType pChannelTypeParam, @MyNotNull SpecialContext pContext ); + @MyNotNullServiceParam + void testCookieParams( @MyNotNullServiceParam ChannelType pChannelTypeParam, + @MyNotNullServiceParam SpecialContext pContext ); /** *

@@ -247,7 +252,7 @@ void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pO * @param query2 * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String testOptionalQueryParams( String query1, int query2 ); /** @@ -257,7 +262,7 @@ void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pO * @param pComplextBookingID * @return boolean */ - boolean processComplexBookingID( @MyNotNull ComplexBookingID pComplextBookingID ); + boolean processComplexBookingID( @MyNotNullServiceParam ComplexBookingID pComplextBookingID ); /** *

@@ -268,9 +273,9 @@ void testDateHeaderParams( @MyNotNull String pPath, @MyNotNull OffsetDateTime pO * @param pDoubleCode * @return {@link String} */ - @MyNotNull - String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull BookingCode pBookingCode, - @MyNotNull DoubleCode pDoubleCode ); + @MyNotNullServiceParam + String testDataTypesAsHeaderParam( @MyNotNullServiceParam BookingID pBookingID, + @MyNotNullServiceParam BookingCode pBookingCode, @MyNotNullServiceParam DoubleCode pDoubleCode ); /** *

@@ -279,8 +284,8 @@ String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull B * @param pContext * @return {@link String} */ - @MyNotNull - String testDataTypesAsHeaderBeanParam( @MyNotNull AdvancedHeader pContext ); + @MyNotNullServiceParam + String testDataTypesAsHeaderBeanParam( @MyNotNullServiceParam AdvancedHeader pContext ); /** *

@@ -289,7 +294,7 @@ String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull B * @param pIntegerArray * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String testPrimitiveArrays( int[] pIntegerArray ); /** @@ -299,8 +304,8 @@ String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull B * @param pBookingCode * @return {@link String} */ - @MyNotNull - String testDataTypeAsQueryParam( @MyNotNull BookingCode pBookingCode ); + @MyNotNullServiceParam + String testDataTypeAsQueryParam( @MyNotNullServiceParam BookingCode pBookingCode ); /** *

@@ -309,8 +314,8 @@ String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull B * @param pBeanParam * @return {@link String} */ - @MyNotNull - String testDataTypeAsBeanQueryParam( @MyNotNull QueryBeanParam pBeanParam ); + @MyNotNullServiceParam + String testDataTypeAsBeanQueryParam( @MyNotNullServiceParam QueryBeanParam pBeanParam ); /** *

@@ -319,7 +324,7 @@ String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull B * @param pIntValues * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String testPrimitiveArrayAsQueryParam( int[] pIntValues ); /** @@ -329,7 +334,7 @@ String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull B * @param pStrings * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String testSimpleTypesAsQueryParams( List pStrings ); /** @@ -339,8 +344,8 @@ String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull B * @param pIntegers * @return {@link String} */ - @MyNotNull - String testPrimitiveWrapperArrayAsQueryParam( @MyNotEmpty Set pIntegers ); + @MyNotNullServiceParam + String testPrimitiveWrapperArrayAsQueryParam( @MyNotEmptyServiceParam Set pIntegers ); /** *

@@ -349,8 +354,8 @@ String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull B * @param pBean * @return {@link String} */ - @MyNotNull - String testMultivaluedQueryParamsBean( @MyNotNull MultivaluedQueryParamsBean pBean ); + @MyNotNullServiceParam + String testMultivaluedQueryParamsBean( @MyNotNullServiceParam MultivaluedQueryParamsBean pBean ); /** *

@@ -363,9 +368,10 @@ String testDataTypesAsHeaderParam( @MyNotNull BookingID pBookingID, @MyNotNull B * @param pLocalDates * @return {@link String} */ - @MyNotNull - String testMulitvaluedDataTypeAsQueryParam( List pCodes, @MyNotEmpty Set pLongCodes, - List pBookingIDs, List pTimestamps, SortedSet pLocalDates ); + @MyNotNullServiceParam + String testMulitvaluedDataTypeAsQueryParam( List pCodes, + @MyNotEmptyServiceParam Set pLongCodes, List pBookingIDs, List pTimestamps, + SortedSet pLocalDates ); /** *

@@ -374,8 +380,8 @@ String testMulitvaluedDataTypeAsQueryParam( List pCodes, @MyNot * @param pQueryBean * @return {@link String} */ - @MyNotNull - String testMulitvaluedDataTypeAsBeanQueryParam( @MyNotNull DataTypesQueryBean pQueryBean ); + @MyNotNullServiceParam + String testMulitvaluedDataTypeAsBeanQueryParam( @MyNotNullServiceParam DataTypesQueryBean pQueryBean ); /** *

@@ -384,8 +390,8 @@ String testMulitvaluedDataTypeAsQueryParam( List pCodes, @MyNot * @param pMultiValuedBean * @return {@link String} */ - @MyNotNull - String testMultiValuedHeaderFieldsInBeanParam( @MyNotNull MultiValuedHeaderBeanParam pMultiValuedBean ); + @MyNotNullServiceParam + String testMultiValuedHeaderFieldsInBeanParam( @MyNotNullServiceParam MultiValuedHeaderBeanParam pMultiValuedBean ); /** *

@@ -401,8 +407,8 @@ String testMulitvaluedDataTypeAsQueryParam( List pCodes, @MyNot * @param pBase64 * @return {@link String} */ - @MyNotNull - String testMultiValuedHeaderFields( Set pNames, @MyNotEmpty int[] pInts, Set pDoubles, + @MyNotNullServiceParam + String testMultiValuedHeaderFields( Set pNames, @MyNotEmptyServiceParam int[] pInts, Set pDoubles, Set pCodes, OffsetDateTime pStartDate, Set pTimestamps, Set pTimes, byte[] pBase64 ); @@ -412,8 +418,8 @@ String testMultiValuedHeaderFields( Set pNames, @MyNotEmpty int[] pInts, * * @param pBookingID */ - @MyNotNull - void testBookingIDAsPathParam( @MyNotNull BookingID pBookingID ); + @MyNotNullServiceParam + void testBookingIDAsPathParam( @MyNotNullServiceParam BookingID pBookingID ); /** *

@@ -421,7 +427,7 @@ String testMultiValuedHeaderFields( Set pNames, @MyNotEmpty int[] pInts, * * @param pBookingID */ - @MyNotNull + @MyNotNullServiceParam void testBookingIDAsHeaderParam( BookingID pBookingID ); /** @@ -431,8 +437,8 @@ String testMultiValuedHeaderFields( Set pNames, @MyNotEmpty int[] pInts, * @param pContext * @return {@link String} */ - @MyNotNull - String testContextWithPrimitives( @MyNotNull ContextWithPrimitives pContext ); + @MyNotNullServiceParam + String testContextWithPrimitives( @MyNotNullServiceParam ContextWithPrimitives pContext ); /** *

@@ -446,7 +452,7 @@ String testMultiValuedHeaderFields( Set pNames, @MyNotEmpty int[] pInts, * @param pVeryLong * @return {@link String} */ - @MyNotNull - String testPrimitivesAsParams( int pAnInt, @MyNotNull Integer pAnInteger, boolean pABoolean, - @MyNotNull Boolean pBooleanWrapper, long pALong, @MyNotNull Long pVeryLong ); + @MyNotNullServiceParam + String testPrimitivesAsParams( int pAnInt, @MyNotNullServiceParam Integer pAnInteger, boolean pABoolean, + @MyNotNullServiceParam Boolean pBooleanWrapper, long pALong, @MyNotNullServiceParam Long pVeryLong ); } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/Sale.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/Sale.java index fb537441d..86c7ec818 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/Sale.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/Sale.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; import java.util.Objects; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullProperty; import com.anaptecs.jeaf.validation.api.spring.SpringValidationExecutor; import com.anaptecs.spring.base.Channel; import com.fasterxml.jackson.annotation.JsonAutoDetect; @@ -126,7 +126,7 @@ public static Builder newBuilder( Sale pObject ) { * @param pTransactionAmount Value to which {@link #transactionAmount} should be set. * @return {@link Builder} Instance of this builder to support chaining setters. Method never returns null. */ - public Builder setTransactionAmount( @MyNotNull BigDecimal pTransactionAmount ) { + public Builder setTransactionAmount( @MyNotNullProperty BigDecimal pTransactionAmount ) { // Assign value to attribute transactionAmount = pTransactionAmount; return this; @@ -160,7 +160,7 @@ public Sale build( ) { * * @return {@link BigDecimal} Value to which {@link #transactionAmount} is set. */ - @MyNotNull + @MyNotNullProperty public BigDecimal getTransactionAmount( ) { return transactionAmount; } @@ -170,7 +170,7 @@ public BigDecimal getTransactionAmount( ) { * * @param pTransactionAmount Value to which {@link #transactionAmount} should be set. */ - public void setTransactionAmount( @MyNotNull BigDecimal pTransactionAmount ) { + public void setTransactionAmount( @MyNotNullProperty BigDecimal pTransactionAmount ) { // Assign value to attribute transactionAmount = pTransactionAmount; } diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/monitoring/MonitoringService.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/monitoring/MonitoringService.java index 7f58395e4..403725c33 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/monitoring/MonitoringService.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/monitoring/MonitoringService.java @@ -5,7 +5,7 @@ */ package com.anaptecs.spring.service.monitoring; -import com.anaptecs.annotations.MyNotNull; +import com.anaptecs.annotations.MyNotNullServiceParam; public interface MonitoringService { /** @@ -14,6 +14,6 @@ public interface MonitoringService { * * @return {@link String} */ - @MyNotNull + @MyNotNullServiceParam String getVersionInfo( ); } \ No newline at end of file diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/PathlessServiceResource.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/PathlessServiceResource.java index 0bf57de79..092aa6cef 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/PathlessServiceResource.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/PathlessServiceResource.java @@ -30,6 +30,8 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import com.anaptecs.annotations.MyNotEmptyRESTParam; +import com.anaptecs.annotations.MyNotNullRESTParam; import com.anaptecs.jeaf.validation.api.ValidationExecutor; import com.anaptecs.spring.base.BookingID; import com.anaptecs.spring.base.DoubleCode; @@ -84,6 +86,7 @@ public PathlessServiceResource( PathlessService pPathlessService, ObjectMapper p @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "doSomething", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String getSomething( ) { // Delegate request to service. String lResponse = pathlessService.getSomething(); @@ -98,8 +101,9 @@ public String getSomething( ) { @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "processTechParam", method = { RequestMethod.POST }) + @MyNotNullRESTParam public void processTechParam( @RequestHeader(name = "names", required = false) String[] pNames, - @RequestHeader(name = "ints", required = true) int[] pInts, + @RequestHeader(name = "ints", required = true) @MyNotEmptyRESTParam int[] pInts, @RequestHeader(name = "doubles", required = false) Double[] pDoubles, @RequestHeader(name = "codes", required = false) String[] pCodesAsBasicType, @RequestHeader(name = "stringCodeList", required = false) String[] pStringCodeListAsBasicType, @@ -215,15 +219,16 @@ public void processTechParam( @RequestHeader(name = "names", required = false) S @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "test-query-bean-param", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testQueryBeanParam( @RequestParam(name = "longCodes", required = false) Long[] pLongCodesAsBasicType, @RequestParam(name = "codes", required = false) int[] pCodesAsBasicType, @RequestParam(name = "doubleCodes", required = false) Double[] pDoubleCodesAsBasicType, @RequestParam(name = "bookingIDs", required = false) String[] pBookingIDsAsBasicType, @RequestParam(name = "bookingIDsArray", required = false) String[] pBookingIDsArrayAsBasicType, - @RequestParam(name = "offsetDateTime", required = true) String pOffsetDateTimeAsBasicType, - @RequestParam(name = "offsetTime", required = true) String pOffsetTimeAsBasicType, - @RequestParam(name = "localDateTime", required = true) String pLocalDateTimeAsBasicType, - @RequestParam(name = "localTime", required = true) String pLocalTimeAsBasicType, + @RequestParam(name = "offsetDateTime", required = true) @MyNotNullRESTParam String pOffsetDateTimeAsBasicType, + @RequestParam(name = "offsetTime", required = true) @MyNotNullRESTParam String pOffsetTimeAsBasicType, + @RequestParam(name = "localDateTime", required = true) @MyNotNullRESTParam String pLocalDateTimeAsBasicType, + @RequestParam(name = "localTime", required = true) @MyNotNullRESTParam String pLocalTimeAsBasicType, @RequestParam(name = "timestamps", required = false) String[] pTimestampsAsBasicType, @RequestParam(name = "times", required = false) String[] pTimesAsBasicType, @RequestParam(name = "startTimestamps", required = false) String[] pStartTimestampsAsBasicType ) { diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/ProductServiceResource.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/ProductServiceResource.java index 6c523a81d..c87116d3c 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/ProductServiceResource.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/ProductServiceResource.java @@ -34,6 +34,8 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import com.anaptecs.annotations.MyNotEmptyRESTParam; +import com.anaptecs.annotations.MyNotNullRESTParam; import com.anaptecs.jeaf.rest.resource.api.CustomHeaderFilter; import com.anaptecs.jeaf.validation.api.ValidationExecutor; import com.anaptecs.spring.base.AnotherDataType; @@ -107,7 +109,8 @@ public List getProducts( ) { @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/{id}", method = { RequestMethod.GET }) - public Product getProduct( @PathVariable(name = "id", required = true) String pProductID ) { + @MyNotNullRESTParam + public Product getProduct( @PathVariable(name = "id", required = true) @MyNotNullRESTParam String pProductID ) { // Validate request parameter(s). validationExecutor.validateRequest(ProductService.class, pProductID); // Delegate request to service. @@ -123,7 +126,7 @@ public Product getProduct( @PathVariable(name = "id", required = true) String pP @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/", method = { RequestMethod.POST }) - public boolean createProduct( @RequestBody(required = true) Product pProduct ) { + public boolean createProduct( @RequestBody(required = true) @MyNotNullRESTParam Product pProduct ) { // Validate request parameter(s). validationExecutor.validateRequest(ProductService.class, pProduct); // Delegate request to service. @@ -139,12 +142,15 @@ public boolean createProduct( @RequestBody(required = true) Product pProduct ) { @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/sortiment/{id}", method = { RequestMethod.GET }) - public Sortiment getSortiment( @RequestHeader(name = "token", required = true) String pAccessToken, - @RequestHeader(name = "lang", required = true) Locale pLanguage, + @MyNotNullRESTParam + public Sortiment getSortiment( + @RequestHeader(name = "token", required = true) @MyNotNullRESTParam String pAccessToken, + @RequestHeader(name = "lang", required = true) @MyNotNullRESTParam Locale pLanguage, @CookieValue(name = "reseller", required = true) long pResellerID, @PathVariable(name = "id", required = true) long pPathParam, - @RequestParam(name = "q1", required = true) String pQueryParam, String pLang, - @RequestHeader(name = "intCode", required = true) int pIntCodeAsBasicType, + @RequestParam(name = "q1", required = true) @MyNotNullRESTParam String pQueryParam, + @MyNotNullRESTParam String pLang, + @RequestHeader(name = "intCode", required = true) @MyNotNullRESTParam int pIntCodeAsBasicType, @RequestHeader Map pHeaders ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. @@ -183,7 +189,8 @@ public Sortiment getSortiment( @RequestHeader(name = "token", required = true) S consumes = { "application/json" }, produces = { "application/json" }, method = { RequestMethod.POST }) - public ChannelCode createChannelCode( @RequestBody(required = true) String pChannelCode ) { + @MyNotNullRESTParam + public ChannelCode createChannelCode( @RequestBody(required = true) @MyNotNullRESTParam String pChannelCode ) { // Validate request parameter(s). validationExecutor.validateRequest(ProductService.class, pChannelCode); // Delegate request to service. @@ -199,6 +206,7 @@ public ChannelCode createChannelCode( @RequestBody(required = true) String pChan @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "products/", method = { RequestMethod.HEAD }) + @MyNotNullRESTParam public void ping( ) { // Delegate request to service. productService.ping(); @@ -211,6 +219,7 @@ public void ping( ) { @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/deprecated/operation", method = { RequestMethod.GET }) @Deprecated + @MyNotNullRESTParam public String deprecatedOperation( ) { // Delegate request to service. String lResponse = productService.deprecatedOperation(); @@ -225,10 +234,12 @@ public String deprecatedOperation( ) { @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/deprecated/context", method = { RequestMethod.POST }) - public String deprecatedContext( @RequestHeader(name = "token", required = true) String pAccessToken, - @RequestHeader(name = "lang", required = true) Locale pLanguage, + @MyNotNullRESTParam + public String deprecatedContext( + @RequestHeader(name = "token", required = true) @MyNotNullRESTParam String pAccessToken, + @RequestHeader(name = "lang", required = true) @MyNotNullRESTParam Locale pLanguage, @CookieValue(name = "reseller", required = true) long pResellerID, - @RequestParam(name = "q1", required = true) String pQueryParam ) { + @RequestParam(name = "q1", required = true) @MyNotNullRESTParam String pQueryParam ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. DeprecatedContext.Builder lContextBuilder = DeprecatedContext.builder(); @@ -252,9 +263,11 @@ public String deprecatedContext( @RequestHeader(name = "token", required = true) @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "products/deprecated/beanParams", method = { RequestMethod.POST }) - public void deprecatedBeanParam( @RequestHeader(name = "token", required = true) String pAccessToken, - @RequestHeader(name = "lang", required = true) Locale pLanguage, - @RequestParam(name = "q2", required = true) @Deprecated String pOldStyle ) { + @MyNotNullRESTParam + public void deprecatedBeanParam( + @RequestHeader(name = "token", required = true) @MyNotNullRESTParam String pAccessToken, + @RequestHeader(name = "lang", required = true) @MyNotNullRESTParam Locale pLanguage, + @RequestParam(name = "q2", required = true) @Deprecated @MyNotNullRESTParam String pOldStyle ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. BeanParameter.Builder lBeanParamBuilder = BeanParameter.builder(); @@ -275,6 +288,7 @@ public void deprecatedBeanParam( @RequestHeader(name = "token", required = true) @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/deprecated/params", method = { RequestMethod.POST }) @Deprecated + @MyNotNullRESTParam public String deprecatedParams( @RequestHeader(name = "param1", required = true) @Deprecated int pParam1 ) { // Validate request parameter(s). validationExecutor.validateRequest(ProductService.class, pParam1); @@ -291,7 +305,8 @@ public String deprecatedParams( @RequestHeader(name = "param1", required = true) @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/deprecated/body", method = { RequestMethod.POST }) - public String deprecatedBody( @RequestBody(required = true) @Deprecated String pBody ) { + @MyNotNullRESTParam + public String deprecatedBody( @RequestBody(required = true) @Deprecated @MyNotNullRESTParam String pBody ) { // Validate request parameter(s). validationExecutor.validateRequest(ProductService.class, pBody); // Delegate request to service. @@ -307,7 +322,9 @@ public String deprecatedBody( @RequestBody(required = true) @Deprecated String p @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "products/deprecated/complexBody", method = { RequestMethod.POST }) - public void deprectedComplexRequestBody( @RequestBody(required = true) @Deprecated Product pProduct ) { + @MyNotNullRESTParam + public void deprectedComplexRequestBody( + @RequestBody(required = true) @Deprecated @MyNotNullRESTParam Product pProduct ) { // Validate request parameter(s). validationExecutor.validateRequest(ProductService.class, pProduct); // Delegate request to service. @@ -321,6 +338,7 @@ public void deprectedComplexRequestBody( @RequestBody(required = true) @Deprecat @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/deprecated/complexReturn", method = { RequestMethod.GET }) @Deprecated + @MyNotNullRESTParam public Product deprecatedComplexReturn( ) { // Delegate request to service. Product lResponse = productService.deprecatedComplexReturn(); @@ -335,14 +353,17 @@ public Product deprecatedComplexReturn( ) { @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "products/specific/{id}", method = { RequestMethod.PATCH }) - public void loadSpecificThings( @RequestHeader(name = "token", required = true) String pAccessToken, - @RequestHeader(name = "lang", required = true) Locale pLanguage, + @MyNotNullRESTParam + public void loadSpecificThings( + @RequestHeader(name = "token", required = true) @MyNotNullRESTParam String pAccessToken, + @RequestHeader(name = "lang", required = true) @MyNotNullRESTParam Locale pLanguage, @CookieValue(name = "reseller", required = true) long pResellerID, @PathVariable(name = "id", required = true) long pPathParam, - @RequestParam(name = "q1", required = true) String pQueryParam, String pLang, - @RequestHeader(name = "intCode", required = true) int pIntCodeAsBasicType, - @RequestHeader(name = "specificHeader", required = true) String pSpecificHeader, - @CookieValue(name = "Channel-Type", required = true) ChannelType pChannelType, + @RequestParam(name = "q1", required = true) @MyNotNullRESTParam String pQueryParam, + @MyNotNullRESTParam String pLang, + @RequestHeader(name = "intCode", required = true) @MyNotNullRESTParam int pIntCodeAsBasicType, + @RequestHeader(name = "specificHeader", required = true) @MyNotNullRESTParam String pSpecificHeader, + @CookieValue(name = "Channel-Type", required = true) @MyNotNullRESTParam ChannelType pChannelType, @RequestHeader Map pHeaders ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. @@ -376,7 +397,9 @@ public void loadSpecificThings( @RequestHeader(name = "token", required = true) @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/ChannelCodeObject", method = { RequestMethod.POST }) - public ChannelCode createChannelCodeFromObject( @RequestBody(required = true) ChannelCode pChannelCode ) { + @MyNotNullRESTParam + public ChannelCode createChannelCodeFromObject( + @RequestBody(required = true) @MyNotNullRESTParam ChannelCode pChannelCode ) { // Validate request parameter(s). validationExecutor.validateRequest(ProductService.class, pChannelCode); // Delegate request to service. @@ -392,7 +415,9 @@ public ChannelCode createChannelCodeFromObject( @RequestBody(required = true) Ch @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/currencies", method = { RequestMethod.POST }) - public List addCurrencies( @RequestBody(required = true) List pCurrencies ) { + @MyNotEmptyRESTParam + public List addCurrencies( + @RequestBody(required = true) @MyNotEmptyRESTParam List pCurrencies ) { // Validate request parameter(s). validationExecutor.validateRequest(ProductService.class, pCurrencies); // Delegate request to service. @@ -408,7 +433,8 @@ public List addCurrencies( @RequestBody(required = true) List pHeaders ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. @@ -933,6 +977,7 @@ public String testTechnicalHeaderBean( @RequestHeader(name = "Reseller", require @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/product-codes", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String processDataTypes( @RequestParam(name = "pCodes", required = false) String[] pCodesAsBasicType ) { // Convert basic type parameters into "real" objects. List pCodes; @@ -960,6 +1005,7 @@ public String processDataTypes( @RequestParam(name = "pCodes", required = false) @PreAuthorize("hasAnyRole('NO_ACCESS')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "products/info", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String getVersionInfo( ) { // Delegate request to service. String lResponse = productService.getVersionInfo(); diff --git a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/RESTProductServiceResource.java b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/RESTProductServiceResource.java index b33dbecd3..d2806cf01 100644 --- a/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/RESTProductServiceResource.java +++ b/jeaf-generator-test-spring/src-gen/main/java/com/anaptecs/spring/service/resource/RESTProductServiceResource.java @@ -40,6 +40,8 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; +import com.anaptecs.annotations.MyNotEmptyRESTParam; +import com.anaptecs.annotations.MyNotNullRESTParam; import com.anaptecs.jeaf.rest.resource.api.CustomHeaderFilter; import com.anaptecs.jeaf.validation.api.ValidationExecutor; import com.anaptecs.spring.base.BookingCode; @@ -132,7 +134,8 @@ public List getProducts( @RequestParam(name = "maxResult", required = f @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "{id}", method = { RequestMethod.GET }) - public Product getProduct( @PathVariable(name = "id", required = true) String pProductID ) { + @MyNotNullRESTParam + public Product getProduct( @PathVariable(name = "id", required = true) @MyNotNullRESTParam String pProductID ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pProductID); // Delegate request to service. @@ -148,7 +151,7 @@ public Product getProduct( @PathVariable(name = "id", required = true) String pP @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(method = { RequestMethod.POST }) - public boolean createProduct( @RequestBody(required = true) Product pProduct ) { + public boolean createProduct( @RequestBody(required = true) @MyNotNullRESTParam Product pProduct ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pProduct); // Delegate request to service. @@ -164,12 +167,15 @@ public boolean createProduct( @RequestBody(required = true) Product pProduct ) { @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "sortiment/{id}", method = { RequestMethod.GET }) - public Sortiment getSortiment( @RequestHeader(name = "token", required = true) String pAccessToken, - @RequestHeader(name = "lang", required = true) Locale pLanguage, + @MyNotNullRESTParam + public Sortiment getSortiment( + @RequestHeader(name = "token", required = true) @MyNotNullRESTParam String pAccessToken, + @RequestHeader(name = "lang", required = true) @MyNotNullRESTParam Locale pLanguage, @CookieValue(name = "reseller", required = true) long pResellerID, @PathVariable(name = "id", required = true) long pPathParam, - @RequestParam(name = "q1", required = true) String pQueryParam, String pLang, - @RequestHeader(name = "intCode", required = true) int pIntCodeAsBasicType, + @RequestParam(name = "q1", required = true) @MyNotNullRESTParam String pQueryParam, + @MyNotNullRESTParam String pLang, + @RequestHeader(name = "intCode", required = true) @MyNotNullRESTParam int pIntCodeAsBasicType, @RequestHeader Map pHeaders ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. @@ -204,7 +210,8 @@ public Sortiment getSortiment( @RequestHeader(name = "token", required = true) S @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "ChannelCode", method = { RequestMethod.POST }) - public ChannelCode createChannelCode( @RequestBody(required = true) String pChannelCode ) { + @MyNotNullRESTParam + public ChannelCode createChannelCode( @RequestBody(required = true) @MyNotNullRESTParam String pChannelCode ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pChannelCode); // Delegate request to service. @@ -220,6 +227,7 @@ public ChannelCode createChannelCode( @RequestBody(required = true) String pChan @PreAuthorize("hasAnyRole('Customer', 'Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(method = { RequestMethod.HEAD }) + @MyNotNullRESTParam public void ping( ) { // Delegate request to service. rESTProductService.ping(); @@ -231,6 +239,7 @@ public void ping( ) { @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "test-init", method = { RequestMethod.GET }) + @MyNotNullRESTParam public void testInit( ) { // Delegate request to service. rESTProductService.testInit(); @@ -243,7 +252,7 @@ public void testInit( ) { @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "currencies/{channelCode}", method = { RequestMethod.GET }) public List getSupportedCurrencies( - @PathVariable(name = "channelCode", required = true) String pChannelCodeAsBasicType ) { + @PathVariable(name = "channelCode", required = true) @MyNotNullRESTParam String pChannelCodeAsBasicType ) { // Convert basic type parameters into "real" objects. ChannelCode pChannelCode; if (pChannelCodeAsBasicType != null) { @@ -268,7 +277,7 @@ public List getSupportedCurrencies( @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "async-currencies/{channelCode}", method = { RequestMethod.GET }) public List getSupportedCurrenciesAsync( - @PathVariable(name = "channelCode", required = true) String pChannelCodeAsBasicType ) { + @PathVariable(name = "channelCode", required = true) @MyNotNullRESTParam String pChannelCodeAsBasicType ) { // Convert basic type parameters into "real" objects. ChannelCode pChannelCode; if (pChannelCodeAsBasicType != null) { @@ -292,9 +301,11 @@ public List getSupportedCurrenciesAsync( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "test-params", method = { RequestMethod.GET }) - public String testParams( @RequestHeader(name = "Big-Header", required = true) BigDecimal pBigDecimalHeader, + @MyNotNullRESTParam + public String testParams( + @RequestHeader(name = "Big-Header", required = true) @MyNotNullRESTParam BigDecimal pBigDecimalHeader, @CookieValue(name = "giveMeMoreCookies", required = true) @RequestBody(required = true) int pIntCookieParam, - @RequestParam(name = "locale", required = true) Locale pLocaleQueryParam ) { + @RequestParam(name = "locale", required = true) @MyNotNullRESTParam Locale pLocaleQueryParam ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pBigDecimalHeader, pIntCookieParam, pLocaleQueryParam); // Delegate request to service. @@ -310,9 +321,11 @@ public String testParams( @RequestHeader(name = "Big-Header", required = true) B @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "test-enum-params/{channelType}", method = { RequestMethod.GET }) - public void testEnumParams( @PathVariable(name = "channelType", required = true) ChannelType pChannelType, - @RequestParam(name = "timeUnit", required = true) TimeUnit pTimeUnit, - @RequestParam(name = "extensibleEnum", required = true) ExtensibleEnum pExtensibleEnum ) { + @MyNotNullRESTParam + public void testEnumParams( + @PathVariable(name = "channelType", required = true) @MyNotNullRESTParam ChannelType pChannelType, + @RequestParam(name = "timeUnit", required = true) @MyNotNullRESTParam TimeUnit pTimeUnit, + @RequestParam(name = "extensibleEnum", required = true) @MyNotNullRESTParam ExtensibleEnum pExtensibleEnum ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pChannelType, pTimeUnit, pExtensibleEnum); // Delegate request to service. @@ -325,9 +338,11 @@ public void testEnumParams( @PathVariable(name = "channelType", required = true) @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "test-enum-header-params", method = { RequestMethod.GET }) - public void testEnumHeaderParams( @RequestHeader(name = "Channel-Type", required = true) ChannelType pChannelType, - @RequestHeader(name = "Time-Unit", required = true) TimeUnit pTimeUnit, - @RequestHeader(name = "Extensible-Enum", required = true) ExtensibleEnum pExtensibleEnum ) { + @MyNotNullRESTParam + public void testEnumHeaderParams( + @RequestHeader(name = "Channel-Type", required = true) @MyNotNullRESTParam ChannelType pChannelType, + @RequestHeader(name = "Time-Unit", required = true) @MyNotNullRESTParam TimeUnit pTimeUnit, + @RequestHeader(name = "Extensible-Enum", required = true) @MyNotNullRESTParam ExtensibleEnum pExtensibleEnum ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pChannelType, pTimeUnit, pExtensibleEnum); // Delegate request to service. @@ -340,17 +355,20 @@ public void testEnumHeaderParams( @RequestHeader(name = "Channel-Type", required @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "test-date-query-params/{path}", method = { RequestMethod.GET }) - public void testDateQueryParams( @PathVariable(name = "path", required = true) String pPath, - @RequestParam(name = "startTimestamp", required = true) String pStartTimestampAsBasicType, - @RequestParam(name = "startTime", required = true) String pStartTimeAsBasicType, - @RequestParam(name = "localStartTimestamp", required = true) String pLocalStartTimestampAsBasicType, - @RequestParam(name = "localStartTime", required = true) String pLocalStartTimeAsBasicType, - @RequestParam(name = "localStartDate", required = true) String pLocalStartDateAsBasicType, - @RequestParam(name = "calendar", required = true) String pCalendarAsBasicType, - @RequestParam(name = "utilDate", required = true) String pUtilDateAsBasicType, - @RequestParam(name = "sqlTimestamp", required = true) String pSQLTimestampAsBasicType, - @RequestParam(name = "sqlTime", required = true) String pSQLTimeAsBasicType, - @RequestParam(name = "sqlDate", required = true) String pSQLDateAsBasicType, + @MyNotNullRESTParam + public void testDateQueryParams( @PathVariable(name = "path", required = true) @MyNotNullRESTParam String pPath, + @RequestParam(name = "startTimestamp", required = true) @MyNotNullRESTParam String pStartTimestampAsBasicType, + @RequestParam(name = "startTime", required = true) @MyNotNullRESTParam String pStartTimeAsBasicType, + @RequestParam( + name = "localStartTimestamp", + required = true) @MyNotNullRESTParam String pLocalStartTimestampAsBasicType, + @RequestParam(name = "localStartTime", required = true) @MyNotNullRESTParam String pLocalStartTimeAsBasicType, + @RequestParam(name = "localStartDate", required = true) @MyNotNullRESTParam String pLocalStartDateAsBasicType, + @RequestParam(name = "calendar", required = true) @MyNotNullRESTParam String pCalendarAsBasicType, + @RequestParam(name = "utilDate", required = true) @MyNotNullRESTParam String pUtilDateAsBasicType, + @RequestParam(name = "sqlTimestamp", required = true) @MyNotNullRESTParam String pSQLTimestampAsBasicType, + @RequestParam(name = "sqlTime", required = true) @MyNotNullRESTParam String pSQLTimeAsBasicType, + @RequestParam(name = "sqlDate", required = true) @MyNotNullRESTParam String pSQLDateAsBasicType, @RequestParam(name = "calendars", required = false) String[] pCalendarsAsBasicType ) { // Convert date types into real objects. OffsetDateTime pStartTimestamp; @@ -469,17 +487,18 @@ public void testDateQueryParams( @PathVariable(name = "path", required = true) S @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "test-date-query-params-beans/{path}", method = { RequestMethod.GET }) - public void testDateQueryParamsBean( @PathVariable(name = "path", required = true) String pPath, - @RequestParam(name = "offsetDateTime", required = true) String pOffsetDateTimeAsBasicType, - @RequestParam(name = "offsetTime", required = true) String pOffsetTimeAsBasicType, - @RequestParam(name = "localDateTime", required = true) String pLocalDateTimeAsBasicType, - @RequestParam(name = "localTime", required = true) String pLocalTimeAsBasicType, - @RequestParam(name = "localDate", required = true) String pLocalDateAsBasicType, - @RequestParam(name = "utilDate", required = true) String pUtilDateAsBasicType, - @RequestParam(name = "calendar", required = true) String pCalendarAsBasicType, - @RequestParam(name = "sqlTimestamp", required = true) String pSqlTimestampAsBasicType, - @RequestParam(name = "sqlTime", required = true) String pSqlTimeAsBasicType, - @RequestParam(name = "sqlDate", required = true) String pSqlDateAsBasicType ) { + @MyNotNullRESTParam + public void testDateQueryParamsBean( @PathVariable(name = "path", required = true) @MyNotNullRESTParam String pPath, + @RequestParam(name = "offsetDateTime", required = true) @MyNotNullRESTParam String pOffsetDateTimeAsBasicType, + @RequestParam(name = "offsetTime", required = true) @MyNotNullRESTParam String pOffsetTimeAsBasicType, + @RequestParam(name = "localDateTime", required = true) @MyNotNullRESTParam String pLocalDateTimeAsBasicType, + @RequestParam(name = "localTime", required = true) @MyNotNullRESTParam String pLocalTimeAsBasicType, + @RequestParam(name = "localDate", required = true) @MyNotNullRESTParam String pLocalDateAsBasicType, + @RequestParam(name = "utilDate", required = true) @MyNotNullRESTParam String pUtilDateAsBasicType, + @RequestParam(name = "calendar", required = true) @MyNotNullRESTParam String pCalendarAsBasicType, + @RequestParam(name = "sqlTimestamp", required = true) @MyNotNullRESTParam String pSqlTimestampAsBasicType, + @RequestParam(name = "sqlTime", required = true) @MyNotNullRESTParam String pSqlTimeAsBasicType, + @RequestParam(name = "sqlDate", required = true) @MyNotNullRESTParam String pSqlDateAsBasicType ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. DateQueryParamsBean.Builder lQueryParamsBuilder = DateQueryParamsBean.builder(); @@ -550,17 +569,18 @@ public void testDateQueryParamsBean( @PathVariable(name = "path", required = tru @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "test-date-header-params/{path}", method = { RequestMethod.GET }) - public void testDateHeaderParams( @PathVariable(name = "path", required = true) String pPath, - @RequestHeader(name = "Offset-Date-Time", required = true) String pOffsetDateTimeAsBasicType, - @RequestHeader(name = "Offset-Time", required = true) String pOffsetTimeAsBasicType, - @RequestHeader(name = "Local-Date-Time", required = true) String pLocalDateTimeAsBasicType, - @RequestHeader(name = "Local-Time", required = true) String pLocalTimeAsBasicType, - @RequestHeader(name = "Local-Date", required = true) String pLocalDateAsBasicType, - @RequestHeader(name = "Calendar", required = true) String pCalendarAsBasicType, - @RequestHeader(name = "Util-Date", required = true) String pUtilDateAsBasicType, - @RequestHeader(name = "SQL-Timestamp", required = true) String pSQLTimestampAsBasicType, - @RequestHeader(name = "SQL-Time", required = true) String pSQLTimeAsBasicType, - @RequestHeader(name = "SQL-Date", required = true) String pSQLDateAsBasicType, + @MyNotNullRESTParam + public void testDateHeaderParams( @PathVariable(name = "path", required = true) @MyNotNullRESTParam String pPath, + @RequestHeader(name = "Offset-Date-Time", required = true) @MyNotNullRESTParam String pOffsetDateTimeAsBasicType, + @RequestHeader(name = "Offset-Time", required = true) @MyNotNullRESTParam String pOffsetTimeAsBasicType, + @RequestHeader(name = "Local-Date-Time", required = true) @MyNotNullRESTParam String pLocalDateTimeAsBasicType, + @RequestHeader(name = "Local-Time", required = true) @MyNotNullRESTParam String pLocalTimeAsBasicType, + @RequestHeader(name = "Local-Date", required = true) @MyNotNullRESTParam String pLocalDateAsBasicType, + @RequestHeader(name = "Calendar", required = true) @MyNotNullRESTParam String pCalendarAsBasicType, + @RequestHeader(name = "Util-Date", required = true) @MyNotNullRESTParam String pUtilDateAsBasicType, + @RequestHeader(name = "SQL-Timestamp", required = true) @MyNotNullRESTParam String pSQLTimestampAsBasicType, + @RequestHeader(name = "SQL-Time", required = true) @MyNotNullRESTParam String pSQLTimeAsBasicType, + @RequestHeader(name = "SQL-Date", required = true) @MyNotNullRESTParam String pSQLDateAsBasicType, @RequestHeader(name = "util-dates", required = false) String[] pUtilDatesAsBasicType ) { // Convert date types into real objects. OffsetDateTime pOffsetDateTime; @@ -676,17 +696,18 @@ public void testDateHeaderParams( @PathVariable(name = "path", required = true) @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "test-date-header-params-beans/{path}", method = { RequestMethod.GET }) - public void testDateHeaderParamsBean( @PathVariable(name = "path", required = true) String pPath, - @RequestHeader(name = "Offset-Date-Time", required = true) String pOffsetDateTimeAsBasicType, - @RequestHeader(name = "Offset-Time", required = true) String pOffsetTimeAsBasicType, - @RequestHeader(name = "Local-Date-Time", required = true) String pLocalDateTimeAsBasicType, - @RequestHeader(name = "Local-Time", required = true) String pLocalTimeAsBasicType, - @RequestHeader(name = "Local-Date", required = true) String pLocalDateAsBasicType, - @RequestHeader(name = "Util-Date", required = true) String pUtilDateAsBasicType, - @RequestHeader(name = "Calendar", required = true) String pCalendarAsBasicType, - @RequestHeader(name = "SQL-Timestamp", required = true) String pSqlTimestampAsBasicType, - @RequestHeader(name = "SQL-Time", required = true) String pSqlTimeAsBasicType, - @RequestHeader(name = "SQL-Date", required = true) String pSqlDateAsBasicType ) { + @MyNotNullRESTParam + public void testDateHeaderParamsBean( @PathVariable(name = "path", required = true) @MyNotNullRESTParam String pPath, + @RequestHeader(name = "Offset-Date-Time", required = true) @MyNotNullRESTParam String pOffsetDateTimeAsBasicType, + @RequestHeader(name = "Offset-Time", required = true) @MyNotNullRESTParam String pOffsetTimeAsBasicType, + @RequestHeader(name = "Local-Date-Time", required = true) @MyNotNullRESTParam String pLocalDateTimeAsBasicType, + @RequestHeader(name = "Local-Time", required = true) @MyNotNullRESTParam String pLocalTimeAsBasicType, + @RequestHeader(name = "Local-Date", required = true) @MyNotNullRESTParam String pLocalDateAsBasicType, + @RequestHeader(name = "Util-Date", required = true) @MyNotNullRESTParam String pUtilDateAsBasicType, + @RequestHeader(name = "Calendar", required = true) @MyNotNullRESTParam String pCalendarAsBasicType, + @RequestHeader(name = "SQL-Timestamp", required = true) @MyNotNullRESTParam String pSqlTimestampAsBasicType, + @RequestHeader(name = "SQL-Time", required = true) @MyNotNullRESTParam String pSqlTimeAsBasicType, + @RequestHeader(name = "SQL-Date", required = true) @MyNotNullRESTParam String pSqlDateAsBasicType ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. DateHeaderParamsBean.Builder lHeaderParamsBuilder = DateHeaderParamsBean.builder(); @@ -757,17 +778,19 @@ public void testDateHeaderParamsBean( @PathVariable(name = "path", required = tr @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "cookies", method = { RequestMethod.GET }) + @MyNotNullRESTParam public void testCookieParams( @CookieValue(name = "Channel-Type-Param", required = true) @RequestBody( - required = true) ChannelType pChannelTypeParam, - @RequestHeader(name = "token", required = true) String pAccessToken, - @RequestHeader(name = "lang", required = true) Locale pLanguage, + required = true) @MyNotNullRESTParam ChannelType pChannelTypeParam, + @RequestHeader(name = "token", required = true) @MyNotNullRESTParam String pAccessToken, + @RequestHeader(name = "lang", required = true) @MyNotNullRESTParam Locale pLanguage, @CookieValue(name = "reseller", required = true) long pResellerID, @PathVariable(name = "id", required = true) long pPathParam, - @RequestParam(name = "q1", required = true) String pQueryParam, String pLang, - @RequestHeader(name = "intCode", required = true) int pIntCodeAsBasicType, - @RequestHeader(name = "specificHeader", required = true) String pSpecificHeader, - @CookieValue(name = "Channel-Type", required = true) ChannelType pChannelType, + @RequestParam(name = "q1", required = true) @MyNotNullRESTParam String pQueryParam, + @MyNotNullRESTParam String pLang, + @RequestHeader(name = "intCode", required = true) @MyNotNullRESTParam int pIntCodeAsBasicType, + @RequestHeader(name = "specificHeader", required = true) @MyNotNullRESTParam String pSpecificHeader, + @CookieValue(name = "Channel-Type", required = true) @MyNotNullRESTParam ChannelType pChannelType, @RequestHeader Map pHeaders ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. @@ -801,6 +824,7 @@ public void testCookieParams( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "test-optional-query-params", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testOptionalQueryParams( @RequestParam(name = "query1", required = false, defaultValue = "Just a default value") String query1, @RequestParam(name = "query2", required = false) int query2 ) { @@ -820,7 +844,7 @@ public String testOptionalQueryParams( @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "complex/{bookingID}", method = { RequestMethod.GET }) public boolean processComplexBookingID( - @PathVariable(name = "bookingID", required = true) String pComplextBookingIDAsBasicType ) { + @PathVariable(name = "bookingID", required = true) @MyNotNullRESTParam String pComplextBookingIDAsBasicType ) { // Convert basic type parameters into "real" objects. ComplexBookingID pComplextBookingID = this.deserializeCompositeDataType(pComplextBookingIDAsBasicType, ComplexBookingID.class); @@ -839,10 +863,11 @@ public boolean processComplexBookingID( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "dataTypesInHeader", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testDataTypesAsHeaderParam( - @RequestHeader(name = "BookingID", required = true) String pBookingIDAsBasicType, - @RequestHeader(name = "BookingCode", required = true) String pBookingCodeAsBasicType, - @RequestHeader(name = "DoubleCode", required = true) Double pDoubleCodeAsBasicType ) { + @RequestHeader(name = "BookingID", required = true) @MyNotNullRESTParam String pBookingIDAsBasicType, + @RequestHeader(name = "BookingCode", required = true) @MyNotNullRESTParam String pBookingCodeAsBasicType, + @RequestHeader(name = "DoubleCode", required = true) @MyNotNullRESTParam Double pDoubleCodeAsBasicType ) { // Convert basic type parameters into "real" objects. BookingID pBookingID = this.deserializeCompositeDataType(pBookingIDAsBasicType, BookingID.class); BookingCode pBookingCode; @@ -874,10 +899,11 @@ public String testDataTypesAsHeaderParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "dataTypesInBeanHeader", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testDataTypesAsHeaderBeanParam( - @RequestHeader(name = "bookingID", required = true) String pBookingIDAsBasicType, - @RequestHeader(name = "bookingCode", required = true) String pBookingCodeAsBasicType, - @RequestHeader(name = "DoubleCode", required = true) Double pDoubleCodeAsBasicType ) { + @RequestHeader(name = "bookingID", required = true) @MyNotNullRESTParam String pBookingIDAsBasicType, + @RequestHeader(name = "bookingCode", required = true) @MyNotNullRESTParam String pBookingCodeAsBasicType, + @RequestHeader(name = "DoubleCode", required = true) @MyNotNullRESTParam Double pDoubleCodeAsBasicType ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. AdvancedHeader.Builder lContextBuilder = AdvancedHeader.builder(); @@ -909,6 +935,7 @@ public String testDataTypesAsHeaderBeanParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testPrimitiveArrayAsBody", method = { RequestMethod.POST }) + @MyNotNullRESTParam public String testPrimitiveArrays( @RequestBody(required = false) int[] pIntegerArray ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pIntegerArray); @@ -925,8 +952,9 @@ public String testPrimitiveArrays( @RequestBody(required = false) int[] pInteger @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testDataTypeAsQueryParam", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testDataTypeAsQueryParam( - @RequestParam(name = "bookingCode", required = true) String pBookingCodeAsBasicType ) { + @RequestParam(name = "bookingCode", required = true) @MyNotNullRESTParam String pBookingCodeAsBasicType ) { // Convert basic type parameters into "real" objects. BookingCode pBookingCode; if (pBookingCodeAsBasicType != null) { @@ -950,8 +978,9 @@ public String testDataTypeAsQueryParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testDataTypeAsBeanQueryParam", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testDataTypeAsBeanQueryParam( - @RequestParam(name = "bookingCode", required = true) String pBookingCodeAsBasicType, + @RequestParam(name = "bookingCode", required = true) @MyNotNullRESTParam String pBookingCodeAsBasicType, @RequestParam(name = "maxResults", required = true, defaultValue = "47") int pMaxResults ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. @@ -977,6 +1006,7 @@ public String testDataTypeAsBeanQueryParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testPrimitiveArrayAsQueryParam", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testPrimitiveArrayAsQueryParam( @RequestParam(name = "intValues", required = false) int[] pIntValues ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pIntValues); @@ -993,6 +1023,7 @@ public String testPrimitiveArrayAsQueryParam( @RequestParam(name = "intValues", @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testSimpleTypesAsQueryParams", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testSimpleTypesAsQueryParams( @RequestParam(name = "strings", required = false) List pStrings ) { // Validate request parameter(s). @@ -1010,8 +1041,9 @@ public String testSimpleTypesAsQueryParams( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testPrimitiveWrapperArrayAsQueryParam", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testPrimitiveWrapperArrayAsQueryParam( - @RequestParam(name = "integers", required = true) Set pIntegers ) { + @RequestParam(name = "integers", required = true) @MyNotEmptyRESTParam Set pIntegers ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pIntegers); // Delegate request to service. @@ -1027,6 +1059,7 @@ public String testPrimitiveWrapperArrayAsQueryParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testMultivaluedQueryParamsBean", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testMultivaluedQueryParamsBean( @RequestParam(name = "intArray", required = false) int[] pIntArray, @RequestParam(name = "strings", required = false) String[] pStrings, @RequestParam(name = "integers", required = false) Integer[] pIntegers, @@ -1056,9 +1089,10 @@ public String testMultivaluedQueryParamsBean( @RequestParam(name = "intArray", r @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testMulitvaluedDataTypeAsQueryParam", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testMulitvaluedDataTypeAsQueryParam( @RequestParam(name = "codes", required = false) int[] pCodesAsBasicType, - @RequestParam(name = "longCodes", required = true) Long[] pLongCodesAsBasicType, + @RequestParam(name = "longCodes", required = true) @MyNotEmptyRESTParam Long[] pLongCodesAsBasicType, @RequestParam(name = "bookingIDs", required = false) String[] pBookingIDsAsBasicType, @RequestParam(name = "timestamps", required = false) String[] pTimestampsAsBasicType, @RequestParam(name = "localDates", required = false) String[] pLocalDatesAsBasicType ) { @@ -1131,16 +1165,17 @@ public String testMulitvaluedDataTypeAsQueryParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testMulitvaluedDataTypeAsBeanQueryParam", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testMulitvaluedDataTypeAsBeanQueryParam( @RequestParam(name = "longCodes", required = false) Long[] pLongCodesAsBasicType, @RequestParam(name = "codes", required = false) int[] pCodesAsBasicType, @RequestParam(name = "doubleCodes", required = false) Double[] pDoubleCodesAsBasicType, @RequestParam(name = "bookingIDs", required = false) String[] pBookingIDsAsBasicType, @RequestParam(name = "bookingIDsArray", required = false) String[] pBookingIDsArrayAsBasicType, - @RequestParam(name = "offsetDateTime", required = true) String pOffsetDateTimeAsBasicType, - @RequestParam(name = "offsetTime", required = true) String pOffsetTimeAsBasicType, - @RequestParam(name = "localDateTime", required = true) String pLocalDateTimeAsBasicType, - @RequestParam(name = "localTime", required = true) String pLocalTimeAsBasicType, + @RequestParam(name = "offsetDateTime", required = true) @MyNotNullRESTParam String pOffsetDateTimeAsBasicType, + @RequestParam(name = "offsetTime", required = true) @MyNotNullRESTParam String pOffsetTimeAsBasicType, + @RequestParam(name = "localDateTime", required = true) @MyNotNullRESTParam String pLocalDateTimeAsBasicType, + @RequestParam(name = "localTime", required = true) @MyNotNullRESTParam String pLocalTimeAsBasicType, @RequestParam(name = "timestamps", required = false) String[] pTimestampsAsBasicType, @RequestParam(name = "times", required = false) String[] pTimesAsBasicType, @RequestParam(name = "startTimestamps", required = false) String[] pStartTimestampsAsBasicType ) { @@ -1245,9 +1280,10 @@ public String testMulitvaluedDataTypeAsBeanQueryParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testMultiValuedHeaderFieldsInBeanParam", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testMultiValuedHeaderFieldsInBeanParam( @RequestHeader(name = "names", required = false) String[] pNames, - @RequestHeader(name = "ints", required = true) int[] pInts, + @RequestHeader(name = "ints", required = true) @MyNotEmptyRESTParam int[] pInts, @RequestHeader(name = "doubles", required = false) Double[] pDoubles, @RequestHeader(name = "codes", required = false) String[] pCodesAsBasicType, @RequestHeader(name = "stringCodeList", required = false) String[] pStringCodeListAsBasicType, @@ -1364,8 +1400,9 @@ public String testMultiValuedHeaderFieldsInBeanParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "testMultiValuedHeaderFields", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testMultiValuedHeaderFields( @RequestHeader(name = "names", required = false) Set pNames, - @RequestHeader(name = "ints", required = true) int[] pInts, + @RequestHeader(name = "ints", required = true) @MyNotEmptyRESTParam int[] pInts, @RequestHeader(name = "doubles", required = false) Set pDoubles, @RequestHeader(name = "codes", required = false) String[] pCodesAsBasicType, @RequestHeader(name = "startDate", required = false) String pStartDateAsBasicType, @@ -1435,8 +1472,9 @@ public String testMultiValuedHeaderFields( @RequestHeader(name = "names", requir @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "booking-id-as-path-param/{bookingID}", method = { RequestMethod.PATCH }) + @MyNotNullRESTParam public void testBookingIDAsPathParam( - @PathVariable(name = "bookingID", required = true) String pBookingIDAsBasicType ) { + @PathVariable(name = "bookingID", required = true) @MyNotNullRESTParam String pBookingIDAsBasicType ) { // Convert basic type parameters into "real" objects. BookingID pBookingID = this.deserializeCompositeDataType(pBookingIDAsBasicType, BookingID.class); // Validate request parameter(s). @@ -1451,6 +1489,7 @@ public void testBookingIDAsPathParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.NO_CONTENT) @RequestMapping(path = "booking-id-as-header-param", method = { RequestMethod.PATCH }) + @MyNotNullRESTParam public void testBookingIDAsHeaderParam( @RequestHeader(name = "bookingID", required = false) String pBookingIDAsBasicType ) { // Convert basic type parameters into "real" objects. @@ -1467,12 +1506,13 @@ public void testBookingIDAsHeaderParam( @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "test-context-with-primitives", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testContextWithPrimitives( @RequestHeader(name = "aBoolean", required = true) boolean pABoolean, - @RequestHeader(name = "aBooleanWrapper", required = true) Boolean pABooleanWrapper, + @RequestHeader(name = "aBooleanWrapper", required = true) @MyNotNullRESTParam Boolean pABooleanWrapper, @RequestHeader(name = "anInt", required = true) int pAnInt, - @RequestHeader(name = "anInteger", required = true) Integer pAnInteger, + @RequestHeader(name = "anInteger", required = true) @MyNotNullRESTParam Integer pAnInteger, @RequestParam(name = "aLong", required = true) long pALong, - @RequestParam(name = "aVeryLong", required = true) Long pAVeryLong ) { + @RequestParam(name = "aVeryLong", required = true) @MyNotNullRESTParam Long pAVeryLong ) { // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the // service interface but "only" our REST controller. ContextWithPrimitives.Builder lContextBuilder = ContextWithPrimitives.builder(); @@ -1498,12 +1538,13 @@ public String testContextWithPrimitives( @RequestHeader(name = "aBoolean", requi @PreAuthorize("hasAnyRole('Sales Agent')") @ResponseStatus(HttpStatus.OK) @RequestMapping(path = "test-primitives-as-params", method = { RequestMethod.GET }) + @MyNotNullRESTParam public String testPrimitivesAsParams( @RequestHeader(name = "pAnInt", required = true) int pAnInt, - @RequestHeader(name = "pAnInteger", required = true) Integer pAnInteger, + @RequestHeader(name = "pAnInteger", required = true) @MyNotNullRESTParam Integer pAnInteger, @RequestHeader(name = "pABoolean", required = true) boolean pABoolean, - @RequestHeader(name = "pBooleanWrapper", required = true) Boolean pBooleanWrapper, + @RequestHeader(name = "pBooleanWrapper", required = true) @MyNotNullRESTParam Boolean pBooleanWrapper, @RequestParam(name = "pALong", required = true) long pALong, - @RequestParam(name = "pVeryLong", required = true) Long pVeryLong ) { + @RequestParam(name = "pVeryLong", required = true) @MyNotNullRESTParam Long pVeryLong ) { // Validate request parameter(s). validationExecutor.validateRequest(RESTProductService.class, pAnInt, pAnInteger, pABoolean, pBooleanWrapper, pALong, pVeryLong); diff --git a/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyProperty.java b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyProperty.java new file mode 100644 index 000000000..469178f93 --- /dev/null +++ b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyProperty.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotEmptyProperty { + +} diff --git a/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyRESTParam.java b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyRESTParam.java new file mode 100644 index 000000000..33c87c458 --- /dev/null +++ b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyRESTParam.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotEmptyRESTParam { + +} diff --git a/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyServiceParam.java b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyServiceParam.java new file mode 100644 index 000000000..2af055ab5 --- /dev/null +++ b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotEmptyServiceParam.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotEmptyServiceParam { + +} diff --git a/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNull.java b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullProperty.java similarity index 85% rename from jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNull.java rename to jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullProperty.java index 1fb169ddf..71227cf7f 100644 --- a/jeaf-generator-test-open-api-service-objects/src/main/java/com/anaptecs/annotations/MyNotNull.java +++ b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullProperty.java @@ -6,6 +6,6 @@ import java.lang.annotation.Target; @Target({ METHOD, PARAMETER }) -public @interface MyNotNull { +public @interface MyNotNullProperty { } diff --git a/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullRESTParam.java b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullRESTParam.java new file mode 100644 index 000000000..c7d6d8b5a --- /dev/null +++ b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullRESTParam.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotNullRESTParam { + +} diff --git a/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullServiceParam.java b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullServiceParam.java new file mode 100644 index 000000000..28318f883 --- /dev/null +++ b/jeaf-generator-test-spring/src/main/java/com/anaptecs/annotations/MyNotNullServiceParam.java @@ -0,0 +1,11 @@ +package com.anaptecs.annotations; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; + +import java.lang.annotation.Target; + +@Target({ METHOD, PARAMETER }) +public @interface MyNotNullServiceParam { + +} diff --git a/jeaf-generator/src/main/resources/entity/Entity.xpt b/jeaf-generator/src/main/resources/entity/Entity.xpt index 8612f5f2e..60d30f0ee 100644 --- a/jeaf-generator/src/main/resources/entity/Entity.xpt +++ b/jeaf-generator/src/main/resources/entity/Entity.xpt @@ -94,7 +94,7 @@ } «EXPAND Attribute::PropertyAccessors FOREACH ownedAttribute» - «EXPAND JEAFOperation::PersistentObjectOperation FOREACH ownedOperation» + «EXPAND JEAFOperation::BusinessOperation FOREACH ownedOperation» /** * Method returns the class id of this business object class. @@ -129,7 +129,7 @@ // Nothing to do. } - «EXPAND JEAFOperation::PersistentObjectOperationImpl FOREACH ownedOperation» + «EXPAND JEAFOperation::BusinessOperationImpl FOREACH ownedOperation» } diff --git a/jeaf-generator/src/main/resources/functions/SystemProperties.ext b/jeaf-generator/src/main/resources/functions/SystemProperties.ext index 46475cb1b..4cf4331ae 100644 --- a/jeaf-generator/src/main/resources/functions/SystemProperties.ext +++ b/jeaf-generator/src/main/resources/functions/SystemProperties.ext @@ -25,6 +25,7 @@ cached boolean listUnsecuredRESTEndpoints(): cached String getDefaultSecurityRoleName(): getSystemProperty("switch.gen.security.default.security.role", ""); +// NotNull / NotEmpty annotation settings for properties cached boolean generateNotNullAnnotationForSingleValuedProperties(): getBooleanSystemProperty("jeaf.generator.generateNotNullAnnotationForSingleValuedProperties", false); @@ -36,3 +37,30 @@ cached boolean generateNotEmptyAnnotationForMultiValuedProperties(): cached String notEmptyAnnotationNameForMultiValuedProperties(): getSystemProperty("jeaf.generator.notEmptyAnnotationNameForMultiValuedProperties"); + +// NotNull / NotEmpty annotation settings for services +cached boolean generateNotNullAnnotationForSingleValuedServiceParameters(): + getBooleanSystemProperty("jeaf.generator.generateNotNullAnnotationForSingleValuedServiceParameters", false); + +cached String notNullAnnotationNameForSingleValuedServiceParameters(): + getSystemProperty("jeaf.generator.notNullAnnotationNameForSingleValuedServiceParameters"); + +cached boolean generateNotEmptyAnnotationForMultiValuedServiceParameters(): + getBooleanSystemProperty("jeaf.generator.generateNotEmptyAnnotationForMultiValuedServiceParameters", false); + +cached String notEmptyAnnotationNameForMultiValuedServiceParameters(): + getSystemProperty("jeaf.generator.notEmptyAnnotationNameForMultiValuedServiceParameters"); + + +// NotNull / NotEmpty annotation settings for REST controllers +cached boolean generateNotNullAnnotationForSingleValuedRESTParameters(): + getBooleanSystemProperty("jeaf.generator.generateNotNullAnnotationForSingleValuedRESTParameters", false); + +cached String notNullAnnotationNameForSingleValuedRESTParameters(): + getSystemProperty("jeaf.generator.notNullAnnotationNameForSingleValuedRESTParameters"); + +cached boolean generateNotEmptyAnnotationForMultiValuedRESTParameters(): + getBooleanSystemProperty("jeaf.generator.generateNotEmptyAnnotationForMultiValuedRESTParameters", false); + +cached String notEmptyAnnotationNameForMultiValuedRESTParameters(): + getSystemProperty("jeaf.generator.notEmptyAnnotationNameForMultiValuedRESTParameters"); diff --git a/jeaf-generator/src/main/resources/java/DomainObject.xpt b/jeaf-generator/src/main/resources/java/DomainObject.xpt index ed8145fe6..731ef3454 100644 --- a/jeaf-generator/src/main/resources/java/DomainObject.xpt +++ b/jeaf-generator/src/main/resources/java/DomainObject.xpt @@ -131,7 +131,7 @@ «ENDIF» «EXPAND Attribute::PropertyAccessors FOREACH ownedAttribute» - «EXPAND jeaf::JEAFOperation::PersistentObjectOperation FOREACH ownedOperation» + «EXPAND jeaf::JEAFOperation::BusinessOperation FOREACH ownedOperation» «EXPAND java::Helper::GenerateToStringMethod» } «ENDFILE» @@ -164,7 +164,7 @@ super(pDomainObjectID); } - «EXPAND jeaf::JEAFOperation::PersistentObjectOperationImpl FOREACH ownedOperation» + «EXPAND jeaf::JEAFOperation::BusinessOperationImpl FOREACH ownedOperation» } «ENDFILE» «ENDIF» diff --git a/jeaf-generator/src/main/resources/java/Helper.xpt b/jeaf-generator/src/main/resources/java/Helper.xpt index 61c87e0d0..a8db269c4 100644 --- a/jeaf-generator/src/main/resources/java/Helper.xpt +++ b/jeaf-generator/src/main/resources/java/Helper.xpt @@ -5,6 +5,8 @@ «EXTENSION functions::Class» «EXTENSION functions::Property» «EXTENSION functions::SoftLink» +«EXTENSION functions::RESTResource» +«EXTENSION functions::JEAFService» «EXTENSION functions::JEAFDeprecated» «EXTENSION functions::SystemProperties» @@ -523,15 +525,52 @@ «ENDIF -» «ENDDEFINE» -«DEFINE NotNullAnnotationForParameter FOR uml::Parameter -» +«DEFINE NotNullAnnotationForParameter(String context) FOR uml::Parameter -» + «IF lower > 0 -» + «IF context == "RESTResource"» + «IF isMultivalued() -» + «IF generateNotEmptyAnnotationForMultiValuedRESTParameters() -» + @«notEmptyAnnotationNameForMultiValuedRESTParameters()» + «ENDIF -» + «ELSE -» + «IF generateNotNullAnnotationForSingleValuedRESTParameters() && type.isPrimitiveType() == false -» + @«notNullAnnotationNameForSingleValuedRESTParameters()» + «ENDIF -» + «ENDIF -» + «ELSEIF context == "JEAFService" || context == "JEAFServiceProvider"» + «IF isMultivalued() -» + «IF generateNotEmptyAnnotationForMultiValuedServiceParameters() -» + @«notEmptyAnnotationNameForMultiValuedServiceParameters()» + «ENDIF -» + «ELSE -» + «IF generateNotNullAnnotationForSingleValuedServiceParameters() && type.isPrimitiveType() == false -» + @«notNullAnnotationNameForSingleValuedServiceParameters()» + «ENDIF -» + «ENDIF -» + «ELSE» + «IF isMultivalued() -» + «IF generateNotEmptyAnnotationForMultiValuedProperties() -» + @«notEmptyAnnotationNameForMultiValuedProperties()» + «ENDIF -» + «ELSE -» + «IF generateNotNullAnnotationForSingleValuedProperties() && type.isPrimitiveType() == false -» + @«notNullAnnotationNameForSingleValuedProperties()» + «ENDIF -» + «ENDIF -» + «ENDIF» + «ENDIF -» +«ENDDEFINE» + + +«DEFINE NotNullAnnotationForBeanParameter FOR uml::Property -» «IF lower > 0 -» «IF isMultivalued() -» - «IF generateNotEmptyAnnotationForMultiValuedProperties() -» - @«notEmptyAnnotationNameForMultiValuedProperties()» + «IF generateNotEmptyAnnotationForMultiValuedRESTParameters() -» + @«notEmptyAnnotationNameForMultiValuedRESTParameters()» «ENDIF -» «ELSE -» - «IF generateNotNullAnnotationForSingleValuedProperties() && type.isPrimitiveType() == false -» - @«notNullAnnotationNameForSingleValuedProperties()» + «IF generateNotNullAnnotationForSingleValuedRESTParameters() && type.isPrimitiveType() == false -» + @«notNullAnnotationNameForSingleValuedRESTParameters()» «ENDIF -» «ENDIF -» «ENDIF -» diff --git a/jeaf-generator/src/main/resources/java/POJO.xpt b/jeaf-generator/src/main/resources/java/POJO.xpt index bf32ebacb..d19823a54 100644 --- a/jeaf-generator/src/main/resources/java/POJO.xpt +++ b/jeaf-generator/src/main/resources/java/POJO.xpt @@ -260,7 +260,7 @@ «EXPAND java::Helper::GenerateOfForClass FOR this» «EXPAND java::Attribute::AbstractGetterForDerivedProperty FOREACH this.getDerivedProperties()» - «EXPAND jeaf::JEAFOperation::PersistentObjectOperation FOREACH ownedOperation» + «EXPAND jeaf::JEAFOperation::BusinessOperation FOREACH ownedOperation» «EXPAND java::Helper::GenerateCustomHeadersOperations» «EXPAND jeafgenerator::api::ClassExtensionHook::CustomOperations» «EXPAND java::Helper::GenerateEqualsHashCode(name + "Base")» @@ -303,7 +303,7 @@ «EXPAND java::Builder::GenerateBuilderImpl» «EXPAND java::Attribute::EmptyGetterImplForDerivedProperty FOREACH this.getDerivedProperties()» - «EXPAND jeaf::JEAFOperation::PersistentObjectOperationImpl FOREACH ownedOperation» + «EXPAND jeaf::JEAFOperation::BusinessOperationImpl FOREACH ownedOperation» «IF this.compositeDataTypeCustomSerialization» /** diff --git a/jeaf-generator/src/main/resources/java/ServiceObject.xpt b/jeaf-generator/src/main/resources/java/ServiceObject.xpt index 6294d00b9..a842fdd5f 100644 --- a/jeaf-generator/src/main/resources/java/ServiceObject.xpt +++ b/jeaf-generator/src/main/resources/java/ServiceObject.xpt @@ -246,7 +246,7 @@ «EXPAND java::Helper::GenerateOfForClass FOR this» «EXPAND java::Attribute::AbstractGetterForDerivedProperty FOREACH this.getDerivedProperties()» - «EXPAND jeaf::JEAFOperation::PersistentObjectOperation FOREACH ownedOperation» + «EXPAND jeaf::JEAFOperation::BusinessOperation FOREACH ownedOperation» «EXPAND java::Helper::GenerateCustomHeadersOperations» «EXPAND jeafgenerator::api::ClassExtensionHook::CustomOperations» «EXPAND java::Helper::GenerateEqualsHashCode(name + "Base")» @@ -289,7 +289,7 @@ «EXPAND java::Builder::GenerateBuilderImpl» «EXPAND java::Attribute::EmptyGetterImplForDerivedProperty FOREACH this.getDerivedProperties()» - «EXPAND jeaf::JEAFOperation::PersistentObjectOperationImpl FOREACH ownedOperation» + «EXPAND jeaf::JEAFOperation::BusinessOperationImpl FOREACH ownedOperation» «IF this.compositeDataTypeCustomSerialization» /** diff --git a/jeaf-generator/src/main/resources/jeaf/JEAFComponent.xpt b/jeaf-generator/src/main/resources/jeaf/JEAFComponent.xpt index 4e7be2412..4e1ca48d9 100644 --- a/jeaf-generator/src/main/resources/jeaf/JEAFComponent.xpt +++ b/jeaf-generator/src/main/resources/jeaf/JEAFComponent.xpt @@ -755,7 +755,7 @@ return null; } - «EXPAND JEAFOperation::ServiceOperationImpl FOREACH this.getAllOperations()» + «EXPAND JEAFOperation::ServiceOperationImpl("JEAFService") FOREACH this.getAllOperations()» } «ENDFILE» diff --git a/jeaf-generator/src/main/resources/jeaf/JEAFOperation.xpt b/jeaf-generator/src/main/resources/jeaf/JEAFOperation.xpt index c9e1a58fb..af2fc78e1 100644 --- a/jeaf-generator/src/main/resources/jeaf/JEAFOperation.xpt +++ b/jeaf-generator/src/main/resources/jeaf/JEAFOperation.xpt @@ -12,13 +12,13 @@ //interface methods are returned -«DEFINE InterfaceOperation FOR Operation» +«DEFINE PlainInterfaceOperation(String context) FOR Operation» «EXPAND functions::Javadoc::JavadocForOperation» «EXPAND java::Helper::GenerateDeprecationAnnotation-» «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult() -» «EXPAND Validation::ValidationAnnotation FOR this.getReturnResult()» - «EXPAND java::Helper::NotNullAnnotationForParameter FOR this.getReturnResult()» - «getReturnTypeName()» «name» («EXPAND ParameterSignature(true)»)«getThrownExceptionsAsString()»; + «EXPAND java::Helper::NotNullAnnotationForParameter(context) FOR this.getReturnResult()» + «getReturnTypeName()» «name» («EXPAND ParameterSignature(true, context)»)«getThrownExceptionsAsString()»; «ENDDEFINE» «DEFINE ServiceInterfaceOperation FOR Operation» @@ -26,8 +26,8 @@ «EXPAND java::Helper::GenerateDeprecationAnnotation-» «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult() -» «EXPAND Validation::ValidationAnnotation FOR this.getReturnResult()» - «EXPAND java::Helper::NotNullAnnotationForParameter FOR this.getReturnResult()» - «IF this.isDefaultOperation()»default «ENDIF»«getReturnTypeName()» «name» («EXPAND ParameterSignature(true)»)«getThrownExceptionsAsString()» + «EXPAND java::Helper::NotNullAnnotationForParameter("JEAFService") FOR this.getReturnResult()» + «IF this.isDefaultOperation()»default «ENDIF»«getReturnTypeName()» «name» («EXPAND ParameterSignature(true, "JEAFService")»)«getThrownExceptionsAsString()» «IF this.isDefaultOperation()» «LET this.asDefaultOperation().operationType AS operationType» { @@ -81,14 +81,42 @@ «ENDIF» «ENDDEFINE» +«DEFINE ServiceOperationImpl(String context) FOR Operation» + «EXPAND functions::Javadoc::JavadocForOperation» + «EXPAND java::Helper::GenerateDeprecationAnnotation-» + «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult() -» + «EXPAND java::Helper::NotNullAnnotationForParameter(context) FOR this.getReturnResult()» + @Override + «visibility» «getReturnTypeName()» «name» («EXPAND ParameterSignatureNoValidationAnnotation»)«getThrownExceptionsAsString()» { + «IF getReturnTypeName() != "void"» + // TODO Implement method and return real result + «IF returnsPrimitiveType()» + «IF getReturnTypeName() != "boolean"» return 0; «ELSE» return false;«ENDIF» + «ELSE» + return null; + «ENDIF» + «ENDIF» + } +«ENDDEFINE» + +//abstract methods are returned +«DEFINE BusinessOperation FOR Operation» + «EXPAND functions::Javadoc::JavadocForOperation» + «EXPAND java::Helper::GenerateDeprecationAnnotation-» + «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult() -» + «EXPAND Validation::ValidationAnnotation FOR this.getReturnResult()» + «EXPAND java::Helper::NotNullAnnotationForParameter("BusinessOperation") FOR this.getReturnResult()» + «visibility» abstract «getReturnTypeName()» «name» («EXPAND ParameterSignature(true, "BusinessOperation")»)«getThrownExceptionsAsString()»; +«ENDDEFINE» + //interfaceImpl methods are returned -«DEFINE PersistentObjectOperationImpl FOR Operation» +«DEFINE BusinessOperationImpl FOR Operation» «EXPAND functions::Javadoc::JavadocForOperation» «EXPAND java::Helper::GenerateDeprecationAnnotation-» «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult()» - «EXPAND java::Helper::NotNullAnnotationForParameter FOR this.getReturnResult()» + «EXPAND java::Helper::NotNullAnnotationForParameter("BusinessOperation") FOR this.getReturnResult()» @Override - «visibility» «getReturnTypeName()» «name» («EXPAND ParameterSignature(true)»)«getThrownExceptionsAsString()» { + «visibility» «getReturnTypeName()» «name» («EXPAND ParameterSignature(true, "BusinessOperation")»)«getThrownExceptionsAsString()» { // TODO: Implement business logic for method. «IF getReturnTypeName() != "void"» «IF getReturnTypeName() != "boolean"» @@ -104,41 +132,13 @@ } «ENDDEFINE» -«DEFINE ServiceOperationImpl FOR Operation» - «EXPAND functions::Javadoc::JavadocForOperation» - «EXPAND java::Helper::GenerateDeprecationAnnotation-» - «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult() -» - «EXPAND java::Helper::NotNullAnnotationForParameter FOR this.getReturnResult()» - @Override - «visibility» «getReturnTypeName()» «name» («EXPAND ParameterSignatureNoValidationAnnotation»)«getThrownExceptionsAsString()» { - «IF getReturnTypeName() != "void"» - // TODO Implement method and return real result - «IF returnsPrimitiveType()» - «IF getReturnTypeName() != "boolean"» return 0; «ELSE» return false;«ENDIF» - «ELSE» - return null; - «ENDIF» - «ENDIF» - } -«ENDDEFINE» - -//abstract methods are returned -«DEFINE PersistentObjectOperation FOR Operation» - «EXPAND functions::Javadoc::JavadocForOperation» - «EXPAND java::Helper::GenerateDeprecationAnnotation-» - «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult() -» - «EXPAND Validation::ValidationAnnotation FOR this.getReturnResult()» - «EXPAND java::Helper::NotNullAnnotationForParameter FOR this.getReturnResult()» - «visibility» abstract «getReturnTypeName()» «name» («EXPAND ParameterSignature(true)»)«getThrownExceptionsAsString()»; -«ENDDEFINE» - -«DEFINE ParameterSignature(boolean addValidation) FOR Operation» - «EXPAND ParameterDefinition(addValidation) FOREACH ownedParameter.select(e| e.isInputParameter() && e.isParameterSuppressed() == false) SEPARATOR ", "» +«DEFINE ParameterSignature(boolean addValidation, String context) FOR Operation» + «EXPAND ParameterDefinition(addValidation, context) FOREACH ownedParameter.select(e| e.isInputParameter() && e.isParameterSuppressed() == false) SEPARATOR ", "» «ENDDEFINE» -«DEFINE ParameterDefinition(boolean addValidation) FOR Parameter» +«DEFINE ParameterDefinition(boolean addValidation, String context) FOR Parameter» «EXPAND java::Helper::GenerateDeprecationAnnotation-» - «IF addValidation»«EXPAND Validation::ValidationAnnotation» «ENDIF» «EXPAND java::Helper::NotNullAnnotationForParameter» «this.getTypeName()» «this.name» + «IF addValidation»«EXPAND Validation::ValidationAnnotation» «ENDIF» «EXPAND java::Helper::NotNullAnnotationForParameter(context)» «this.getTypeName()» «this.name» «ENDDEFINE» «DEFINE ParameterSignatureNoValidationAnnotation FOR Operation» diff --git a/jeaf-generator/src/main/resources/jeaf/JEAFService.xpt b/jeaf-generator/src/main/resources/jeaf/JEAFService.xpt index 1f4101f4d..d52a2fd82 100644 --- a/jeaf-generator/src/main/resources/jeaf/JEAFService.xpt +++ b/jeaf-generator/src/main/resources/jeaf/JEAFService.xpt @@ -100,7 +100,7 @@ public final class «name»Proxy extends ServiceProxy implements «name» «IF g «IF this.returnResult().isMultivalued().first() == true»@SuppressWarnings("unchecked")«ENDIF» «EXPAND java::Helper::GenerateDeprecationAnnotation-» «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult() -» - «visibility» «getReturnTypeName()» «name» («EXPAND JEAFOperation::ParameterSignature(true)») «getThrownExceptionsAsString()» { + «visibility» «getReturnTypeName()» «name» («EXPAND JEAFOperation::ParameterSignature(true, "JEAFService")») «getThrownExceptionsAsString()» { try { Command lCommand = new «this.getCommandClassName()»(«asParameterListNames()»); «IF getReturnTypeName() != "void"» @@ -178,7 +178,7 @@ final class «this.getCommandClassName()» extends Command { * «asParameterJavaDoc()» */ - «this.getCommandClassName()»(«EXPAND JEAFOperation::ParameterSignature(false)») { + «this.getCommandClassName()»(«EXPAND JEAFOperation::ParameterSignature(false, "JEAFService")») { super(«targetService.name».class); «FOREACH ownedParameter AS param» «IF param.isInputParameter() && param.isParameterSuppressed() == false» diff --git a/jeaf-generator/src/main/resources/jeaf/RESTResource.xpt b/jeaf-generator/src/main/resources/jeaf/RESTResource.xpt index 565ae8a10..cb1802aa7 100644 --- a/jeaf-generator/src/main/resources/jeaf/RESTResource.xpt +++ b/jeaf-generator/src/main/resources/jeaf/RESTResource.xpt @@ -221,6 +221,7 @@ public class «name»Resource { «IF produces.size > 0»@«getEnterpriseJavaPackage()».ws.rs.Produces(«IF produces.size > 1»{«ENDIF»«FOREACH produces AS mediaType SEPARATOR ","»«getEnterpriseJavaPackage()».ws.rs.core.MediaType.«mediaType»«ENDFOREACH»«IF produces.size > 1»}«ENDIF»)«ENDIF» «EXPAND java::Helper::GenerateDeprecationAnnotation-» «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult()-» + «EXPAND java::Helper::NotNullAnnotationForParameter("RESTResource") FOR this.getReturnResult()-» public «getEnterpriseJavaPackage()».ws.rs.core.Response «name» («EXPAND RESTParameterSignature FOR this» «IF this.ownedParameter.select(e|e.hasParamCustomHeaders()).size > 0» «IF ownedParameter.select(e| e.isInputParameter() && e.isParameterSuppressed() == false).size > 0»,«ENDIF» @«getEnterpriseJavaPackage()».ws.rs.core.Context «getEnterpriseJavaPackage()».ws.rs.core.HttpHeaders pHeaders«ENDIF»)«getThrownExceptionsAsString()»{ «IF this.hasDataTypeParameters()» // Convert basic type parameters into "real" objects. @@ -364,6 +365,7 @@ public class «name»Resource { ) «EXPAND java::Helper::GenerateDeprecationAnnotation-» «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult()-» + «EXPAND java::Helper::NotNullAnnotationForParameter("RESTResource") FOR this.getReturnResult()-» public «getReturnTypeName()» «name» («EXPAND SpringRESTParameterSignature FOR this» «IF this.ownedParameter.select(e|e.hasParamCustomHeaders()).size > 0» «IF ownedParameter.select(e| e.isInputParameter() && e.isParameterSuppressed() == false).size > 0»,«ENDIF» @org.springframework.web.bind.annotation.RequestHeader java.util.Map pHeaders«ENDIF»)«getThrownExceptionsAsString()»{ «IF this.hasBeanParameters()» // Convert parameters into object as "BeanParams" are not supported by Spring Web. This way we do not pollute the service interface but "only" our REST controller. @@ -709,6 +711,7 @@ public class «name»Resource { «IF produces.size > 0»@«getEnterpriseJavaPackage()».ws.rs.Produces(«IF produces.size > 1»{«ENDIF»«FOREACH produces AS mediaType SEPARATOR ","»«getEnterpriseJavaPackage()».ws.rs.core.MediaType.«mediaType»«ENDFOREACH»«IF produces.size > 1»}«ENDIF»)«ENDIF» «EXPAND java::Helper::GenerateDeprecationAnnotation -» «EXPAND java::Helper::GenerateDeprecationAnnotation FOR this.getReturnResult()-» + «EXPAND java::Helper::NotNullAnnotationForParameter("RESTResource") FOR this.getReturnResult()-» public void «name» (@«getEnterpriseJavaPackage()».ws.rs.container.Suspended «getEnterpriseJavaPackage()».ws.rs.container.AsyncResponse pAsyncResponse, @«getEnterpriseJavaPackage()».ws.rs.core.Context «getEnterpriseJavaPackage()».servlet.http.HttpServletRequest pRequest «IF this.hasInputParameters()»,«ENDIF» «EXPAND RESTParameterSignature FOR this»)«getThrownExceptionsAsString()»{ // Lookup workload manager that takes care that the system will have an optimal throughput. com.anaptecs.jeaf.workload.api.WorkloadManager lWorkloadManager = com.anaptecs.jeaf.workload.api.Workload.getWorkloadManager(); @@ -812,6 +815,7 @@ public class «name»Resource { «ENDIF» «EXPAND java::Helper::GenerateDeprecationAnnotation» +«EXPAND java::Helper::NotNullAnnotationForParameter("RESTResource")» «IF this.type.isOpenAPIDataType() && this.isRequestBody() == false» «IF ((JMM::OpenAPIDataType) this.type).compositeDataType» String«IF this.isMultivalued()»[]«ENDIF» «this.name»AsBasicType @@ -849,6 +853,7 @@ public class «name»Resource { «EXPAND java::Helper::GenerateDeprecationAnnotation» «IF this.isBeanParam() == false» + «EXPAND java::Helper::NotNullAnnotationForParameter("RESTResource")» «IF this.type.isOpenAPIDataType() && this.isRequestBody() == false» «IF ((JMM::OpenAPIDataType) this.type).compositeDataType» String«IF this.isMultivalued()»[]«ENDIF» «name»AsBasicType @@ -889,6 +894,7 @@ public class «name»Resource { «ENDIF-» «EXPAND java::Helper::GenerateDeprecationAnnotation» + «EXPAND java::Helper::NotNullAnnotationForBeanParameter» «IF this.type.isOpenAPIDataType() » «IF ((JMM::OpenAPIDataType) this.type).compositeDataType» String«IF this.isMultivalued()»[]«ENDIF» «this.asParameter()»AsBasicType diff --git a/jeaf-generator/src/main/resources/jeaf/RESTServiceProxy.xpt b/jeaf-generator/src/main/resources/jeaf/RESTServiceProxy.xpt index 18d211387..a8720a6a0 100644 --- a/jeaf-generator/src/main/resources/jeaf/RESTServiceProxy.xpt +++ b/jeaf-generator/src/main/resources/jeaf/RESTServiceProxy.xpt @@ -30,7 +30,7 @@ package «packageName()».restproxy; * Service Provider Interface is generated so that a proxy for a REST Resource can be provided as JEAF Service Provider. */ public interface «name»RESTProxyServiceProvider extends com.anaptecs.jeaf.core.api.ServiceProvider { - «EXPAND JEAFOperation::InterfaceOperation FOREACH this.getAllOperations().typeSelect(RESTOperation)» + «EXPAND JEAFOperation::PlainInterfaceOperation("RESTResource") FOREACH this.getAllOperations().typeSelect(RESTOperation)» } «ENDFILE» «ENDDEFINE» diff --git a/jeaf-generator/src/main/resources/jeaf/ServiceProvider.xpt b/jeaf-generator/src/main/resources/jeaf/ServiceProvider.xpt index 54519acd7..7b69a7ec3 100644 --- a/jeaf-generator/src/main/resources/jeaf/ServiceProvider.xpt +++ b/jeaf-generator/src/main/resources/jeaf/ServiceProvider.xpt @@ -16,7 +16,7 @@ package «packageName()»; «EXPAND java::Helper::GenerateDeprecationAnnotation-» public interface «name» extends «IF generalization.size > 0» «this.getAllExtendedInterfaces()» «ELSE»com.anaptecs.jeaf.core.api.ServiceProvider«ENDIF» { -«EXPAND JEAFOperation::InterfaceOperation FOREACH this.ownedOperation» +«EXPAND JEAFOperation::PlainInterfaceOperation("JEAFServiceProvider") FOREACH this.ownedOperation» } «ENDFILE» @@ -121,7 +121,7 @@ final class «name» extends «name»Base { } «FOREACH this.getAllImplementedInterfaces() AS interface» - «EXPAND JEAFOperation::ServiceOperationImpl FOREACH interface.ownedOperation» + «EXPAND JEAFOperation::ServiceOperationImpl("JEAFServiceProvider") FOREACH interface.ownedOperation» «ENDFOREACH» } «ENDFILE»