From ee181526999a228588d391f3a6d7e366eac55bf1 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Thu, 7 Sep 2023 15:01:26 +0200 Subject: [PATCH 01/21] reservation API --- .../cs/rest/reservations-api/Procfile | 1 + .../cs/rest/reservations-api/README.md | 36 ++++ .../cs/rest/reservations-api/build.gradle | 99 +++++++++ .../rest/reservations-api/gradle.properties | 6 + .../cs/rest/reservations-api/settings.gradle | 1 + .../reservationsApi/ReservationsApi.java | 28 +++ .../config/DatabaseConfiguration.java | 39 ++++ .../config/OpenApiConfiguration.java | 23 ++ .../config/SecurityConfiguration.java | 55 +++++ .../config/WebConfiguration.java | 31 +++ .../exception/DuplicateUserException.java | 10 + .../exception/ReservationException.java | 10 + .../mapper/ReservationMapper.java | 22 ++ .../reservationsApi/mapper/UserMapper.java | 12 ++ .../reservationsApi/model/Reservation.java | 30 +++ .../reservationsApi/model/User.java | 27 +++ .../repository/ReservationRepository.java | 21 ++ .../repository/UserRepository.java | 14 ++ .../security/TokenAuthenticationFilter.java | 58 +++++ .../security/TokenProvider.java | 84 ++++++++ .../service/ReservationService.java | 23 ++ .../service/ReservationServiceImpl.java | 89 ++++++++ .../service/UserDetailsServiceImpl.java | 32 +++ .../reservationsApi/service/UserService.java | 15 ++ .../service/UserServiceImpl.java | 44 ++++ .../reservationsApi/web/DateTimeAware.java | 5 + .../advise/ReservationExceptionHandler.java | 44 ++++ .../controller/ReservationRestController.java | 69 ++++++ .../web/controller/UserRestController.java | 79 +++++++ .../web/request/CreateReservationRequest.java | 38 ++++ .../web/request/LoginRequest.java | 16 ++ .../web/request/RegisterRequest.java | 20 ++ .../web/request/UpdateReservationRequest.java | 37 ++++ .../web/response/AuthResponse.java | 11 + .../web/response/ReservationResponse.java | 28 +++ .../web/response/UserResponse.java | 23 ++ .../src/main/resources/application.yaml | 20 ++ .../config/TestsConfiguration.java | 9 + .../mapper/ReservationMapperTests.java | 78 +++++++ .../mapper/UserMapperTests.java | 38 ++++ .../service/ReservationServiceImplTests.java | 204 ++++++++++++++++++ .../service/UserDetailsServiceImplTests.java | 57 +++++ .../service/UserServiceImplTests.java | 100 +++++++++ .../ReservationRestControllerTests.java | 199 +++++++++++++++++ .../controller/UserRestControllerTests.java | 131 +++++++++++ .../src/test/resources/application-test.yaml | 7 + .../rest/reservations-api/system.properties | 1 + 47 files changed, 2024 insertions(+) create mode 100644 jdk_11_gradle/cs/rest/reservations-api/Procfile create mode 100644 jdk_11_gradle/cs/rest/reservations-api/README.md create mode 100644 jdk_11_gradle/cs/rest/reservations-api/build.gradle create mode 100644 jdk_11_gradle/cs/rest/reservations-api/gradle.properties create mode 100644 jdk_11_gradle/cs/rest/reservations-api/settings.gradle create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/ReservationsApi.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/DatabaseConfiguration.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/OpenApiConfiguration.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/SecurityConfiguration.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/WebConfiguration.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/exception/DuplicateUserException.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/exception/ReservationException.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/mapper/ReservationMapper.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/mapper/UserMapper.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/model/Reservation.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/model/User.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/repository/ReservationRepository.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/repository/UserRepository.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/security/TokenAuthenticationFilter.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/security/TokenProvider.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/ReservationService.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/ReservationServiceImpl.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserDetailsServiceImpl.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserService.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserServiceImpl.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/DateTimeAware.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/advise/ReservationExceptionHandler.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/ReservationRestController.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestController.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/CreateReservationRequest.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/LoginRequest.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/RegisterRequest.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/UpdateReservationRequest.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/AuthResponse.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/ReservationResponse.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/UserResponse.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/main/resources/application.yaml create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/config/TestsConfiguration.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/mapper/ReservationMapperTests.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/mapper/UserMapperTests.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/ReservationServiceImplTests.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/UserDetailsServiceImplTests.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/UserServiceImplTests.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/web/controller/ReservationRestControllerTests.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestControllerTests.java create mode 100644 jdk_11_gradle/cs/rest/reservations-api/src/test/resources/application-test.yaml create mode 100644 jdk_11_gradle/cs/rest/reservations-api/system.properties diff --git a/jdk_11_gradle/cs/rest/reservations-api/Procfile b/jdk_11_gradle/cs/rest/reservations-api/Procfile new file mode 100644 index 000000000..e60585444 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/Procfile @@ -0,0 +1 @@ +web: java -Dserver.port=$PORT $JAVA_OPTS -jar build/libs/reservations-api.jar \ No newline at end of file diff --git a/jdk_11_gradle/cs/rest/reservations-api/README.md b/jdk_11_gradle/cs/rest/reservations-api/README.md new file mode 100644 index 000000000..a7f04ed35 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/README.md @@ -0,0 +1,36 @@ +# Reservations API + +Simple API built with SpringBoot and MongoDB database. + +## Documentation + +Documentation can be found [here](https://cg-reservations-api.herokuapp.com/documentation) + +## How to run + +### Application + +1. Clone the repository by executing commands: + +``` +cd +git clone https://github.com/cyrilgavala/reservations-api.git . +``` + +2. Open the project with your preferable IDE. + If you use IntelliJ IDEA, it will offer you a **SpringBoot** runner configuration. +3. Update the runner by adding environment variable ```DATABASE_URL``` containing + URL to your MongoDB database and ```JWT_SECRET``` with 512-bit secret. +4. Run the runner configuration. + +### Tests + +1. To run tests you need to pass step 2. from previous instructions and run command: + + ```./gradlew test``` + + It will also execute ```jacocoTestReport``` gradle task, which will generate + test report on path ```reservation-api/build/reports/jacoco/test/html/index.html```. +2. To run whether you pass 95% test coverage check, simply run command: + + ```./gradlew jacocoTestCoverageVerification``` diff --git a/jdk_11_gradle/cs/rest/reservations-api/build.gradle b/jdk_11_gradle/cs/rest/reservations-api/build.gradle new file mode 100644 index 000000000..c7faa46bd --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/build.gradle @@ -0,0 +1,99 @@ +plugins { + id 'org.springframework.boot' version '2.7.0' + id 'io.spring.dependency-management' version '1.0.11.RELEASE' + id 'java' + id 'jacoco' +} + +group = 'sk.cyrilgavala' +sourceCompatibility = '11' + +repositories { + mavenCentral() +} + +dependencies { + /* Annotation processors */ + annotationProcessor group: 'org.projectlombok', name: 'lombok-mapstruct-binding', version: '0.1.0' + annotationProcessor group: 'org.mapstruct', name: 'mapstruct-processor', version: mapStructVersion + annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion + + /* Implementation dependencies */ + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-mongodb', version: springBootVersion + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-validation', version: springBootVersion + implementation group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: springBootVersion + implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: jjwtVersion + implementation group: 'io.jsonwebtoken', name: 'jjwt-impl', version: jjwtVersion + implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: jjwtVersion + implementation group: 'org.mapstruct', name: 'mapstruct', version: mapStructVersion + implementation group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2' + implementation group: 'org.springdoc', name: 'springdoc-openapi-ui', version: '1.6.8' + + /* Compile only dependencies */ + compileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion + + /* Test annotation processors */ + testAnnotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion + testAnnotationProcessor group: 'org.mapstruct', name: 'mapstruct-processor', version: mapStructVersion + + /* Test implementation dependencies */ + testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: springBootVersion + testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: springBootVersion + testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: springBootVersion + testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-data-mongodb', version: springBootVersion + testImplementation group: 'org.springframework.security', name: 'spring-security-test', version: springSecurityVersion + + /* Test compile only dependencies */ + testCompileOnly group: 'org.projectlombok', name: 'lombok', version: lombokVersion + +} + +def jacocoExcludePackages = ["**/reservationsApi/ReservationsApi.class", + "**/reservationsApi/config/**", + "**/reservationsApi/exception/*", + "**/reservationsApi/model/*", + "**/reservationsApi/security/*", + "**/reservationsApi/web/advise/*", + "**/reservationsApi/web/interceptor/*", + "**/reservationsApi/web/request/*", + "**/reservationsApi/web/response/*"] + +test { + useJUnitPlatform() + finalizedBy jacocoTestReport +} + +jacoco { + toolVersion "0.8.8" +} + +jacocoTestReport { + dependsOn test + reports { + xml.required = false + csv.required = false + } + afterEvaluate { + classDirectories.setFrom(files(classDirectories.files.collect { + fileTree(dir: it, exclude: jacocoExcludePackages) + })) + } +} + +jacocoTestCoverageVerification { + violationRules { + rule { + limit { + minimum = 0.95 + } + } + } + afterEvaluate { + classDirectories.setFrom(files(classDirectories.files.collect { + fileTree(dir: it, exclude: jacocoExcludePackages) + })) + } +} + +check.dependsOn jacocoTestCoverageVerification diff --git a/jdk_11_gradle/cs/rest/reservations-api/gradle.properties b/jdk_11_gradle/cs/rest/reservations-api/gradle.properties new file mode 100644 index 000000000..47bc436da --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/gradle.properties @@ -0,0 +1,6 @@ +springBootVersion=2.7.0 +springSecurityVersion=5.6.3 +lombokVersion=1.18.24 +mapStructVersion=1.4.2.Final +swaggerVersion=3.0.0 +jjwtVersion=0.11.5 \ No newline at end of file diff --git a/jdk_11_gradle/cs/rest/reservations-api/settings.gradle b/jdk_11_gradle/cs/rest/reservations-api/settings.gradle new file mode 100644 index 000000000..df2a6f778 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'reservations-api' \ No newline at end of file diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/ReservationsApi.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/ReservationsApi.java new file mode 100644 index 000000000..5465b4074 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/ReservationsApi.java @@ -0,0 +1,28 @@ +package sk.cyrilgavala.reservationsApi; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +import java.util.TimeZone; + +@SpringBootApplication +@EnableWebSecurity +@EnableMongoRepositories(basePackages = "sk.cyrilgavala.reservationsApi.repository") +@EnableTransactionManagement +@ComponentScan({"sk.cyrilgavala.reservationsApi.config", + "sk.cyrilgavala.reservationsApi.mapper", + "sk.cyrilgavala.reservationsApi.security", + "sk.cyrilgavala.reservationsApi.service", + "sk.cyrilgavala.reservationsApi.web"}) +public class ReservationsApi { + + public static void main(String[] args) { + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + SpringApplication.run(ReservationsApi.class, args); + } + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/DatabaseConfiguration.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/DatabaseConfiguration.java new file mode 100644 index 000000000..064e05457 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/DatabaseConfiguration.java @@ -0,0 +1,39 @@ +package sk.cyrilgavala.reservationsApi.config; + +import com.mongodb.ConnectionString; +import com.mongodb.MongoClientSettings; +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.mongodb.MongoDatabaseFactory; +import org.springframework.data.mongodb.MongoTransactionManager; +import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration; + +@Configuration +public class DatabaseConfiguration extends AbstractMongoClientConfiguration { + + @Value("${databaseUrl}") + private String databaseUrl; + + @Bean + MongoTransactionManager transactionManager(MongoDatabaseFactory dbFactory) { + return new MongoTransactionManager(dbFactory); + } + + @Override + protected String getDatabaseName() { + return "reservations-api"; + } + + @Override + public MongoClient mongoClient() { + ConnectionString connectionString = new ConnectionString(databaseUrl); + MongoClientSettings mongoClientSettings = MongoClientSettings.builder() + .applyConnectionString(connectionString) + .build(); + return MongoClients.create(mongoClientSettings); + } + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/OpenApiConfiguration.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/OpenApiConfiguration.java new file mode 100644 index 000000000..c828cf161 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/OpenApiConfiguration.java @@ -0,0 +1,23 @@ +package sk.cyrilgavala.reservationsApi.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityScheme; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class OpenApiConfiguration { + + @Bean + public OpenAPI springShopOpenAPI() { + return new OpenAPI() + .components( + new Components().addSecuritySchemes("bearer-key", + new SecurityScheme().type(SecurityScheme.Type.HTTP).scheme("bearer").bearerFormat("JWT"))) + .info(new Info().title("Reservations API") + .description("Simple API for implementing basic reservation system.") + .version("v1.0.0")); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/SecurityConfiguration.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/SecurityConfiguration.java new file mode 100644 index 000000000..d9e09184f --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/SecurityConfiguration.java @@ -0,0 +1,55 @@ +package sk.cyrilgavala.reservationsApi.config; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.HttpStatusEntryPoint; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import sk.cyrilgavala.reservationsApi.security.TokenAuthenticationFilter; + +@RequiredArgsConstructor +@Configuration +public class SecurityConfiguration { + + public static final String ADMIN = "ADMIN"; + public static final String USER = "USER"; + private final TokenAuthenticationFilter tokenAuthenticationFilter; + + @Bean + AuthenticationManager authenticationManager(AuthenticationConfiguration authenticationConfiguration) throws Exception { + return authenticationConfiguration.getAuthenticationManager(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(10); + } + + @Bean + SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http.authorizeRequests() + .antMatchers(HttpMethod.GET, "/api/reservation/**").hasAnyAuthority(ADMIN, USER) + .antMatchers(HttpMethod.POST, "/api/reservation").hasAnyAuthority(ADMIN, USER) + .antMatchers(HttpMethod.PUT, "/api/reservation").hasAnyAuthority(ADMIN, USER) + .antMatchers(HttpMethod.DELETE, "/api/reservation/**").hasAnyAuthority(ADMIN, USER) + .antMatchers(HttpMethod.GET, "/api/reservation").hasAuthority(ADMIN) + .antMatchers("/api/user/**").permitAll() + .antMatchers("/", "/error", "/documentation", "/swagger-ui.html", "/swagger-ui/**", "/v3/api-docs", "/v3/api-docs/**").permitAll() + .anyRequest().authenticated(); + http.addFilterBefore(tokenAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); + http.exceptionHandling(e -> e.authenticationEntryPoint(new HttpStatusEntryPoint(HttpStatus.UNAUTHORIZED))); + http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS); + http.cors().and().csrf().disable(); + return http.build(); + } + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/WebConfiguration.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/WebConfiguration.java new file mode 100644 index 000000000..47ce81c6b --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/config/WebConfiguration.java @@ -0,0 +1,31 @@ +package sk.cyrilgavala.reservationsApi.config; + +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; +import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.List; +import java.util.TimeZone; + +@Configuration +public class WebConfiguration implements WebMvcConfigurer { + + @Override + public void configureMessageConverters(List> converters) { + WebMvcConfigurer.super.configureMessageConverters(converters); + + Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder(); + builder.modules(new JavaTimeModule(), new Jdk8Module()); + builder.timeZone(TimeZone.getTimeZone("UTC")); + builder.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + + final MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(); + converter.setObjectMapper(builder.build()); + } + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/exception/DuplicateUserException.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/exception/DuplicateUserException.java new file mode 100644 index 000000000..93a94b039 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/exception/DuplicateUserException.java @@ -0,0 +1,10 @@ +package sk.cyrilgavala.reservationsApi.exception; + +public class DuplicateUserException extends RuntimeException { + + private static final long serialVersionUID = 9197342664218222132L; + + public DuplicateUserException(String message) { + super(message); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/exception/ReservationException.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/exception/ReservationException.java new file mode 100644 index 000000000..d69161ee1 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/exception/ReservationException.java @@ -0,0 +1,10 @@ +package sk.cyrilgavala.reservationsApi.exception; + +public class ReservationException extends RuntimeException { + + private static final long serialVersionUID = 4033799885256608552L; + + public ReservationException(String message) { + super(message); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/mapper/ReservationMapper.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/mapper/ReservationMapper.java new file mode 100644 index 000000000..7169f9c21 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/mapper/ReservationMapper.java @@ -0,0 +1,22 @@ +package sk.cyrilgavala.reservationsApi.mapper; + +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.MappingTarget; +import sk.cyrilgavala.reservationsApi.model.Reservation; +import sk.cyrilgavala.reservationsApi.web.request.CreateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.request.UpdateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.response.ReservationResponse; + +@Mapper(componentModel = "spring") +public interface ReservationMapper { + + @Mapping(target = "uuid", ignore = true) + Reservation createRequestToModel(CreateReservationRequest request); + + @Mapping(target = "createdAt", ignore = true) + Reservation updateRequestToModel(@MappingTarget Reservation model, UpdateReservationRequest request); + + ReservationResponse modelToResponse(Reservation model); + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/mapper/UserMapper.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/mapper/UserMapper.java new file mode 100644 index 000000000..32c2a999b --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/mapper/UserMapper.java @@ -0,0 +1,12 @@ +package sk.cyrilgavala.reservationsApi.mapper; + +import org.mapstruct.Mapper; +import sk.cyrilgavala.reservationsApi.model.User; +import sk.cyrilgavala.reservationsApi.web.response.UserResponse; + +@Mapper(componentModel = "spring") +public interface UserMapper { + + UserResponse modelToResponse(User model); + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/model/Reservation.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/model/Reservation.java new file mode 100644 index 000000000..8d18efb56 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/model/Reservation.java @@ -0,0 +1,30 @@ +package sk.cyrilgavala.reservationsApi.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; +import org.springframework.data.mongodb.core.mapping.Field; +import org.springframework.data.mongodb.core.mapping.FieldType; + +import java.time.LocalDateTime; + +@Document(collection = "reservations") +@NoArgsConstructor +@AllArgsConstructor +@Data +public class Reservation { + + @Id + private String uuid; + @Field(targetType = FieldType.STRING) + private String reservationFor; + @Field(targetType = FieldType.DATE_TIME) + private LocalDateTime reservationFrom; + @Field(targetType = FieldType.DATE_TIME) + private LocalDateTime reservationTo; + @Field(targetType = FieldType.DATE_TIME) + private LocalDateTime createdAt; + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/model/User.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/model/User.java new file mode 100644 index 000000000..3cd39e56a --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/model/User.java @@ -0,0 +1,27 @@ +package sk.cyrilgavala.reservationsApi.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.mapping.Document; +import org.springframework.data.mongodb.core.mapping.Field; +import org.springframework.data.mongodb.core.mapping.FieldType; + +@Document(collection = "users") +@Data +@NoArgsConstructor +@AllArgsConstructor +public class User { + + @Id + private String id; + @Field(targetType = FieldType.STRING) + private String username; + @Field(targetType = FieldType.STRING) + private String email; + @Field(targetType = FieldType.STRING) + private String password; + @Field(targetType = FieldType.STRING) + private String role; +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/repository/ReservationRepository.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/repository/ReservationRepository.java new file mode 100644 index 000000000..59b98e9a2 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/repository/ReservationRepository.java @@ -0,0 +1,21 @@ +package sk.cyrilgavala.reservationsApi.repository; + +import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.data.mongodb.repository.Query; +import org.springframework.stereotype.Repository; +import sk.cyrilgavala.reservationsApi.model.Reservation; + +import java.time.LocalDateTime; +import java.util.List; + +@Repository +public interface ReservationRepository extends MongoRepository { + + Reservation findByUuid(String reservationUuid); + + List findAllByReservationFor(String reservationFor, Sort sort); + + @Query("{ $or: [ {$and: [{'reservationFrom': {$lt: ?0}}, {'reservationTo': {$gt: ?0}}]}, {$and: [{'reservationFrom': {$lt: ?1}}, {'reservationTo': {$gt: ?1}}]}] }") + List findAllBetween(LocalDateTime from, LocalDateTime to); +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/repository/UserRepository.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/repository/UserRepository.java new file mode 100644 index 000000000..0cc403787 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/repository/UserRepository.java @@ -0,0 +1,14 @@ +package sk.cyrilgavala.reservationsApi.repository; + +import org.springframework.data.mongodb.repository.MongoRepository; +import sk.cyrilgavala.reservationsApi.model.User; + +import java.util.Optional; + +public interface UserRepository extends MongoRepository { + Optional findByUsername(String username); + + Boolean existsByUsername(String username); + + Boolean existsByEmail(String email); +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/security/TokenAuthenticationFilter.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/security/TokenAuthenticationFilter.java new file mode 100644 index 000000000..dd11dfad4 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/security/TokenAuthenticationFilter.java @@ -0,0 +1,58 @@ +package sk.cyrilgavala.reservationsApi.security; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +import javax.servlet.FilterChain; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Optional; + +@Slf4j +@RequiredArgsConstructor +@Component +public class TokenAuthenticationFilter extends OncePerRequestFilter { + + private static final String TOKEN_HEADER = "Authorization"; + private static final String TOKEN_PREFIX = "Bearer "; + + private final UserDetailsService userDetailsService; + private final TokenProvider tokenProvider; + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException { + try { + getJwtFromRequest(request) + .flatMap(tokenProvider::validateTokenAndGetJws) + .ifPresent(jws -> { + String username = jws.getBody().getSubject(); + UserDetails userDetails = userDetailsService.loadUserByUsername(username); + UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request)); + SecurityContextHolder.getContext().setAuthentication(authentication); + }); + } catch (Exception e) { + log.error("Cannot set user authentication", e); + } + chain.doFilter(request, response); + } + + private Optional getJwtFromRequest(HttpServletRequest request) { + String tokenHeader = request.getHeader(TOKEN_HEADER); + if (StringUtils.hasText(tokenHeader) && tokenHeader.startsWith(TOKEN_PREFIX)) { + return Optional.of(tokenHeader.replace(TOKEN_PREFIX, "")); + } + return Optional.empty(); + } + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/security/TokenProvider.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/security/TokenProvider.java new file mode 100644 index 000000000..4cb3cccaa --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/security/TokenProvider.java @@ -0,0 +1,84 @@ +package sk.cyrilgavala.reservationsApi.security; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jws; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.MalformedJwtException; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.UnsupportedJwtException; +import io.jsonwebtoken.security.Keys; +import io.jsonwebtoken.security.SignatureException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.stereotype.Component; + +import java.time.ZonedDateTime; +import java.util.Date; +import java.util.Optional; +import java.util.UUID; +import java.util.stream.Collectors; + +@Slf4j +@Component +public class TokenProvider { + + private static final String TOKEN_TYPE = "JWT"; + private static final String TOKEN_ISSUER = "reservations-api"; + private static final String TOKEN_AUDIENCE = "reservations-ui"; + @Value("${app.jwt.secret}") + private String jwtSecret; + @Value("${app.jwt.expiration.minutes}") + private Long jwtExpirationMinutes; + + public String generate(Authentication authentication) { + UserDetails user = (User) authentication.getPrincipal(); + + String roles = user.getAuthorities() + .stream() + .map(GrantedAuthority::getAuthority) + .collect(Collectors.joining(",")); + + byte[] signingKey = jwtSecret.getBytes(); + + return Jwts.builder() + .setHeaderParam("typ", TOKEN_TYPE) + .signWith(Keys.hmacShaKeyFor(signingKey), SignatureAlgorithm.HS512) + .setExpiration(Date.from(ZonedDateTime.now().plusMinutes(jwtExpirationMinutes).toInstant())) + .setIssuedAt(Date.from(ZonedDateTime.now().toInstant())) + .setId(UUID.randomUUID().toString()) + .setIssuer(TOKEN_ISSUER) + .setAudience(TOKEN_AUDIENCE) + .setSubject(user.getUsername()) + .claim("rol", roles) + .compact(); + } + + public Optional> validateTokenAndGetJws(String token) { + try { + byte[] signingKey = jwtSecret.getBytes(); + + Jws jws = Jwts.parserBuilder() + .setSigningKey(signingKey) + .build() + .parseClaimsJws(token); + + return Optional.of(jws); + } catch (ExpiredJwtException exception) { + log.error("Request to parse expired JWT : {} failed : {}", token, exception.getMessage()); + } catch (UnsupportedJwtException exception) { + log.error("Request to parse unsupported JWT : {} failed : {}", token, exception.getMessage()); + } catch (MalformedJwtException exception) { + log.error("Request to parse invalid JWT : {} failed : {}", token, exception.getMessage()); + } catch (SignatureException exception) { + log.error("Request to parse JWT with invalid signature : {} failed : {}", token, exception.getMessage()); + } catch (IllegalArgumentException exception) { + log.error("Request to parse empty or null JWT : {} failed : {}", token, exception.getMessage()); + } + return Optional.empty(); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/ReservationService.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/ReservationService.java new file mode 100644 index 000000000..e77ea5f8d --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/ReservationService.java @@ -0,0 +1,23 @@ +package sk.cyrilgavala.reservationsApi.service; + +import sk.cyrilgavala.reservationsApi.web.request.CreateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.request.UpdateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.response.ReservationResponse; + +import java.util.List; + +/** + * Service for basic operations for reservations. + */ +public interface ReservationService { + + ReservationResponse createReservation(CreateReservationRequest request); + + ReservationResponse updateReservation(UpdateReservationRequest request); + + List getAllReservations(); + + List getAllReservationsForUsername(String username); + + void deleteReservation(String reservationUuid); +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/ReservationServiceImpl.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/ReservationServiceImpl.java new file mode 100644 index 000000000..1ee729339 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/ReservationServiceImpl.java @@ -0,0 +1,89 @@ +package sk.cyrilgavala.reservationsApi.service; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import sk.cyrilgavala.reservationsApi.exception.ReservationException; +import sk.cyrilgavala.reservationsApi.mapper.ReservationMapper; +import sk.cyrilgavala.reservationsApi.model.Reservation; +import sk.cyrilgavala.reservationsApi.repository.ReservationRepository; +import sk.cyrilgavala.reservationsApi.web.request.CreateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.request.UpdateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.response.ReservationResponse; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.stream.Collectors; + +@Slf4j +@Service +@Transactional +@RequiredArgsConstructor +public class ReservationServiceImpl implements ReservationService { + private static final String RESERVATION_UNPROCESSABLE_START_DATE_IS_AFTER_END_DATE = "Reservation unprocessable: start date is after end date"; + private static final String RESERVATION_UNPROCESSABLE_COVERS_ANOTHER_RESERVATION = "Reservation unprocessable: covers another reservation"; + private static final String RESERVATION_UNPROCESSABLE_START_DATE_IN_PAST = "Reservation unprocessable: start date is in past"; + private final ReservationRepository repository; + private final ReservationMapper mapper; + + @Override + public ReservationResponse createReservation(CreateReservationRequest request) { + validateDates(request.getReservationFrom(), request.getReservationTo()); + Reservation mappedReservation = mapper.createRequestToModel(request); + Reservation savedReservation = repository.insert(mappedReservation); + return mapper.modelToResponse(savedReservation); + } + + @Override + public ReservationResponse updateReservation(UpdateReservationRequest request) { + validateDates(request.getReservationFrom(), request.getReservationTo()); + Reservation loadedReservation = repository.findByUuid(request.getUuid()); + Reservation updatedReservation = mapper.updateRequestToModel(loadedReservation, request); + Reservation savedReservation = repository.save(updatedReservation); + return mapper.modelToResponse(savedReservation); + } + + @Override + @Transactional(readOnly = true) + public List getAllReservations() { + return repository.findAll(Sort.by("reservationFrom").descending()) + .stream() + .map(mapper::modelToResponse) + .collect(Collectors.toList()); + } + + @Override + @Transactional(readOnly = true) + public List getAllReservationsForUsername(String username) { + return repository.findAllByReservationFor(username, Sort.by("reservationFrom").descending()) + .stream() + .map(mapper::modelToResponse) + .collect(Collectors.toList()); + } + + @Override + public void deleteReservation(String reservationUuid) { + repository.deleteById(reservationUuid); + } + + private void validateDates(LocalDateTime from, LocalDateTime to) { + if (from.isAfter(to)) { + log.error(RESERVATION_UNPROCESSABLE_START_DATE_IS_AFTER_END_DATE); + throw new ReservationException(RESERVATION_UNPROCESSABLE_START_DATE_IS_AFTER_END_DATE); + } + LocalDateTime now = LocalDateTime.now(); + if (now.isAfter(from)) { + log.error(RESERVATION_UNPROCESSABLE_START_DATE_IN_PAST); + throw new ReservationException(RESERVATION_UNPROCESSABLE_START_DATE_IN_PAST); + } + List reservations = repository.findAllBetween(from, to); + reservations.stream() + .findFirst() + .ifPresent(reservation -> { + log.error(RESERVATION_UNPROCESSABLE_COVERS_ANOTHER_RESERVATION); + throw new ReservationException(RESERVATION_UNPROCESSABLE_COVERS_ANOTHER_RESERVATION); + }); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserDetailsServiceImpl.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserDetailsServiceImpl.java new file mode 100644 index 000000000..fb9e09f87 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserDetailsServiceImpl.java @@ -0,0 +1,32 @@ +package sk.cyrilgavala.reservationsApi.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; +import sk.cyrilgavala.reservationsApi.web.response.UserResponse; + +import java.util.Collections; + +@Service +@RequiredArgsConstructor +public class UserDetailsServiceImpl implements UserDetailsService { + + private final UserService userService; + + @Override + public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { + UserResponse user = userService.getByUsername(username); + return mapToUserDetails(user); + } + + private UserDetails mapToUserDetails(UserResponse userResponse) { + return new User( + userResponse.getUsername(), + userResponse.getPassword(), + Collections.singletonList(new SimpleGrantedAuthority(userResponse.getRole()))); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserService.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserService.java new file mode 100644 index 000000000..62141bcd0 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserService.java @@ -0,0 +1,15 @@ +package sk.cyrilgavala.reservationsApi.service; + +import sk.cyrilgavala.reservationsApi.model.User; +import sk.cyrilgavala.reservationsApi.web.response.UserResponse; + +public interface UserService { + + UserResponse getByUsername(String username); + + boolean existsByUsername(String username); + + boolean existsByEmail(String email); + + UserResponse saveUser(User user); +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserServiceImpl.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserServiceImpl.java new file mode 100644 index 000000000..98da8451b --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/service/UserServiceImpl.java @@ -0,0 +1,44 @@ +package sk.cyrilgavala.reservationsApi.service; + +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import sk.cyrilgavala.reservationsApi.mapper.UserMapper; +import sk.cyrilgavala.reservationsApi.model.User; +import sk.cyrilgavala.reservationsApi.repository.UserRepository; +import sk.cyrilgavala.reservationsApi.web.response.UserResponse; + +@Service +@Transactional +@RequiredArgsConstructor +public class UserServiceImpl implements UserService { + + private final UserRepository repository; + private final UserMapper mapper; + + @Override + @Transactional(readOnly = true) + public UserResponse getByUsername(String username) { + return mapper.modelToResponse(repository.findByUsername(username) + .orElseThrow(() -> new UsernameNotFoundException("User not found with username: " + username))); + } + + @Override + @Transactional(readOnly = true) + public boolean existsByUsername(String username) { + return repository.existsByUsername(username); + } + + @Override + @Transactional(readOnly = true) + public boolean existsByEmail(String email) { + return repository.existsByEmail(email); + } + + @Override + public UserResponse saveUser(User user) { + return mapper.modelToResponse(repository.insert(user)); + } + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/DateTimeAware.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/DateTimeAware.java new file mode 100644 index 000000000..be5112615 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/DateTimeAware.java @@ -0,0 +1,5 @@ +package sk.cyrilgavala.reservationsApi.web; + +public interface DateTimeAware { + String DATE_TIME_FORMAT = "yyyy-MM-dd HH:mm:ss"; +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/advise/ReservationExceptionHandler.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/advise/ReservationExceptionHandler.java new file mode 100644 index 000000000..72211a83c --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/advise/ReservationExceptionHandler.java @@ -0,0 +1,44 @@ +package sk.cyrilgavala.reservationsApi.web.advise; + +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.lang.Nullable; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import org.springframework.web.util.WebUtils; +import sk.cyrilgavala.reservationsApi.exception.DuplicateUserException; +import sk.cyrilgavala.reservationsApi.exception.ReservationException; + +import javax.validation.ConstraintViolationException; +import java.util.Objects; + +@ControllerAdvice +public class ReservationExceptionHandler extends ResponseEntityExceptionHandler { + + @ExceptionHandler(value = {ReservationException.class}) + protected ResponseEntity handleReservationException(ReservationException ex, WebRequest request) { + return handleExceptionInternal(ex, null, new HttpHeaders(), HttpStatus.UNPROCESSABLE_ENTITY, request); + } + + @ExceptionHandler(value = {ConstraintViolationException.class}) + protected ResponseEntity handleConstraintViolationException(ConstraintViolationException ex, WebRequest request) { + return handleExceptionInternal(ex, null, new HttpHeaders(), HttpStatus.BAD_REQUEST, request); + } + + @ExceptionHandler(value = {DuplicateUserException.class}) + protected ResponseEntity handleDuplicateUserException(DuplicateUserException ex, WebRequest request) { + return handleExceptionInternal(ex, null, new HttpHeaders(), HttpStatus.CONFLICT, request); + } + + @Override + protected ResponseEntity handleExceptionInternal(Exception ex, @Nullable Object body, HttpHeaders headers, HttpStatus status, WebRequest request) { + Objects.requireNonNull(ex); + if (HttpStatus.INTERNAL_SERVER_ERROR.equals(status)) { + request.setAttribute(WebUtils.ERROR_EXCEPTION_ATTRIBUTE, ex, WebRequest.SCOPE_REQUEST); + } + return new ResponseEntity<>(body != null ? body : ex.getMessage(), headers, status); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/ReservationRestController.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/ReservationRestController.java new file mode 100644 index 000000000..1ae279495 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/ReservationRestController.java @@ -0,0 +1,69 @@ +package sk.cyrilgavala.reservationsApi.web.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; +import sk.cyrilgavala.reservationsApi.service.ReservationService; +import sk.cyrilgavala.reservationsApi.web.request.CreateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.request.UpdateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.response.ReservationResponse; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import java.util.List; + +@Tag(name = "Reservations") +@RestController +@RequestMapping(value = "/api/reservation", produces = MediaType.APPLICATION_JSON_VALUE) +@Validated +@CrossOrigin +@RequiredArgsConstructor +public class ReservationRestController { + + private final ReservationService service; + + @Operation(summary = "Get reservations for particular user", description = "Get reservations for particular user when correct username provided.", security = {@SecurityRequirement(name = "bearer-key")}) + @GetMapping("/{username}") + public List getAllReservationsForUser(@PathVariable @NotBlank String username) { + return service.getAllReservationsForUsername(username); + } + + @Operation(summary = "Get all reservations", description = "Get all reservations available.", security = {@SecurityRequirement(name = "bearer-key")}) + @GetMapping + public List getAllReservations() { + return service.getAllReservations(); + } + + @Operation(summary = "Create new reservation", description = "Create new reservation when valid information provided.", security = {@SecurityRequirement(name = "bearer-key")}) + @PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE) + @ResponseStatus(HttpStatus.CREATED) + public ReservationResponse createReservation(@Valid @RequestBody CreateReservationRequest requestBody) { + return service.createReservation(requestBody); + } + + @Operation(summary = "Update reservation", description = "Update reservation when valid information provided.", security = {@SecurityRequirement(name = "bearer-key")}) + @PutMapping(consumes = MediaType.APPLICATION_JSON_VALUE) + public ReservationResponse updateReservation(@Valid @RequestBody UpdateReservationRequest requestBody) { + return service.updateReservation(requestBody); + } + + @Operation(summary = "Delete reservation", description = "Delete reservation when valid UUID provided.", security = {@SecurityRequirement(name = "bearer-key")}) + @DeleteMapping("/{reservationUuid}") + public void deleteReservation(@PathVariable @NotBlank String reservationUuid) { + service.deleteReservation(reservationUuid); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestController.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestController.java new file mode 100644 index 000000000..cf40748f2 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestController.java @@ -0,0 +1,79 @@ +package sk.cyrilgavala.reservationsApi.web.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestController; +import sk.cyrilgavala.reservationsApi.config.SecurityConfiguration; +import sk.cyrilgavala.reservationsApi.exception.DuplicateUserException; +import sk.cyrilgavala.reservationsApi.model.User; +import sk.cyrilgavala.reservationsApi.security.TokenProvider; +import sk.cyrilgavala.reservationsApi.service.UserService; +import sk.cyrilgavala.reservationsApi.web.request.LoginRequest; +import sk.cyrilgavala.reservationsApi.web.request.RegisterRequest; +import sk.cyrilgavala.reservationsApi.web.response.AuthResponse; + +import javax.validation.Valid; +import java.util.Base64; + +@Tag(name = "Users") +@RestController +@RequestMapping("/api/user") +@RequiredArgsConstructor +@CrossOrigin +public class UserRestController { + + private final UserService userService; + private final AuthenticationManager authenticationManager; + private final TokenProvider tokenProvider; + private final PasswordEncoder passwordEncoder; + + @Operation(summary = "Perform user's login to retrieve access token.", description = "Perform user's login to retrieve access token.") + @PostMapping("/login") + public AuthResponse login(@Valid @RequestBody LoginRequest loginRequest) { + String token = authenticateAndGetToken(loginRequest.getUsername(), new String(Base64.getDecoder().decode(loginRequest.getPassword()))); + return new AuthResponse(token); + } + + @Operation(summary = "Perform user's registration to save a user and retrieve access token.", description = "Perform user's registration to save a user and retrieve access token.") + @ResponseStatus(HttpStatus.CREATED) + @PostMapping("/register") + public AuthResponse register(@Valid @RequestBody RegisterRequest registerRequest) { + if (userService.existsByUsername(registerRequest.getUsername())) { + throw new DuplicateUserException(String.format("Username %s already been used", registerRequest.getUsername())); + } + if (userService.existsByEmail(registerRequest.getEmail())) { + throw new DuplicateUserException(String.format("Email %s already been used", registerRequest.getEmail())); + } + + userService.saveUser(mapRegisterRequestToUser(registerRequest)); + + String token = authenticateAndGetToken(registerRequest.getUsername(), new String(Base64.getDecoder().decode(registerRequest.getPassword()))); + return new AuthResponse(token); + } + + private String authenticateAndGetToken(String username, String password) { + Authentication authentication = authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(username, password)); + return tokenProvider.generate(authentication); + } + + private User mapRegisterRequestToUser(RegisterRequest registerRequest) { + User user = new User(); + user.setUsername(registerRequest.getUsername()); + user.setPassword(passwordEncoder.encode(new String(Base64.getDecoder().decode(registerRequest.getPassword())))); + user.setEmail(registerRequest.getEmail()); + user.setRole(SecurityConfiguration.USER); + return user; + } + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/CreateReservationRequest.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/CreateReservationRequest.java new file mode 100644 index 000000000..034ab4da5 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/CreateReservationRequest.java @@ -0,0 +1,38 @@ +package sk.cyrilgavala.reservationsApi.web.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import sk.cyrilgavala.reservationsApi.web.DateTimeAware; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.time.LocalDateTime; + +@JsonInclude(value = JsonInclude.Include.NON_EMPTY) +@NoArgsConstructor +@AllArgsConstructor +@Data +public class CreateReservationRequest implements DateTimeAware, Serializable { + + private static final long serialVersionUID = -44348945472726119L; + + @NotBlank + private String reservationFor; + + @NotNull + @JsonFormat(pattern = DATE_TIME_FORMAT, shape = JsonFormat.Shape.STRING) + private LocalDateTime reservationFrom; + + @NotNull + @JsonFormat(pattern = DATE_TIME_FORMAT, shape = JsonFormat.Shape.STRING) + private LocalDateTime reservationTo; + + @NotNull + @JsonFormat(pattern = DATE_TIME_FORMAT, shape = JsonFormat.Shape.STRING) + private LocalDateTime createdAt; + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/LoginRequest.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/LoginRequest.java new file mode 100644 index 000000000..ae53b68f6 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/LoginRequest.java @@ -0,0 +1,16 @@ +package sk.cyrilgavala.reservationsApi.web.request; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +@AllArgsConstructor +public class LoginRequest { + + @NotBlank + private String username; + @NotBlank + private String password; +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/RegisterRequest.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/RegisterRequest.java new file mode 100644 index 000000000..0f56a7603 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/RegisterRequest.java @@ -0,0 +1,20 @@ +package sk.cyrilgavala.reservationsApi.web.request; + +import lombok.AllArgsConstructor; +import lombok.Data; + +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; + +@Data +@AllArgsConstructor +public class RegisterRequest { + + @NotBlank + private String username; + @NotBlank + @Email + private String email; + @NotBlank + private String password; +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/UpdateReservationRequest.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/UpdateReservationRequest.java new file mode 100644 index 000000000..29da8a3ae --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/request/UpdateReservationRequest.java @@ -0,0 +1,37 @@ +package sk.cyrilgavala.reservationsApi.web.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import sk.cyrilgavala.reservationsApi.web.DateTimeAware; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.time.LocalDateTime; + +@JsonInclude(value = JsonInclude.Include.NON_EMPTY) +@NoArgsConstructor +@AllArgsConstructor +@Data +public class UpdateReservationRequest implements DateTimeAware, Serializable { + + private static final long serialVersionUID = 555607903324853344L; + + @NotBlank + private String uuid; + + @NotBlank + private String reservationFor; + + @NotNull + @JsonFormat(pattern = DATE_TIME_FORMAT, shape = JsonFormat.Shape.STRING) + private LocalDateTime reservationFrom; + + @NotNull + @JsonFormat(pattern = DATE_TIME_FORMAT, shape = JsonFormat.Shape.STRING) + private LocalDateTime reservationTo; + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/AuthResponse.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/AuthResponse.java new file mode 100644 index 000000000..25fed0661 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/AuthResponse.java @@ -0,0 +1,11 @@ +package sk.cyrilgavala.reservationsApi.web.response; + +import lombok.AllArgsConstructor; +import lombok.Data; + +@Data +@AllArgsConstructor +public class AuthResponse { + + private String accessToken; +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/ReservationResponse.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/ReservationResponse.java new file mode 100644 index 000000000..9578f37f1 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/ReservationResponse.java @@ -0,0 +1,28 @@ +package sk.cyrilgavala.reservationsApi.web.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import sk.cyrilgavala.reservationsApi.web.DateTimeAware; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@NoArgsConstructor +@AllArgsConstructor +@Data +@JsonInclude(JsonInclude.Include.NON_EMPTY) +public class ReservationResponse implements DateTimeAware, Serializable { + + private static final long serialVersionUID = 5714157215793550376L; + + private String uuid; + private String reservationFor; + @JsonFormat(pattern = DATE_TIME_FORMAT, shape = JsonFormat.Shape.STRING) + private LocalDateTime reservationFrom; + @JsonFormat(pattern = DATE_TIME_FORMAT, shape = JsonFormat.Shape.STRING) + private LocalDateTime reservationTo; + +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/UserResponse.java b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/UserResponse.java new file mode 100644 index 000000000..cf824d790 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/java/sk/cyrilgavala/reservationsApi/web/response/UserResponse.java @@ -0,0 +1,23 @@ +package sk.cyrilgavala.reservationsApi.web.response; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class UserResponse implements Serializable { + + private static final long serialVersionUID = -3333137047634067175L; + + private String id; + private String username; + private String email; + @JsonIgnore + private String password; + private String role; +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/main/resources/application.yaml b/jdk_11_gradle/cs/rest/reservations-api/src/main/resources/application.yaml new file mode 100644 index 000000000..ce6b6147b --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/main/resources/application.yaml @@ -0,0 +1,20 @@ +spring.application.name: 'ReservationAPI' +springdoc: + packagesToScan: 'sk.cyrilgavala.reservationsApi.web' + pathsToMatch: '/api/**' + swagger-ui.path: '/documentation' + +databaseUrl: ${DATABASE_URL:localhost:27017} + +app: + jwt: + secret: ${JWT_SECRET:'jwt_secret'} + expiration: + minutes: 60 + +# logging levels +logging.level: + org.mongodb: WARN + org.springframework: WARN + org.springdoc: WARN + org.apache: WARN \ No newline at end of file diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/config/TestsConfiguration.java b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/config/TestsConfiguration.java new file mode 100644 index 000000000..f4e76d241 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/config/TestsConfiguration.java @@ -0,0 +1,9 @@ +package sk.cyrilgavala.reservationsApi.config; + +import org.springframework.boot.test.context.TestConfiguration; +import org.springframework.context.annotation.Import; + +@TestConfiguration +@Import({WebConfiguration.class, SecurityConfiguration.class}) +public class TestsConfiguration { +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/mapper/ReservationMapperTests.java b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/mapper/ReservationMapperTests.java new file mode 100644 index 000000000..360b67ae0 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/mapper/ReservationMapperTests.java @@ -0,0 +1,78 @@ +package sk.cyrilgavala.reservationsApi.mapper; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import sk.cyrilgavala.reservationsApi.model.Reservation; +import sk.cyrilgavala.reservationsApi.web.request.CreateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.request.UpdateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.response.ReservationResponse; + +import java.time.LocalDateTime; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Test cases for {@link ReservationMapper}. + */ +@ExtendWith(MockitoExtension.class) +public class ReservationMapperTests { + + private static final String UUID = "reservationUuid"; + private static final String USERNAME = "username"; + private static final LocalDateTime DATE_15_00 = LocalDateTime.of(2022, 5, 20, 15, 0, 0); + private static final LocalDateTime DATE_16_00 = LocalDateTime.of(2022, 5, 20, 16, 0, 0); + + private final ReservationMapper mapper = new ReservationMapperImpl(); + + @Test + void creteRequestToModel_validRequest() { + CreateReservationRequest request = new CreateReservationRequest(USERNAME, DATE_15_00, DATE_16_00, DATE_15_00); + Reservation result = mapper.createRequestToModel(request); + assertThat(result != null).isTrue(); + assertThat(result.getReservationFor()).isEqualTo(USERNAME); + assertThat(result.getReservationFrom()).isEqualTo(DATE_15_00); + assertThat(result.getReservationTo()).isEqualTo(DATE_16_00); + assertThat(result.getCreatedAt()).isEqualTo(DATE_15_00); + } + + @Test + void updateRequestToModel_null() { + Reservation result = mapper.updateRequestToModel(new Reservation(), null); + assertThat(result).isNull(); + } + + @Test + void updateRequestToModel_validRequest() { + UpdateReservationRequest request = new UpdateReservationRequest(UUID, USERNAME, DATE_15_00, DATE_16_00); + Reservation result = mapper.updateRequestToModel(new Reservation(), request); + assertThat(result != null).isTrue(); + assertThat(result.getReservationFor()).isEqualTo(USERNAME); + assertThat(result.getReservationFrom()).isEqualTo(DATE_15_00); + assertThat(result.getReservationTo()).isEqualTo(DATE_16_00); + assertThat(result.getUuid()).isEqualTo(UUID); + } + + @Test + void createRequestToModel_null() { + Reservation result = mapper.createRequestToModel(null); + assertThat(result).isNull(); + } + + @Test + void modelToResponse_validModel() { + Reservation model = new Reservation(UUID, USERNAME, DATE_15_00, DATE_16_00, DATE_15_00); + ReservationResponse result = mapper.modelToResponse(model); + assertThat(result != null).isTrue(); + assertThat(result.getReservationFor()).isEqualTo(USERNAME); + assertThat(result.getReservationFrom()).isEqualTo(DATE_15_00); + assertThat(result.getReservationTo()).isEqualTo(DATE_16_00); + assertThat(result.getUuid()).isEqualTo(UUID); + } + + @Test + void modelToResponse_null() { + ReservationResponse result = mapper.modelToResponse(null); + assertThat(result).isNull(); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/mapper/UserMapperTests.java b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/mapper/UserMapperTests.java new file mode 100644 index 000000000..cc8e86b24 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/mapper/UserMapperTests.java @@ -0,0 +1,38 @@ +package sk.cyrilgavala.reservationsApi.mapper; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.junit.jupiter.MockitoExtension; +import sk.cyrilgavala.reservationsApi.model.User; +import sk.cyrilgavala.reservationsApi.web.response.UserResponse; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; + +/** + * Test cases for {@link UserMapper}. + */ +@ExtendWith(MockitoExtension.class) +public class UserMapperTests { + + private final UserMapper mapper = new UserMapperImpl(); + + @Test + void modelToResponse_validModel() { + User user = new User("userId", "userName", "user@test.com", "userPassword", "USER"); + UserResponse response = mapper.modelToResponse(user); + assertNotNull(response); + assertEquals("userId", response.getId()); + assertEquals("userName", response.getUsername()); + assertEquals("user@test.com", response.getEmail()); + assertEquals("userPassword", response.getPassword()); + assertEquals("USER", response.getRole()); + } + + @Test + void modelToResponse_null() { + UserResponse response = mapper.modelToResponse(null); + assertNull(response); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/ReservationServiceImplTests.java b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/ReservationServiceImplTests.java new file mode 100644 index 000000000..db4878aed --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/ReservationServiceImplTests.java @@ -0,0 +1,204 @@ +package sk.cyrilgavala.reservationsApi.service; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.data.domain.Sort; +import sk.cyrilgavala.reservationsApi.exception.ReservationException; +import sk.cyrilgavala.reservationsApi.mapper.ReservationMapper; +import sk.cyrilgavala.reservationsApi.model.Reservation; +import sk.cyrilgavala.reservationsApi.repository.ReservationRepository; +import sk.cyrilgavala.reservationsApi.web.request.CreateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.request.UpdateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.response.ReservationResponse; + +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyNoMoreInteractions; +import static org.mockito.Mockito.when; + +/** + * Test cases for {@link ReservationService}. + */ +@ExtendWith(value = MockitoExtension.class) +public class ReservationServiceImplTests { + + private static final LocalDateTime DATE_15_00 = LocalDateTime.now().truncatedTo(ChronoUnit.HOURS).plusDays(1).withHour(15); + private static final LocalDateTime DATE_16_00 = LocalDateTime.now().truncatedTo(ChronoUnit.HOURS).plusDays(1).withHour(16); + private static final LocalDateTime DATE_17_00 = LocalDateTime.now().truncatedTo(ChronoUnit.HOURS).plusDays(1).withHour(17); + private static final String RESERVATION_UUID = "reservationUuid"; + private static final String USERNAME = "username"; + private static final String REVERTED_DATES_ERROR_MESSAGE = "Reservation unprocessable: start date is after end date"; + private static final String RESERVATION_EXISTS_ERROR_MESSAGE = "Reservation unprocessable: covers another reservation"; + private static final String START_IN_PAST_ERROR_MESSAGE = "Reservation unprocessable: start date is in past"; + private final CreateReservationRequest createRequest = new CreateReservationRequest(); + private final UpdateReservationRequest updateRequest = new UpdateReservationRequest(); + + @Mock + private transient ReservationRepository repository; + @Mock + private ReservationMapper mapper; + @InjectMocks + private ReservationServiceImpl service; + + @Test + void create_invalidDatesFromAfterTo_errorThrown() { + createRequest.setReservationFrom(DATE_17_00); + createRequest.setReservationTo(DATE_15_00); + + try { + service.createReservation(createRequest); + fail("Reservation exception should be thrown"); + } catch (ReservationException exception) { + assertEquals(REVERTED_DATES_ERROR_MESSAGE, exception.getMessage(), "Different message"); + + verifyNoMoreInteractions(repository); + } + } + + @Test + void create_invalidDatesStartInPast_errorThrown() { + createRequest.setReservationFrom(DATE_17_00.minusDays(2)); + createRequest.setReservationTo(DATE_15_00); + + try { + service.createReservation(createRequest); + fail("Reservation exception should be thrown"); + } catch (ReservationException exception) { + assertEquals(START_IN_PAST_ERROR_MESSAGE, exception.getMessage(), "Different message"); + + verifyNoMoreInteractions(repository); + } + } + + @Test + void create_invalidDatesReservationExists_errorThrown() { + createRequest.setReservationFrom(DATE_15_00); + createRequest.setReservationTo(DATE_17_00); + + when(repository.findAllBetween(DATE_15_00, DATE_17_00)).thenReturn(Collections.singletonList(new Reservation())); + + try { + service.createReservation(createRequest); + fail("Reservation exception should be thrown"); + } catch (ReservationException exception) { + assertEquals(RESERVATION_EXISTS_ERROR_MESSAGE, exception.getMessage(), "Different message"); + + verifyNoMoreInteractions(repository); + } + } + + @Test + void create_validRequest_pass() { + Reservation reservationModel = new Reservation("uuid", "username", DATE_15_00, DATE_17_00, DATE_15_00); + createRequest.setReservationFrom(DATE_15_00); + createRequest.setReservationTo(DATE_17_00); + + when(repository.findAllBetween(DATE_15_00, DATE_17_00)).thenReturn(Collections.emptyList()); + when(mapper.createRequestToModel(createRequest)).thenReturn(reservationModel); + when(repository.insert(reservationModel)).thenReturn(reservationModel); + when(mapper.modelToResponse(reservationModel)) + .thenReturn(new ReservationResponse(null, null, DATE_15_00, DATE_17_00)); + + try { + ReservationResponse result = service.createReservation(createRequest); + + assertEquals(DATE_15_00, result.getReservationFrom()); + assertEquals(DATE_17_00, result.getReservationTo()); + + verifyNoMoreInteractions(repository); + } catch (ReservationException exception) { + fail("Reservation exception should not be thrown"); + } + } + + @Test + void update_validRequest_pass() { + updateRequest.setReservationFrom(DATE_16_00); + updateRequest.setReservationTo(DATE_17_00); + updateRequest.setUuid(RESERVATION_UUID); + Reservation reservationToReturn = new Reservation(RESERVATION_UUID, null, DATE_16_00, DATE_17_00, DATE_15_00); + Reservation reservationFromDb = new Reservation(RESERVATION_UUID, null, DATE_15_00, DATE_17_00, DATE_15_00); + + when(repository.findAllBetween(DATE_16_00, DATE_17_00)).thenReturn(Collections.emptyList()); + when(repository.findByUuid(RESERVATION_UUID)).thenReturn(reservationFromDb); + when(repository.save(reservationToReturn)).thenReturn(reservationToReturn); + when(mapper.updateRequestToModel(reservationFromDb, updateRequest)).thenReturn(reservationToReturn); + when(mapper.modelToResponse(reservationToReturn)) + .thenReturn(new ReservationResponse(RESERVATION_UUID, null, DATE_16_00, DATE_17_00)); + + try { + ReservationResponse result = service.updateReservation(updateRequest); + + assertEquals(DATE_16_00, result.getReservationFrom()); + assertEquals(DATE_17_00, result.getReservationTo()); + + verifyNoMoreInteractions(repository); + } catch (ReservationException exception) { + fail("Reservation exception should not be thrown"); + } + } + + @Test + void delete_validUuid_pass() { + service.deleteReservation(RESERVATION_UUID); + verify(repository).deleteById(RESERVATION_UUID); + } + + @Test + void getAllReservations_pass() { + when(repository.findAll(Sort.by("reservationFrom").descending())) + .thenReturn(Arrays.asList( + new Reservation(RESERVATION_UUID + "1", USERNAME, DATE_15_00, DATE_16_00, DATE_15_00), + new Reservation(RESERVATION_UUID + "2", USERNAME, DATE_16_00, DATE_17_00, DATE_16_00))); + when(mapper.modelToResponse(any(Reservation.class))) + .thenReturn( + new ReservationResponse(RESERVATION_UUID + "1", USERNAME, DATE_15_00, DATE_16_00), + new ReservationResponse(RESERVATION_UUID + "2", USERNAME, DATE_16_00, DATE_17_00)); + + List result = service.getAllReservations(); + assertThat(result.size()).isEqualTo(2); + assertThat(result.get(0).getUuid()).isEqualTo(RESERVATION_UUID + "1"); + assertThat(result.get(0).getReservationFor()).isEqualTo(USERNAME); + assertThat(result.get(0).getReservationFrom()).isEqualTo(DATE_15_00); + assertThat(result.get(0).getReservationTo()).isEqualTo(DATE_16_00); + assertThat(result.get(1).getUuid()).isEqualTo(RESERVATION_UUID + "2"); + assertThat(result.get(1).getReservationFor()).isEqualTo(USERNAME); + assertThat(result.get(1).getReservationFrom()).isEqualTo(DATE_16_00); + assertThat(result.get(1).getReservationTo()).isEqualTo(DATE_17_00); + } + + @Test + void getReservationsForUsername_pass() { + when(repository.findAllByReservationFor(USERNAME, Sort.by("reservationFrom").descending())) + .thenReturn(Arrays.asList( + new Reservation(RESERVATION_UUID + "1", USERNAME, DATE_15_00, DATE_16_00, DATE_15_00), + new Reservation(RESERVATION_UUID + "2", USERNAME, DATE_16_00, DATE_17_00, DATE_16_00))); + when(mapper.modelToResponse(any(Reservation.class))) + .thenReturn( + new ReservationResponse(RESERVATION_UUID + "1", USERNAME, DATE_15_00, DATE_16_00), + new ReservationResponse(RESERVATION_UUID + "2", USERNAME, DATE_16_00, DATE_17_00)); + + List result = service.getAllReservationsForUsername(USERNAME); + assertThat(result.size()).isEqualTo(2); + assertThat(result.get(0).getUuid()).isEqualTo(RESERVATION_UUID + "1"); + assertThat(result.get(0).getReservationFor()).isEqualTo(USERNAME); + assertThat(result.get(0).getReservationFrom()).isEqualTo(DATE_15_00); + assertThat(result.get(0).getReservationTo()).isEqualTo(DATE_16_00); + assertThat(result.get(1).getUuid()).isEqualTo(RESERVATION_UUID + "2"); + assertThat(result.get(1).getReservationFor()).isEqualTo(USERNAME); + assertThat(result.get(1).getReservationFrom()).isEqualTo(DATE_16_00); + assertThat(result.get(1).getReservationTo()).isEqualTo(DATE_17_00); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/UserDetailsServiceImplTests.java b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/UserDetailsServiceImplTests.java new file mode 100644 index 000000000..cb95ab8ed --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/UserDetailsServiceImplTests.java @@ -0,0 +1,57 @@ +package sk.cyrilgavala.reservationsApi.service; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import sk.cyrilgavala.reservationsApi.web.response.UserResponse; + +import java.util.Collections; +import java.util.Set; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.when; + +/** + * Test cases for {@link UserDetailsServiceImpl}. + */ +@ExtendWith(MockitoExtension.class) +public class UserDetailsServiceImplTests { + + @Mock + private UserService userService; + @InjectMocks + private UserDetailsServiceImpl userDetailsService; + + @Test + void loadUserByUsername_userFound_pass() { + when(userService.getByUsername("userName")).thenReturn(new UserResponse("userId", "userName", "user@test.com", "userPassword", "USER")); + try { + UserDetails userDetails = userDetailsService.loadUserByUsername("userName"); + assertNotNull(userDetails); + assertEquals("userName", userDetails.getUsername()); + assertEquals("userPassword", userDetails.getPassword()); + assertThat(userDetails.getAuthorities()).hasSize(1).isEqualTo(Collections.unmodifiableSet(Set.of(new SimpleGrantedAuthority("USER")))); + } catch (UsernameNotFoundException ex) { + fail("Error should not be thrown"); + } + } + + @Test + void loadUserByUsername_userNotFound_errorThrown() { + when(userService.getByUsername("userName")).thenThrow(new UsernameNotFoundException("User not found with username: userName")); + try { + userDetailsService.loadUserByUsername("userName"); + fail("Error should be thrown"); + } catch (UsernameNotFoundException ex) { + assertEquals("User not found with username: userName", ex.getMessage()); + } + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/UserServiceImplTests.java b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/UserServiceImplTests.java new file mode 100644 index 000000000..40a8b4d7c --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/service/UserServiceImplTests.java @@ -0,0 +1,100 @@ +package sk.cyrilgavala.reservationsApi.service; + +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import sk.cyrilgavala.reservationsApi.mapper.UserMapper; +import sk.cyrilgavala.reservationsApi.model.User; +import sk.cyrilgavala.reservationsApi.repository.UserRepository; +import sk.cyrilgavala.reservationsApi.web.response.UserResponse; + +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.mockito.Mockito.when; + +/** + * Test cases for {@link UserServiceImpl}. + */ +@ExtendWith(MockitoExtension.class) +public class UserServiceImplTests { + + private static final String ID = "userId"; + private static final String USERNAME = "username"; + private static final String EMAIL = "user@test.com"; + private static final String PASSWORD = "userPassword"; + private static final String ROLE = "USER"; + + @Mock + private UserRepository repository; + @Mock + private UserMapper mapper; + @InjectMocks + private UserServiceImpl userService; + + @Test + void getByUsername_userFound_pass() { + User user = new User(ID, USERNAME, EMAIL, PASSWORD, ROLE); + UserResponse userResponse = new UserResponse(ID, USERNAME, EMAIL, PASSWORD, ROLE); + when(repository.findByUsername(USERNAME)).thenReturn(Optional.of(user)); + when(mapper.modelToResponse(user)).thenReturn(userResponse); + + try { + UserResponse response = userService.getByUsername(USERNAME); + assertNotNull(response); + assertEquals(ID, response.getId()); + assertEquals(USERNAME, response.getUsername()); + assertEquals(EMAIL, response.getEmail()); + assertEquals(PASSWORD, response.getPassword()); + assertEquals(ROLE, response.getRole()); + } catch (UsernameNotFoundException ex) { + fail("Error should not be thrown"); + } + } + + @Test + void getByUsername_userNotFound_errorThrown() { + when(repository.findByUsername(USERNAME)).thenReturn(Optional.empty()); + + try { + userService.getByUsername(USERNAME); + fail("Error should not be thrown"); + } catch (UsernameNotFoundException ex) { + assertEquals("User not found with username: " + USERNAME, ex.getMessage()); + } + } + + @Test + void existsByUsername() { + when(repository.existsByUsername(USERNAME)).thenReturn(true); + assertTrue(userService.existsByUsername(USERNAME)); + } + + @Test + void existsByEmail() { + when(repository.existsByEmail(EMAIL)).thenReturn(true); + assertTrue(userService.existsByEmail(EMAIL)); + } + + @Test + void saveUser() { + User user = new User(ID, USERNAME, EMAIL, PASSWORD, ROLE); + UserResponse userResponse = new UserResponse(ID, USERNAME, EMAIL, PASSWORD, ROLE); + when(repository.insert(user)).thenReturn(user); + when(mapper.modelToResponse(user)).thenReturn(userResponse); + + UserResponse response = userService.saveUser(user); + assertNotNull(response); + assertEquals(ID, response.getId()); + assertEquals(USERNAME, response.getUsername()); + assertEquals(EMAIL, response.getEmail()); + assertEquals(PASSWORD, response.getPassword()); + assertEquals(ROLE, response.getRole()); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/web/controller/ReservationRestControllerTests.java b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/web/controller/ReservationRestControllerTests.java new file mode 100644 index 000000000..445ac9c25 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/web/controller/ReservationRestControllerTests.java @@ -0,0 +1,199 @@ +package sk.cyrilgavala.reservationsApi.web.controller; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.servlet.MockMvc; +import sk.cyrilgavala.reservationsApi.exception.ReservationException; +import sk.cyrilgavala.reservationsApi.service.ReservationService; +import sk.cyrilgavala.reservationsApi.web.request.CreateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.request.UpdateReservationRequest; +import sk.cyrilgavala.reservationsApi.web.response.ReservationResponse; + +import java.time.LocalDateTime; +import java.util.Collections; +import java.util.List; + +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * Test cases for {@link ReservationRestController}. + */ +@WebMvcTest +@ActiveProfiles("test") +public class ReservationRestControllerTests { + + private static final String UUID = "uuid"; + private static final String USERNAME = "username"; + private static final String BLANK_USERNAME = " "; + private static final LocalDateTime DATE_15_00 = LocalDateTime.of(2022, 5, 20, 15, 0, 0); + private static final LocalDateTime DATE_16_00 = LocalDateTime.of(2022, 5, 20, 16, 0, 0); + private static final String BLANK_USERNAME_ERROR_MESSAGE_GET = "getAllReservationsForUser.username: must not be blank"; + private static final String BLANK_UUID_ERROR_MESSAGE = "deleteReservation.reservationUuid: must not be blank"; + private static final String BLANK_USERNAME_ERROR_MESSAGE_POST = "Validation failed for argument"; + private static final String RESERVATION_UNPROCESSABLE_START_DATE_IS_AFTER_END_DATE = "Reservation unprocessable: start date is after end date"; + private static final String RESERVATION_UNPROCESSABLE_COVERS_ANOTHER_RESERVATION = "Reservation unprocessable: covers another reservation"; + private final ObjectMapper objectMapper = new ObjectMapper() + .registerModule(new JavaTimeModule()) + .registerModule(new Jdk8Module()) + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + @MockBean + private ReservationService service; + @Autowired + private MockMvc mockMvc; + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void get_reservationsForUser_pass() throws Exception { + List response = Collections.singletonList( + new ReservationResponse(UUID, USERNAME, DATE_15_00, DATE_16_00)); + when(service.getAllReservationsForUsername(USERNAME)).thenReturn(response); + + mockMvc.perform(get("/api/reservation/" + USERNAME)) + .andExpect(status().isOk()) + .andExpect(header().string("Content-Type", MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().json(objectMapper.writeValueAsString(response))); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void get_reservationsForUser_passEmptyResponse() throws Exception { + List response = Collections.emptyList(); + when(service.getAllReservationsForUsername(USERNAME)).thenReturn(response); + + mockMvc.perform(get("/api/reservation/" + USERNAME)) + .andExpect(status().isOk()) + .andExpect(header().string("Content-Type", MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().json(objectMapper.writeValueAsString(response))); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void get_reservationsForUser_error_400() throws Exception { + List response = Collections.emptyList(); + when(service.getAllReservationsForUsername(USERNAME)).thenReturn(response); + + mockMvc.perform(get("/api/reservation/" + BLANK_USERNAME)) + .andExpect(status().isBadRequest()) + .andExpect(content().string(BLANK_USERNAME_ERROR_MESSAGE_GET)); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"ADMIN"}) + void get_reservations_pass() throws Exception { + List response = Collections.singletonList(new ReservationResponse(UUID, USERNAME, DATE_15_00, DATE_16_00)); + when(service.getAllReservations()).thenReturn(response); + + mockMvc.perform(get("/api/reservation")) + .andExpect(status().isOk()) + .andExpect(header().string("Content-Type", MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().json(objectMapper.writeValueAsString(response))); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void delete_validUuid_pass() throws Exception { + doNothing().when(service).deleteReservation(UUID); + + mockMvc.perform(delete("/api/reservation/" + UUID)) + .andExpect(status().isOk()) + .andExpect(content().string("")); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void delete_blankUuid_error_400() throws Exception { + mockMvc.perform(delete("/api/reservation/" + BLANK_USERNAME)) + .andExpect(status().isBadRequest()) + .andExpect(content().string(BLANK_UUID_ERROR_MESSAGE)); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void create_validRequest_pass() throws Exception { + CreateReservationRequest request = new CreateReservationRequest(USERNAME, DATE_15_00, DATE_16_00, DATE_15_00); + ReservationResponse response = new ReservationResponse(UUID, USERNAME, DATE_15_00, DATE_16_00); + when(service.createReservation(request)).thenReturn(response); + + mockMvc.perform(post("/api/reservation") + .contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isCreated()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().json(objectMapper.writeValueAsString(response))); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void create_invalidRequest_error_400() throws Exception { + CreateReservationRequest request = new CreateReservationRequest(BLANK_USERNAME, DATE_15_00, DATE_16_00, DATE_15_00); + + boolean validResponseMessage = mockMvc.perform(post("/api/reservation") + .contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isBadRequest()) + .andReturn().getResponse().getContentAsString().startsWith(BLANK_USERNAME_ERROR_MESSAGE_POST); + Assertions.assertTrue(validResponseMessage); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void create_invalidRequest_coveringReservationPresent_422() throws Exception { + CreateReservationRequest request = new CreateReservationRequest(USERNAME, DATE_15_00, DATE_16_00, DATE_15_00); + when(service.createReservation(request)).thenThrow(new ReservationException(RESERVATION_UNPROCESSABLE_COVERS_ANOTHER_RESERVATION)); + + mockMvc.perform(post("/api/reservation") + .contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isUnprocessableEntity()) + .andExpect(content().string(RESERVATION_UNPROCESSABLE_COVERS_ANOTHER_RESERVATION)); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void create_invalidRequest_startDateAfterEndDate_422() throws Exception { + CreateReservationRequest request = new CreateReservationRequest(USERNAME, DATE_16_00, DATE_15_00, DATE_15_00); + when(service.createReservation(request)).thenThrow(new ReservationException(RESERVATION_UNPROCESSABLE_START_DATE_IS_AFTER_END_DATE)); + + mockMvc.perform(post("/api/reservation") + .contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isUnprocessableEntity()) + .andExpect(content().string(RESERVATION_UNPROCESSABLE_START_DATE_IS_AFTER_END_DATE)); + } + + @Test + @WithMockUser(username = USERNAME, authorities = {"USER"}) + void update_validRequest_pass() throws Exception { + UpdateReservationRequest request = new UpdateReservationRequest(UUID, USERNAME, DATE_15_00, DATE_16_00); + ReservationResponse response = new ReservationResponse(UUID, USERNAME, DATE_15_00, DATE_16_00); + when(service.updateReservation(request)).thenReturn(response); + + mockMvc.perform(put("/api/reservation") + .contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(request))) + .andExpect(status().isOk()) + .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().json(objectMapper.writeValueAsString(response))); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestControllerTests.java b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestControllerTests.java new file mode 100644 index 000000000..86a11764b --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/test/java/sk/cyrilgavala/reservationsApi/web/controller/UserRestControllerTests.java @@ -0,0 +1,131 @@ +package sk.cyrilgavala.reservationsApi.web.controller; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.MediaType; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.web.servlet.MockMvc; +import sk.cyrilgavala.reservationsApi.model.User; +import sk.cyrilgavala.reservationsApi.security.TokenProvider; +import sk.cyrilgavala.reservationsApi.service.UserService; +import sk.cyrilgavala.reservationsApi.web.request.LoginRequest; +import sk.cyrilgavala.reservationsApi.web.request.RegisterRequest; +import sk.cyrilgavala.reservationsApi.web.response.AuthResponse; +import sk.cyrilgavala.reservationsApi.web.response.UserResponse; + +import java.util.Base64; + +import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +/** + * Test cases for {@link UserRestController}. + */ +@WebMvcTest +@ActiveProfiles("test") +public class UserRestControllerTests { + + private static final String USERNAME = "username"; + private static final String PASSWORD_ENCODED = Base64.getEncoder().encodeToString("password".getBytes()); + private static final String PASSWORD_DECODED = "password"; + private static final String PASSWORD_HASHED = "$2a$10$VmtzKs.GroqLKkd4nzhbZ.F2LS4j3qQsR5afWeiID52GpQTR/vv8S"; + private static final String EMAIL = "user@test.com"; + private static final String ACCESS_TOKEN = "thisIsGeneratedJwtAccessToken"; + private static final String ERROR_CONTENT_TYPE = "text/plain;charset=UTF-8"; + private static final String DUPLICATE_USERNAME_ERROR_MESSAGE = String.format("Username %s already been used", USERNAME); + private static final String DUPLICATE_EMAIL_ERROR_MESSAGE = String.format("Email %s already been used", EMAIL); + + private final LoginRequest loginRequest = new LoginRequest(USERNAME, PASSWORD_ENCODED); + private final RegisterRequest registerRequest = new RegisterRequest(USERNAME, EMAIL, PASSWORD_ENCODED); + + private final ObjectMapper objectMapper = new ObjectMapper() + .registerModule(new JavaTimeModule()) + .registerModule(new Jdk8Module()) + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + @MockBean + private UserService userService; + @MockBean + private AuthenticationManager authenticationManager; + @MockBean + private TokenProvider tokenProvider; + @MockBean + private PasswordEncoder passwordEncoder; + @Autowired + private MockMvc mockMvc; + + @Test + void login_validRequest_pass() throws Exception { + Authentication authentication = new UsernamePasswordAuthenticationToken(USERNAME, PASSWORD_DECODED); + AuthResponse response = new AuthResponse(ACCESS_TOKEN); + when(authenticationManager.authenticate(authentication)).thenReturn(authentication); + when(tokenProvider.generate(authentication)).thenReturn(ACCESS_TOKEN); + + mockMvc.perform(post("/api/user/login") + .contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(loginRequest))) + .andExpect(status().isOk()) + .andExpect(header().string("Content-Type", MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().json(objectMapper.writeValueAsString(response))); + } + + @Test + void register_usernameExists_409() throws Exception { + when(userService.existsByUsername(USERNAME)).thenReturn(true); + + mockMvc.perform(post("/api/user/register") + .contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(registerRequest))) + .andExpect(status().isConflict()) + .andExpect(header().string("Content-Type", ERROR_CONTENT_TYPE)) + .andExpect(content().string(DUPLICATE_USERNAME_ERROR_MESSAGE)); + } + + @Test + void register_emailExists_409() throws Exception { + when(userService.existsByUsername(USERNAME)).thenReturn(false); + when(userService.existsByEmail(EMAIL)).thenReturn(true); + + mockMvc.perform(post("/api/user/register") + .contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(registerRequest))) + .andExpect(status().isConflict()) + .andExpect(header().string("Content-Type", ERROR_CONTENT_TYPE)) + .andExpect(content().string(DUPLICATE_EMAIL_ERROR_MESSAGE)); + } + + @Test + void register_validRequest_pass() throws Exception { + User userToSave = new User(null, USERNAME, EMAIL, PASSWORD_HASHED, "USER"); + Authentication authentication = new UsernamePasswordAuthenticationToken(USERNAME, PASSWORD_DECODED); + AuthResponse response = new AuthResponse(ACCESS_TOKEN); + + when(userService.existsByUsername(USERNAME)).thenReturn(false); + when(userService.existsByEmail(EMAIL)).thenReturn(false); + when(passwordEncoder.encode(PASSWORD_ENCODED)).thenReturn(PASSWORD_HASHED); + when(userService.saveUser(userToSave)).thenReturn(new UserResponse()); + when(authenticationManager.authenticate(authentication)).thenReturn(authentication); + when(tokenProvider.generate(authentication)).thenReturn(ACCESS_TOKEN); + + mockMvc.perform(post("/api/user/register") + .contentType(MediaType.APPLICATION_JSON_VALUE) + .content(objectMapper.writeValueAsString(registerRequest))) + .andExpect(status().isCreated()) + .andExpect(header().string("Content-Type", MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE)) + .andExpect(content().json(objectMapper.writeValueAsString(response))); + } +} diff --git a/jdk_11_gradle/cs/rest/reservations-api/src/test/resources/application-test.yaml b/jdk_11_gradle/cs/rest/reservations-api/src/test/resources/application-test.yaml new file mode 100644 index 000000000..b963833e4 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/src/test/resources/application-test.yaml @@ -0,0 +1,7 @@ +spring.application.name: 'ReservationAPI' +databaseUrl: 'mongodb://localhost:27017' +app: + jwt: + secret: 'jwt_secret' + expiration: + minutes: 60 \ No newline at end of file diff --git a/jdk_11_gradle/cs/rest/reservations-api/system.properties b/jdk_11_gradle/cs/rest/reservations-api/system.properties new file mode 100644 index 000000000..9146af538 --- /dev/null +++ b/jdk_11_gradle/cs/rest/reservations-api/system.properties @@ -0,0 +1 @@ +java.runtime.version=11 From 9797226ffcb8865229b1b61bdd4d435437161091 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Fri, 8 Sep 2023 13:03:44 +0200 Subject: [PATCH 02/21] preparing embedded driver --- .../rest/reservations-api/build.gradle.kts | 43 ++++++ .../EmbeddedEvoMasterController.java | 142 ++++++++++++++++++ .../gradle/wrapper/gradle-wrapper.properties | 2 +- jdk_11_gradle/settings.gradle.kts | 5 +- 4 files changed, 190 insertions(+), 2 deletions(-) create mode 100644 jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts create mode 100644 jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java diff --git a/jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts b/jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts new file mode 100644 index 000000000..c8fd47af3 --- /dev/null +++ b/jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts @@ -0,0 +1,43 @@ + +repositories { + mavenLocal() + mavenCentral() + maven( url ="https://jcenter.bintray.com") +} + + +plugins { + `java-library` + // id("io.spring.dependency-management") version "1.0.6.RELEASE" +} + +configurations { + implementation { + resolutionStrategy.failOnVersionConflict() + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + + +//dependencyManagement { +// imports { +// // mavenBom("io.micronaut:micronaut-bom:1.3.4") +// } +//} + +val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" + +dependencies{ + implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") + implementation("org.evomaster:evomaster-client-java-dependencies:$EVOMASTER_VERSION") + + api(project(":cs:rest:reservations-api")) + + //Gradle api() is not importing transitive dependencies??? + implementation("org.springframework.boot:spring-boot-starter-web:2.7.0") + implementation("org.mongodb:mongodb-driver-sync:4.4.2") +} \ No newline at end of file diff --git a/jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java b/jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java new file mode 100644 index 000000000..b56372b00 --- /dev/null +++ b/jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java @@ -0,0 +1,142 @@ +package em.embedded.reservationsapi; + +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; +import org.evomaster.client.java.controller.EmbeddedSutController; +import org.evomaster.client.java.controller.InstrumentedSutStarter; +import org.evomaster.client.java.controller.api.dto.AuthenticationDto; +import org.evomaster.client.java.controller.api.dto.SutInfoDto; +import org.evomaster.client.java.controller.internal.db.DbSpecification; +import org.evomaster.client.java.controller.problem.ProblemInfo; +import org.evomaster.client.java.controller.problem.RestProblem; +import org.springframework.boot.SpringApplication; +import org.springframework.context.ConfigurableApplicationContext; +import org.testcontainers.containers.GenericContainer; +import sk.cyrilgavala.reservationsApi.ReservationsApi; + +import java.util.List; +import java.util.Map; + + +/** + * Class used to start/stop the SUT. This will be controller by the EvoMaster process + */ +public class EmbeddedEvoMasterController extends EmbeddedSutController { + + public static void main(String[] args) { + + int port = 40100; + if (args.length > 0) { + port = Integer.parseInt(args[0]); + } + + EmbeddedEvoMasterController controller = new EmbeddedEvoMasterController(port); + InstrumentedSutStarter starter = new InstrumentedSutStarter(controller); + + starter.start(); + } + + + private ConfigurableApplicationContext ctx; + + private static final int MONGODB_PORT = 27017; + + //https://www.mongodb.com/docs/drivers/java/sync/current/compatibility/ + private static final String MONGODB_VERSION = "4.4"; + + private static final String MONGODB_DATABASE_NAME = "Reservations"; + + private static final GenericContainer mongodbContainer = new GenericContainer("mongo:" + MONGODB_VERSION) + .withExposedPorts(MONGODB_PORT); + + private String mongoDbUrl; + + private MongoClient mongoClient; + + public EmbeddedEvoMasterController() { + this(0); + } + + public EmbeddedEvoMasterController(int port) { + setControllerPort(port); + } + + + @Override + public String startSut() { + + mongodbContainer.start(); + mongoDbUrl = "mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT) + "/" + MONGODB_DATABASE_NAME; + mongoClient = MongoClients.create(mongoDbUrl); + + + + ctx = SpringApplication.run(ReservationsApi.class, + new String[]{"--server.port=0", + "--databaseUrl="+mongoDbUrl, + "--spring.data.mongodb.uri="+mongoDbUrl, + "--spring.cache.type=NONE" + }); + + return "http://localhost:" + getSutPort(); + } + + protected int getSutPort() { + return (Integer) ((Map) ctx.getEnvironment() + .getPropertySources().get("server.ports").getSource()) + .get("local.server.port"); + } + + + @Override + public boolean isSutRunning() { + return ctx != null && ctx.isRunning(); + } + + @Override + public void stopSut() { + ctx.stop(); + ctx.close(); + + mongodbContainer.stop(); + } + + @Override + public String getPackagePrefixesToCover() { + return "sk.cyrilgavala.reservationsApi."; + } + + @Override + public void resetStateOfSUT() { + mongoClient.getDatabase(MONGODB_DATABASE_NAME).drop(); + } + + @Override + public List getDbSpecifications() { + return null; + } + + + @Override + public List getInfoForAuthentication() { + return null; + } + + + + + @Override + public ProblemInfo getProblemInfo() { + return new RestProblem( + "http://localhost:" + getSutPort() + "/v3/api-docs", + null + ); + } + + @Override + public SutInfoDto.OutputFormat getPreferredOutputFormat() { + return SutInfoDto.OutputFormat.JAVA_JUNIT_4; + } + + +} diff --git a/jdk_11_gradle/gradle/wrapper/gradle-wrapper.properties b/jdk_11_gradle/gradle/wrapper/gradle-wrapper.properties index be52383ef..da9702f9e 100644 --- a/jdk_11_gradle/gradle/wrapper/gradle-wrapper.properties +++ b/jdk_11_gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/jdk_11_gradle/settings.gradle.kts b/jdk_11_gradle/settings.gradle.kts index 066fb8861..dcbda1de0 100644 --- a/jdk_11_gradle/settings.gradle.kts +++ b/jdk_11_gradle/settings.gradle.kts @@ -2,4 +2,7 @@ rootProject.name = "emb_jdk_11_gradle" include("cs:graphql:patio-api") include("em:embedded:graphql:patio-api") -include("em:external:graphql:patio-api") \ No newline at end of file +include("em:external:graphql:patio-api") + +include("cs:rest:reservations-api") +include("em:embedded:rest:reservations-api") \ No newline at end of file From 35f11774fa002aa4a1fbd1e8907da3106864e830 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Fri, 8 Sep 2023 13:04:54 +0200 Subject: [PATCH 03/21] ignoring build folders --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index d12c3ed9c..bde091a22 100644 --- a/.gitignore +++ b/.gitignore @@ -252,3 +252,5 @@ dotnet_3/em/embedded/rest/ScsDriver/generated-tests/ /jdk_17_maven/cs/web/spring-petclinic/target/ /jdk_17_maven/em/embedded/web/spring-petclinic/target/ /statistics/table_suts.tex +/jdk_11_gradle/cs/rest/reservations-api/build/ +/jdk_11_gradle/em/embedded/rest/reservations-api/build/ From 4a1218e3778c1b2b6c82a12b753341f674ace87a Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Tue, 19 Sep 2023 21:31:47 +0200 Subject: [PATCH 04/21] working on external driver --- README.md | 2 + .../cs/rest/reservations-api/build.gradle | 9 + .../EmbeddedEvoMasterController.java | 1 + .../rest/reservations-api/build.gradle.kts | 67 ++++++ .../ExternalEvoMasterController.java | 216 ++++++++++++++++++ jdk_11_gradle/settings.gradle.kts | 3 +- 6 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts create mode 100644 jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java diff --git a/README.md b/README.md index 02a001abd..4c9fbd9d5 100644 --- a/README.md +++ b/README.md @@ -72,6 +72,8 @@ More details (e.g., #LOCs and used databases) on these APIs can be found [in thi ### REST: Java/Kotlin +* Reservations API (not-known license), [jdk_11_gradle/cs/rest/reservations-api](jdk_11_gradle/cs/rest/reservations-api) , from [https://github.com/cyrilgavala/reservations-api](https://github.com/cyrilgavala/reservations-api) + * Genome Nexus (MIT), [jdk_8_maven/cs/rest-gui/genome-nexus](jdk_8_maven/cs/rest-gui/genome-nexus), from [https://github.com/genome-nexus/genome-nexus](https://github.com/genome-nexus/genome-nexus) * Market (MIT), [jdk_11_maven/cs/rest-gui/market](jdk_11_maven/cs/rest-gui/market), from [https://github.com/aleksey-lukyanets/market](https://github.com/aleksey-lukyanets/market) diff --git a/jdk_11_gradle/cs/rest/reservations-api/build.gradle b/jdk_11_gradle/cs/rest/reservations-api/build.gradle index c7faa46bd..d9b46dcf9 100644 --- a/jdk_11_gradle/cs/rest/reservations-api/build.gradle +++ b/jdk_11_gradle/cs/rest/reservations-api/build.gradle @@ -97,3 +97,12 @@ jacocoTestCoverageVerification { } check.dependsOn jacocoTestCoverageVerification + + +tasks.named("bootJar") { + archiveClassifier = 'sut' +} + +tasks.named("jar") { + archiveClassifier = 'plain' +} \ No newline at end of file diff --git a/jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java b/jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java index b56372b00..575ca5ff0 100644 --- a/jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java +++ b/jdk_11_gradle/em/embedded/rest/reservations-api/src/main/java/em/embedded/reservationsapi/EmbeddedEvoMasterController.java @@ -119,6 +119,7 @@ public List getDbSpecifications() { @Override public List getInfoForAuthentication() { + //TODO might need to setup JWT headers here return null; } diff --git a/jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts b/jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts new file mode 100644 index 000000000..c96cf93e7 --- /dev/null +++ b/jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts @@ -0,0 +1,67 @@ +import org.gradle.jvm.tasks.Jar + + +repositories { + mavenLocal() + mavenCentral() + maven( url ="https://jcenter.bintray.com") +} + + +plugins { + `java-library` + // id("io.spring.dependency-management") version "1.0.6.RELEASE" + application + // id("com.github.johnrengelman.shadow") version "4.0.2" +} + +configurations { + implementation { + resolutionStrategy.failOnVersionConflict() + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + + +//dependencyManagement { +// imports { +// mavenBom("io.micronaut:micronaut-bom:1.3.4") +// } +//} + +val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" + +dependencies{ + implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") + implementation("org.evomaster:evomaster-client-java-instrumentation:$EVOMASTER_VERSION") + implementation("org.evomaster:evomaster-client-java-dependencies:$EVOMASTER_VERSION") + implementation("org.mongodb:mongodb-driver-sync:4.4.2") +} + + + +val fatJar = task("fatJar", type = Jar::class) { + baseName = "${project.name}-evomaster-runner" + isZip64 = true + manifest { + attributes["Implementation-Title"] = "EM" + attributes["Implementation-Version"] = "1.0" + attributes["Main-Class"] = "em.external.reservationsapi.ExternalEvoMasterController" + attributes["Premain-Class"] = "org.evomaster.client.java.instrumentation.InstrumentingAgent" + attributes["Agent-Class"] = "org.evomaster.client.java.instrumentation.InstrumentingAgent" + attributes["Can-Redefine-Classes"] = "true" + attributes["Can-Retransform-Classes"] = "true" + } + from(configurations.runtimeClasspath.get().map{ if (it.isDirectory) it else zipTree(it) }) + with(tasks.jar.get() as CopySpec) +} + +tasks { + "build" { + dependsOn(fatJar) + } +} diff --git a/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java b/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java new file mode 100644 index 000000000..19987e473 --- /dev/null +++ b/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java @@ -0,0 +1,216 @@ +package em.external.reservationsapi; + +import org.evomaster.client.java.controller.ExternalSutController; +import org.evomaster.client.java.controller.InstrumentedSutStarter; +import org.evomaster.client.java.controller.api.dto.AuthenticationDto; +import org.evomaster.client.java.controller.api.dto.JsonTokenPostLoginDto; +import org.evomaster.client.java.controller.api.dto.SutInfoDto; +import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType; +import org.evomaster.client.java.controller.db.DbCleaner; +import org.evomaster.client.java.controller.db.SqlScriptRunnerCached; +import org.evomaster.client.java.controller.internal.db.DbSpecification; +import org.evomaster.client.java.controller.problem.GraphQlProblem; +import org.evomaster.client.java.controller.problem.ProblemInfo; +import org.evomaster.client.java.controller.problem.RestProblem; +import org.testcontainers.containers.GenericContainer; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +public class ExternalEvoMasterController extends ExternalSutController { + + + public static void main(String[] args) { + + int controllerPort = 40100; + if (args.length > 0) { + controllerPort = Integer.parseInt(args[0]); + } + int sutPort = 12345; + if (args.length > 1) { + sutPort = Integer.parseInt(args[1]); + } + String jarLocation = "cs/rest/reservations-api/build/libs"; + if (args.length > 2) { + jarLocation = args[2]; + } + if(! jarLocation.endsWith(".jar")) { + jarLocation += "/reservations-api-sut.jar"; + } + + int timeoutSeconds = 120; + if(args.length > 3){ + timeoutSeconds = Integer.parseInt(args[3]); + } + String command = "java"; + if(args.length > 4){ + command = args[4]; + } + + + ExternalEvoMasterController controller = + new ExternalEvoMasterController(controllerPort, jarLocation, + sutPort, timeoutSeconds, command); + InstrumentedSutStarter starter = new InstrumentedSutStarter(controller); + + starter.start(); + } + + private final int timeoutSeconds; + private final int sutPort; + private String jarLocation; + private static final int MONGODB_PORT = 27017; + + //https://www.mongodb.com/docs/drivers/java/sync/current/compatibility/ + private static final String MONGODB_VERSION = "4.4"; + + private static final String MONGODB_DATABASE_NAME = "Reservations"; + + private static final GenericContainer mongodbContainer = new GenericContainer("mongo:" + MONGODB_VERSION) + .withExposedPorts(MONGODB_PORT); + + private String mongoDbUrl; + + private MongoClient mongoClient; + + + public ExternalEvoMasterController(){ + this(40100, "../core/target", 12345, 120, "java"); + } + + public ExternalEvoMasterController(String jarLocation) { + this(); + this.jarLocation = jarLocation; + } + + public ExternalEvoMasterController( + int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command + ) { + + if(jarLocation==null || jarLocation.isEmpty()){ + throw new IllegalArgumentException("Missing jar location"); + } + + + this.sutPort = sutPort; + this.jarLocation = jarLocation; + this.timeoutSeconds = timeoutSeconds; + setControllerPort(controllerPort); + setJavaCommand(command); + } + + + @Override + public String[] getInputParameters() { + return new String[]{ + "-micronaut.server.port="+sutPort, + "-datasources.default.url=" + dbUrl() + }; + } + + public String[] getJVMParameters() { + return new String[]{}; + } + + private String dbUrl() { + + String host = postgres.getContainerIpAddress(); + int port = postgres.getMappedPort(5432); + + String url = "jdbc"; + url += ":postgresql://"+host+":"+port+"/patio"; + + return url; + } + + @Override + public String getBaseURL() { + return "http://localhost:" + sutPort; + } + + @Override + public String getPathToExecutableJar() { + return jarLocation; + } + + @Override + public String getLogMessageOfInitializedServer() { + return "Startup completed in"; + } + + @Override + public long getMaxAwaitForInitializationInSeconds() { + return timeoutSeconds; + } + + @Override + public void preStart() { + postgres.start(); + } + + @Override + public void postStart() { + closeDataBaseConnection(); + + try { + sqlConnection = DriverManager.getConnection(dbUrl(), "patio", "patio"); + dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection) + .withSchemas("public").withDisabledSmartClean()); + // initSqlOnResourcePath = "/initDb.sql"; + + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + @Override + public void resetStateOfSUT() { + mongoClient.getDatabase(MONGODB_DATABASE_NAME).drop(); + } + + @Override + public void preStop() { + closeDataBaseConnection(); + } + + @Override + public void postStop() { + postgres.stop(); + } + + + + @Override + public String getPackagePrefixesToCover() { + return "sk.cyrilgavala.reservationsApi."; + } + + @Override + public ProblemInfo getProblemInfo() { + return new RestProblem( + "http://localhost:" + getSutPort() + "/v3/api-docs", + null + ); + } + + @Override + public SutInfoDto.OutputFormat getPreferredOutputFormat() { + return SutInfoDto.OutputFormat.JAVA_JUNIT_5; + } + + + + @Override + public List getInfoForAuthentication() { + return null; + } + + @Override + public List getDbSpecifications() { + return null; + } +} diff --git a/jdk_11_gradle/settings.gradle.kts b/jdk_11_gradle/settings.gradle.kts index dcbda1de0..e23021156 100644 --- a/jdk_11_gradle/settings.gradle.kts +++ b/jdk_11_gradle/settings.gradle.kts @@ -5,4 +5,5 @@ include("em:embedded:graphql:patio-api") include("em:external:graphql:patio-api") include("cs:rest:reservations-api") -include("em:embedded:rest:reservations-api") \ No newline at end of file +include("em:embedded:rest:reservations-api") +include("em:external:rest:reservations-api") From cacc7d9ca735afabe29d6b751d64264d9e4bb643 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Tue, 19 Sep 2023 22:01:54 +0200 Subject: [PATCH 05/21] more on external driver --- .../ExternalEvoMasterController.java | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java b/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java index 19987e473..ce9fad3c9 100644 --- a/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java +++ b/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java @@ -1,5 +1,7 @@ package em.external.reservationsapi; +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; import org.evomaster.client.java.controller.ExternalSutController; import org.evomaster.client.java.controller.InstrumentedSutStarter; import org.evomaster.client.java.controller.api.dto.AuthenticationDto; @@ -107,8 +109,8 @@ public ExternalEvoMasterController( @Override public String[] getInputParameters() { return new String[]{ - "-micronaut.server.port="+sutPort, - "-datasources.default.url=" + dbUrl() + "--server.port=" + sutPort, + "--spring.data.mongodb.uri="+mongoDbUrl }; } @@ -116,17 +118,6 @@ public String[] getJVMParameters() { return new String[]{}; } - private String dbUrl() { - - String host = postgres.getContainerIpAddress(); - int port = postgres.getMappedPort(5432); - - String url = "jdbc"; - url += ":postgresql://"+host+":"+port+"/patio"; - - return url; - } - @Override public String getBaseURL() { return "http://localhost:" + sutPort; @@ -149,22 +140,13 @@ public long getMaxAwaitForInitializationInSeconds() { @Override public void preStart() { - postgres.start(); + mongodbContainer.start(); + mongoDbUrl = "mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT) + "/" + MONGODB_DATABASE_NAME; + mongoClient = MongoClients.create(mongoDbUrl); } @Override public void postStart() { - closeDataBaseConnection(); - - try { - sqlConnection = DriverManager.getConnection(dbUrl(), "patio", "patio"); - dbSpecification = Arrays.asList(new DbSpecification(DatabaseType.POSTGRES,sqlConnection) - .withSchemas("public").withDisabledSmartClean()); - // initSqlOnResourcePath = "/initDb.sql"; - - } catch (Exception e) { - throw new RuntimeException(e); - } } @Override @@ -174,12 +156,11 @@ public void resetStateOfSUT() { @Override public void preStop() { - closeDataBaseConnection(); } @Override public void postStop() { - postgres.stop(); + mongodbContainer.stop(); } @@ -192,7 +173,7 @@ public String getPackagePrefixesToCover() { @Override public ProblemInfo getProblemInfo() { return new RestProblem( - "http://localhost:" + getSutPort() + "/v3/api-docs", + "http://localhost:" + sutPort + "/v3/api-docs", null ); } From 3e2930d0cd7711f16590936b02f53b2351bb259b Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Wed, 20 Sep 2023 14:34:49 +0200 Subject: [PATCH 06/21] fixed issue --- .../ExternalEvoMasterController.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java b/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java index ce9fad3c9..ee333ccf2 100644 --- a/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java +++ b/jdk_11_gradle/em/external/rest/reservations-api/src/main/java/em/external/reservationsapi/ExternalEvoMasterController.java @@ -5,22 +5,12 @@ import org.evomaster.client.java.controller.ExternalSutController; import org.evomaster.client.java.controller.InstrumentedSutStarter; import org.evomaster.client.java.controller.api.dto.AuthenticationDto; -import org.evomaster.client.java.controller.api.dto.JsonTokenPostLoginDto; import org.evomaster.client.java.controller.api.dto.SutInfoDto; -import org.evomaster.client.java.controller.api.dto.database.schema.DatabaseType; -import org.evomaster.client.java.controller.db.DbCleaner; -import org.evomaster.client.java.controller.db.SqlScriptRunnerCached; import org.evomaster.client.java.controller.internal.db.DbSpecification; -import org.evomaster.client.java.controller.problem.GraphQlProblem; import org.evomaster.client.java.controller.problem.ProblemInfo; import org.evomaster.client.java.controller.problem.RestProblem; import org.testcontainers.containers.GenericContainer; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.util.Arrays; -import java.util.Collections; import java.util.List; public class ExternalEvoMasterController extends ExternalSutController { @@ -110,6 +100,7 @@ public ExternalEvoMasterController( public String[] getInputParameters() { return new String[]{ "--server.port=" + sutPort, + "--databaseUrl="+mongoDbUrl, "--spring.data.mongodb.uri="+mongoDbUrl }; } @@ -130,7 +121,7 @@ public String getPathToExecutableJar() { @Override public String getLogMessageOfInitializedServer() { - return "Startup completed in"; + return "Started ReservationsApi in"; } @Override From 33f7fcc0fe84bf152209861dc953255d0eaf0d52 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Wed, 20 Sep 2023 14:42:38 +0200 Subject: [PATCH 07/21] adding schema --- openapi-swagger/reservations-api.json | 381 ++++++++++++++++++++++++++ 1 file changed, 381 insertions(+) create mode 100644 openapi-swagger/reservations-api.json diff --git a/openapi-swagger/reservations-api.json b/openapi-swagger/reservations-api.json new file mode 100644 index 000000000..36a99ddab --- /dev/null +++ b/openapi-swagger/reservations-api.json @@ -0,0 +1,381 @@ +{ + "openapi": "3.0.1", + "info": { + "title": "Reservations API", + "description": "Simple API for implementing basic reservation system.", + "version": "v1.0.0" + }, + "servers": [ + { + "url": "http://localhost:12345", + "description": "Generated server url" + } + ], + "tags": [ + { + "name": "Reservations" + }, + { + "name": "Users" + } + ], + "paths": { + "/api/reservation": { + "get": { + "tags": [ + "Reservations" + ], + "summary": "Get all reservations", + "description": "Get all reservations available.", + "operationId": "getAllReservations", + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ReservationResponse" + } + } + } + } + } + }, + "security": [ + { + "bearer-key": [] + } + ] + }, + "put": { + "tags": [ + "Reservations" + ], + "summary": "Update reservation", + "description": "Update reservation when valid information provided.", + "operationId": "updateReservation", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/UpdateReservationRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ReservationResponse" + } + } + } + } + }, + "security": [ + { + "bearer-key": [] + } + ] + }, + "post": { + "tags": [ + "Reservations" + ], + "summary": "Create new reservation", + "description": "Create new reservation when valid information provided.", + "operationId": "createReservation", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/CreateReservationRequest" + } + } + }, + "required": true + }, + "responses": { + "201": { + "description": "Created", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ReservationResponse" + } + } + } + } + }, + "security": [ + { + "bearer-key": [] + } + ] + } + }, + "/api/user/register": { + "post": { + "tags": [ + "Users" + ], + "summary": "Perform user's registration to save a user and retrieve access token.", + "description": "Perform user's registration to save a user and retrieve access token.", + "operationId": "register", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/RegisterRequest" + } + } + }, + "required": true + }, + "responses": { + "201": { + "description": "Created", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/AuthResponse" + } + } + } + } + } + } + }, + "/api/user/login": { + "post": { + "tags": [ + "Users" + ], + "summary": "Perform user's login to retrieve access token.", + "description": "Perform user's login to retrieve access token.", + "operationId": "login", + "requestBody": { + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/LoginRequest" + } + } + }, + "required": true + }, + "responses": { + "200": { + "description": "OK", + "content": { + "*/*": { + "schema": { + "$ref": "#/components/schemas/AuthResponse" + } + } + } + } + } + } + }, + "/api/reservation/{username}": { + "get": { + "tags": [ + "Reservations" + ], + "summary": "Get reservations for particular user", + "description": "Get reservations for particular user when correct username provided.", + "operationId": "getAllReservationsForUser", + "parameters": [ + { + "name": "username", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ReservationResponse" + } + } + } + } + } + }, + "security": [ + { + "bearer-key": [] + } + ] + } + }, + "/api/reservation/{reservationUuid}": { + "delete": { + "tags": [ + "Reservations" + ], + "summary": "Delete reservation", + "description": "Delete reservation when valid UUID provided.", + "operationId": "deleteReservation", + "parameters": [ + { + "name": "reservationUuid", + "in": "path", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK" + } + }, + "security": [ + { + "bearer-key": [] + } + ] + } + } + }, + "components": { + "schemas": { + "UpdateReservationRequest": { + "required": [ + "reservationFor", + "reservationFrom", + "reservationTo", + "uuid" + ], + "type": "object", + "properties": { + "uuid": { + "type": "string" + }, + "reservationFor": { + "type": "string" + }, + "reservationFrom": { + "type": "string", + "format": "date-time" + }, + "reservationTo": { + "type": "string", + "format": "date-time" + } + } + }, + "ReservationResponse": { + "type": "object", + "properties": { + "uuid": { + "type": "string" + }, + "reservationFor": { + "type": "string" + }, + "reservationFrom": { + "type": "string", + "format": "date-time" + }, + "reservationTo": { + "type": "string", + "format": "date-time" + } + } + }, + "RegisterRequest": { + "required": [ + "email", + "password", + "username" + ], + "type": "object", + "properties": { + "username": { + "type": "string" + }, + "email": { + "type": "string" + }, + "password": { + "type": "string" + } + } + }, + "AuthResponse": { + "type": "object", + "properties": { + "accessToken": { + "type": "string" + } + } + }, + "LoginRequest": { + "required": [ + "password", + "username" + ], + "type": "object", + "properties": { + "username": { + "type": "string" + }, + "password": { + "type": "string" + } + } + }, + "CreateReservationRequest": { + "required": [ + "createdAt", + "reservationFor", + "reservationFrom", + "reservationTo" + ], + "type": "object", + "properties": { + "reservationFor": { + "type": "string" + }, + "reservationFrom": { + "type": "string", + "format": "date-time" + }, + "reservationTo": { + "type": "string", + "format": "date-time" + }, + "createdAt": { + "type": "string", + "format": "date-time" + } + } + } + }, + "securitySchemes": { + "bearer-key": { + "type": "http", + "scheme": "bearer", + "bearerFormat": "JWT" + } + } + } +} \ No newline at end of file From a73bd335fcbec381852cdead912d4ede10afd70f Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Wed, 20 Sep 2023 14:47:01 +0200 Subject: [PATCH 08/21] data for reservations-api --- statistics/data.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/statistics/data.csv b/statistics/data.csv index a5399d2a7..58d839017 100644 --- a/statistics/data.csv +++ b/statistics/data.csv @@ -1,4 +1,5 @@ EMB,NAME,TYPE,LANGUAGE,RUNTIME,BUILD,FILES,LOCS,DATABASE,LICENSE,ENDPOINTS,URL +TRUE,reservations-api,REST,Java,JDK 11,Gradle,39,1853,MongoDB,UNDEFINED,7,https://github.com/cyrilgavala/reservations-api TRUE,catwatch,REST,Java,JDK 8,Maven,106,9636,H2,Apache,14,https://github.com/zalando-incubator/catwatch TRUE,cwa-verification,REST,Java,JDK 11,Maven,47,3955,H2,Apache,5,https://github.com/corona-warn-app/cwa-verification-server TRUE,features-service,REST,Java,JDK 8,Maven,39,2275,H2,Apache,18,https://github.com/JavierMF/features-service From 7527c973ca2a2e906632a009236a8c4547674f30 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Wed, 20 Sep 2023 14:58:00 +0200 Subject: [PATCH 09/21] updated script --- .gitignore | 1 + scripts/dist.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index bde091a22..726fe4cb6 100644 --- a/.gitignore +++ b/.gitignore @@ -254,3 +254,4 @@ dotnet_3/em/embedded/rest/ScsDriver/generated-tests/ /statistics/table_suts.tex /jdk_11_gradle/cs/rest/reservations-api/build/ /jdk_11_gradle/em/embedded/rest/reservations-api/build/ +/jdk_11_gradle/em/external/rest/reservations-api/build/ diff --git a/scripts/dist.py b/scripts/dist.py index 628644cee..e4f82c194 100755 --- a/scripts/dist.py +++ b/scripts/dist.py @@ -225,6 +225,8 @@ def build_jdk_11_gradle(): # Copy JAR files copy(folder + "/cs/graphql/patio-api/build/libs/patio-api-sut.jar", DIST) copy(folder + "/em/external/graphql/patio-api/build/libs/patio-api-evomaster-runner.jar", DIST) + copy(folder + "/cs/rest/reservations-api/build/libs/reservations-api-sut.jar", DIST) + copy(folder + "/em/external/rest/reservations-api/build/libs/reservations-api-evomaster-runner.jar", DIST) # Building JavaScript projects From 30573733bb7ca9cdcb159ec45328f9aee6d9f55e Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Wed, 20 Sep 2023 15:01:59 +0200 Subject: [PATCH 10/21] starting with JDK 17 Gradle --- .../gradle/wrapper/gradle-wrapper.properties | 5 + jdk_17_gradle/gradlew | 185 ++++++++++++++++++ jdk_17_gradle/gradlew.bat | 89 +++++++++ jdk_17_gradle/settings.gradle.kts | 6 + 4 files changed, 285 insertions(+) create mode 100644 jdk_17_gradle/gradle/wrapper/gradle-wrapper.properties create mode 100644 jdk_17_gradle/gradlew create mode 100644 jdk_17_gradle/gradlew.bat create mode 100644 jdk_17_gradle/settings.gradle.kts diff --git a/jdk_17_gradle/gradle/wrapper/gradle-wrapper.properties b/jdk_17_gradle/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..da9702f9e --- /dev/null +++ b/jdk_17_gradle/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/jdk_17_gradle/gradlew b/jdk_17_gradle/gradlew new file mode 100644 index 000000000..4f906e0c8 --- /dev/null +++ b/jdk_17_gradle/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/jdk_17_gradle/gradlew.bat b/jdk_17_gradle/gradlew.bat new file mode 100644 index 000000000..107acd32c --- /dev/null +++ b/jdk_17_gradle/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/jdk_17_gradle/settings.gradle.kts b/jdk_17_gradle/settings.gradle.kts new file mode 100644 index 000000000..45c3eb73f --- /dev/null +++ b/jdk_17_gradle/settings.gradle.kts @@ -0,0 +1,6 @@ +rootProject.name = "emb_jdk_17_gradle" + +//include("cs:graphql:patio-api") +//include("em:embedded:graphql:patio-api") +//include("em:external:graphql:patio-api") + From 8e6090f8db692f5dbb2528cfaf1bb6a88a732d79 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Wed, 20 Sep 2023 15:09:45 +0200 Subject: [PATCH 11/21] adding source code of bibliothek --- .../bibliothek/.checkstyle/checkstyle.xml | 281 ++++++++++++++++++ .../bibliothek/.checkstyle/suppressions.xml | 7 + .../cs/rest/bibliothek/.dockerignore | 10 + .../.spotless/bibliothek.importorder | 4 + jdk_17_gradle/cs/rest/bibliothek/Dockerfile | 34 +++ .../cs/rest/bibliothek/build.gradle.kts | 67 +++++ .../docker/default.application.yaml | 8 + jdk_17_gradle/cs/rest/bibliothek/license.txt | 21 ++ .../cs/rest/bibliothek/license_header.txt | 23 ++ jdk_17_gradle/cs/rest/bibliothek/readme.md | 3 + .../cs/rest/bibliothek/settings.gradle.kts | 5 + .../bibliothek/BibliothekApplication.java | 42 +++ .../configuration/AppConfiguration.java | 79 +++++ .../configuration/MongoConfiguration.java | 50 ++++ .../configuration/OpenAPIConfiguration.java | 63 ++++ .../configuration/WebConfiguration.java | 37 +++ .../bibliothek/controller/RootController.java | 43 +++ .../controller/v2/DownloadController.java | 168 +++++++++++ .../controller/v2/ProjectController.java | 111 +++++++ .../controller/v2/ProjectsController.java | 77 +++++ .../controller/v2/VersionBuildController.java | 138 +++++++++ .../v2/VersionBuildsController.java | 142 +++++++++ .../controller/v2/VersionController.java | 116 ++++++++ .../v2/VersionFamilyBuildsController.java | 158 ++++++++++ .../v2/VersionFamilyController.java | 116 ++++++++ .../bibliothek/database/model/Build.java | 93 ++++++ .../bibliothek/database/model/Project.java | 37 +++ .../bibliothek/database/model/Version.java | 52 ++++ .../database/model/VersionFamily.java | 46 +++ .../database/repository/BuildCollection.java | 41 +++ .../repository/ProjectCollection.java | 35 +++ .../repository/VersionCollection.java | 40 +++ .../repository/VersionFamilyCollection.java | 38 +++ .../papermc/bibliothek/exception/Advice.java | 88 ++++++ .../bibliothek/exception/BuildNotFound.java | 31 ++ .../bibliothek/exception/DownloadFailed.java | 35 +++ .../exception/DownloadNotFound.java | 31 ++ .../bibliothek/exception/ProjectNotFound.java | 31 ++ .../bibliothek/exception/VersionNotFound.java | 31 ++ .../papermc/bibliothek/filter/CorsFilter.java | 45 +++ .../bibliothek/util/BringOrderToChaos.java | 49 +++ .../java/io/papermc/bibliothek/util/HTTP.java | 54 ++++ .../papermc/bibliothek/util/NameSource.java | 28 ++ .../papermc/bibliothek/util/TimeSource.java | 31 ++ .../src/main/resources/application.yaml | 23 ++ 45 files changed, 2662 insertions(+) create mode 100644 jdk_17_gradle/cs/rest/bibliothek/.checkstyle/checkstyle.xml create mode 100644 jdk_17_gradle/cs/rest/bibliothek/.checkstyle/suppressions.xml create mode 100644 jdk_17_gradle/cs/rest/bibliothek/.dockerignore create mode 100644 jdk_17_gradle/cs/rest/bibliothek/.spotless/bibliothek.importorder create mode 100644 jdk_17_gradle/cs/rest/bibliothek/Dockerfile create mode 100644 jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts create mode 100644 jdk_17_gradle/cs/rest/bibliothek/docker/default.application.yaml create mode 100644 jdk_17_gradle/cs/rest/bibliothek/license.txt create mode 100644 jdk_17_gradle/cs/rest/bibliothek/license_header.txt create mode 100644 jdk_17_gradle/cs/rest/bibliothek/readme.md create mode 100644 jdk_17_gradle/cs/rest/bibliothek/settings.gradle.kts create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/BibliothekApplication.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/AppConfiguration.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/MongoConfiguration.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/OpenAPIConfiguration.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/WebConfiguration.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/RootController.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/ProjectController.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/ProjectsController.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildsController.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionController.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionFamilyBuildsController.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionFamilyController.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Build.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Project.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Version.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/VersionFamily.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/BuildCollection.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/ProjectCollection.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/VersionCollection.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/VersionFamilyCollection.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/Advice.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/BuildNotFound.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/DownloadFailed.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/DownloadNotFound.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/ProjectNotFound.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/VersionNotFound.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/filter/CorsFilter.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/BringOrderToChaos.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/HTTP.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/NameSource.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/TimeSource.java create mode 100644 jdk_17_gradle/cs/rest/bibliothek/src/main/resources/application.yaml diff --git a/jdk_17_gradle/cs/rest/bibliothek/.checkstyle/checkstyle.xml b/jdk_17_gradle/cs/rest/bibliothek/.checkstyle/checkstyle.xml new file mode 100644 index 000000000..454e70909 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/.checkstyle/checkstyle.xml @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jdk_17_gradle/cs/rest/bibliothek/.checkstyle/suppressions.xml b/jdk_17_gradle/cs/rest/bibliothek/.checkstyle/suppressions.xml new file mode 100644 index 000000000..f315cf91e --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/.checkstyle/suppressions.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/jdk_17_gradle/cs/rest/bibliothek/.dockerignore b/jdk_17_gradle/cs/rest/bibliothek/.dockerignore new file mode 100644 index 000000000..c9adf3fa6 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/.dockerignore @@ -0,0 +1,10 @@ +# vim: ft=gitignore +# Everything ignored by default +* +# Only whitelist what's needed +!*.gradle.kts +!docker/ +!gradle/ +!gradlew +!license*.txt +!src/ diff --git a/jdk_17_gradle/cs/rest/bibliothek/.spotless/bibliothek.importorder b/jdk_17_gradle/cs/rest/bibliothek/.spotless/bibliothek.importorder new file mode 100644 index 000000000..5019d442a --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/.spotless/bibliothek.importorder @@ -0,0 +1,4 @@ +#Organize Import Order +#Mon Dec 05 23:26:49 PST 2022 +0= +1=\# diff --git a/jdk_17_gradle/cs/rest/bibliothek/Dockerfile b/jdk_17_gradle/cs/rest/bibliothek/Dockerfile new file mode 100644 index 000000000..65bafb395 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/Dockerfile @@ -0,0 +1,34 @@ +ARG JAVA_VERSION=17 +ARG JVM_FLAVOR=hotspot + +FROM openjdk:${JAVA_VERSION}-jdk-slim AS builder +WORKDIR /build + +COPY ./ ./ +RUN ./gradlew clean buildForDocker --no-daemon + + +ARG JAVA_VERSION +ARG JVM_FLAVOR + +FROM openjdk:${JAVA_VERSION}-slim +WORKDIR /app + +RUN groupadd --system bibliothek \ + && useradd --system bibliothek --gid bibliothek \ + && chown -R bibliothek:bibliothek /app +USER bibliothek:bibliothek + +VOLUME /data/storage +EXPOSE 8080 + +# We override default config location search path, +# so that a custom file with defaults can be used +# Normally would use environment variables, +# but they take precedence over config file +# https://docs.spring.io/spring-boot/docs/1.5.6.RELEASE/reference/html/boot-features-external-config.html +ENV SPRING_CONFIG_LOCATION="optional:classpath:/,optional:classpath:/config/,file:./default.application.yaml,optional:file:./,optional:file:./config/" +COPY ./docker/default.application.yaml ./default.application.yaml + +COPY --from=builder /build/build/libs/docker/bibliothek.jar ./ +CMD ["java", "-jar", "/app/bibliothek.jar"] diff --git a/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts new file mode 100644 index 000000000..25dcb108f --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts @@ -0,0 +1,67 @@ +plugins { + id("java") + + alias(libs.plugins.indra) + alias(libs.plugins.indra.checkstyle) + alias(libs.plugins.spotless) + alias(libs.plugins.spring.dependency.management) + alias(libs.plugins.spring.boot) +} + +group = "io.papermc" +version = "1.0.0-SNAPSHOT" + +repositories { + mavenCentral() +} + +indra { + javaVersions { + target(17) + } + + github("PaperMC", "bibliothek") + mitLicense() +} + +spotless { + java { + endWithNewline() + importOrderFile(rootProject.file(".spotless/bibliothek.importorder")) + indentWithSpaces(2) + licenseHeaderFile(rootProject.file("license_header.txt")) + trimTrailingWhitespace() + } +} + +dependencies { + annotationProcessor("org.springframework.boot", "spring-boot-configuration-processor") + checkstyle(libs.stylecheck) + implementation(libs.jetbrains.annotations) + implementation(libs.springdoc.openapi.starter.webmvc.ui) + implementation("org.springframework.boot", "spring-boot-starter-data-mongodb") + implementation("org.springframework.boot", "spring-boot-starter-validation") + implementation("org.springframework.boot", "spring-boot-starter-web") + testImplementation("org.springframework.boot", "spring-boot-starter-test") { + exclude(group = "org.junit.vintage", module = "junit-vintage-engine") + } +} + +tasks { + bootJar { + launchScript() + } + + // From StackOverflow: https://stackoverflow.com/a/53087407 + // Licensed under: CC BY-SA 4.0 + // Adapted to Kotlin + register("buildForDocker") { + from(bootJar) + into("build/libs/docker") + rename { fileName -> + // a simple way is to remove the "-$version" from the jar filename + // but you can customize the filename replacement rule as you wish. + fileName.replace("-$version", "") + } + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/docker/default.application.yaml b/jdk_17_gradle/cs/rest/bibliothek/docker/default.application.yaml new file mode 100644 index 000000000..cf0645341 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/docker/default.application.yaml @@ -0,0 +1,8 @@ +--- +app: + # path to volume in Dockerfile - make sure to keep in sync + storagePath: "/data/storage" + apiBaseUrl: "http://localhost/api" +server: + forward-headers-strategy: "framework" + port: 8080 diff --git a/jdk_17_gradle/cs/rest/bibliothek/license.txt b/jdk_17_gradle/cs/rest/bibliothek/license.txt new file mode 100644 index 000000000..12cd1ed6c --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/license.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019-2023 PaperMC + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/jdk_17_gradle/cs/rest/bibliothek/license_header.txt b/jdk_17_gradle/cs/rest/bibliothek/license_header.txt new file mode 100644 index 000000000..8c4dc2584 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/license_header.txt @@ -0,0 +1,23 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ diff --git a/jdk_17_gradle/cs/rest/bibliothek/readme.md b/jdk_17_gradle/cs/rest/bibliothek/readme.md new file mode 100644 index 000000000..9df590c5c --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/readme.md @@ -0,0 +1,3 @@ +# bibliothek + +A downloads API. diff --git a/jdk_17_gradle/cs/rest/bibliothek/settings.gradle.kts b/jdk_17_gradle/cs/rest/bibliothek/settings.gradle.kts new file mode 100644 index 000000000..33f528e53 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/settings.gradle.kts @@ -0,0 +1,5 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} + +rootProject.name = "bibliothek" diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/BibliothekApplication.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/BibliothekApplication.java new file mode 100644 index 000000000..1cf670f5f --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/BibliothekApplication.java @@ -0,0 +1,42 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek; + +import io.papermc.bibliothek.configuration.AppConfiguration; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.web.servlet.ServletComponentScan; + +@EnableConfigurationProperties({ + AppConfiguration.class +}) +@SpringBootApplication +@ServletComponentScan +@SuppressWarnings("checkstyle:HideUtilityClassConstructor") +public class BibliothekApplication { + public static void main(final String[] args) { + SpringApplication.run(BibliothekApplication.class, args); + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/AppConfiguration.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/AppConfiguration.java new file mode 100644 index 000000000..075442aa2 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/AppConfiguration.java @@ -0,0 +1,79 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.configuration; + +import jakarta.validation.constraints.NotNull; +import java.net.URL; +import java.nio.file.Path; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.validation.annotation.Validated; + +@ConfigurationProperties(prefix = "app") +@Validated +public class AppConfiguration { + private URL apiBaseUrl; + private String apiTitle; + private String apiVersion; + private @NotNull Path storagePath; + + @SuppressWarnings("checkstyle:MethodName") + public URL getApiBaseUrl() { + return this.apiBaseUrl; + } + + @SuppressWarnings("checkstyle:MethodName") + public void setApiBaseUrl(final URL apiBaseUrl) { + this.apiBaseUrl = apiBaseUrl; + } + + @SuppressWarnings("checkstyle:MethodName") + public String getApiTitle() { + return this.apiTitle; + } + + @SuppressWarnings("checkstyle:MethodName") + public void setApiTitle(final String apiTitle) { + this.apiTitle = apiTitle; + } + + @SuppressWarnings("checkstyle:MethodName") + public String getApiVersion() { + return this.apiVersion; + } + + @SuppressWarnings("checkstyle:MethodName") + public void setApiVersion(final String apiVersion) { + this.apiVersion = apiVersion; + } + + @SuppressWarnings("checkstyle:MethodName") + public Path getStoragePath() { + return this.storagePath; + } + + @SuppressWarnings("checkstyle:MethodName") + public void setStoragePath(final Path storagePath) { + this.storagePath = storagePath; + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/MongoConfiguration.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/MongoConfiguration.java new file mode 100644 index 000000000..b60b767be --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/MongoConfiguration.java @@ -0,0 +1,50 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.mongodb.MongoDatabaseFactory; +import org.springframework.data.mongodb.core.convert.DbRefResolver; +import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver; +import org.springframework.data.mongodb.core.convert.DefaultMongoTypeMapper; +import org.springframework.data.mongodb.core.convert.MappingMongoConverter; +import org.springframework.data.mongodb.core.convert.MongoCustomConversions; +import org.springframework.data.mongodb.core.mapping.MongoMappingContext; + +@Configuration +class MongoConfiguration { + @Bean + MappingMongoConverter mappingMongoConverter( + final MongoDatabaseFactory mongoDatabaseFactory, + final MongoMappingContext context, + final MongoCustomConversions mongoCustomConversions + ) { + final DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDatabaseFactory); + final MappingMongoConverter mappingConverter = new MappingMongoConverter(dbRefResolver, context); + mappingConverter.setCustomConversions(mongoCustomConversions); + mappingConverter.setTypeMapper(new DefaultMongoTypeMapper(null)); // to remove _class + return mappingConverter; + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/OpenAPIConfiguration.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/OpenAPIConfiguration.java new file mode 100644 index 000000000..61528619f --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/OpenAPIConfiguration.java @@ -0,0 +1,63 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.configuration; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.media.Schema; +import io.swagger.v3.oas.models.servers.Server; +import java.net.URL; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import org.springdoc.core.customizers.OpenApiCustomizer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +class OpenAPIConfiguration { + @Bean + OpenAPI openAPI(final AppConfiguration configuration) { + final OpenAPI api = new OpenAPI(); + api.info( + new Info() + .title(configuration.getApiTitle()) + .version(configuration.getApiVersion()) + ); + final URL apiBaseUrl = configuration.getApiBaseUrl(); + if (apiBaseUrl != null) { + api.servers(List.of(new Server().url(apiBaseUrl.toExternalForm()))); + } + return api; + } + + @Bean + @SuppressWarnings("rawtypes") // nothing we can do, the API exposes it raw + OpenApiCustomizer sortSchemasAlphabetically() { + return openApi -> { + final Map schemas = openApi.getComponents().getSchemas(); + openApi.getComponents().setSchemas(new TreeMap<>(schemas)); + }; + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/WebConfiguration.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/WebConfiguration.java new file mode 100644 index 000000000..db2d94f17 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/configuration/WebConfiguration.java @@ -0,0 +1,37 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.configuration; + +import jakarta.servlet.Filter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.filter.ShallowEtagHeaderFilter; + +@Configuration +class WebConfiguration { + @Bean + Filter shallowETagHeaderFilter() { + return new ShallowEtagHeaderFilter(); + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/RootController.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/RootController.java new file mode 100644 index 000000000..0026c862a --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/RootController.java @@ -0,0 +1,43 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.controller; + +import java.net.URI; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class RootController { + @GetMapping({ + "/", + "/docs" // without trailing / + }) + public ResponseEntity redirectToDocs() { + return ResponseEntity.status(HttpStatus.FOUND) + .location(URI.create("docs/")) + .build(); + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java new file mode 100644 index 000000000..ebfcddd95 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/DownloadController.java @@ -0,0 +1,168 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.controller.v2; + +import io.papermc.bibliothek.configuration.AppConfiguration; +import io.papermc.bibliothek.database.model.Build; +import io.papermc.bibliothek.database.model.Project; +import io.papermc.bibliothek.database.model.Version; +import io.papermc.bibliothek.database.repository.BuildCollection; +import io.papermc.bibliothek.database.repository.ProjectCollection; +import io.papermc.bibliothek.database.repository.VersionCollection; +import io.papermc.bibliothek.exception.BuildNotFound; +import io.papermc.bibliothek.exception.DownloadFailed; +import io.papermc.bibliothek.exception.DownloadNotFound; +import io.papermc.bibliothek.exception.ProjectNotFound; +import io.papermc.bibliothek.exception.VersionNotFound; +import io.papermc.bibliothek.util.HTTP; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.headers.Header; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.constraints.Pattern; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.Duration; +import java.util.Map; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.io.FileSystemResource; +import org.springframework.http.CacheControl; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE) +@SuppressWarnings("checkstyle:FinalClass") +public class DownloadController { + private static final CacheControl CACHE = HTTP.sMaxAgePublicCache(Duration.ofDays(7)); + private final AppConfiguration configuration; + private final ProjectCollection projects; + private final VersionCollection versions; + private final BuildCollection builds; + + @Autowired + private DownloadController( + final AppConfiguration configuration, + final ProjectCollection projects, + final VersionCollection versions, + final BuildCollection builds + ) { + this.configuration = configuration; + this.projects = projects; + this.versions = versions; + this.builds = builds; + } + + @ApiResponse( + responseCode = "200", + headers = { + @Header( + name = "Content-Disposition", + description = "A header indicating that the content is expected to be displayed as an attachment, that is downloaded and saved locally.", + schema = @Schema(type = "string") + ), + @Header( + name = "ETag", + description = "An identifier for a specific version of a resource. It lets caches be more efficient and save bandwidth, as a web server does not need to resend a full response if the content has not changed.", + schema = @Schema(type = "string") + ), + @Header( + name = "Last-Modified", + description = "The date and time at which the origin server believes the resource was last modified.", + schema = @Schema(type = "string") + ) + } + ) + @GetMapping( + value = "/v2/projects/{project:[a-z]+}/versions/{version:" + Version.PATTERN + "}/builds/{build:\\d+}/downloads/{download:" + Build.Download.PATTERN + "}", + produces = { + MediaType.APPLICATION_JSON_VALUE, + HTTP.APPLICATION_JAVA_ARCHIVE_VALUE + } + ) + @Operation(summary = "Downloads the given file from a build's data.") + public ResponseEntity download( + @Parameter(name = "project", description = "The project identifier.", example = "paper") + @PathVariable("project") + @Pattern(regexp = "[a-z]+") // + final String projectName, + @Parameter(description = "A version of the project.") + @PathVariable("version") + @Pattern(regexp = Version.PATTERN) // + final String versionName, + @Parameter(description = "A build of the version.") + @PathVariable("build") + @Pattern(regexp = "\\d+") // + final int buildNumber, + @Parameter(description = "A download of the build.") + @PathVariable("download") + @Pattern(regexp = Build.Download.PATTERN) // + final String downloadName + ) { + final Project project = this.projects.findByName(projectName).orElseThrow(ProjectNotFound::new); + final Version version = this.versions.findByProjectAndName(project._id(), versionName).orElseThrow(VersionNotFound::new); + final Build build = this.builds.findByProjectAndVersionAndNumber(project._id(), version._id(), buildNumber).orElseThrow(BuildNotFound::new); + + for (final Map.Entry download : build.downloads().entrySet()) { + if (download.getValue().name().equals(downloadName)) { + try { + return new JavaArchive( + this.configuration.getStoragePath() + .resolve(project.name()) + .resolve(version.name()) + .resolve(String.valueOf(build.number())) + .resolve(download.getValue().name()), + CACHE + ); + } catch (final IOException e) { + throw new DownloadFailed(e); + } + } + } + throw new DownloadNotFound(); + } + + private static class JavaArchive extends ResponseEntity { + JavaArchive(final Path path, final CacheControl cache) throws IOException { + super(new FileSystemResource(path), headersFor(path, cache), HttpStatus.OK); + } + + private static HttpHeaders headersFor(final Path path, final CacheControl cache) throws IOException { + final HttpHeaders headers = new HttpHeaders(); + headers.setCacheControl(cache); + headers.setContentDisposition(HTTP.attachmentDisposition(path.getFileName())); + headers.setContentType(HTTP.APPLICATION_JAVA_ARCHIVE); + headers.setLastModified(Files.getLastModifiedTime(path).toInstant()); + return headers; + } + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/ProjectController.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/ProjectController.java new file mode 100644 index 000000000..0016f3853 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/ProjectController.java @@ -0,0 +1,111 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.controller.v2; + +import io.papermc.bibliothek.database.model.Project; +import io.papermc.bibliothek.database.model.Version; +import io.papermc.bibliothek.database.model.VersionFamily; +import io.papermc.bibliothek.database.repository.ProjectCollection; +import io.papermc.bibliothek.database.repository.VersionCollection; +import io.papermc.bibliothek.database.repository.VersionFamilyCollection; +import io.papermc.bibliothek.exception.ProjectNotFound; +import io.papermc.bibliothek.util.HTTP; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.constraints.Pattern; +import java.time.Duration; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.CacheControl; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE) +@SuppressWarnings("checkstyle:FinalClass") +public class ProjectController { + private static final CacheControl CACHE = HTTP.sMaxAgePublicCache(Duration.ofMinutes(30)); + private final ProjectCollection projects; + private final VersionFamilyCollection families; + private final VersionCollection versions; + + @Autowired + private ProjectController( + final ProjectCollection projects, + final VersionFamilyCollection families, + final VersionCollection versions + ) { + this.projects = projects; + this.families = families; + this.versions = versions; + } + + @ApiResponse( + content = @Content( + schema = @Schema(implementation = ProjectResponse.class) + ), + responseCode = "200" + ) + @GetMapping("/v2/projects/{project:[a-z]+}") + @Operation(summary = "Gets information about a project.") + public ResponseEntity project( + @Parameter(name = "project", description = "The project identifier.", example = "paper") + @PathVariable("project") + @Pattern(regexp = "[a-z]+") // + final String projectName + ) { + final Project project = this.projects.findByName(projectName).orElseThrow(ProjectNotFound::new); + final List families = this.families.findAllByProject(project._id()); + final List versions = this.versions.findAllByProject(project._id()); + return HTTP.cachedOk(ProjectResponse.from(project, families, versions), CACHE); + } + + @Schema + private record ProjectResponse( + @Schema(name = "project_id", pattern = "[a-z]+", example = "paper") + String project_id, + @Schema(name = "project_name", example = "Paper") + String project_name, + @Schema(name = "version_groups") + List version_groups, + @Schema(name = "versions") + List versions + ) { + static ProjectResponse from(final Project project, final List families, final List versions) { + return new ProjectResponse( + project.name(), + project.friendlyName(), + families.stream().sorted(VersionFamily.COMPARATOR).map(VersionFamily::name).toList(), + versions.stream().sorted(Version.COMPARATOR).map(Version::name).toList() + ); + } + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/ProjectsController.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/ProjectsController.java new file mode 100644 index 000000000..ab805e7b6 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/ProjectsController.java @@ -0,0 +1,77 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.controller.v2; + +import io.papermc.bibliothek.database.model.Project; +import io.papermc.bibliothek.database.repository.ProjectCollection; +import io.papermc.bibliothek.util.HTTP; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import java.time.Duration; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.CacheControl; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE) +@SuppressWarnings("checkstyle:FinalClass") +public class ProjectsController { + private static final CacheControl CACHE = HTTP.sMaxAgePublicCache(Duration.ofDays(7)); + private final ProjectCollection projects; + + @Autowired + private ProjectsController(final ProjectCollection projects) { + this.projects = projects; + } + + @ApiResponse( + content = @Content( + schema = @Schema(implementation = ProjectsResponse.class) + ), + responseCode = "200" + ) + @GetMapping("/v2/projects") + @Operation(summary = "Gets a list of all available projects.") + public ResponseEntity projects() { + final List projects = this.projects.findAll(); + return HTTP.cachedOk(ProjectsResponse.from(projects), CACHE); + } + + @Schema + private record ProjectsResponse( + @Schema(name = "projects") + List projects + ) { + static ProjectsResponse from(final List projects) { + return new ProjectsResponse(projects.stream().map(Project::name).toList()); + } + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java new file mode 100644 index 000000000..a0ac6eaf0 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildController.java @@ -0,0 +1,138 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.controller.v2; + +import io.papermc.bibliothek.database.model.Build; +import io.papermc.bibliothek.database.model.Project; +import io.papermc.bibliothek.database.model.Version; +import io.papermc.bibliothek.database.repository.BuildCollection; +import io.papermc.bibliothek.database.repository.ProjectCollection; +import io.papermc.bibliothek.database.repository.VersionCollection; +import io.papermc.bibliothek.exception.BuildNotFound; +import io.papermc.bibliothek.exception.ProjectNotFound; +import io.papermc.bibliothek.exception.VersionNotFound; +import io.papermc.bibliothek.util.HTTP; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.constraints.Pattern; +import java.time.Duration; +import java.time.Instant; +import java.util.List; +import java.util.Map; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.CacheControl; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE) +@SuppressWarnings("checkstyle:FinalClass") +public class VersionBuildController { + private static final CacheControl CACHE = HTTP.sMaxAgePublicCache(Duration.ofDays(7)); + private final ProjectCollection projects; + private final VersionCollection versions; + private final BuildCollection builds; + + @Autowired + private VersionBuildController( + final ProjectCollection projects, + final VersionCollection versions, + final BuildCollection builds + ) { + this.projects = projects; + this.versions = versions; + this.builds = builds; + } + + @ApiResponse( + content = @Content( + schema = @Schema(implementation = BuildResponse.class) + ), + responseCode = "200" + ) + @GetMapping("/v2/projects/{project:[a-z]+}/versions/{version:" + Version.PATTERN + "}/builds/{build:\\d+}") + @Operation(summary = "Gets information related to a specific build.") + public ResponseEntity build( + @Parameter(name = "project", description = "The project identifier.", example = "paper") + @PathVariable("project") + @Pattern(regexp = "[a-z]+") // + final String projectName, + @Parameter(description = "A version of the project.") + @PathVariable("version") + @Pattern(regexp = Version.PATTERN) // + final String versionName, + @Parameter(description = "A build of the version.") + @PathVariable("build") + @Pattern(regexp = "\\d+") // + final int buildNumber + ) { + final Project project = this.projects.findByName(projectName).orElseThrow(ProjectNotFound::new); + final Version version = this.versions.findByProjectAndName(project._id(), versionName).orElseThrow(VersionNotFound::new); + final Build build = this.builds.findByProjectAndVersionAndNumber(project._id(), version._id(), buildNumber).orElseThrow(BuildNotFound::new); + return HTTP.cachedOk(BuildResponse.from(project, version, build), CACHE); + } + + @Schema + private record BuildResponse( + @Schema(name = "project_id", pattern = "[a-z]+", example = "paper") + String project_id, + @Schema(name = "project_name", example = "Paper") + String project_name, + @Schema(name = "version", pattern = Version.PATTERN, example = "1.18") + String version, + @Schema(name = "build", pattern = "\\d+", example = "10") + int build, + @Schema(name = "time") + Instant time, + @Schema(name = "channel") + Build.Channel channel, + @Schema(name = "promoted") + boolean promoted, + @Schema(name = "changes") + List changes, + @Schema(name = "downloads") + Map downloads + ) { + static BuildResponse from(final Project project, final Version version, final Build build) { + return new BuildResponse( + project.name(), + project.friendlyName(), + version.name(), + build.number(), + build.time(), + build.channelOrDefault(), + build.promotedOrDefault(), + build.changes(), + build.downloads() + ); + } + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildsController.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildsController.java new file mode 100644 index 000000000..e41327fa0 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionBuildsController.java @@ -0,0 +1,142 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.controller.v2; + +import io.papermc.bibliothek.database.model.Build; +import io.papermc.bibliothek.database.model.Project; +import io.papermc.bibliothek.database.model.Version; +import io.papermc.bibliothek.database.repository.BuildCollection; +import io.papermc.bibliothek.database.repository.ProjectCollection; +import io.papermc.bibliothek.database.repository.VersionCollection; +import io.papermc.bibliothek.exception.ProjectNotFound; +import io.papermc.bibliothek.exception.VersionNotFound; +import io.papermc.bibliothek.util.HTTP; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.constraints.Pattern; +import java.time.Duration; +import java.time.Instant; +import java.util.List; +import java.util.Map; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.CacheControl; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE) +@SuppressWarnings("checkstyle:FinalClass") +public class VersionBuildsController { + private static final CacheControl CACHE = HTTP.sMaxAgePublicCache(Duration.ofMinutes(5)); + private final ProjectCollection projects; + private final VersionCollection versions; + private final BuildCollection builds; + + @Autowired + private VersionBuildsController( + final ProjectCollection projects, + final VersionCollection versions, + final BuildCollection builds + ) { + this.projects = projects; + this.versions = versions; + this.builds = builds; + } + + @ApiResponse( + content = @Content( + schema = @Schema(implementation = BuildsResponse.class) + ), + responseCode = "200" + ) + @GetMapping("/v2/projects/{project:[a-z]+}/versions/{version:" + Version.PATTERN + "}/builds") + @Operation(summary = "Gets all available builds for a project's version.") + public ResponseEntity builds( + @Parameter(name = "project", description = "The project identifier.", example = "paper") + @PathVariable("project") + @Pattern(regexp = "[a-z]+") // + final String projectName, + @Parameter(description = "A version of the project.") + @PathVariable("version") + @Pattern(regexp = Version.PATTERN) // + final String versionName + ) { + final Project project = this.projects.findByName(projectName).orElseThrow(ProjectNotFound::new); + final Version version = this.versions.findByProjectAndName(project._id(), versionName).orElseThrow(VersionNotFound::new); + final List builds = this.builds.findAllByProjectAndVersion(project._id(), version._id()); + return HTTP.cachedOk(BuildsResponse.from(project, version, builds), CACHE); + } + + @Schema + private record BuildsResponse( + @Schema(name = "project_id", pattern = "[a-z]+", example = "paper") + String project_id, + @Schema(name = "project_name", example = "Paper") + String project_name, + @Schema(name = "version", pattern = Version.PATTERN, example = "1.18") + String version, + @Schema(name = "builds") + List builds + ) { + static BuildsResponse from(final Project project, final Version version, final List builds) { + return new BuildsResponse( + project.name(), + project.friendlyName(), + version.name(), + builds.stream().map(build -> new VersionBuild( + build.number(), + build.time(), + build.channelOrDefault(), + build.promotedOrDefault(), + build.changes(), + build.downloads() + )).toList() + ); + } + + @Schema + public record VersionBuild( + @Schema(name = "build", pattern = "\\d+", example = "10") + int build, + @Schema(name = "time") + Instant time, + @Schema(name = "channel") + Build.Channel channel, + @Schema(name = "promoted") + boolean promoted, + @Schema(name = "changes") + List changes, + @Schema(name = "downloads") + Map downloads + ) { + } + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionController.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionController.java new file mode 100644 index 000000000..b1cbb9d97 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionController.java @@ -0,0 +1,116 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.controller.v2; + +import io.papermc.bibliothek.database.model.Build; +import io.papermc.bibliothek.database.model.Project; +import io.papermc.bibliothek.database.model.Version; +import io.papermc.bibliothek.database.repository.BuildCollection; +import io.papermc.bibliothek.database.repository.ProjectCollection; +import io.papermc.bibliothek.database.repository.VersionCollection; +import io.papermc.bibliothek.exception.ProjectNotFound; +import io.papermc.bibliothek.exception.VersionNotFound; +import io.papermc.bibliothek.util.HTTP; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.constraints.Pattern; +import java.time.Duration; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.CacheControl; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE) +@SuppressWarnings("checkstyle:FinalClass") +public class VersionController { + private static final CacheControl CACHE = HTTP.sMaxAgePublicCache(Duration.ofMinutes(5)); + private final ProjectCollection projects; + private final VersionCollection versions; + private final BuildCollection builds; + + @Autowired + private VersionController( + final ProjectCollection projects, + final VersionCollection versions, + final BuildCollection builds + ) { + this.projects = projects; + this.versions = versions; + this.builds = builds; + } + + @ApiResponse( + content = @Content( + schema = @Schema(implementation = VersionResponse.class) + ), + responseCode = "200" + ) + @GetMapping("/v2/projects/{project:[a-z]+}/versions/{version:" + Version.PATTERN + "}") + @Operation(summary = "Gets information about a version.") + public ResponseEntity version( + @Parameter(name = "project", description = "The project identifier.", example = "paper") + @PathVariable("project") + @Pattern(regexp = "[a-z]+") // + final String projectName, + @Parameter(description = "A version of the project.") + @PathVariable("version") + @Pattern(regexp = Version.PATTERN) // + final String versionName + ) { + final Project project = this.projects.findByName(projectName).orElseThrow(ProjectNotFound::new); + final Version version = this.versions.findByProjectAndName(project._id(), versionName).orElseThrow(VersionNotFound::new); + final List builds = this.builds.findAllByProjectAndVersion(project._id(), version._id()); + return HTTP.cachedOk(VersionResponse.from(project, version, builds), CACHE); + } + + @Schema + private record VersionResponse( + @Schema(name = "project_id", pattern = "[a-z]+", example = "paper") + String project_id, + @Schema(name = "project_name", example = "Paper") + String project_name, + @Schema(name = "version", pattern = Version.PATTERN, example = "1.18") + String version, + @Schema(name = "builds") + List builds + ) { + static VersionResponse from(final Project project, final Version version, final List builds) { + return new VersionResponse( + project.name(), + project.friendlyName(), + version.name(), + builds.stream().map(Build::number).toList() + ); + } + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionFamilyBuildsController.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionFamilyBuildsController.java new file mode 100644 index 000000000..c1d57334f --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionFamilyBuildsController.java @@ -0,0 +1,158 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.controller.v2; + +import io.papermc.bibliothek.database.model.Build; +import io.papermc.bibliothek.database.model.Project; +import io.papermc.bibliothek.database.model.Version; +import io.papermc.bibliothek.database.model.VersionFamily; +import io.papermc.bibliothek.database.repository.BuildCollection; +import io.papermc.bibliothek.database.repository.ProjectCollection; +import io.papermc.bibliothek.database.repository.VersionCollection; +import io.papermc.bibliothek.database.repository.VersionFamilyCollection; +import io.papermc.bibliothek.exception.ProjectNotFound; +import io.papermc.bibliothek.exception.VersionNotFound; +import io.papermc.bibliothek.util.HTTP; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.constraints.Pattern; +import java.time.Duration; +import java.time.Instant; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import org.bson.types.ObjectId; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.CacheControl; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE) +@SuppressWarnings("checkstyle:FinalClass") +public class VersionFamilyBuildsController { + private static final CacheControl CACHE = HTTP.sMaxAgePublicCache(Duration.ofMinutes(5)); + private final ProjectCollection projects; + private final VersionFamilyCollection families; + private final VersionCollection versions; + private final BuildCollection builds; + + @Autowired + private VersionFamilyBuildsController( + final ProjectCollection projects, + final VersionFamilyCollection families, + final VersionCollection versions, + final BuildCollection builds + ) { + this.projects = projects; + this.families = families; + this.versions = versions; + this.builds = builds; + } + + @ApiResponse( + content = @Content( + schema = @Schema(implementation = VersionFamilyBuildsResponse.class) + ), + responseCode = "200" + ) + @GetMapping("/v2/projects/{project:[a-z]+}/version_group/{family:" + Version.PATTERN + "}/builds") + @Operation(summary = "Gets all available builds for a project's version group.") + public ResponseEntity familyBuilds( + @Parameter(name = "project", description = "The project identifier.", example = "paper") + @PathVariable("project") + @Pattern(regexp = "[a-z]+") // + final String projectName, + @Parameter(description = "The version group name.") + @PathVariable("family") + @Pattern(regexp = Version.PATTERN) // + final String familyName + ) { + final Project project = this.projects.findByName(projectName).orElseThrow(ProjectNotFound::new); + final VersionFamily family = this.families.findByProjectAndName(project._id(), familyName).orElseThrow(VersionNotFound::new); + final Map versions = this.versions.findAllByProjectAndGroup(project._id(), family._id()).stream() + .collect(Collectors.toMap(Version::_id, Function.identity())); + final List builds = this.builds.findAllByProjectAndVersionIn(project._id(), versions.keySet()); + return HTTP.cachedOk(VersionFamilyBuildsResponse.from(project, family, versions, builds), CACHE); + } + + @Schema + private record VersionFamilyBuildsResponse( + @Schema(name = "project_id", pattern = "[a-z]+", example = "paper") + String project_id, + @Schema(name = "project_name", example = "Paper") + String project_name, + @Schema(name = "version_group", pattern = Version.PATTERN, example = "1.18") + String version_group, + @Schema(name = "versions") + List versions, + @Schema(name = "builds") + List builds + ) { + static VersionFamilyBuildsResponse from(final Project project, final VersionFamily family, final Map versions, final List builds) { + return new VersionFamilyBuildsResponse( + project.name(), + project.friendlyName(), + family.name(), + versions.values().stream().sorted(Version.COMPARATOR).map(Version::name).toList(), + builds.stream().map(build -> new VersionFamilyBuild( + versions.get(build.version()).name(), + build.number(), + build.time(), + build.channelOrDefault(), + build.promotedOrDefault(), + build.changes(), + build.downloads() + )).toList() + ); + } + + @Schema + public static record VersionFamilyBuild( + @Schema(name = "version", pattern = Version.PATTERN, example = "1.18") + String version, + @Schema(name = "build", pattern = "\\d+", example = "10") + int build, + @Schema(name = "time") + Instant time, + @Schema(name = "channel") + Build.Channel channel, + @Schema(name = "promoted") + boolean promoted, + @Schema(name = "changes") + List changes, + @Schema(name = "downloads") + Map downloads + ) { + } + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionFamilyController.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionFamilyController.java new file mode 100644 index 000000000..b84bd882a --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/controller/v2/VersionFamilyController.java @@ -0,0 +1,116 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.controller.v2; + +import io.papermc.bibliothek.database.model.Project; +import io.papermc.bibliothek.database.model.Version; +import io.papermc.bibliothek.database.model.VersionFamily; +import io.papermc.bibliothek.database.repository.ProjectCollection; +import io.papermc.bibliothek.database.repository.VersionCollection; +import io.papermc.bibliothek.database.repository.VersionFamilyCollection; +import io.papermc.bibliothek.exception.ProjectNotFound; +import io.papermc.bibliothek.exception.VersionNotFound; +import io.papermc.bibliothek.util.HTTP; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.validation.constraints.Pattern; +import java.time.Duration; +import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.CacheControl; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE) +@SuppressWarnings("checkstyle:FinalClass") +public class VersionFamilyController { + private static final CacheControl CACHE = HTTP.sMaxAgePublicCache(Duration.ofMinutes(5)); + private final ProjectCollection projects; + private final VersionFamilyCollection families; + private final VersionCollection versions; + + @Autowired + private VersionFamilyController( + final ProjectCollection projects, + final VersionFamilyCollection families, + final VersionCollection versions + ) { + this.projects = projects; + this.families = families; + this.versions = versions; + } + + @ApiResponse( + content = @Content( + schema = @Schema(implementation = VersionFamilyResponse.class) + ), + responseCode = "200" + ) + @GetMapping("/v2/projects/{project:[a-z]+}/version_group/{family:" + Version.PATTERN + "}") + @Operation(summary = "Gets information about a project's version group.") + public ResponseEntity family( + @Parameter(name = "project", description = "The project identifier.", example = "paper") + @PathVariable("project") + @Pattern(regexp = "[a-z]+") // + final String projectName, + @Parameter(description = "The version group name.") + @PathVariable("family") + @Pattern(regexp = Version.PATTERN) // + final String familyName + ) { + final Project project = this.projects.findByName(projectName).orElseThrow(ProjectNotFound::new); + final VersionFamily family = this.families.findByProjectAndName(project._id(), familyName).orElseThrow(VersionNotFound::new); + final List versions = this.versions.findAllByProjectAndGroup(project._id(), family._id()); + return HTTP.cachedOk(VersionFamilyResponse.from(project, family, versions), CACHE); + } + + @Schema + private record VersionFamilyResponse( + @Schema(name = "project_id", pattern = "[a-z]+", example = "paper") + String project_id, + @Schema(name = "project_name", example = "Paper") + String project_name, + @Schema(name = "version_group", pattern = Version.PATTERN, example = "1.18") + String version_group, + @Schema(name = "versions") + List versions + ) { + static VersionFamilyResponse from(final Project project, final VersionFamily family, final List versions) { + return new VersionFamilyResponse( + project.name(), + project.friendlyName(), + family.name(), + versions.stream().sorted(Version.COMPARATOR).map(Version::name).toList() + ); + } + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Build.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Build.java new file mode 100644 index 000000000..0f7c53fbb --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Build.java @@ -0,0 +1,93 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.database.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.Instant; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import org.bson.types.ObjectId; +import org.intellij.lang.annotations.Language; +import org.jetbrains.annotations.Nullable; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.index.CompoundIndex; +import org.springframework.data.mongodb.core.mapping.Document; + +@CompoundIndex(def = "{'project': 1, 'version': 1}") +@CompoundIndex(def = "{'project': 1, 'version': 1, 'number': 1}") +@Document(collection = "builds") +public record Build( + @Id ObjectId _id, + ObjectId project, + ObjectId version, + int number, + Instant time, + List changes, + Map downloads, + @JsonProperty + @Nullable Channel channel, + @JsonInclude(JsonInclude.Include.NON_NULL) + @Nullable Boolean promoted +) { + public Channel channelOrDefault() { + return Objects.requireNonNullElse(this.channel(), Build.Channel.DEFAULT); + } + + public boolean promotedOrDefault() { + return Objects.requireNonNullElse(this.promoted(), false); + } + + public enum Channel { + @JsonProperty("default") + DEFAULT, + @JsonProperty("experimental") + EXPERIMENTAL; + } + + @Schema + public record Change( + @Schema(name = "commit") + String commit, + @Schema(name = "summary") + String summary, + @Schema(name = "message") + String message + ) { + } + + @Schema + public record Download( + @Schema(name = "name", pattern = "[a-z0-9._-]+", example = "paper-1.18-10.jar") + String name, + @Schema(name = "sha256", pattern = "[a-f0-9]{64}", example = "f065e2d345d9d772d5cf2a1ce5c495c4cc56eb2fcd6820e82856485fa19414c8") + String sha256 + ) { + // NOTE: this pattern cannot contain any capturing groups + @Language("RegExp") + public static final String PATTERN = "[a-zA-Z0-9._-]+"; + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Project.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Project.java new file mode 100644 index 000000000..1308c9a91 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Project.java @@ -0,0 +1,37 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.database.model; + +import org.bson.types.ObjectId; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.index.Indexed; +import org.springframework.data.mongodb.core.mapping.Document; + +@Document(collection = "projects") +public record Project( + @Id ObjectId _id, + @Indexed String name, + String friendlyName +) { +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Version.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Version.java new file mode 100644 index 000000000..fa6d48c85 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/Version.java @@ -0,0 +1,52 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.database.model; + +import io.papermc.bibliothek.util.BringOrderToChaos; +import io.papermc.bibliothek.util.NameSource; +import io.papermc.bibliothek.util.TimeSource; +import java.time.Instant; +import java.util.Comparator; +import org.bson.types.ObjectId; +import org.intellij.lang.annotations.Language; +import org.jetbrains.annotations.Nullable; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.index.CompoundIndex; +import org.springframework.data.mongodb.core.mapping.Document; + +@CompoundIndex(def = "{'project': 1, 'group': 1}") +@CompoundIndex(def = "{'project': 1, 'name': 1}") +@Document(collection = "versions") +public record Version( + @Id ObjectId _id, + ObjectId project, + ObjectId group, + String name, + @Nullable Instant time +) implements NameSource, TimeSource { + // NOTE: this pattern cannot contain any capturing groups + @Language("RegExp") + public static final String PATTERN = "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?"; + public static final Comparator COMPARATOR = BringOrderToChaos.timeOrNameComparator(); +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/VersionFamily.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/VersionFamily.java new file mode 100644 index 000000000..beb0ed600 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/model/VersionFamily.java @@ -0,0 +1,46 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.database.model; + +import io.papermc.bibliothek.util.BringOrderToChaos; +import io.papermc.bibliothek.util.NameSource; +import io.papermc.bibliothek.util.TimeSource; +import java.time.Instant; +import java.util.Comparator; +import org.bson.types.ObjectId; +import org.jetbrains.annotations.Nullable; +import org.springframework.data.annotation.Id; +import org.springframework.data.mongodb.core.index.CompoundIndex; +import org.springframework.data.mongodb.core.mapping.Document; + +@CompoundIndex(def = "{'project': 1, 'name': 1}") +@Document(collection = "version_groups") +public record VersionFamily( + @Id ObjectId _id, + ObjectId project, + String name, + @Nullable Instant time +) implements NameSource, TimeSource { + public static final Comparator COMPARATOR = BringOrderToChaos.timeOrNameComparator(); +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/BuildCollection.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/BuildCollection.java new file mode 100644 index 000000000..0b82be17f --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/BuildCollection.java @@ -0,0 +1,41 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.database.repository; + +import io.papermc.bibliothek.database.model.Build; +import java.util.Collection; +import java.util.List; +import java.util.Optional; +import org.bson.types.ObjectId; +import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface BuildCollection extends MongoRepository { + List findAllByProjectAndVersion(final ObjectId project, final ObjectId version); + + List findAllByProjectAndVersionIn(final ObjectId project, final Collection version); + + Optional findByProjectAndVersionAndNumber(final ObjectId project, final ObjectId version, final int number); +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/ProjectCollection.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/ProjectCollection.java new file mode 100644 index 000000000..e71bc54c7 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/ProjectCollection.java @@ -0,0 +1,35 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.database.repository; + +import io.papermc.bibliothek.database.model.Project; +import java.util.Optional; +import org.bson.types.ObjectId; +import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ProjectCollection extends MongoRepository { + Optional findByName(final String name); +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/VersionCollection.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/VersionCollection.java new file mode 100644 index 000000000..f75e46e9e --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/VersionCollection.java @@ -0,0 +1,40 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.database.repository; + +import io.papermc.bibliothek.database.model.Version; +import java.util.List; +import java.util.Optional; +import org.bson.types.ObjectId; +import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface VersionCollection extends MongoRepository { + List findAllByProject(final ObjectId project); + + List findAllByProjectAndGroup(final ObjectId project, final ObjectId group); + + Optional findByProjectAndName(final ObjectId project, final String name); +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/VersionFamilyCollection.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/VersionFamilyCollection.java new file mode 100644 index 000000000..c598af3b4 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/database/repository/VersionFamilyCollection.java @@ -0,0 +1,38 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.database.repository; + +import io.papermc.bibliothek.database.model.VersionFamily; +import java.util.List; +import java.util.Optional; +import org.bson.types.ObjectId; +import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface VersionFamilyCollection extends MongoRepository { + List findAllByProject(final ObjectId project); + + Optional findByProjectAndName(final ObjectId project, final String name); +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/Advice.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/Advice.java new file mode 100644 index 000000000..fbf34e842 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/Advice.java @@ -0,0 +1,88 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.exception; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.NoHandlerFoundException; + +@ControllerAdvice +@SuppressWarnings("checkstyle:FinalClass") +class Advice { + private final ObjectMapper json; + + @Autowired + private Advice(final ObjectMapper json) { + this.json = json; + } + + @ExceptionHandler(BuildNotFound.class) + @ResponseBody + public ResponseEntity buildNotFound(final BuildNotFound exception) { + return this.error(HttpStatus.NOT_FOUND, "Build not found."); + } + + @ExceptionHandler(DownloadFailed.class) + @ResponseBody + public ResponseEntity downloadFailed(final DownloadFailed exception) { + return this.error(HttpStatus.INTERNAL_SERVER_ERROR, "An internal error occurred while serving your download."); + } + + @ExceptionHandler(DownloadNotFound.class) + @ResponseBody + public ResponseEntity downloadNotFound(final DownloadNotFound exception) { + return this.error(HttpStatus.NOT_FOUND, "Download not found."); + } + + @ExceptionHandler(ProjectNotFound.class) + @ResponseBody + public ResponseEntity projectNotFound(final ProjectNotFound exception) { + return this.error(HttpStatus.NOT_FOUND, "Project not found."); + } + + @ExceptionHandler(VersionNotFound.class) + @ResponseBody + public ResponseEntity versionNotFound(final VersionNotFound exception) { + return this.error(HttpStatus.NOT_FOUND, "Version not found."); + } + + @ExceptionHandler(NoHandlerFoundException.class) + @ResponseBody + public ResponseEntity endpointNotFound(final NoHandlerFoundException exception) { + return this.error(HttpStatus.NOT_FOUND, "Endpoint not found."); + } + + private ResponseEntity error(final HttpStatus status, final String error) { + return new ResponseEntity<>( + this.json.createObjectNode() + .put("error", error), + status + ); + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/BuildNotFound.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/BuildNotFound.java new file mode 100644 index 000000000..dd1bc056e --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/BuildNotFound.java @@ -0,0 +1,31 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.exception; + +import java.io.Serial; + +public class BuildNotFound extends RuntimeException { + @Serial + private static final long serialVersionUID = 4345323173317573160L; +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/DownloadFailed.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/DownloadFailed.java new file mode 100644 index 000000000..d25169721 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/DownloadFailed.java @@ -0,0 +1,35 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.exception; + +import java.io.Serial; + +public class DownloadFailed extends RuntimeException { + @Serial + private static final long serialVersionUID = -1573093686056663600L; + + public DownloadFailed(final Throwable cause) { + super(cause); + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/DownloadNotFound.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/DownloadNotFound.java new file mode 100644 index 000000000..272148518 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/DownloadNotFound.java @@ -0,0 +1,31 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.exception; + +import java.io.Serial; + +public class DownloadNotFound extends RuntimeException { + @Serial + private static final long serialVersionUID = -1709491048606353671L; +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/ProjectNotFound.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/ProjectNotFound.java new file mode 100644 index 000000000..05a2ca666 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/ProjectNotFound.java @@ -0,0 +1,31 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.exception; + +import java.io.Serial; + +public class ProjectNotFound extends RuntimeException { + @Serial + private static final long serialVersionUID = 210738408624095602L; +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/VersionNotFound.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/VersionNotFound.java new file mode 100644 index 000000000..7b52785f3 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/exception/VersionNotFound.java @@ -0,0 +1,31 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.exception; + +import java.io.Serial; + +public class VersionNotFound extends RuntimeException { + @Serial + private static final long serialVersionUID = 1716350953824887164L; +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/filter/CorsFilter.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/filter/CorsFilter.java new file mode 100644 index 000000000..bd23d732c --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/filter/CorsFilter.java @@ -0,0 +1,45 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.filter; + +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.annotation.WebFilter; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; + +@WebFilter("/*") +public class CorsFilter implements Filter { + + @Override + public void doFilter(final ServletRequest request, final ServletResponse response, final FilterChain chain) throws IOException, ServletException { + final HttpServletResponse httpServletResponse = (HttpServletResponse) response; + httpServletResponse.setHeader("Access-Control-Allow-Origin", "*"); + httpServletResponse.setHeader("Access-Control-Allow-Methods", "GET"); + chain.doFilter(request, response); + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/BringOrderToChaos.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/BringOrderToChaos.java new file mode 100644 index 000000000..e325378fb --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/BringOrderToChaos.java @@ -0,0 +1,49 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.util; + +import java.time.Instant; +import java.util.Comparator; +import java.util.Objects; + +public final class BringOrderToChaos { + private BringOrderToChaos() { + } + + public static Comparator timeOrNameComparator() { + return (o1, o2) -> { + final Instant t1 = o1.time(); + final Instant t2 = o2.time(); + // Both objects are not guaranteed to have a time present, but are guaranteed + // to have a name present - we prefer to compare them by time, but in cases where + // the time is not available on both objects we will compare them using their name + if (t1 != null && t2 != null) { + return t1.compareTo(t2); + } + final String n1 = Objects.requireNonNull(o1.name(), () -> "name of " + o1); + final String n2 = Objects.requireNonNull(o2.name(), () -> "name of " + o2); + return n1.compareTo(n2); + }; + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/HTTP.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/HTTP.java new file mode 100644 index 000000000..de7ec7665 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/HTTP.java @@ -0,0 +1,54 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.util; + +import java.nio.charset.StandardCharsets; +import java.nio.file.Path; +import java.time.Duration; +import org.springframework.http.CacheControl; +import org.springframework.http.ContentDisposition; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; + +public final class HTTP { + public static final String APPLICATION_JAVA_ARCHIVE_VALUE = "application/java-archive"; + public static final MediaType APPLICATION_JAVA_ARCHIVE = new MediaType("application", "java-archive"); + + private HTTP() { + } + + public static ResponseEntity cachedOk(final T response, final CacheControl cache) { + return ResponseEntity.ok().cacheControl(cache).body(response); + } + + public static CacheControl sMaxAgePublicCache(final Duration sMaxAge) { + return CacheControl.empty() + .cachePublic() + .sMaxAge(sMaxAge); + } + + public static ContentDisposition attachmentDisposition(final Path filename) { + return ContentDisposition.attachment().filename(filename.getFileName().toString(), StandardCharsets.UTF_8).build(); + } +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/NameSource.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/NameSource.java new file mode 100644 index 000000000..ea5de4272 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/NameSource.java @@ -0,0 +1,28 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.util; + +public interface NameSource { + String name(); +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/TimeSource.java b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/TimeSource.java new file mode 100644 index 000000000..be35ed7a1 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/java/io/papermc/bibliothek/util/TimeSource.java @@ -0,0 +1,31 @@ +/* + * This file is part of bibliothek, licensed under the MIT License. + * + * Copyright (c) 2019-2023 PaperMC + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +package io.papermc.bibliothek.util; + +import java.time.Instant; +import org.jetbrains.annotations.UnknownNullability; + +public interface TimeSource { + @UnknownNullability Instant time(); +} diff --git a/jdk_17_gradle/cs/rest/bibliothek/src/main/resources/application.yaml b/jdk_17_gradle/cs/rest/bibliothek/src/main/resources/application.yaml new file mode 100644 index 000000000..77a5739b5 --- /dev/null +++ b/jdk_17_gradle/cs/rest/bibliothek/src/main/resources/application.yaml @@ -0,0 +1,23 @@ +spring: + data: + mongodb: + # "library" instead of "bibliothek" is intentional here + database: "library" + mvc: + throw-exception-if-no-handler-found: true + web: + resources: + add-mappings: false +springdoc: + api-docs: + path: "/openapi" + show-actuator: false + swagger-ui: + disable-swagger-default-url: true + operations-sorter: "alpha" + path: "/docs/" + show-common-extensions: true +server: + error: + whitelabel: + enabled: false From db944007cef1b5572834a48fe0710881e752f657 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Wed, 20 Sep 2023 15:13:33 +0200 Subject: [PATCH 12/21] starting configuring em folder --- .../em/rest/bibliothek/build.gradle.kts | 36 +++++++++++++++++++ jdk_17_gradle/settings.gradle.kts | 6 ++-- 2 files changed, 39 insertions(+), 3 deletions(-) create mode 100644 jdk_17_gradle/em/rest/bibliothek/build.gradle.kts diff --git a/jdk_17_gradle/em/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/em/rest/bibliothek/build.gradle.kts new file mode 100644 index 000000000..1b79d83c5 --- /dev/null +++ b/jdk_17_gradle/em/rest/bibliothek/build.gradle.kts @@ -0,0 +1,36 @@ + +repositories { + mavenLocal() + mavenCentral() + maven( url ="https://jcenter.bintray.com") +} + + +plugins { + `java-library` +} + +configurations { + implementation { + resolutionStrategy.failOnVersionConflict() + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + + +val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" + +dependencies{ + implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") + implementation("org.evomaster:evomaster-client-java-dependencies:$EVOMASTER_VERSION") + + api(project(":cs:rest:bibliothek")) + + //Gradle api() is not importing transitive dependencies??? +// implementation("org.springframework.boot:spring-boot-starter-web:2.7.0") +// implementation("org.mongodb:mongodb-driver-sync:4.4.2") +} \ No newline at end of file diff --git a/jdk_17_gradle/settings.gradle.kts b/jdk_17_gradle/settings.gradle.kts index 45c3eb73f..4a76b904c 100644 --- a/jdk_17_gradle/settings.gradle.kts +++ b/jdk_17_gradle/settings.gradle.kts @@ -1,6 +1,6 @@ rootProject.name = "emb_jdk_17_gradle" -//include("cs:graphql:patio-api") -//include("em:embedded:graphql:patio-api") -//include("em:external:graphql:patio-api") +include("cs:rest:bibliothek") +include("em:embedded:rest:bibliothek") +//include("em:external:rest:bibliothek") From 5b74e8827b025ee86ad5015c8476d09c935198c3 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Wed, 20 Sep 2023 15:29:17 +0200 Subject: [PATCH 13/21] fixing build issues --- .gitignore | 1 + jdk_17_gradle/gradle/libs.versions.toml | 14 ++++++++++++++ jdk_17_gradle/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 jdk_17_gradle/gradle/libs.versions.toml create mode 100644 jdk_17_gradle/gradle/wrapper/gradle-wrapper.jar diff --git a/.gitignore b/.gitignore index 726fe4cb6..745ca3da6 100644 --- a/.gitignore +++ b/.gitignore @@ -255,3 +255,4 @@ dotnet_3/em/embedded/rest/ScsDriver/generated-tests/ /jdk_11_gradle/cs/rest/reservations-api/build/ /jdk_11_gradle/em/embedded/rest/reservations-api/build/ /jdk_11_gradle/em/external/rest/reservations-api/build/ +/jdk_17_gradle/.gradle/ diff --git a/jdk_17_gradle/gradle/libs.versions.toml b/jdk_17_gradle/gradle/libs.versions.toml new file mode 100644 index 000000000..b0ae4f337 --- /dev/null +++ b/jdk_17_gradle/gradle/libs.versions.toml @@ -0,0 +1,14 @@ +[versions] +indra = "3.1.1" + +[plugins] +indra = { id = "net.kyori.indra", version.ref = "indra" } +indra-checkstyle = { id = "net.kyori.indra.checkstyle", version.ref = "indra" } +spotless = { id = "com.diffplug.spotless", version = "6.19.0" } +spring-boot = { id = "org.springframework.boot", version = "3.1.1" } +spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.1" } + +[libraries] +jetbrains-annotations = { group = "org.jetbrains", name = "annotations", version = "24.0.1" } +springdoc-openapi-starter-webmvc-ui = { group = "org.springdoc", name = "springdoc-openapi-starter-webmvc-ui", version = "2.1.0" } +stylecheck = { group = "ca.stellardrift", name = "stylecheck", version = "0.2.1" } diff --git a/jdk_17_gradle/gradle/wrapper/gradle-wrapper.jar b/jdk_17_gradle/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/jdk_17_gradle/gradle/wrapper/gradle-wrapper.properties b/jdk_17_gradle/gradle/wrapper/gradle-wrapper.properties index da9702f9e..fae08049a 100644 --- a/jdk_17_gradle/gradle/wrapper/gradle-wrapper.properties +++ b/jdk_17_gradle/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 01e95a2ad6d91c0909d2c8249b11fcf96e52ff64 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Thu, 21 Sep 2023 10:20:49 +0200 Subject: [PATCH 14/21] fixed relative paths --- jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts index 25dcb108f..ce4fb8239 100644 --- a/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts +++ b/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts @@ -27,9 +27,9 @@ indra { spotless { java { endWithNewline() - importOrderFile(rootProject.file(".spotless/bibliothek.importorder")) + importOrderFile(rootProject.file("cs/rest/bibliothek/.spotless/bibliothek.importorder")) indentWithSpaces(2) - licenseHeaderFile(rootProject.file("license_header.txt")) + licenseHeaderFile(rootProject.file("cs/rest/bibliothek/license_header.txt")) trimTrailingWhitespace() } } From 717c12a8708d4d02044e28e542c1e5e89a977372 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Thu, 21 Sep 2023 10:49:11 +0200 Subject: [PATCH 15/21] working on embedded driver --- .../rest/bibliothek/build.gradle.kts | 7 +- .../EmbeddedEvoMasterController.java | 145 ++++++++++++++++++ 2 files changed, 150 insertions(+), 2 deletions(-) rename jdk_17_gradle/em/{ => embedded}/rest/bibliothek/build.gradle.kts (68%) create mode 100644 jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java diff --git a/jdk_17_gradle/em/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts similarity index 68% rename from jdk_17_gradle/em/rest/bibliothek/build.gradle.kts rename to jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts index 1b79d83c5..55372f788 100644 --- a/jdk_17_gradle/em/rest/bibliothek/build.gradle.kts +++ b/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts @@ -31,6 +31,9 @@ dependencies{ api(project(":cs:rest:bibliothek")) //Gradle api() is not importing transitive dependencies??? -// implementation("org.springframework.boot:spring-boot-starter-web:2.7.0") -// implementation("org.mongodb:mongodb-driver-sync:4.4.2") + implementation("org.springframework.boot:spring-boot-starter-web:3.1.1") + implementation("org.mongodb:mongodb-driver-sync:4.9.1") + + implementation("org.springframework.boot:spring-boot-starter-data-mongodb:3.1.1") + implementation("org.springframework.boot:spring-boot-starter-validation:3.1.1") } \ No newline at end of file diff --git a/jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java b/jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java new file mode 100644 index 000000000..031d838c7 --- /dev/null +++ b/jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java @@ -0,0 +1,145 @@ +package em.embedded.bibliothek; + +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; +import io.papermc.bibliothek.BibliothekApplication; +import org.evomaster.client.java.controller.EmbeddedSutController; +import org.evomaster.client.java.controller.InstrumentedSutStarter; +import org.evomaster.client.java.controller.api.dto.AuthenticationDto; +import org.evomaster.client.java.controller.api.dto.SutInfoDto; +import org.evomaster.client.java.controller.internal.db.DbSpecification; +import org.evomaster.client.java.controller.problem.ProblemInfo; +import org.evomaster.client.java.controller.problem.RestProblem; +import org.springframework.boot.SpringApplication; +import org.springframework.context.ConfigurableApplicationContext; +import org.testcontainers.containers.GenericContainer; + + +import java.util.List; +import java.util.Map; + + +/** + * Class used to start/stop the SUT. This will be controller by the EvoMaster process + */ +public class EmbeddedEvoMasterController extends EmbeddedSutController { + + public static void main(String[] args) { + + int port = 40100; + if (args.length > 0) { + port = Integer.parseInt(args[0]); + } + + EmbeddedEvoMasterController controller = new EmbeddedEvoMasterController(port); + InstrumentedSutStarter starter = new InstrumentedSutStarter(controller); + + starter.start(); + } + + + private ConfigurableApplicationContext ctx; + + private static final int MONGODB_PORT = 27017; + + //https://www.mongodb.com/docs/drivers/java/sync/current/compatibility/ + + private static final String MONGODB_VERSION = "6.1"; + + private static final String MONGODB_DATABASE_NAME = "Reservations"; + + private static final GenericContainer mongodbContainer = new GenericContainer("mongo:" + MONGODB_VERSION) + .withExposedPorts(MONGODB_PORT); + + private String mongoDbUrl; + + private MongoClient mongoClient; + + public EmbeddedEvoMasterController() { + this(0); + } + + public EmbeddedEvoMasterController(int port) { + setControllerPort(port); + } + + + @Override + public String startSut() { + + mongodbContainer.start(); + mongoDbUrl = "mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT) + "/" + MONGODB_DATABASE_NAME; + mongoClient = MongoClients.create(mongoDbUrl); + + + + ctx = SpringApplication.run(BibliothekApplication.class, + new String[]{"--server.port=0", + "--databaseUrl="+mongoDbUrl, + "--spring.data.mongodb.uri="+mongoDbUrl, + "--spring.cache.type=NONE" + }); + + return "http://localhost:" + getSutPort(); + } + + protected int getSutPort() { + return (Integer) ((Map) ctx.getEnvironment() + .getPropertySources().get("server.ports").getSource()) + .get("local.server.port"); + } + + + @Override + public boolean isSutRunning() { + return ctx != null && ctx.isRunning(); + } + + @Override + public void stopSut() { + ctx.stop(); + ctx.close(); + + mongodbContainer.stop(); + } + + @Override + public String getPackagePrefixesToCover() { + return "io.papermc.bibliothek."; + } + + @Override + public void resetStateOfSUT() { + mongoClient.getDatabase(MONGODB_DATABASE_NAME).drop(); + } + + @Override + public List getDbSpecifications() { + return null; + } + + + @Override + public List getInfoForAuthentication() { + //TODO might need to setup JWT headers here + return null; + } + + + + + @Override + public ProblemInfo getProblemInfo() { + return new RestProblem( + "http://localhost:" + getSutPort() + "/v3/api-docs", + null + ); + } + + @Override + public SutInfoDto.OutputFormat getPreferredOutputFormat() { + return SutInfoDto.OutputFormat.JAVA_JUNIT_4; + } + + +} From ff6e82dc2f68f9028dd2ef5def77c646b97dd126 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Fri, 22 Sep 2023 12:26:39 +0200 Subject: [PATCH 16/21] embedded driver --- .../em/embedded/rest/bibliothek/build.gradle.kts | 4 +++- .../embedded/bibliothek/EmbeddedEvoMasterController.java | 9 +++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts index 55372f788..607e03117 100644 --- a/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts +++ b/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts @@ -26,7 +26,9 @@ val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" dependencies{ implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") - implementation("org.evomaster:evomaster-client-java-dependencies:$EVOMASTER_VERSION") + implementation("org.evomaster:evomaster-client-java-dependencies:$EVOMASTER_VERSION"){ + exclude("com.github.tomakehurst") + } api(project(":cs:rest:bibliothek")) diff --git a/jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java b/jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java index 031d838c7..f267ddd01 100644 --- a/jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java +++ b/jdk_17_gradle/em/embedded/rest/bibliothek/src/main/java/em/embedded/bibliothek/EmbeddedEvoMasterController.java @@ -44,9 +44,9 @@ public static void main(String[] args) { //https://www.mongodb.com/docs/drivers/java/sync/current/compatibility/ - private static final String MONGODB_VERSION = "6.1"; + private static final String MONGODB_VERSION = "6.0"; - private static final String MONGODB_DATABASE_NAME = "Reservations"; + private static final String MONGODB_DATABASE_NAME = "library"; private static final GenericContainer mongodbContainer = new GenericContainer("mongo:" + MONGODB_VERSION) .withExposedPorts(MONGODB_PORT); @@ -77,7 +77,8 @@ public String startSut() { new String[]{"--server.port=0", "--databaseUrl="+mongoDbUrl, "--spring.data.mongodb.uri="+mongoDbUrl, - "--spring.cache.type=NONE" + "--spring.cache.type=NONE", + "--app.storagePath=./tmp/bibliothek" }); return "http://localhost:" + getSutPort(); @@ -131,7 +132,7 @@ public List getInfoForAuthentication() { @Override public ProblemInfo getProblemInfo() { return new RestProblem( - "http://localhost:" + getSutPort() + "/v3/api-docs", + "http://localhost:" + getSutPort() + "/openapi", null ); } From f7fe321275e935a8d5f5ec5a4e00e3cefd77a5ba Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Fri, 22 Sep 2023 13:48:06 +0200 Subject: [PATCH 17/21] starting with external driver --- .../cs/rest/bibliothek/build.gradle.kts | 9 +- .../external/rest/bibliothek/build.gradle.kts | 60 ++++++ .../ExternalEvoMasterController.java | 189 ++++++++++++++++++ jdk_17_gradle/settings.gradle.kts | 2 +- 4 files changed, 257 insertions(+), 3 deletions(-) create mode 100644 jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts create mode 100644 jdk_17_gradle/em/external/rest/bibliothek/src/main/java/em/external/bibliothek/ExternalEvoMasterController.java diff --git a/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts index ce4fb8239..0a344aa0e 100644 --- a/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts +++ b/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts @@ -2,7 +2,7 @@ plugins { id("java") alias(libs.plugins.indra) - alias(libs.plugins.indra.checkstyle) + //alias(libs.plugins.indra.checkstyle) alias(libs.plugins.spotless) alias(libs.plugins.spring.dependency.management) alias(libs.plugins.spring.boot) @@ -36,7 +36,7 @@ spotless { dependencies { annotationProcessor("org.springframework.boot", "spring-boot-configuration-processor") - checkstyle(libs.stylecheck) + //checkstyle(libs.stylecheck) implementation(libs.jetbrains.annotations) implementation(libs.springdoc.openapi.starter.webmvc.ui) implementation("org.springframework.boot", "spring-boot-starter-data-mongodb") @@ -49,9 +49,14 @@ dependencies { tasks { bootJar { + archiveClassifier.set("sut") launchScript() } + jar{ + archiveClassifier.set("plain") + } + // From StackOverflow: https://stackoverflow.com/a/53087407 // Licensed under: CC BY-SA 4.0 // Adapted to Kotlin diff --git a/jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts new file mode 100644 index 000000000..6e2d002e6 --- /dev/null +++ b/jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts @@ -0,0 +1,60 @@ +import org.gradle.jvm.tasks.Jar + + +repositories { + mavenLocal() + mavenCentral() + maven( url ="https://jcenter.bintray.com") +} + + +plugins { + `java-library` + application +} + +configurations { + implementation { + resolutionStrategy.failOnVersionConflict() + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 +} + + +val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" + +dependencies{ + implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") + implementation("org.evomaster:evomaster-client-java-instrumentation:$EVOMASTER_VERSION") + implementation("org.evomaster:evomaster-client-java-dependencies:$EVOMASTER_VERSION") + implementation("org.mongodb:mongodb-driver-sync:4.9.1") +} + + + +val fatJar = task("fatJar", type = Jar::class) { + duplicatesStrategy = DuplicatesStrategy.WARN + archiveBaseName.set("${project.name}-evomaster-runner") + isZip64 = true + manifest { + attributes["Implementation-Title"] = "EM" + attributes["Implementation-Version"] = "1.0" + attributes["Main-Class"] = "em.external.bibliothek.ExternalEvoMasterController" + attributes["Premain-Class"] = "org.evomaster.client.java.instrumentation.InstrumentingAgent" + attributes["Agent-Class"] = "org.evomaster.client.java.instrumentation.InstrumentingAgent" + attributes["Can-Redefine-Classes"] = "true" + attributes["Can-Retransform-Classes"] = "true" + } + from(configurations.runtimeClasspath.get().map{ if (it.isDirectory) it else zipTree(it) }) + with(tasks.jar.get() as CopySpec) +} + +tasks { + "build" { + dependsOn(fatJar) + } +} diff --git a/jdk_17_gradle/em/external/rest/bibliothek/src/main/java/em/external/bibliothek/ExternalEvoMasterController.java b/jdk_17_gradle/em/external/rest/bibliothek/src/main/java/em/external/bibliothek/ExternalEvoMasterController.java new file mode 100644 index 000000000..bb8aa6435 --- /dev/null +++ b/jdk_17_gradle/em/external/rest/bibliothek/src/main/java/em/external/bibliothek/ExternalEvoMasterController.java @@ -0,0 +1,189 @@ +package em.external.bibliothek; + +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; +import org.evomaster.client.java.controller.ExternalSutController; +import org.evomaster.client.java.controller.InstrumentedSutStarter; +import org.evomaster.client.java.controller.api.dto.AuthenticationDto; +import org.evomaster.client.java.controller.api.dto.SutInfoDto; +import org.evomaster.client.java.controller.internal.db.DbSpecification; +import org.evomaster.client.java.controller.problem.ProblemInfo; +import org.evomaster.client.java.controller.problem.RestProblem; +import org.testcontainers.containers.GenericContainer; + +import java.util.List; + +public class ExternalEvoMasterController extends ExternalSutController { + + + public static void main(String[] args) { + + int controllerPort = 40100; + if (args.length > 0) { + controllerPort = Integer.parseInt(args[0]); + } + int sutPort = 12345; + if (args.length > 1) { + sutPort = Integer.parseInt(args[1]); + } + String jarLocation = "cs/rest/bibliothek/build/libs"; + if (args.length > 2) { + jarLocation = args[2]; + } + if(! jarLocation.endsWith(".jar")) { + jarLocation += "/bibliothek-sut.jar"; + } + + int timeoutSeconds = 120; + if(args.length > 3){ + timeoutSeconds = Integer.parseInt(args[3]); + } + String command = "java"; + if(args.length > 4){ + command = args[4]; + } + + + ExternalEvoMasterController controller = + new ExternalEvoMasterController(controllerPort, jarLocation, + sutPort, timeoutSeconds, command); + InstrumentedSutStarter starter = new InstrumentedSutStarter(controller); + + starter.start(); + } + + private final int timeoutSeconds; + private final int sutPort; + private String jarLocation; + private static final int MONGODB_PORT = 27017; + + //https://www.mongodb.com/docs/drivers/java/sync/current/compatibility/ + private static final String MONGODB_VERSION = "6.0"; + + private static final String MONGODB_DATABASE_NAME = "library"; + + private static final GenericContainer mongodbContainer = new GenericContainer("mongo:" + MONGODB_VERSION) + .withExposedPorts(MONGODB_PORT); + + private String mongoDbUrl; + + private MongoClient mongoClient; + + + public ExternalEvoMasterController(){ + this(40100, "../core/target", 12345, 120, "java"); + } + + public ExternalEvoMasterController(String jarLocation) { + this(); + this.jarLocation = jarLocation; + } + + public ExternalEvoMasterController( + int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command + ) { + + if(jarLocation==null || jarLocation.isEmpty()){ + throw new IllegalArgumentException("Missing jar location"); + } + + + this.sutPort = sutPort; + this.jarLocation = jarLocation; + this.timeoutSeconds = timeoutSeconds; + setControllerPort(controllerPort); + setJavaCommand(command); + } + + + @Override + public String[] getInputParameters() { + return new String[]{ + "--server.port=" + sutPort, + "--databaseUrl="+mongoDbUrl, + "--spring.data.mongodb.uri="+mongoDbUrl, + "--app.storagePath=./tmp/bibliothek/" + "p"+sutPort + }; + } + + public String[] getJVMParameters() { + return new String[]{}; + } + + @Override + public String getBaseURL() { + return "http://localhost:" + sutPort; + } + + @Override + public String getPathToExecutableJar() { + return jarLocation; + } + + @Override + public String getLogMessageOfInitializedServer() { + return "Started BibliothekApplication in"; + } + + @Override + public long getMaxAwaitForInitializationInSeconds() { + return timeoutSeconds; + } + + @Override + public void preStart() { + mongodbContainer.start(); + mongoDbUrl = "mongodb://" + mongodbContainer.getContainerIpAddress() + ":" + mongodbContainer.getMappedPort(MONGODB_PORT) + "/" + MONGODB_DATABASE_NAME; + mongoClient = MongoClients.create(mongoDbUrl); + } + + @Override + public void postStart() { + } + + @Override + public void resetStateOfSUT() { + mongoClient.getDatabase(MONGODB_DATABASE_NAME).drop(); + } + + @Override + public void preStop() { + } + + @Override + public void postStop() { + mongodbContainer.stop(); + } + + + + @Override + public String getPackagePrefixesToCover() { + return "io.papermc.bibliothek."; + } + + @Override + public ProblemInfo getProblemInfo() { + return new RestProblem( + "http://localhost:" + sutPort + "/openapi", + null + ); + } + + @Override + public SutInfoDto.OutputFormat getPreferredOutputFormat() { + return SutInfoDto.OutputFormat.JAVA_JUNIT_5; + } + + + + @Override + public List getInfoForAuthentication() { + return null; + } + + @Override + public List getDbSpecifications() { + return null; + } +} diff --git a/jdk_17_gradle/settings.gradle.kts b/jdk_17_gradle/settings.gradle.kts index 4a76b904c..029a97f1f 100644 --- a/jdk_17_gradle/settings.gradle.kts +++ b/jdk_17_gradle/settings.gradle.kts @@ -2,5 +2,5 @@ rootProject.name = "emb_jdk_17_gradle" include("cs:rest:bibliothek") include("em:embedded:rest:bibliothek") -//include("em:external:rest:bibliothek") +include("em:external:rest:bibliothek") From 291e39b59f74f6681a52f09259e22bc2bf17069f Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Fri, 22 Sep 2023 13:54:17 +0200 Subject: [PATCH 18/21] fixed version --- jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts index 0a344aa0e..b92d0d787 100644 --- a/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts +++ b/jdk_17_gradle/cs/rest/bibliothek/build.gradle.kts @@ -49,6 +49,7 @@ dependencies { tasks { bootJar { + version = "" archiveClassifier.set("sut") launchScript() } From b8f921912ec456fd24663e904a6b3f4a6e2c9855 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Sun, 24 Sep 2023 22:05:34 +0200 Subject: [PATCH 19/21] fixing gradle build --- README.md | 4 +++- jdk_11_gradle/build.gradle | 6 +++++ .../graphql/patio-api/build.gradle.kts | 2 +- .../rest/reservations-api/build.gradle.kts | 2 +- .../graphql/patio-api/build.gradle.kts | 2 +- .../rest/reservations-api/build.gradle.kts | 2 +- jdk_17_gradle/build.gradle | 6 +++++ .../embedded/rest/bibliothek/build.gradle.kts | 3 +-- .../external/rest/bibliothek/build.gradle.kts | 2 +- scripts/dist.py | 24 +++++++++++++++++++ scripts/version.py | 11 ++++----- 11 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 jdk_11_gradle/build.gradle create mode 100644 jdk_17_gradle/build.gradle diff --git a/README.md b/README.md index 4c9fbd9d5..1e32a583a 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,9 @@ More details (e.g., #LOCs and used databases) on these APIs can be found [in thi ### REST: Java/Kotlin -* Reservations API (not-known license), [jdk_11_gradle/cs/rest/reservations-api](jdk_11_gradle/cs/rest/reservations-api) , from [https://github.com/cyrilgavala/reservations-api](https://github.com/cyrilgavala/reservations-api) +* Bibliothek (MIT), [jdk_17_gradle/cs/rest/bibliothek](jdk_17_gradle/cs/rest/bibliothek), from [https://github.com/PaperMC/bibliothek](https://github.com/PaperMC/bibliothek) + +* Reservations API (not-known license), [jdk_11_gradle/cs/rest/reservations-api](jdk_11_gradle/cs/rest/reservations-api), from [https://github.com/cyrilgavala/reservations-api](https://github.com/cyrilgavala/reservations-api) * Genome Nexus (MIT), [jdk_8_maven/cs/rest-gui/genome-nexus](jdk_8_maven/cs/rest-gui/genome-nexus), from [https://github.com/genome-nexus/genome-nexus](https://github.com/genome-nexus/genome-nexus) diff --git a/jdk_11_gradle/build.gradle b/jdk_11_gradle/build.gradle new file mode 100644 index 000000000..c1c05b9f8 --- /dev/null +++ b/jdk_11_gradle/build.gradle @@ -0,0 +1,6 @@ + +allprojects { + ext { + EVOMASTER_VERSION = "1.6.2-SNAPSHOT" + } +} diff --git a/jdk_11_gradle/em/embedded/graphql/patio-api/build.gradle.kts b/jdk_11_gradle/em/embedded/graphql/patio-api/build.gradle.kts index 0e4c50e08..94b8a1e09 100644 --- a/jdk_11_gradle/em/embedded/graphql/patio-api/build.gradle.kts +++ b/jdk_11_gradle/em/embedded/graphql/patio-api/build.gradle.kts @@ -29,7 +29,7 @@ dependencyManagement { } } -val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" +val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION") dependencies{ implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") diff --git a/jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts b/jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts index c8fd47af3..6456118ad 100644 --- a/jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts +++ b/jdk_11_gradle/em/embedded/rest/reservations-api/build.gradle.kts @@ -29,7 +29,7 @@ java { // } //} -val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" +val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION") dependencies{ implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") diff --git a/jdk_11_gradle/em/external/graphql/patio-api/build.gradle.kts b/jdk_11_gradle/em/external/graphql/patio-api/build.gradle.kts index 97424188c..560619a4d 100644 --- a/jdk_11_gradle/em/external/graphql/patio-api/build.gradle.kts +++ b/jdk_11_gradle/em/external/graphql/patio-api/build.gradle.kts @@ -37,7 +37,7 @@ dependencyManagement { } } -val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" +val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION") dependencies{ implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") diff --git a/jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts b/jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts index c96cf93e7..83c2bf02e 100644 --- a/jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts +++ b/jdk_11_gradle/em/external/rest/reservations-api/build.gradle.kts @@ -33,7 +33,7 @@ java { // } //} -val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" +val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION") dependencies{ implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") diff --git a/jdk_17_gradle/build.gradle b/jdk_17_gradle/build.gradle new file mode 100644 index 000000000..c1c05b9f8 --- /dev/null +++ b/jdk_17_gradle/build.gradle @@ -0,0 +1,6 @@ + +allprojects { + ext { + EVOMASTER_VERSION = "1.6.2-SNAPSHOT" + } +} diff --git a/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts index 607e03117..4c8f54632 100644 --- a/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts +++ b/jdk_17_gradle/em/embedded/rest/bibliothek/build.gradle.kts @@ -21,8 +21,7 @@ java { targetCompatibility = JavaVersion.VERSION_17 } - -val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" +val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION") dependencies{ implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") diff --git a/jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts b/jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts index 6e2d002e6..6ee753dc9 100644 --- a/jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts +++ b/jdk_17_gradle/em/external/rest/bibliothek/build.gradle.kts @@ -25,7 +25,7 @@ java { } -val EVOMASTER_VERSION = "1.6.2-SNAPSHOT" +val EVOMASTER_VERSION = project.ext.get("EVOMASTER_VERSION") dependencies{ implementation("org.evomaster:evomaster-client-java-controller:$EVOMASTER_VERSION") diff --git a/scripts/dist.py b/scripts/dist.py index e4f82c194..3deb73ed1 100755 --- a/scripts/dist.py +++ b/scripts/dist.py @@ -228,6 +228,29 @@ def build_jdk_11_gradle(): copy(folder + "/cs/rest/reservations-api/build/libs/reservations-api-sut.jar", DIST) copy(folder + "/em/external/rest/reservations-api/build/libs/reservations-api-evomaster-runner.jar", DIST) +#################### +def build_jdk_17_gradle(): + env_vars = os.environ.copy() + env_vars["JAVA_HOME"] = JAVA_HOME_17 + folder = "jdk_17_gradle" + + command = "gradlew" + + if platform.system() == "Darwin": + command = "./gradlew" + + gradleres = run([command, "build", "-x", "test"], shell=SHELL, cwd=os.path.join(PROJ_LOCATION, folder), + env=env_vars) + gradleres = gradleres.returncode + + if gradleres != 0: + print("\nERROR: Gradle command failed") + exit(1) + + # Copy JAR files + copy(folder + "/cs/rest/bibliothek/build/libs/bibliothek-sut.jar", DIST) + copy(folder + "/em/external/rest/bibliothek/build/libs/bibliothek-evomaster-runner.jar", DIST) + # Building JavaScript projects def buildJS(path, name): @@ -320,6 +343,7 @@ def makeZip(): build_jdk_11_maven() build_jdk_17_maven() build_jdk_11_gradle() +build_jdk_17_gradle() ## Those are disabled for now... might support back in the future # build_js_npm() diff --git a/scripts/version.py b/scripts/version.py index 2823141f1..f8a778e63 100755 --- a/scripts/version.py +++ b/scripts/version.py @@ -68,9 +68,9 @@ def replaceInProperty(file): replacement = 'EVOMASTER_VERSION='+version+'\n' replace(file, regex, replacement) -def replaceInKotlinGradle(file): - regex = re.compile(r'.*val.*EVOMASTER_VERSION.*=.*') - replacement = "val EVOMASTER_VERSION = \""+version+"\"\n" +def replaceInGradle(file): + regex = re.compile(r'.*EVOMASTER_VERSION.*=.*') + replacement = " EVOMASTER_VERSION = \""+version+"\"\n" replace(file, regex, replacement) def versionSetMaven(folder, jdk_home): @@ -124,9 +124,8 @@ def replaceInCS(): replaceInPom("jdk_11_maven/pom.xml") replaceInPom("jdk_17_maven/pom.xml") -# is there any easier way for Gradle? -replaceInKotlinGradle("jdk_11_gradle/em/embedded/graphql/patio-api/build.gradle.kts") -replaceInKotlinGradle("jdk_11_gradle/em/external/graphql/patio-api/build.gradle.kts") +replaceInGradle("jdk_17_gradle/build.gradle") +replaceInGradle("jdk_11_gradle/build.gradle") replaceInDist() From 69e6f08b38886c9859a497da49b62ea9608f5021 Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Sun, 24 Sep 2023 22:30:48 +0200 Subject: [PATCH 20/21] schema and data for bibliothek --- openapi-swagger/bibliothek.json | 698 ++++++++++++++++++++++++++++++++ statistics/data.csv | 1 + 2 files changed, 699 insertions(+) create mode 100644 openapi-swagger/bibliothek.json diff --git a/openapi-swagger/bibliothek.json b/openapi-swagger/bibliothek.json new file mode 100644 index 000000000..c1e76c50a --- /dev/null +++ b/openapi-swagger/bibliothek.json @@ -0,0 +1,698 @@ +{ + "openapi": "3.0.1", + "info": {}, + "servers": [ + { + "url": "http://localhost:12080", + "description": "Generated server url" + } + ], + "paths": { + "/v2/projects": { + "get": { + "tags": [ + "projects-controller" + ], + "summary": "Gets a list of all available projects.", + "operationId": "projects", + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProjectsResponse" + } + } + } + } + } + } + }, + "/v2/projects/{project}": { + "get": { + "tags": [ + "project-controller" + ], + "summary": "Gets information about a project.", + "operationId": "project", + "parameters": [ + { + "name": "project", + "in": "path", + "description": "The project identifier.", + "required": true, + "schema": { + "pattern": "[a-z]+", + "type": "string" + }, + "example": "paper" + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProjectResponse" + } + } + } + } + } + } + }, + "/v2/projects/{project}/versions/{version}": { + "get": { + "tags": [ + "version-controller" + ], + "summary": "Gets information about a version.", + "operationId": "version", + "parameters": [ + { + "name": "project", + "in": "path", + "description": "The project identifier.", + "required": true, + "schema": { + "pattern": "[a-z]+", + "type": "string" + }, + "example": "paper" + }, + { + "name": "version", + "in": "path", + "description": "A version of the project.", + "required": true, + "schema": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/VersionResponse" + } + } + } + } + } + } + }, + "/v2/projects/{project}/versions/{version}/builds": { + "get": { + "tags": [ + "version-builds-controller" + ], + "summary": "Gets all available builds for a project's version.", + "operationId": "builds", + "parameters": [ + { + "name": "project", + "in": "path", + "description": "The project identifier.", + "required": true, + "schema": { + "pattern": "[a-z]+", + "type": "string" + }, + "example": "paper" + }, + { + "name": "version", + "in": "path", + "description": "A version of the project.", + "required": true, + "schema": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/BuildsResponse" + } + } + } + } + } + } + }, + "/v2/projects/{project}/versions/{version}/builds/{build}": { + "get": { + "tags": [ + "version-build-controller" + ], + "summary": "Gets information related to a specific build.", + "operationId": "build", + "parameters": [ + { + "name": "project", + "in": "path", + "description": "The project identifier.", + "required": true, + "schema": { + "pattern": "[a-z]+", + "type": "string" + }, + "example": "paper" + }, + { + "name": "version", + "in": "path", + "description": "A version of the project.", + "required": true, + "schema": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string" + } + }, + { + "name": "build", + "in": "path", + "description": "A build of the version.", + "required": true, + "schema": { + "pattern": "\\d+", + "type": "integer", + "format": "int32" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/BuildResponse" + } + } + } + } + } + } + }, + "/v2/projects/{project}/versions/{version}/builds/{build}/downloads/{download}": { + "get": { + "tags": [ + "download-controller" + ], + "summary": "Downloads the given file from a build's data.", + "operationId": "download", + "parameters": [ + { + "name": "project", + "in": "path", + "description": "The project identifier.", + "required": true, + "schema": { + "pattern": "[a-z]+", + "type": "string" + }, + "example": "paper" + }, + { + "name": "version", + "in": "path", + "description": "A version of the project.", + "required": true, + "schema": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string" + } + }, + { + "name": "build", + "in": "path", + "description": "A build of the version.", + "required": true, + "schema": { + "pattern": "\\d+", + "type": "integer", + "format": "int32" + } + }, + { + "name": "download", + "in": "path", + "description": "A download of the build.", + "required": true, + "schema": { + "pattern": "[a-zA-Z0-9._-]+", + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "headers": { + "ETag": { + "description": "An identifier for a specific version of a resource. It lets caches be more efficient and save bandwidth, as a web server does not need to resend a full response if the content has not changed.", + "style": "simple", + "schema": { + "type": "string" + } + }, + "Content-Disposition": { + "description": "A header indicating that the content is expected to be displayed as an attachment, that is downloaded and saved locally.", + "style": "simple", + "schema": { + "type": "string" + } + }, + "Last-Modified": { + "description": "The date and time at which the origin server believes the resource was last modified.", + "style": "simple", + "schema": { + "type": "string" + } + } + }, + "content": { + "application/json": { + "schema": { + "type": "object" + } + }, + "application/java-archive": { + "schema": { + "type": "object" + } + } + } + } + } + } + }, + "/v2/projects/{project}/version_group/{family}": { + "get": { + "tags": [ + "version-family-controller" + ], + "summary": "Gets information about a project's version group.", + "operationId": "family", + "parameters": [ + { + "name": "project", + "in": "path", + "description": "The project identifier.", + "required": true, + "schema": { + "pattern": "[a-z]+", + "type": "string" + }, + "example": "paper" + }, + { + "name": "family", + "in": "path", + "description": "The version group name.", + "required": true, + "schema": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/VersionFamilyResponse" + } + } + } + } + } + } + }, + "/v2/projects/{project}/version_group/{family}/builds": { + "get": { + "tags": [ + "version-family-builds-controller" + ], + "summary": "Gets all available builds for a project's version group.", + "operationId": "familyBuilds", + "parameters": [ + { + "name": "project", + "in": "path", + "description": "The project identifier.", + "required": true, + "schema": { + "pattern": "[a-z]+", + "type": "string" + }, + "example": "paper" + }, + { + "name": "family", + "in": "path", + "description": "The version group name.", + "required": true, + "schema": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "OK", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/VersionFamilyBuildsResponse" + } + } + } + } + } + } + } + }, + "components": { + "schemas": { + "BuildResponse": { + "type": "object", + "properties": { + "project_id": { + "pattern": "[a-z]+", + "type": "string", + "example": "paper" + }, + "project_name": { + "type": "string", + "example": "Paper" + }, + "version": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string", + "example": "1.18" + }, + "build": { + "pattern": "\\d+", + "type": "integer", + "format": "int32", + "example": 10 + }, + "time": { + "type": "string", + "format": "date-time" + }, + "channel": { + "type": "string", + "enum": [ + "default", + "experimental" + ] + }, + "promoted": { + "type": "boolean" + }, + "changes": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Change" + } + }, + "downloads": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Download" + } + } + } + }, + "BuildsResponse": { + "type": "object", + "properties": { + "project_id": { + "pattern": "[a-z]+", + "type": "string", + "example": "paper" + }, + "project_name": { + "type": "string", + "example": "Paper" + }, + "version": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string", + "example": "1.18" + }, + "builds": { + "type": "array", + "items": { + "$ref": "#/components/schemas/VersionBuild" + } + } + } + }, + "Change": { + "type": "object", + "properties": { + "commit": { + "type": "string" + }, + "summary": { + "type": "string" + }, + "message": { + "type": "string" + } + } + }, + "Download": { + "type": "object", + "properties": { + "name": { + "pattern": "[a-z0-9._-]+", + "type": "string", + "example": "paper-1.18-10.jar" + }, + "sha256": { + "pattern": "[a-f0-9]{64}", + "type": "string", + "example": "f065e2d345d9d772d5cf2a1ce5c495c4cc56eb2fcd6820e82856485fa19414c8" + } + } + }, + "ProjectResponse": { + "type": "object", + "properties": { + "project_id": { + "pattern": "[a-z]+", + "type": "string", + "example": "paper" + }, + "project_name": { + "type": "string", + "example": "Paper" + }, + "version_groups": { + "type": "array", + "items": { + "type": "string" + } + }, + "versions": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "ProjectsResponse": { + "type": "object", + "properties": { + "projects": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "VersionBuild": { + "type": "object", + "properties": { + "build": { + "pattern": "\\d+", + "type": "integer", + "format": "int32", + "example": 10 + }, + "time": { + "type": "string", + "format": "date-time" + }, + "channel": { + "type": "string", + "enum": [ + "default", + "experimental" + ] + }, + "promoted": { + "type": "boolean" + }, + "changes": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Change" + } + }, + "downloads": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Download" + } + } + } + }, + "VersionFamilyBuild": { + "type": "object", + "properties": { + "version": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string", + "example": "1.18" + }, + "build": { + "pattern": "\\d+", + "type": "integer", + "format": "int32", + "example": 10 + }, + "time": { + "type": "string", + "format": "date-time" + }, + "channel": { + "type": "string", + "enum": [ + "default", + "experimental" + ] + }, + "promoted": { + "type": "boolean" + }, + "changes": { + "type": "array", + "items": { + "$ref": "#/components/schemas/Change" + } + }, + "downloads": { + "type": "object", + "additionalProperties": { + "$ref": "#/components/schemas/Download" + } + } + } + }, + "VersionFamilyBuildsResponse": { + "type": "object", + "properties": { + "project_id": { + "pattern": "[a-z]+", + "type": "string", + "example": "paper" + }, + "project_name": { + "type": "string", + "example": "Paper" + }, + "version_group": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string", + "example": "1.18" + }, + "versions": { + "type": "array", + "items": { + "type": "string" + } + }, + "builds": { + "type": "array", + "items": { + "$ref": "#/components/schemas/VersionFamilyBuild" + } + } + } + }, + "VersionFamilyResponse": { + "type": "object", + "properties": { + "project_id": { + "pattern": "[a-z]+", + "type": "string", + "example": "paper" + }, + "project_name": { + "type": "string", + "example": "Paper" + }, + "version_group": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string", + "example": "1.18" + }, + "versions": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, + "VersionResponse": { + "type": "object", + "properties": { + "project_id": { + "pattern": "[a-z]+", + "type": "string", + "example": "paper" + }, + "project_name": { + "type": "string", + "example": "Paper" + }, + "version": { + "pattern": "[0-9.]+-?(?:pre|SNAPSHOT)?(?:[0-9.]+)?", + "type": "string", + "example": "1.18" + }, + "builds": { + "type": "array", + "items": { + "type": "integer", + "format": "int32" + } + } + } + } + } + } +} \ No newline at end of file diff --git a/statistics/data.csv b/statistics/data.csv index 58d839017..a9f943fc9 100644 --- a/statistics/data.csv +++ b/statistics/data.csv @@ -1,4 +1,5 @@ EMB,NAME,TYPE,LANGUAGE,RUNTIME,BUILD,FILES,LOCS,DATABASE,LICENSE,ENDPOINTS,URL +TRUE,bibliothek,REST,Java,JDK 17,Gradle,33,2176,MongoDB,MIT,8,https://github.com/PaperMC/bibliothek TRUE,reservations-api,REST,Java,JDK 11,Gradle,39,1853,MongoDB,UNDEFINED,7,https://github.com/cyrilgavala/reservations-api TRUE,catwatch,REST,Java,JDK 8,Maven,106,9636,H2,Apache,14,https://github.com/zalando-incubator/catwatch TRUE,cwa-verification,REST,Java,JDK 11,Maven,47,3955,H2,Apache,5,https://github.com/corona-warn-app/cwa-verification-server From 7443b9ebd874e1bd6a6bb5e89ef36ebe579412bd Mon Sep 17 00:00:00 2001 From: arcuri82 Date: Sun, 24 Sep 2023 22:35:04 +0200 Subject: [PATCH 21/21] updated tables --- statistics/suts.R | 2 ++ statistics/table_emb.md | 2 ++ 2 files changed, 4 insertions(+) diff --git a/statistics/suts.R b/statistics/suts.R index 0c4514a85..770bca640 100644 --- a/statistics/suts.R +++ b/statistics/suts.R @@ -21,6 +21,8 @@ suts <- function(){ "scout-api", "genome-nexus", "market", + "bibliothek", + "reservations-api", #"petclinic-graphql", #"patio-api", #"timbuctoo", diff --git a/statistics/table_emb.md b/statistics/table_emb.md index 80f06565d..ddf81716b 100644 --- a/statistics/table_emb.md +++ b/statistics/table_emb.md @@ -18,7 +18,9 @@ |__cwa-verification__|REST|3955|47|5|Java|JDK 11|Maven|H2| |__gestaohospital__|REST|3506|33|20|Java|JDK 8|Maven|MongoDB| |__features-service__|REST|2275|39|18|Java|JDK 8|Maven|H2| +|__bibliothek__|REST|2176|33|8|Java|JDK 17|Gradle|MongoDB| |__restcountries__|REST|1977|24|22|Java|JDK 8|Maven|| +|__reservations-api__|REST|1853|39|7|Java|JDK 11|Gradle|MongoDB| |__rest-scs__|REST|862|13|11|Java|JDK 8|Maven|| |__rest-ncs__|REST|605|9|6|Java|JDK 8|Maven|| |__rest-news__|REST|857|11|7|Kotlin|JDK 8|Maven|H2|