Skip to content

Commit

Permalink
polish
Browse files Browse the repository at this point in the history
  • Loading branch information
rajadilipkolli committed Mar 8, 2024
1 parent 6c99d63 commit c5de6ca
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 24 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<!-- TOC -->
* [spring boot integration experiments](#spring-boot-integration-experiments)
* [Tech Stack](#tech-stack)
* [Useful Docker Commands](#useful-docker-commands)
* [Useful git Commands](#useful-git-commands)
<!-- TOC -->
Expand All @@ -29,7 +30,7 @@ The following table list all sample codes related to the spring boot integration
| [MultiTenancy Schema Based](./jpa/multitenancy/schema) | The application, demonstrates running multi tenancy in JPA using schema based i.e Shared Database with Separate Schema | Completed |
| [MultiTenancy with multipledatsources](./jpa/multitenancy/multidatasource-multitenancy) | The application, demonstrates running multi tenancy in JPA using all strategies using multidatasources | Completed |
| [mongodb-elasticsearch-integration](./boot-mongodb-elasticsearch) | The application, demonstrates saving the data in MongoDb and then searching in ElasticSearch for quick Search, GeoSpatial Search | WIP |
| [spring-boot-graphql-querydsl](./graphql/spring-boot-graphql-querydsl) | The application, demonstrates the way to connect to database using graph ql and querydsl | WIP |
| [spring-boot-graphql-querydsl](./graphql/boot-graphql-querydsl) | The application, demonstrates the way to connect to database using graph ql and querydsl | WIP |
| [spring-boot-graphql-webmvc](./graphql/boot-graphql-webmvc) | The application, demonstrates how to apply graphql concepts to the spring boot project | WIP |
| [Choas Engineering Principles](./boot-choas-monkey) | The application, demonstrates how to apply choas engineering concepts to the spring boot project, test using Gatling to demonstrate the difference | WIP |
| [Feature Toggles](./boot-togglz-sample) | The application, demonstrates how to apply feature toggles concepts to the spring boot project | WIP |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public class ContainersConfig {
@Bean
@ServiceConnection
PostgreSQLContainer<?> postgreSQLContainer() {
return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.1-alpine"));
return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine"));
}
}
2 changes: 1 addition & 1 deletion boot-choas-monkey/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
<configuration>
<java>
<googleJavaFormat>
<version>1.17.0</version>
<version>1.19.2</version>
<style>AOSP</style>
</googleJavaFormat>
</java>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class TestApplication {
@ServiceConnection
@RestartScope
PostgreSQLContainer<?> postgreSQLContainer() {
return new PostgreSQLContainer<>("postgres:16.1-alpine");
return new PostgreSQLContainer<>("postgres:16.2-alpine");
}

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class TestApplication {
@Bean
@ServiceConnection
PostgreSQLContainer<?> postgreSQLContainer() {
return new PostgreSQLContainer<>("postgres:16.1-alpine");
return new PostgreSQLContainer<>("postgres:16.2-alpine");
}

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class TestApplication {
@ServiceConnection
@RestartScope
MySQLContainer<?> sqlContainer() {
return new MySQLContainer<>("mysql:8.2");
return new MySQLContainer<>("mysql:8.3");
}

public static void main(String[] args) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public class ContainersConfig {
@Bean
@ServiceConnection
PostgreSQLContainer<?> postgreSQLContainer() {
return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.1-alpine")).withReuse(true);
return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine")).withReuse(true);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
public interface TestContainersConfig {

@ServiceConnection
PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.1-alpine");
PostgreSQLContainer<?> postgreSQLContainer = new PostgreSQLContainer<>("postgres:16.2-alpine");
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ public class ContainersConfig {
@Bean
@ServiceConnection
PostgreSQLContainer<?> postgreSQLContainer() {
return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.1-alpine"));
return new PostgreSQLContainer<>(DockerImageName.parse("postgres:16.2-alpine"));
}
}
3 changes: 1 addition & 2 deletions jpa/boot-jpa-locks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${java.version}</source> <!-- depending on your project -->
<target>${java.version}</target> <!-- depending on your project -->
<annotationProcessorPaths>
<path>
<groupId>org.mapstruct</groupId>
Expand Down Expand Up @@ -183,6 +181,7 @@
-Amapstruct.verbose=true
</arg>
</compilerArgs>
<release>${java.version}</release>
</configuration>
</plugin>
<plugin>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,21 @@ public LoggingAspect(Environment env) {
this.env = env;
}

@Pointcut("within(@org.springframework.stereotype.Repository *)"
+ " || within(@org.springframework.stereotype.Service *)"
+ " || within(@org.springframework.web.bind.annotation.RestController *)")
@Pointcut(
"""
within(@org.springframework.stereotype.Repository *)\
|| within(@org.springframework.stereotype.Service *)\
|| within(@org.springframework.web.bind.annotation.RestController *)\
""")
public void springBeanPointcut() {
// pointcut definition
}

@Pointcut("@within(com.learning.shedlock.config.logging.Loggable) || "
+ "@annotation(com.learning.shedlock.config.logging.Loggable)")
@Pointcut(
"""
@within(com.learning.shedlock.config.logging.Loggable) || \
@annotation(com.learning.shedlock.config.logging.Loggable)\
""")
public void applicationPackagePointcut() {
// pointcut definition
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,10 @@ public class JobController {

@GetMapping
public PagedResult<JobResponse> getAllJobs(
@RequestParam(value = "pageNo", defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false)
int pageNo,
@RequestParam(value = "pageSize", defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false)
int pageSize,
@RequestParam(value = "sortBy", defaultValue = AppConstants.DEFAULT_SORT_BY, required = false)
String sortBy,
@RequestParam(value = "sortDir", defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false)
String sortDir) {
@RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_NUMBER, required = false) int pageNo,
@RequestParam(defaultValue = AppConstants.DEFAULT_PAGE_SIZE, required = false) int pageSize,
@RequestParam(defaultValue = AppConstants.DEFAULT_SORT_BY, required = false) String sortBy,
@RequestParam(defaultValue = AppConstants.DEFAULT_SORT_DIRECTION, required = false) String sortDir) {
FindJobsQuery findJobsQuery = new FindJobsQuery(pageNo, pageSize, sortBy, sortDir);
return jobService.findAllJobs(findJobsQuery);
}
Expand Down

0 comments on commit c5de6ca

Please sign in to comment.