Merge remote-tracking branch 'origin/master' into keycloak

# Conflicts:
#	build.gradle
#	src/main/java/mops/gruppen2/security/KeycloakConfig.java
#	src/main/resources/application.properties

src/main/java/mops/gruppen2/Gruppen2Application.java

@@ -2,10 +2,22 @@ package mops.gruppen2;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 @SpringBootApplication
+@EnableSwagger2
 public class Gruppen2Application {
     public static void main(String[] args) {
         SpringApplication.run(Gruppen2Application.class, args);
     }
+
+    @Bean
+    public Docket productAPI(){
+        return new Docket(DocumentationType.SWAGGER_2).select()
+                .apis(RequestHandlerSelectors.basePackage("mops.gruppen2")).build();
+    }
 }

src/main/java/mops/gruppen2/controllers/SwaggerAPIController.java

@@ -0,0 +1,24 @@
+package mops.gruppen2.controllers;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RestController
+public class SwaggerAPIController {
+	@RequestMapping(value = "/products", method = RequestMethod.GET)
+	public List<String> getProducts(){
+		List<String> productList = new ArrayList<>();
+		productList.add("Honey");
+		productList.add("Almond");
+		return productList;
+	}
+	@RequestMapping(value = "/products", method = RequestMethod.POST)
+	public String createProduct() {
+		return "Product is saved successfully";
+	}
+}