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

fix configuration (#2225)

Browse Source 
* minor logging fix

* spring security sso

* use basic auth

* use form login

* cleanup

* cleanup

* final cleanup

* second client app for sso

* spring boot bootstrap

* add logic

* cleanup

* add simple controller

* add thymeleaf and security

* minor fix

* minor fix

* add more boot properties

* fix live test

* fix live test

* minor fix

* semaphores

* fix configuration
This commit is contained in:
Doha2012 2017-07-08 03:08:04 +02:00 committed by Eugen
parent a6ba135f77
commit 50054a218b
4 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-rest/src/main/java/org/baeldung/config/WebConfig.java
View File

@ -1,15 +1,7 @@
package org.baeldung.config; package org.baeldung.config;
import java.text.SimpleDateFormat;
import java.util.List;
import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
import org.springframework.http.converter.xml.MarshallingHttpMessageConverter;
import org.springframework.oxm.xstream.XStreamMarshaller;
import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
@ -26,7 +18,7 @@ public class WebConfig extends WebMvcConfigurerAdapter {
} }
// //
/*
@Override @Override
public void configureMessageConverters(final List<HttpMessageConverter<?>> messageConverters) { public void configureMessageConverters(final List<HttpMessageConverter<?>> messageConverters) {
final Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder(); final Jackson2ObjectMapperBuilder builder = new Jackson2ObjectMapperBuilder();
@ -51,5 +43,5 @@ public class WebConfig extends WebMvcConfigurerAdapter {
return xmlConverter; return xmlConverter;
} }
*/
} }

2
spring-rest/src/main/java/org/baeldung/web/controller/MyFooController.java
View File

@ -32,7 +32,7 @@ public class MyFooController {
// API - read // API - read
@RequestMapping(method = RequestMethod.GET) @RequestMapping(method = RequestMethod.GET, produces = { "application/json" })
@ResponseBody @ResponseBody
public Collection<Foo> findAll() { public Collection<Foo> findAll() {
return myfoos.values(); return myfoos.values();

5
spring-rest/src/main/webapp/WEB-INF/api-servlet.xml
View File

@ -19,12 +19,11 @@
</bean> </bean>
--> -->
<bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"/> <bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter"/>
<!-- <bean class="org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter"/> <!-- <bean class="org.springframework.http.converter.protobuf.ProtobufHttpMessageConverter"/> -->
--> </mvc:message-converters> </mvc:message-converters>
</mvc:annotation-driven> </mvc:annotation-driven>
<bean id="xstreamMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller" /> <bean id="xstreamMarshaller" class="org.springframework.oxm.xstream.XStreamMarshaller" />
<!-- --> <!-- -->
<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver" /> <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver" />

4
spring-rest/src/test/java/org/baeldung/client/RestTemplateBasicLiveTest.java
View File

@ -42,7 +42,7 @@ public class RestTemplateBasicLiveTest {
@Before @Before
public void beforeTest() { public void beforeTest() {
restTemplate = new RestTemplate(); restTemplate = new RestTemplate();
restTemplate.setMessageConverters(Arrays.asList(new MappingJackson2HttpMessageConverter())); // restTemplate.setMessageConverters(Arrays.asList(new MappingJackson2HttpMessageConverter()));
} }
// GET // GET
@ -78,7 +78,6 @@ public class RestTemplateBasicLiveTest {
@Test @Test
public void givenFooService_whenCallHeadForHeaders_thenReceiveAllHeadersForThatResource() { public void givenFooService_whenCallHeadForHeaders_thenReceiveAllHeadersForThatResource() {
final HttpHeaders httpHeaders = restTemplate.headForHeaders(fooResourceUrl); final HttpHeaders httpHeaders = restTemplate.headForHeaders(fooResourceUrl);
assertTrue(httpHeaders.getContentType() assertTrue(httpHeaders.getContentType()
.includes(MediaType.APPLICATION_JSON)); .includes(MediaType.APPLICATION_JSON));
} }
@ -248,4 +247,5 @@ public class RestTemplateBasicLiveTest {
clientHttpRequestFactory.setConnectTimeout(timeout * 1000); clientHttpRequestFactory.setConnectTimeout(timeout * 1000);
return clientHttpRequestFactory; return clientHttpRequestFactory;
} }
} }