Skip to content

Commit 355e1ae

Browse files
gtiwari333gtiwari333
authored
spring boot 4 (#20)
1 parent c7c39c3 commit 355e1ae

File tree

49 files changed

+421
-450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+421
-450
lines changed

‎.mvn/wrapper/MavenWrapperDownloader.java‎

Lines changed: 0 additions & 117 deletions
This file was deleted.

‎.mvn/wrapper/maven-wrapper.jar‎

-49.5 KB
Binary file not shown.

‎.mvn/wrapper/maven-wrapper.properties‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,3 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=only-script
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Persistence/Search:
4848

4949
Test:
5050
- Unit/integration with JUnit 5, Mockito and Spring Test
51-
- Tests with Spock Framework (Groovy 4, Spock 2)
51+
- Tests with Spock Framework (Groovy 5, Spock 2.4)
5252
- e2e with Selenide, fixtures. default data generated using Spring
5353
- Load test with Gatling/Scala
5454
- Architecture tests using ArchUnit

‎common/pom.xml‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,33 +64,26 @@
6464
<scope>provided</scope>
6565
</dependency>
6666
<dependency>
67-
<groupId>com.fasterxml.jackson.core</groupId>
67+
<groupId>tools.jackson.core</groupId>
6868
<artifactId>jackson-databind</artifactId>
6969
<optional>true</optional>
7070
<scope>provided</scope>
71-
</dependency>
72-
<dependency>
73-
<groupId>com.fasterxml.jackson.datatype</groupId>
74-
<artifactId>jackson-datatype-jsr310</artifactId>
75-
<optional>true</optional>
76-
<scope>provided</scope>
71+
<version>3.0.3</version>
7772
</dependency>
7873
</dependencies>
7974

8075
<build>
8176
<plugins>
82-
<plugin>
83-
<groupId>com.github.spotbugs</groupId>
84-
<artifactId>spotbugs-maven-plugin</artifactId>
85-
<configuration>
86-
<excludeFilterFile>../spot-bugs.filter-exclude.xml</excludeFilterFile>
87-
</configuration>
88-
</plugin>
8977
<plugin>
9078
<groupId>org.apache.maven.plugins</groupId>
91-
<artifactId>maven-checkstyle-plugin</artifactId>
79+
<artifactId>maven-compiler-plugin</artifactId>
9280
<configuration>
93-
<configLocation>../checkstyle.xml</configLocation>
81+
<annotationProcessorPaths>
82+
<path>
83+
<groupId>org.projectlombok</groupId>
84+
<artifactId>lombok</artifactId>
85+
</path>
86+
</annotationProcessorPaths>
9487
</configuration>
9588
</plugin>
9689
</plugins>

‎common/src/main/java/gt/common/test/TestUtil.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
package gt.common.test;
22

3-
import com.fasterxml.jackson.annotation.JsonInclude;
4-
import com.fasterxml.jackson.databind.ObjectMapper;
5-
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
63
import org.springframework.web.bind.annotation.GetMapping;
74

85
import java.io.File;
9-
import java.io.IOException;
106
import java.net.URISyntaxException;
117
import java.net.URL;
128

@@ -26,23 +22,4 @@ public static File fileFromClassPath(String name) {
2622
throw new IllegalArgumentException(e);
2723
}
2824
}
29-
30-
public static byte[] convertObjectToJsonBytes(Object object)
31-
throws IOException {
32-
ObjectMapper mapper = new ObjectMapper();
33-
mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
34-
35-
JavaTimeModule module = new JavaTimeModule();
36-
mapper.registerModule(module);
37-
38-
return mapper.writeValueAsBytes(object);
39-
}
40-
41-
public static byte[] createByteArray(int size, String data) {
42-
byte[] byteArray = new byte[size];
43-
for (int i = 0; i < size; i++) {
44-
byteArray[i] = Byte.parseByte(data, 2);
45-
}
46-
return byteArray;
47-
}
4825
}

‎content-checker/content-checker-service-model/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@
3030
<build>
3131
<plugins>
3232
<plugin>
33-
<groupId>com.github.spotbugs</groupId>
34-
<artifactId>spotbugs-maven-plugin</artifactId>
33+
<groupId>org.apache.maven.plugins</groupId>
34+
<artifactId>maven-compiler-plugin</artifactId>
3535
<configuration>
36-
<excludeFilterFile>../../spot-bugs.filter-exclude.xml</excludeFilterFile>
36+
<annotationProcessorPaths>
37+
<path>
38+
<groupId>org.projectlombok</groupId>
39+
<artifactId>lombok</artifactId>
40+
</path>
41+
</annotationProcessorPaths>
3742
</configuration>
3843
</plugin>
3944
</plugins>

