BAEL-1931 rename SampleService to SampleClient (eugenp#6682)

dszczukocki · pivovarit · commit ce099900562d · 2019-04-14T08:24:03.000+02:00
* BAEL-1931 rename SampleService to SampleClient

* remove not null assertion

* remove fixed method order

* disable usage of local kerberos ticket cache
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
@@ -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/SampleClient.java b/spring-security-sso/spring-security-sso-kerberos/src/main/java/kerberos/client/SampleClient.java
@@ -5,14 +5,14 @@
 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/SampleClientManualTest.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.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 @@
  */
 @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);
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ class KerberosClientApp {`
`12`	`12`	`System.setProperty("java.security.krb5.conf",`
`13`	`13`	`Paths.get(".\\krb-test-workdir\\krb5.conf").normalize().toAbsolutePath().toString());`
`14`	`14`	`System.setProperty("sun.security.krb5.debug", "true");`
	`15`	`+ // disable usage of local kerberos ticket cache`
	`16`	`+ System.setProperty("http.use.global.creds", "false");`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`public static void main(String[] args) {`