Merge branch 'master' into use_BigDecimal_for_decimal_format

asyncapi · Oct 2, 2023 · 5e4cec5 · 5e4cec5
2 parents d4eef16 + 41f2f33
commit 5e4cec5
Show file tree

Hide file tree

Showing 27 changed files with 120 additions and 11 deletions.
diff --git a/filters/all.js b/filters/all.js
@@ -179,3 +179,5 @@ function addBackSlashToPattern(val) {
   return result;
 }
 filter.addBackSlashToPattern = addBackSlashToPattern;
+
+filter.currentTime = () => (new Date(Date.now())).toISOString();
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/java-spring-template",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "Java Spring template for AsyncAPI generator.",
   "keywords": [
     "asyncapi",

diff --git a/partials/AmqpConfig.java b/partials/AmqpConfig.java
@@ -18,6 +18,9 @@
 import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.messaging.MessageChannel;
 
+import javax.annotation.processing.Generated;
+
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @Configuration
 public class Config {
 

diff --git a/partials/CommonPublisher.java b/partials/CommonPublisher.java
@@ -3,6 +3,9 @@
 import org.springframework.integration.annotation.Gateway;
 import org.springframework.integration.annotation.MessagingGateway;
 
+import javax.annotation.processing.Generated;
+
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @MessagingGateway
 public interface PublisherService {
 

diff --git a/partials/KafkaConfig.java b/partials/KafkaConfig.java
@@ -75,9 +75,11 @@
 import org.springframework.kafka.support.serializer.JsonDeserializer;
 import org.springframework.kafka.support.serializer.JsonSerializer;
 
+import javax.annotation.processing.Generated;
 import java.util.HashMap;
 import java.util.Map;
 
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @Configuration
 {% if hasPublish %}@EnableKafka{% endif %}
 public class Config {

diff --git a/partials/KafkaPublisher.java b/partials/KafkaPublisher.java
@@ -13,7 +13,9 @@
         {%- endfor -%}
     {% endif -%}
 {% endfor %}
+import javax.annotation.processing.Generated;
 
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @Service
 public class PublisherService {
 

diff --git a/partials/MqttConfig.java b/partials/MqttConfig.java
@@ -20,6 +20,9 @@
 import org.springframework.messaging.MessageHandler;
 import org.springframework.util.StringUtils;
 
+import javax.annotation.processing.Generated;
+
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @Configuration
 public class Config {
 

diff --git a/template/src/main/java/com/asyncapi/Application.java b/template/src/main/java/com/asyncapi/Application.java
@@ -3,6 +3,9 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import javax.annotation.processing.Generated;
+
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @SpringBootApplication
 public class Application {
 

diff --git a/template/src/main/java/com/asyncapi/model/$$message$$.java b/template/src/main/java/com/asyncapi/model/$$message$$.java
@@ -1,5 +1,6 @@
 package {{ params['userJavaPackage'] }}.model;
 
+import javax.annotation.processing.Generated;
 {% if params.springBoot2 -%}
 import javax.validation.Valid;
 {% else %}
@@ -12,6 +13,7 @@
  * {{ line | safe}}{% endfor %}{% if message.examples() %}
  * Examples: {{message.examples() | examplesToString | safe}}{% endif %}
  */{% endif %}
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 public class {{messageName | camelCase | upperFirst}} {
     {%- if message.payload().anyOf() or message.payload().oneOf() %}
         {%- set payloadName = 'OneOf' %}{%- set hasPrimitive = false %}

diff --git a/template/src/main/java/com/asyncapi/model/$$objectSchema$$.java b/template/src/main/java/com/asyncapi/model/$$objectSchema$$.java
@@ -12,13 +12,15 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 
+import javax.annotation.processing.Generated;
 import java.util.List;
 import java.util.Objects;
 
 {% if schema.description() or schema.examples() %}/**{% for line in schema.description() | splitByLines %}
  * {{ line | safe}}{% endfor %}{% if schema.examples() %}
  * Examples: {{schema.examples() | examplesToString | safe}}{% endif %}
  */{% endif %}
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 public class {{schemaName | camelCase | upperFirst}} {
     {% for propName, prop in schema.properties() %}
         {%- set isRequired = propName | isRequired(schema.required()) %}

diff --git a/template/src/main/java/com/asyncapi/service/CommandLinePublisher.java b/template/src/main/java/com/asyncapi/service/CommandLinePublisher.java
@@ -4,8 +4,10 @@
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.processing.Generated;
 import java.util.Random;
 
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @Component
 public class CommandLinePublisher implements CommandLineRunner {
 

diff --git a/template/src/main/java/com/asyncapi/service/MessageHandlerService.java b/template/src/main/java/com/asyncapi/service/MessageHandlerService.java
@@ -27,6 +27,9 @@
         {%- endif %}
     {%- endfor %}
 {% endif %}
+import javax.annotation.processing.Generated;
+
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @Service
 public class MessageHandlerService {
 

diff --git a/template/src/test/java/com/asyncapi/ApplicationTests.java b/template/src/test/java/com/asyncapi/ApplicationTests.java
@@ -5,6 +5,9 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.processing.Generated;
+
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class ApplicationTests {

diff --git a/template/src/test/java/com/asyncapi/SimpleKafkaTest.java b/template/src/test/java/com/asyncapi/SimpleKafkaTest.java
@@ -41,6 +41,7 @@
 import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import javax.annotation.processing.Generated;
 import java.time.Duration;
 import java.util.Collections;
 import java.util.HashMap;
@@ -51,6 +52,7 @@
 /**
  * Example of tests for kafka based on spring-kafka-test library
  */
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class SimpleKafkaTest {

diff --git a/template/src/test/java/com/asyncapi/TestcontainerKafkaTest.java b/template/src/test/java/com/asyncapi/TestcontainerKafkaTest.java
@@ -39,6 +39,7 @@
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.shaded.com.google.common.collect.Lists;
 
+import javax.annotation.processing.Generated;
 import java.time.Duration;
 import java.util.*;
 
@@ -51,6 +52,7 @@
 /**
  * Example of tests for kafka based on testcontainers library
  */
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class TestcontainerKafkaTest {

diff --git a/template/src/test/java/com/asyncapi/TestcontainerMqttTest.java b/template/src/test/java/com/asyncapi/TestcontainerMqttTest.java
@@ -31,6 +31,7 @@
 import org.springframework.test.context.junit4.SpringRunner;
 import org.testcontainers.containers.GenericContainer;
 
+import javax.annotation.processing.Generated;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
@@ -40,6 +41,7 @@
 /**
  * Example of tests for mqtt based on testcontainers library
  */
+@Generated(value="com.asyncapi.generator.template.spring", date="{{''|currentTime }}")
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class TestcontainerMqttTest {

diff --git a/tests/__snapshots__/additional-formats.test.js.snap b/tests/__snapshots__/additional-formats.test.js.snap
@@ -11,10 +11,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 
+import javax.annotation.processing.Generated;
 import java.util.List;
 import java.util.Objects;
 
 
+@Generated(value="com.asyncapi.generator.template.spring", date="AnyDate")
 public class SongPayload {
     
     private @Valid java.util.UUID id;

diff --git a/tests/__snapshots__/kafka.test.js.snap b/tests/__snapshots__/kafka.test.js.snap
@@ -20,9 +20,11 @@ import org.springframework.kafka.listener.ConcurrentMessageListenerContainer;
 import org.springframework.kafka.support.serializer.JsonDeserializer;
 import org.springframework.kafka.support.serializer.JsonSerializer;
 
+import javax.annotation.processing.Generated;
 import java.util.HashMap;
 import java.util.Map;
 
+@Generated(value="com.asyncapi.generator.template.spring", date="AnyDate")
 @Configuration
 @EnableKafka
 public class Config {
@@ -104,7 +106,9 @@ import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.stereotype.Service;
 
 import com.asyncapi.model.LightMeasuredPayload;
+import javax.annotation.processing.Generated;
 
+@Generated(value="com.asyncapi.generator.template.spring", date="AnyDate")
 @Service
 public class PublisherService {
 
@@ -138,6 +142,9 @@ import org.springframework.messaging.handler.annotation.Payload;
     
 import com.asyncapi.model.LightMeasuredPayload;
 
+import javax.annotation.processing.Generated;
+
+@Generated(value="com.asyncapi.generator.template.spring", date="AnyDate")
 @Service
 public class MessageHandlerService {
 
@@ -169,10 +176,12 @@ import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 
+import javax.annotation.processing.Generated;
 import java.util.List;
 import java.util.Objects;
 
 
+@Generated(value="com.asyncapi.generator.template.spring", date="AnyDate")
 public class LightMeasuredPayload {
     
     private @Valid Integer lumens;
@@ -250,12 +259,14 @@ public class LightMeasuredPayload {
 exports[`template integration tests for generated files using the generator and mqtt example should generate proper config, services and DTOs files for provided kafka 5`] = `
 "package com.asyncapi.model;
 
+import javax.annotation.processing.Generated;
 
 import jakarta.validation.Valid;
 import java.util.Objects;
 import java.util.List;
 
 
+@Generated(value="com.asyncapi.generator.template.spring", date="AnyDate")
 public class LightMeasured {
     private @Valid LightMeasuredPayload payload;
 
@@ -335,6 +346,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.testcontainers.containers.KafkaContainer;
 import org.testcontainers.shaded.com.google.common.collect.Lists;
 
+import javax.annotation.processing.Generated;
 import java.time.Duration;
 import java.util.*;
 
@@ -347,6 +359,7 @@ import static org.junit.Assert.assertNotEquals;
 /**
  * Example of tests for kafka based on testcontainers library
  */
+@Generated(value="com.asyncapi.generator.template.spring", date="AnyDate")
 @RunWith(SpringRunner.class)
 @SpringBootTest
 public class TestcontainerKafkaTest {