From ce099900562daf46408fc8ed9814c1fbe40f8d61 Mon Sep 17 00:00:00 2001
From: Denis <szczukocki.denis@gmail.com>
Date: Sun, 14 Apr 2019 08:24:03 +0200
Subject: [PATCH] BAEL-1931 rename SampleService to SampleClient (#6682)

* BAEL-1931 rename SampleService to SampleClient

* remove not null assertion

* remove fixed method order

* disable usage of local kerberos ticket cache
---
 .../kerberos/client/KerberosClientApp.java     |  2 ++
 .../{SampleService.java => SampleClient.java}  |  4 ++--
 ...alTest.java => SampleClientManualTest.java} | 18 +++++++-----------
 3 files changed, 11 insertions(+), 13 deletions(-)
 rename spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/{SampleService.java => SampleClient.java} (87%)
 rename spring-security-sso/spring-security-sso-kerberos/src/test/java/kerberos/client/{SampleServiceManualTest.java => SampleClientManualTest.java} (59%)

diff --git a/spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/KerberosClientApp.java b/spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/KerberosClientApp.java
index a353961854..9fb86e7658 100644
--- a/spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/KerberosClientApp.java
+++ b/spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/KerberosClientApp.java
@@ -12,6 +12,8 @@ class KerberosClientApp {
 		System.setProperty("java.security.krb5.conf",
 				Paths.get(".\\krb-test-workdir\\krb5.conf").normalize().toAbsolutePath().toString());
 		System.setProperty("sun.security.krb5.debug", "true");
+		// disable usage of local kerberos ticket cache
+		System.setProperty("http.use.global.creds", "false");
 	}
 
 	public static void main(String[] args) {
diff --git a/spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/SampleService.java b/spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/SampleClient.java
similarity index 87%
rename from spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/SampleService.java
rename to spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/SampleClient.java
index 4145cf0c1a..745193e3b0 100644
--- a/spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/SampleService.java
+++ b/spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/SampleClient.java
@@ -5,14 +5,14 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 
 @Service
-class SampleService {
+class SampleClient {
 
 	@Value("${app.access-url}")
 	private String endpoint;
 
 	private RestTemplate restTemplate;
 
-	public SampleService(RestTemplate restTemplate) {
+	public SampleClient(RestTemplate restTemplate) {
 		this.restTemplate = restTemplate;
 	}
 
diff --git a/spring-security-sso/spring-security-sso-kerberos/src/test/java/kerberos/client/SampleServiceManualTest.java b/spring-security-sso/spring-security-sso-kerberos/src/test/java/kerberos/client/SampleClientManualTest.java
similarity index 59%
rename from spring-security-sso/spring-security-sso-kerberos/src/test/java/kerberos/client/SampleServiceManualTest.java
rename to spring-security-sso/spring-security-sso-kerberos/src/test/java/kerberos/client/SampleClientManualTest.java
index d0d9f0ae4b..fdb1b12531 100644
--- a/spring-security-sso/spring-security-sso-kerberos/src/test/java/kerberos/client/SampleServiceManualTest.java
+++ b/spring-security-sso/spring-security-sso-kerberos/src/test/java/kerberos/client/SampleClientManualTest.java
@@ -1,6 +1,5 @@
 package kerberos.client;
 
-import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,7 +9,6 @@ import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 /**
@@ -23,21 +21,19 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
  */
 @RunWith(SpringRunner.class)
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@FixMethodOrder
-public class SampleServiceManualTest {
+public class SampleClientManualTest {
 
 	@Autowired
-	private SampleService sampleService;
+	private SampleClient sampleClient;
 
 	@Test
-	public void a_givenKerberizedRestTemplate_whenServiceCall_thenSuccess() {
-		assertNotNull(sampleService);
-		assertEquals("data from kerberized server", sampleService.getData());
+	public void givenKerberizedRestTemplate_whenServiceCall_thenSuccess() {
+		assertEquals("data from kerberized server", sampleClient.getData());
 	}
 
 	@Test
-	public void b_givenRestTemplate_whenServiceCall_thenFail() {
-		sampleService.setRestTemplate(new RestTemplate());
-		assertThrows(RestClientException.class, sampleService::getData);
+	public void givenRestTemplate_whenServiceCall_thenFail() {
+		sampleClient.setRestTemplate(new RestTemplate());
+		assertThrows(RestClientException.class, sampleClient::getData);
 	}
 }
\ No newline at end of file