Merge branch 'modzeleg' into developer
This commit is contained in:
		
							
								
								
									
										17
									
								
								Klaus.iml
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								Klaus.iml
									
									
									
									
									
								
							@@ -48,7 +48,6 @@
 | 
				
			|||||||
    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.1.RELEASE" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-json:2.3.1.RELEASE" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.0" level="project" />
 | 
					    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.11.0" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
 | 
					 | 
				
			||||||
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.0" level="project" />
 | 
					    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.11.0" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0" level="project" />
 | 
					    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.11.0" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0" level="project" />
 | 
					    <orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0" level="project" />
 | 
				
			||||||
@@ -71,7 +70,6 @@
 | 
				
			|||||||
    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.1.5.Final" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
 | 
					    <orderEntry type="library" name="Maven: jakarta.validation:jakarta.validation-api:2.0.2" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.4.1.Final" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
 | 
					 | 
				
			||||||
    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.projectlombok:lombok:1.18.12" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.mapstruct:mapstruct:1.3.1.Final" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-data-redis:2.3.1.RELEASE" level="project" />
 | 
				
			||||||
@@ -95,5 +93,20 @@
 | 
				
			|||||||
    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.0" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.8.0" level="project" />
 | 
				
			||||||
    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.4.1" level="project" />
 | 
					    <orderEntry type="library" name="Maven: org.codehaus.jettison:jettison:1.4.1" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-ui:2.9.2" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: io.springfox:springfox-spring-web:2.9.2" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger2:2.9.2" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: io.swagger:swagger-annotations:1.5.20" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: io.swagger:swagger-models:1.5.20" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.11.0" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: io.springfox:springfox-spi:2.9.2" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: io.springfox:springfox-core:2.9.2" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: net.bytebuddy:byte-buddy:1.10.11" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: io.springfox:springfox-schema:2.9.2" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: io.springfox:springfox-swagger-common:2.9.2" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: com.google.guava:guava:20.0" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: com.fasterxml:classmate:1.5.1" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-core:1.2.0.RELEASE" level="project" />
 | 
				
			||||||
 | 
					    <orderEntry type="library" name="Maven: org.springframework.plugin:spring-plugin-metadata:1.2.0.RELEASE" level="project" />
 | 
				
			||||||
  </component>
 | 
					  </component>
 | 
				
			||||||
</module>
 | 
					</module>
 | 
				
			||||||
							
								
								
									
										5
									
								
								pom.xml
									
									
									
									
									
								
							
							
						
						
									
										5
									
								
								pom.xml
									
									
									
									
									
								
							@@ -73,6 +73,11 @@
 | 
				
			|||||||
			<artifactId>jettison</artifactId>
 | 
								<artifactId>jettison</artifactId>
 | 
				
			||||||
			<version>1.4.1</version>
 | 
								<version>1.4.1</version>
 | 
				
			||||||
		</dependency>
 | 
							</dependency>
 | 
				
			||||||
 | 
							<dependency>
 | 
				
			||||||
 | 
								<groupId>io.springfox</groupId>
 | 
				
			||||||
 | 
								<artifactId>springfox-boot-starter</artifactId>
 | 
				
			||||||
 | 
								<version>3.0.0</version>
 | 
				
			||||||
 | 
							</dependency>
 | 
				
			||||||
    </dependencies>
 | 
					    </dependencies>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<build>
 | 
						<build>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,22 @@
 | 
				
			|||||||
 | 
					package com.release11.klaus.config;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.context.annotation.Bean;
 | 
				
			||||||
 | 
					import org.springframework.context.annotation.Configuration;
 | 
				
			||||||
 | 
					import springfox.documentation.builders.PathSelectors;
 | 
				
			||||||
 | 
					import springfox.documentation.builders.RequestHandlerSelectors;
 | 
				
			||||||
 | 
					import springfox.documentation.spi.DocumentationType;
 | 
				
			||||||
 | 
					import springfox.documentation.spring.web.plugins.Docket;
 | 
				
			||||||
 | 
					import springfox.documentation.swagger2.annotations.EnableSwagger2;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Configuration
 | 
				
			||||||
 | 
					@EnableSwagger2
 | 
				
			||||||
 | 
					public class SpringFoxConfig {
 | 
				
			||||||
 | 
					    @Bean
 | 
				
			||||||
 | 
					    public Docket api(){
 | 
				
			||||||
 | 
					        return new Docket(DocumentationType.SWAGGER_2)
 | 
				
			||||||
 | 
					                .select()
 | 
				
			||||||
 | 
					                .apis(RequestHandlerSelectors.any())
 | 
				
			||||||
 | 
					                .paths(PathSelectors.any())
 | 
				
			||||||
 | 
					                .build();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -22,7 +22,7 @@ import java.util.*;
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
@Slf4j
 | 
					@Slf4j
 | 
				
			||||||
@Controller
 | 
					@Controller
 | 
				
			||||||
@RequestMapping
 | 
					@RequestMapping(path = "/")
 | 
				
			||||||
@AllArgsConstructor
 | 
					@AllArgsConstructor
 | 
				
			||||||
public class MockController {
 | 
					public class MockController {
 | 
				
			||||||
    private final KlausService klausService;
 | 
					    private final KlausService klausService;
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										
											BIN
										
									
								
								target/classes/com/release11/klaus/config/SpringFoxConfig.class
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								target/classes/com/release11/klaus/config/SpringFoxConfig.class
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							@@ -10,7 +10,7 @@ import org.springframework.stereotype.Component;
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
@Generated(
 | 
					@Generated(
 | 
				
			||||||
    value = "org.mapstruct.ap.MappingProcessor",
 | 
					    value = "org.mapstruct.ap.MappingProcessor",
 | 
				
			||||||
    date = "2021-03-23T11:19:42+0100",
 | 
					    date = "2021-03-26T12:24:03+0100",
 | 
				
			||||||
    comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)"
 | 
					    comments = "version: 1.3.1.Final, compiler: javac, environment: Java 14.0.1 (Oracle Corporation)"
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
@Component
 | 
					@Component
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user