Merge branch 'master' of https://github.com/hornerj94/dummy-service.git

Conflicts: pom.xml src/main/java/de/rtuni/ms/ds/Application.java src/main/resources/application.yml

Merge branch 'master' of https://github.com/hornerj94/dummy-service.git
f5cd3bde · Julian Horner · aa730722 · da02a17d · f5cd3bde · f5cd3bde
Commit f5cd3bde authored 5 years ago by Julian Horner
--- a/.cfignore
+++ b/.cfignore
+launchConfigurations/
+.git/
\ No newline at end of file
--- a/launchConfigurations/dummy-service.launch
+++ b/launchConfigurations/dummy-service.launch
+{
+  "ServiceId": "com.ibm.cloudoe.orion.client.deploy",
+  "Params": {
+    "Target": {
+      "Url": "https://api.eu-gb.cf.cloud.ibm.com",
+      "Org": "organisation one",
+      "Space": "dev"
+    },
+    "Name": "dummy-service",
+    "Instrumentation": {
+      "domain": "eu-gb.mybluemix.net",
+      "instances": "1"
+    }
+  },
+  "Path": "manifest.yml",
+  "Type": "Cloud Foundry"
+}
\ No newline at end of file
--- a/manifest.yml
+++ b/manifest.yml
+---
+applications:
+- buildpack: https://github.com/cloudfoundry/staticfile-buildpack.git
+  host: dummy-service
+  name: dummy-service
+  memory: 64M
\ No newline at end of file
--- a/src/main/java/de/rtuni/ms/ds/Application.java
+++ b/src/main/java/de/rtuni/ms/ds/Application.java
+/*
+ * Copyright 2019 (C) by Julian Horner.
+ * All Rights Reserved.
+ */
+
+package de.rtuni.ms.ds;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+
+/**
+ * Dummy service.
+ * 
+ * @author Julian
+ *
+ */
+@SpringBootApplication
+@EnableEurekaClient     
+public class Application {
+    //---------------------------------------------------------------------------------------------
+    
+    /**
+     * Starts the application.
+     * 
+     * @param args The arguments
+     */
+    public static void main(final String[] args) { SpringApplication.run(Application.class, args); }
+
+    //---------------------------------------------------------------------------------------------
+}
--- a/src/main/java/de/rtuni/ms/ds/HomeController.java
+++ b/src/main/java/de/rtuni/ms/ds/HomeController.java
+/*
+ * Copyright 2019 (C) by Julian Horner.
+ * All Rights Reserved.
+ */
+
+package de.rtuni.ms.ds;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * Class that handles all kind of requests.
+ * 
+ * @author Julian
+ *
+ */
+@Controller
+public class HomeController {
+    //---------------------------------------------------------------------------------------------
+    
+    /**
+     * Catches the request for the start page and returns the name of the corresponding template.
+     * 
+     * @return The name of the template
+     */
+    @RequestMapping("/")
+    public String index() {
+        return "index";
+    }
+
+    /**
+     * Catches the request for the secure page and returns the name of the corresponding template.
+     * 
+     * @return The name of the template
+     */
+    @RequestMapping("/securePage")
+    public String securePage() {
+        return "securePage";
+    }
+
+    //---------------------------------------------------------------------------------------------
+}
\ No newline at end of file
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+  <head>
+    <title>Dummy page</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+	<h1>Page without authentication</h1>
+    <a href="#" th:href="@{/securePage}">geschützte Seite anfordern</a>
+  </body>
+</html>
--- a/src/main/resources/templates/securePage.html
+++ b/src/main/resources/templates/securePage.html
+<!DOCTYPE HTML>
+<html xmlns:th="http://www.thymeleaf.org">
+  <head>
+    <title>Very secure page</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  </head>
+  <body>
+	<h1>Page with authentication</h1>
+    <a href="#" th:href="@{/}">You're authorised to see this page</a>
+  </body>
+</html>
\ No newline at end of file