diff --git a/training1-answer/.project b/training1-answer/.project index de22d09..e017491 100755 --- a/training1-answer/.project +++ b/training1-answer/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/training1-answer/pom.xml b/training1-answer/pom.xml index 7edec7b..44c6677 100755 --- a/training1-answer/pom.xml +++ b/training1-answer/pom.xml @@ -7,7 +7,7 @@ training1-answer - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training1/.project b/training1/.project index fc818af..18cb00a 100755 --- a/training1/.project +++ b/training1/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/training1/pom.xml b/training1/pom.xml index a7d95d9..7d0ad5a 100755 --- a/training1/pom.xml +++ b/training1/pom.xml @@ -7,7 +7,7 @@ training1 - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training2-answer/.project b/training2-answer/.project index 22ca12a..c867404 100755 --- a/training2-answer/.project +++ b/training2-answer/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/training2-answer/pom.xml b/training2-answer/pom.xml index 27689d6..9cc16f6 100755 --- a/training2-answer/pom.xml +++ b/training2-answer/pom.xml @@ -7,7 +7,7 @@ training2-answer - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training2-answer/src/main/java/com/example/business/service/MessageServiceImpl.java b/training2-answer/src/main/java/com/example/business/service/MessageServiceImpl.java index 1529a71..94e4a54 100755 --- a/training2-answer/src/main/java/com/example/business/service/MessageServiceImpl.java +++ b/training2-answer/src/main/java/com/example/business/service/MessageServiceImpl.java @@ -9,8 +9,8 @@ @Service("messageService") public class MessageServiceImpl implements MessageService { @Autowired - MessageRepository messageRepository; - + private MessageRepository messageRepository; + public Message findOne() { return messageRepository.findOne(); } diff --git a/training2/.project b/training2/.project index a09a173..fc62a3d 100755 --- a/training2/.project +++ b/training2/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/training2/pom.xml b/training2/pom.xml index 5fc3980..000e958 100755 --- a/training2/pom.xml +++ b/training2/pom.xml @@ -7,7 +7,7 @@ training2 - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training2/src/main/java/com/example/business/service/MessageServiceImpl.java b/training2/src/main/java/com/example/business/service/MessageServiceImpl.java index 7aa1c81..1f74077 100755 --- a/training2/src/main/java/com/example/business/service/MessageServiceImpl.java +++ b/training2/src/main/java/com/example/business/service/MessageServiceImpl.java @@ -6,7 +6,7 @@ //TODO 演習2 不足しているアノテーションを記述しなさい public class MessageServiceImpl implements MessageService { //TODO 演習2 不足しているアノテーションを記述しなさい - MessageRepository messageRepository; + private MessageRepository messageRepository; public Message findOne() { return messageRepository.findOne(); diff --git a/training3-answer/.project b/training3-answer/.project index b511791..8e24e64 100644 --- a/training3-answer/.project +++ b/training3-answer/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/training3-answer/pom.xml b/training3-answer/pom.xml index 1cb0d4b..e081832 100755 --- a/training3-answer/pom.xml +++ b/training3-answer/pom.xml @@ -6,7 +6,7 @@ training3-answer - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training3-answer/src/main/java/com/example/business/service/MessageServiceImpl.java b/training3-answer/src/main/java/com/example/business/service/MessageServiceImpl.java index b56bf72..1c093fa 100755 --- a/training3-answer/src/main/java/com/example/business/service/MessageServiceImpl.java +++ b/training3-answer/src/main/java/com/example/business/service/MessageServiceImpl.java @@ -5,7 +5,7 @@ public class MessageServiceImpl implements MessageService { - MessageRepository messageRepository; + private MessageRepository messageRepository; public MessageServiceImpl(MessageRepository messageRepository) { this.messageRepository = messageRepository; diff --git a/training3/.project b/training3/.project index e45e4aa..1d947c0 100644 --- a/training3/.project +++ b/training3/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/training3/pom.xml b/training3/pom.xml index 34230f4..ddc2178 100755 --- a/training3/pom.xml +++ b/training3/pom.xml @@ -7,7 +7,7 @@ training3 - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training3/src/main/java/com/example/business/service/MessageServiceImpl.java b/training3/src/main/java/com/example/business/service/MessageServiceImpl.java index f044d34..77ad825 100755 --- a/training3/src/main/java/com/example/business/service/MessageServiceImpl.java +++ b/training3/src/main/java/com/example/business/service/MessageServiceImpl.java @@ -7,7 +7,7 @@ public class MessageServiceImpl implements MessageService { // TODO 演習3 アノテーションがないことを確認 - MessageRepository messageRepository; + private MessageRepository messageRepository; public MessageServiceImpl(MessageRepository messageRepository) { this.messageRepository = messageRepository; diff --git a/training4-answer/.project b/training4-answer/.project index cad7ade..1749df3 100755 --- a/training4-answer/.project +++ b/training4-answer/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/training4-answer/pom.xml b/training4-answer/pom.xml index b43388d..ab7e585 100755 --- a/training4-answer/pom.xml +++ b/training4-answer/pom.xml @@ -6,7 +6,7 @@ training4-answer - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training4-answer/src/main/java/com/example/business/service/MessageServiceImpl.java b/training4-answer/src/main/java/com/example/business/service/MessageServiceImpl.java index 1529a71..9cf83ae 100755 --- a/training4-answer/src/main/java/com/example/business/service/MessageServiceImpl.java +++ b/training4-answer/src/main/java/com/example/business/service/MessageServiceImpl.java @@ -9,7 +9,7 @@ @Service("messageService") public class MessageServiceImpl implements MessageService { @Autowired - MessageRepository messageRepository; + private MessageRepository messageRepository; public Message findOne() { return messageRepository.findOne(); diff --git a/training4-answer/src/test/java/com/example/MessageServiceTest.java b/training4-answer/src/test/java/com/example/MessageServiceTest.java index 1274eef..22001ea 100755 --- a/training4-answer/src/test/java/com/example/MessageServiceTest.java +++ b/training4-answer/src/test/java/com/example/MessageServiceTest.java @@ -7,12 +7,12 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import com.example.business.domain.Message; import com.example.business.service.MessageService; -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @ContextConfiguration(locations = { "./config/applicationContext.xml" }) public class MessageServiceTest { @Autowired diff --git a/training4/.project b/training4/.project index e242569..3fff4a4 100755 --- a/training4/.project +++ b/training4/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/training4/pom.xml b/training4/pom.xml index 9ca754b..a2948d4 100755 --- a/training4/pom.xml +++ b/training4/pom.xml @@ -6,7 +6,7 @@ training4 - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training4/src/main/java/com/example/business/service/MessageServiceImpl.java b/training4/src/main/java/com/example/business/service/MessageServiceImpl.java index 1529a71..9cf83ae 100755 --- a/training4/src/main/java/com/example/business/service/MessageServiceImpl.java +++ b/training4/src/main/java/com/example/business/service/MessageServiceImpl.java @@ -9,7 +9,7 @@ @Service("messageService") public class MessageServiceImpl implements MessageService { @Autowired - MessageRepository messageRepository; + private MessageRepository messageRepository; public Message findOne() { return messageRepository.findOne(); diff --git a/training5-answer/.project b/training5-answer/.project index 903023e..12e55a8 100755 --- a/training5-answer/.project +++ b/training5-answer/.project @@ -15,14 +15,8 @@ - - org.springframework.ide.eclipse.core.springbuilder - - - - org.springframework.ide.eclipse.core.springnature org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature diff --git a/training5-answer/pom.xml b/training5-answer/pom.xml index c285718..583a1a9 100755 --- a/training5-answer/pom.xml +++ b/training5-answer/pom.xml @@ -2,11 +2,11 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.example - 1.0.0 - training5-answer + training5-answer + training5 - 4.1.6.RELEASE + 4.3.13.RELEASE @@ -64,6 +64,6 @@ - training5-answer + 1.0.0 Spring Core Training \ No newline at end of file diff --git a/training5-answer/src/main/java/com/example/business/service/MessageServiceImpl.java b/training5-answer/src/main/java/com/example/business/service/MessageServiceImpl.java index 1529a71..9cf83ae 100755 --- a/training5-answer/src/main/java/com/example/business/service/MessageServiceImpl.java +++ b/training5-answer/src/main/java/com/example/business/service/MessageServiceImpl.java @@ -9,7 +9,7 @@ @Service("messageService") public class MessageServiceImpl implements MessageService { @Autowired - MessageRepository messageRepository; + private MessageRepository messageRepository; public Message findOne() { return messageRepository.findOne(); diff --git a/training5/.project b/training5/.project index d118b2c..45d29e2 100755 --- a/training5/.project +++ b/training5/.project @@ -11,12 +11,12 @@ - org.eclipse.m2e.core.maven2Builder + org.springframework.ide.eclipse.core.springbuilder - org.springframework.ide.eclipse.core.springbuilder + org.eclipse.m2e.core.maven2Builder diff --git a/training5/pom.xml b/training5/pom.xml index fe47e13..13b1386 100755 --- a/training5/pom.xml +++ b/training5/pom.xml @@ -6,7 +6,7 @@ training5 - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training5/src/main/java/com/example/business/service/MessageServiceImpl.java b/training5/src/main/java/com/example/business/service/MessageServiceImpl.java index 1529a71..9cf83ae 100755 --- a/training5/src/main/java/com/example/business/service/MessageServiceImpl.java +++ b/training5/src/main/java/com/example/business/service/MessageServiceImpl.java @@ -9,7 +9,7 @@ @Service("messageService") public class MessageServiceImpl implements MessageService { @Autowired - MessageRepository messageRepository; + private MessageRepository messageRepository; public Message findOne() { return messageRepository.findOne(); diff --git a/training6-answer/pom.xml b/training6-answer/pom.xml index 7f69fc9..8c01406 100755 --- a/training6-answer/pom.xml +++ b/training6-answer/pom.xml @@ -8,7 +8,7 @@ training6-answer - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training6-answer/src/main/java/com/example/business/service/EmployeeServiceImpl.java b/training6-answer/src/main/java/com/example/business/service/EmployeeServiceImpl.java index 4c66943..7cf784d 100755 --- a/training6-answer/src/main/java/com/example/business/service/EmployeeServiceImpl.java +++ b/training6-answer/src/main/java/com/example/business/service/EmployeeServiceImpl.java @@ -13,7 +13,7 @@ @Transactional public class EmployeeServiceImpl implements EmployeeService { @Autowired - EmployeeRepository employeeRepository; + private EmployeeRepository employeeRepository; public List findAll() { return employeeRepository.findAll(); diff --git a/training6/pom.xml b/training6/pom.xml index 262ae4e..8401382 100755 --- a/training6/pom.xml +++ b/training6/pom.xml @@ -8,7 +8,7 @@ training6 - 4.1.6.RELEASE + 4.3.13.RELEASE diff --git a/training6/src/main/java/com/example/business/service/EmployeeServiceImpl.java b/training6/src/main/java/com/example/business/service/EmployeeServiceImpl.java index d847eab..e00881c 100755 --- a/training6/src/main/java/com/example/business/service/EmployeeServiceImpl.java +++ b/training6/src/main/java/com/example/business/service/EmployeeServiceImpl.java @@ -12,7 +12,7 @@ //TODO 演習6 トランザクションのためのアノテーションを記述する public class EmployeeServiceImpl implements EmployeeService { @Autowired - EmployeeRepository employeeRepository; + private EmployeeRepository employeeRepository; public List findAll() { return employeeRepository.findAll(); diff --git a/training7-answer/pom.xml b/training7-answer/pom.xml index e4ad041..094f48a 100755 --- a/training7-answer/pom.xml +++ b/training7-answer/pom.xml @@ -8,7 +8,7 @@ training7-answer - 4.2.8.RELEASE + 4.3.13.RELEASE diff --git a/training7-answer/src/main/java/com/example/business/service/EmployeeServiceImpl.java b/training7-answer/src/main/java/com/example/business/service/EmployeeServiceImpl.java index 4c66943..7cf784d 100755 --- a/training7-answer/src/main/java/com/example/business/service/EmployeeServiceImpl.java +++ b/training7-answer/src/main/java/com/example/business/service/EmployeeServiceImpl.java @@ -13,7 +13,7 @@ @Transactional public class EmployeeServiceImpl implements EmployeeService { @Autowired - EmployeeRepository employeeRepository; + private EmployeeRepository employeeRepository; public List findAll() { return employeeRepository.findAll(); diff --git a/training7/pom.xml b/training7/pom.xml index bce1903..32de9b7 100755 --- a/training7/pom.xml +++ b/training7/pom.xml @@ -8,7 +8,7 @@ training7 - 4.2.8.RELEASE + 4.3.13.RELEASE diff --git a/training7/src/main/java/com/example/business/service/EmployeeServiceImpl.java b/training7/src/main/java/com/example/business/service/EmployeeServiceImpl.java index 4c66943..7cf784d 100755 --- a/training7/src/main/java/com/example/business/service/EmployeeServiceImpl.java +++ b/training7/src/main/java/com/example/business/service/EmployeeServiceImpl.java @@ -13,7 +13,7 @@ @Transactional public class EmployeeServiceImpl implements EmployeeService { @Autowired - EmployeeRepository employeeRepository; + private EmployeeRepository employeeRepository; public List findAll() { return employeeRepository.findAll();