‎content-checker/content-checker-service/pom.xml‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,32 @@
2727
</dependency>
2828
<dependency>
2929
<groupId>org.springframework.boot</groupId>
30-
<artifactId>spring-boot-starter-web</artifactId>
30+
<artifactId>spring-boot-starter-webmvc</artifactId>
3131
</dependency>
3232
<dependency>
3333
<groupId>org.springdoc</groupId>
3434
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
3535
</dependency>
3636

3737
<!-- tracing -->
38+
<dependency>
39+
<groupId>org.springframework.boot</groupId>
40+
<artifactId>spring-boot-micrometer-tracing-brave</artifactId>
41+
</dependency>
3842
<dependency>
3943
<groupId>org.springframework.boot</groupId>
4044
<artifactId>spring-boot-starter-actuator</artifactId>
4145
</dependency>
4246
<dependency>
43-
<groupId>io.micrometer</groupId>
44-
<artifactId>micrometer-tracing-bridge-brave</artifactId>
47+
<groupId>org.springframework.boot</groupId>
48+
<artifactId>spring-boot-starter-zipkin</artifactId>
4549
</dependency>
4650
<dependency>
47-
<groupId>io.zipkin.reporter2</groupId>
48-
<artifactId>zipkin-reporter-brave</artifactId>
51+
<groupId>io.micrometer</groupId>
52+
<artifactId>micrometer-tracing-bridge-brave</artifactId>
4953
</dependency>
54+
55+
5056
<dependency>
5157
<groupId>org.springframework.boot</groupId>
5258
<artifactId>spring-boot-starter-artemis</artifactId>
@@ -57,23 +63,17 @@
5763
<optional>true</optional>
5864
<scope>provided</scope>
5965
</dependency>
60-
<dependency>
61-
<groupId>org.springdoc</groupId>
62-
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
63-
<version>${springdoc-openapi-ui.version}</version>
64-
<optional>true</optional>
65-
</dependency>
6666

6767
<!-- test dependencies -->
6868
<dependency>
6969
<groupId>org.springframework.boot</groupId>
70-
<artifactId>spring-boot-starter-test</artifactId>
70+
<artifactId>spring-boot-starter-webmvc-test</artifactId>
7171
<scope>test</scope>
7272
</dependency>
7373
</dependencies>
7474

7575
<build>
76-
<finalName>${build.profile}-${artifactId}-${project.version}</finalName>
76+
<finalName>${artifactId}-${project.version}</finalName>
7777
<defaultGoal>spring-boot:run</defaultGoal>
7878
<plugins>
7979

@@ -85,6 +85,24 @@
8585
<layers>
8686
<enabled>true</enabled>
8787
</layers>
88+
<excludes>
89+
<exclude>
90+
<groupId>org.projectlombok</groupId>
91+
<artifactId>lombok</artifactId>
92+
</exclude>
93+
</excludes>
94+
</configuration>
95+
</plugin>
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-compiler-plugin</artifactId>
99+
<configuration>
100+
<annotationProcessorPaths>
101+
<path>
102+
<groupId>org.projectlombok</groupId>
103+
<artifactId>lombok</artifactId>
104+
</path>
105+
</annotationProcessorPaths>
88106
</configuration>
89107
</plugin>
90108
<plugin>

‎content-checker/content-checker-service/src/main/java/gt/contentchecker/JMSConfig.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package gt.contentchecker;
22

33
import jakarta.jms.ConnectionFactory;
4-
import org.springframework.boot.autoconfigure.jms.DefaultJmsListenerContainerFactoryConfigurer;
4+
import org.springframework.boot.jms.autoconfigure.DefaultJmsListenerContainerFactoryConfigurer;
55
import org.springframework.context.annotation.Bean;
66
import org.springframework.context.annotation.Configuration;
77
import org.springframework.jms.annotation.EnableJms;
88
import org.springframework.jms.config.DefaultJmsListenerContainerFactory;
99
import org.springframework.jms.config.JmsListenerContainerFactory;
10-
import org.springframework.jms.support.converter.MappingJackson2MessageConverter;
10+
import org.springframework.jms.support.converter.JacksonJsonMessageConverter;
1111
import org.springframework.jms.support.converter.MessageConverter;
1212
import org.springframework.jms.support.converter.MessageType;
1313

@@ -25,7 +25,7 @@ public JmsListenerContainerFactory<?> myFactory(ConnectionFactory connectionFact
2525

2626
@Bean
2727
public MessageConverter jacksonJmsMessageConverter() {
28-
var converter = new MappingJackson2MessageConverter();
28+
var converter = new JacksonJsonMessageConverter();
2929
converter.setTargetType(MessageType.TEXT);
3030
converter.setTypeIdPropertyName("_type");
3131
return converter;

‎content-checker/content-checker-service/src/main/resources/application-default.yml‎

Whitespace-only changes.

0 commit comments

Comments
 (0)