iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAEL-1238 (#2941)

Browse Source 
* michael.good703@gmail.com

michael.good703@gmail.com

* michael.good703@gmail.com

michael.good703@gmail.com

* michael.good703@gmail.com

michael.good703@gmail.com

* update

* michael.good703@gmail.com

Had to add @SpringBootApplication(exclude = MySQLAutoconfiguration.class)

* Updated for 3.3.0.Final

BAEL-1238

* Update pom.xml

* BAEL-1238

Added new module spring-boot-keycloak and removed Keycloak code from spring-boot module

* Minor changes to pom.xml

* Update CustomConverterTest.java

* Update StringToEmployeeConverter.java

* Update GenericBigDecimalConverter.java

* Update MyFeatures.java

* Update .gitignore

* Formatting changes

* "Resolving conflicts"

* Updated spring-boot to remove keycloak

* Updated to see

* Update

* Updated

* Found remnant file and deleted it
This commit is contained in:
Michael C Good
2017-11-03 10:09:31 -04:00
committed by maibin
parent 1f5b0a9749
commit 73ae3cfb1a
21 changed files with 581 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-boot/src/test/java/com/baeldung/keycloak/KeycloakConfigurationTest.java
-51
View File
@@ -1,51 +0,0 @@
package com.baeldung.keycloak;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.keycloak.KeycloakPrincipal;
import org.keycloak.KeycloakSecurityContext;
import org.keycloak.adapters.springboot.client.KeycloakSecurityContextClientRequestInterceptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.mockito.Spy;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.when;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = SpringBoot.class)
public class KeycloakConfigurationTest {
@Spy
private KeycloakSecurityContextClientRequestInterceptor factory;
private MockHttpServletRequest servletRequest;
@Mock
public KeycloakSecurityContext keycloakSecurityContext;
@Mock
private KeycloakPrincipal keycloakPrincipal;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
servletRequest = new MockHttpServletRequest();
RequestContextHolder.setRequestAttributes(new ServletRequestAttributes(servletRequest));
servletRequest.setUserPrincipal(keycloakPrincipal);
when(keycloakPrincipal.getKeycloakSecurityContext()).thenReturn(keycloakSecurityContext);
}
@Test
public void testGetKeycloakSecurityContext() throws Exception {
assertNotNull(keycloakPrincipal.getKeycloakSecurityContext());
}
}
spring-boot/src/test/java/org/baeldung/converter/CustomConverterTest.java
+1 -1
View File
@@ -50,4 +50,4 @@ public class CustomConverterTest {
assertThat(conversionService.convert("2.32", BigDecimal.class))
.isEqualTo(BigDecimal.valueOf(2.32));
}
}
}