Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Andy Wilkinson
2017-01-24 10:53:29 +00:00
parent 6c50874917 1a69a4ff67
commit fa22396dae
3 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-samples/spring-boot-sample-jta-narayana/src/main/java/sample/narayana/AccountService.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package sample.narayana;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.JmsTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -30,7 +29,6 @@ public class AccountService {
private final AccountRepository accountRepository; private final AccountRepository accountRepository;
@Autowired
public AccountService(JmsTemplate jmsTemplate, AccountRepository accountRepository) { public AccountService(JmsTemplate jmsTemplate, AccountRepository accountRepository) {
this.jmsTemplate = jmsTemplate; this.jmsTemplate = jmsTemplate;
this.accountRepository = accountRepository; this.accountRepository = accountRepository;

8
spring-boot-samples/spring-boot-sample-metrics-redis/src/main/java/sample/metrics/redis/SampleController.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import java.util.Map;
import org.hibernate.validator.constraints.NotBlank; import org.hibernate.validator.constraints.NotBlank;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Description; import org.springframework.context.annotation.Description;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -33,7 +32,6 @@ public class SampleController {
private final HelloWorldProperties helloWorldProperties; private final HelloWorldProperties helloWorldProperties;
@Autowired
public SampleController(HelloWorldProperties helloWorldProperties) { public SampleController(HelloWorldProperties helloWorldProperties) {
this.helloWorldProperties = helloWorldProperties; this.helloWorldProperties = helloWorldProperties;
} }
@@ -41,8 +39,8 @@ public class SampleController {
@GetMapping("/") @GetMapping("/")
@ResponseBody @ResponseBody
public Map<String, String> hello() { public Map<String, String> hello() {
return Collections.singletonMap("message", "Hello " + return Collections.singletonMap("message",
this.helloWorldProperties.getName()); "Hello " + this.helloWorldProperties.getName());
} }
protected static class Message { protected static class Message {

4
spring-boot-samples/spring-boot-sample-parent-context/src/main/java/sample/parent/SampleEndpoint.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2016 the original author or authors. * Copyright 2012-2017 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ package sample.parent;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.MessageEndpoint;
import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.annotation.ServiceActivator;
import org.springframework.util.StreamUtils; import org.springframework.util.StreamUtils;
@@ -29,7 +28,6 @@ public class SampleEndpoint {
private final HelloWorldService helloWorldService; private final HelloWorldService helloWorldService;
@Autowired
public SampleEndpoint(HelloWorldService helloWorldService) { public SampleEndpoint(HelloWorldService helloWorldService) {
this.helloWorldService = helloWorldService; this.helloWorldService = helloWorldService;
} }