[FIX] heowc#26 SpringBootJpa

heowc · heowc · commit e76df7b6e658 · 2019-03-18T21:15:42.000+09:00
- change base package
diff --git a/SpringBootJpa/src/main/java/com/example/java/SpringBootJpaApplication.java b/SpringBootJpa/src/main/java/com/example/java/SpringBootJpaApplication.java
@@ -1,12 +1,12 @@
-package com.example;
+package com.example.java;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class SpringBootJpaApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(SpringBootJpaApplication.class, args);
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(SpringBootJpaApplication.class, args);
+    }
 }
diff --git a/SpringBootJpa/src/main/java/com/example/java/onetomany/domain/Order.java b/SpringBootJpa/src/main/java/com/example/java/onetomany/domain/Order.java
@@ -1,4 +1,4 @@
-package com.example.onetomany.domain;
+package com.example.java.onetomany.domain;
 
 import javax.persistence.*;
 
diff --git a/SpringBootJpa/src/main/java/com/example/java/onetomany/domain/Product.java b/SpringBootJpa/src/main/java/com/example/java/onetomany/domain/Product.java
@@ -1,4 +1,4 @@
-package com.example.onetomany.domain;
+package com.example.java.onetomany.domain;
 
 import javax.persistence.*;
 
diff --git a/SpringBootJpa/src/main/java/com/example/java/onetomany/repository/OrderRepository.java b/SpringBootJpa/src/main/java/com/example/java/onetomany/repository/OrderRepository.java
@@ -1,6 +1,6 @@
-package com.example.onetomany.repository;
+package com.example.java.onetomany.repository;
 
-import com.example.onetomany.domain.Order;
+import com.example.java.onetomany.domain.Order;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface OrderRepository extends JpaRepository<Order, Long> {
diff --git a/SpringBootJpa/src/main/java/com/example/java/onetomany/repository/ProductRepository.java b/SpringBootJpa/src/main/java/com/example/java/onetomany/repository/ProductRepository.java
@@ -1,6 +1,6 @@
-package com.example.onetomany.repository;
+package com.example.java.onetomany.repository;
 
-import com.example.onetomany.domain.Product;
+import com.example.java.onetomany.domain.Product;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ProductRepository extends JpaRepository<Product, Long> {
diff --git a/SpringBootJpa/src/main/java/com/example/java/onetoone/domain/Market.java b/SpringBootJpa/src/main/java/com/example/java/onetoone/domain/Market.java
@@ -1,4 +1,4 @@
-package com.example.onetoone.domain;
+package com.example.java.onetoone.domain;
 
 import javax.persistence.*;
 
@@ -67,7 +67,7 @@ public String toString() {
                 "idx=" + idx +
                 ", name='" + name + '\'' +
                 ", location='" + location + '\'' +
-                ", owner=" + owner +
+                ", owner=" + owner.getName() +
                 '}';
     }
 }
diff --git a/SpringBootJpa/src/main/java/com/example/java/onetoone/domain/Owner.java b/SpringBootJpa/src/main/java/com/example/java/onetoone/domain/Owner.java
@@ -1,4 +1,4 @@
-package com.example.onetoone.domain;
+package com.example.java.onetoone.domain;
 
 import javax.persistence.*;
 
@@ -52,7 +52,7 @@ public String toString() {
         return "Owner{" +
                 "idx=" + idx +
                 ", name='" + name + '\'' +
-                ", market=" + market +
+                ", market=" + market.getName() +
                 '}';
     }
 }
diff --git a/SpringBootJpa/src/main/java/com/example/java/onetoone/repository/MarketRepository.java b/SpringBootJpa/src/main/java/com/example/java/onetoone/repository/MarketRepository.java
@@ -1,6 +1,6 @@
-package com.example.onetoone.repository;
+package com.example.java.onetoone.repository;
 
-import com.example.onetoone.domain.Market;
+import com.example.java.onetoone.domain.Market;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface MarketRepository extends JpaRepository<Market, Long> {
diff --git a/SpringBootJpa/src/main/java/com/example/java/onetoone/repository/OwnerRepository.java b/SpringBootJpa/src/main/java/com/example/java/onetoone/repository/OwnerRepository.java
@@ -1,6 +1,6 @@
-package com.example.onetoone.repository;
+package com.example.java.onetoone.repository;
 
-import com.example.onetoone.domain.Owner;
+import com.example.java.onetoone.domain.Owner;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface OwnerRepository extends JpaRepository<Owner, Long> {
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/domain/Customer.java b/SpringBootJpa/src/main/java/com/example/java/simple/domain/Customer.java
@@ -1,4 +1,4 @@
-package com.example.simple.domain;
+package com.example.java.simple.domain;
 
 import javax.persistence.*;
 
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/domain/TimeData.java b/SpringBootJpa/src/main/java/com/example/java/simple/domain/TimeData.java
@@ -1,4 +1,4 @@
-package com.example.simple.domain;
+package com.example.java.simple.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/repository/CustomJpqlRepository.java b/SpringBootJpa/src/main/java/com/example/java/simple/repository/CustomJpqlRepository.java
@@ -1,6 +1,6 @@
-package com.example.simple.repository;
+package com.example.java.simple.repository;
 
-import com.example.simple.domain.Customer;
+import com.example.java.simple.domain.Customer;
 
 import java.util.List;
 
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/repository/CustomerRepository.java b/SpringBootJpa/src/main/java/com/example/java/simple/repository/CustomerRepository.java
@@ -1,6 +1,6 @@
-package com.example.simple.repository;
+package com.example.java.simple.repository;
 
-import com.example.simple.domain.Customer;
+import com.example.java.simple.domain.Customer;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CustomerRepository extends JpaRepository<Customer, Long>, CustomJpqlRepository {
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/repository/SimpleCustomJpqlRepository.java b/SpringBootJpa/src/main/java/com/example/java/simple/repository/SimpleCustomJpqlRepository.java
@@ -1,6 +1,6 @@
-package com.example.simple.repository;
+package com.example.java.simple.repository;
 
-import com.example.simple.domain.Customer;
+import com.example.java.simple.domain.Customer;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/repository/TimeDataRepository.java b/SpringBootJpa/src/main/java/com/example/java/simple/repository/TimeDataRepository.java
@@ -1,6 +1,6 @@
-package com.example.simple.repository;
+package com.example.java.simple.repository;
 
-import com.example.simple.domain.TimeData;
+import com.example.java.simple.domain.TimeData;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TimeDataRepository extends JpaRepository<TimeData, Long> {
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/service/CustomService.java b/SpringBootJpa/src/main/java/com/example/java/simple/service/CustomService.java
@@ -1,6 +1,6 @@
-package com.example.simple.service;
+package com.example.java.simple.service;
 
-import com.example.simple.domain.Customer;
+import com.example.java.simple.domain.Customer;
 
 import java.util.List;
 
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/service/SimpleCustomerService.java b/SpringBootJpa/src/main/java/com/example/java/simple/service/SimpleCustomerService.java
@@ -1,7 +1,7 @@
-package com.example.simple.service;
+package com.example.java.simple.service;
 
-import com.example.simple.domain.Customer;
-import com.example.simple.repository.CustomerRepository;
+import com.example.java.simple.domain.Customer;
+import com.example.java.simple.repository.CustomerRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/web/CustomController.java b/SpringBootJpa/src/main/java/com/example/java/simple/web/CustomController.java
@@ -1,7 +1,7 @@
-package com.example.simple.web;
+package com.example.java.simple.web;
 
-import com.example.simple.domain.Customer;
-import com.example.simple.service.CustomService;
+import com.example.java.simple.domain.Customer;
+import com.example.java.simple.service.CustomService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/SpringBootJpa/src/main/java/com/example/java/simple/web/TimeController.java b/SpringBootJpa/src/main/java/com/example/java/simple/web/TimeController.java
@@ -1,4 +1,4 @@
-package com.example.simple.web;
+package com.example.java.simple.web;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/SpringBootJpa/src/main/kotlin/com/example/kotlin/onetoone/domain/Market.kt b/SpringBootJpa/src/main/kotlin/com/example/kotlin/onetoone/domain/Market.kt
@@ -15,4 +15,8 @@ data class Market(
         var owner: Owner? = null) {
 
     constructor() : this(null, null, null, null)
+
+    override fun toString(): String {
+        return "Market(idx=$idx, name=$name, location=$location, owner=${owner?.name})"
+    }
 }
diff --git a/SpringBootJpa/src/main/kotlin/com/example/kotlin/onetoone/domain/Owner.kt b/SpringBootJpa/src/main/kotlin/com/example/kotlin/onetoone/domain/Owner.kt
@@ -12,5 +12,9 @@ data class Owner(
         @OneToOne @JoinColumn(name = "OWNER_ID")
         var market: Market? = null
 ) {
-        constructor() : this(null, null, null)
+    constructor() : this(null, null, null)
+
+    override fun toString(): String {
+        return "Owner(idx=$idx, name=$name, market=${market?.name})"
+    }
 }
diff --git a/SpringBootJpa/src/test/java/com/example/OneToOneTests.java b/SpringBootJpa/src/test/java/com/example/OneToOneTests.java
diff --git a/SpringBootJpa/src/test/java/com/example/java/CustomerRepositoryTests.java b/SpringBootJpa/src/test/java/com/example/java/CustomerRepositoryTests.java
@@ -1,7 +1,7 @@
-package com.example;
+package com.example.java;
 
-import com.example.simple.domain.Customer;
-import com.example.simple.repository.CustomerRepository;
+import com.example.java.simple.domain.Customer;
+import com.example.java.simple.repository.CustomerRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/SpringBootJpa/src/test/java/com/example/java/EntityManagerTests.java b/SpringBootJpa/src/test/java/com/example/java/EntityManagerTests.java
@@ -1,6 +1,6 @@
-package com.example;
+package com.example.java;
 
-import com.example.simple.domain.Customer;
+import com.example.java.simple.domain.Customer;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/SpringBootJpa/src/test/java/com/example/java/OneToManyTests.java b/SpringBootJpa/src/test/java/com/example/java/OneToManyTests.java
@@ -1,17 +1,14 @@
-package com.example;
+package com.example.java;
 
-import com.example.onetomany.domain.Order;
-import com.example.onetomany.domain.Product;
-import com.example.onetomany.repository.OrderRepository;
-import com.example.onetomany.repository.ProductRepository;
+import com.example.java.onetomany.domain.Order;
+import com.example.java.onetomany.domain.Product;
+import com.example.java.onetomany.repository.OrderRepository;
+import com.example.java.onetomany.repository.ProductRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
-import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/SpringBootJpa/src/test/java/com/example/java/OneToOneTests.java b/SpringBootJpa/src/test/java/com/example/java/OneToOneTests.java
@@ -0,0 +1,53 @@
+package com.example.java;
+
+import com.example.java.onetoone.domain.Market;
+import com.example.java.onetoone.domain.Owner;
+import com.example.java.onetoone.repository.MarketRepository;
+import com.example.java.onetoone.repository.OwnerRepository;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.transaction.annotation.Transactional;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootJpaApplication.class)
+@Transactional
+public class OneToOneTests {
+
+    @Autowired
+    MarketRepository marketRepository;
+
+    @Autowired
+    OwnerRepository ownerRepository;
+
+    @Before
+    public void before_init() {
+        Market wonchulMarket = marketRepository.save(new Market("원철 중화 반점", "서울 구로구"));
+        Market naeunMarket = marketRepository.save(new Market("나은 중화 반점", "서울 구로구"));
+        Market googleMarket = marketRepository.save(new Market("구글 중화 반점", "서울 구로구"));
+
+        Owner wonchul = ownerRepository.save(new Owner("원철"));
+        wonchul.setMarket(wonchulMarket);
+        wonchulMarket.setOwner(wonchul);
+
+        Owner naeun = ownerRepository.save(new Owner("나은"));
+        naeun.setMarket(naeunMarket);
+        naeunMarket.setOwner(naeun);
+
+        Owner google = ownerRepository.save(new Owner("구글"));
+        google.setMarket(googleMarket);
+        googleMarket.setOwner(google);
+
+        marketRepository.findAll().forEach(System.out::println);
+        ownerRepository.findAll().forEach(System.out::println);
+    }
+
+    @Test
+    public void test_findOne() {
+        System.out.println(marketRepository.findById(1L).orElse(null));
+        System.out.println(ownerRepository.findById(1L).orElse(null));
+    }
+}
diff --git a/SpringBootJpa/src/test/java/com/example/java/TimeTests.java b/SpringBootJpa/src/test/java/com/example/java/TimeTests.java
@@ -1,7 +1,7 @@
-package com.example;
+package com.example.java;
 
-import com.example.simple.domain.TimeData;
-import com.example.simple.repository.TimeDataRepository;
+import com.example.java.simple.domain.TimeData;
+import com.example.java.simple.repository.TimeDataRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/SpringBootJpa/src/test/kotlin/com/example/kotlin/OneToManyTests.java b/SpringBootJpa/src/test/kotlin/com/example/kotlin/OneToManyTests.java
@@ -1,9 +1,9 @@
 package com.example.kotlin;
 
-import com.example.onetomany.domain.Order;
-import com.example.onetomany.domain.Product;
-import com.example.onetomany.repository.OrderRepository;
-import com.example.onetomany.repository.ProductRepository;
+import com.example.java.onetomany.domain.Order;
+import com.example.java.onetomany.domain.Product;
+import com.example.java.onetomany.repository.OrderRepository;
+import com.example.java.onetomany.repository.ProductRepository;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/SpringBootJpa/src/test/kotlin/com/example/kotlin/OneToOneTests.kt b/SpringBootJpa/src/test/kotlin/com/example/kotlin/OneToOneTests.kt
@@ -25,13 +25,22 @@ open class OneToOneTests {
 
     @Before
     fun before_init() {
-        marketRepository.save(Market(name = "원철 중화 반점", location = "서울 구로구"))
-        marketRepository.save(Market(name = "나은 중화 반점", location = "서울 구로구"))
-        marketRepository.save(Market(name = "구글 중화 반점", location = "서울 구로구"))
+        val wonchulMarket = marketRepository.save(Market(name = "원철 중화 반점", location = "서울 구로구"))
+        val naeunMarket = marketRepository.save(Market(name = "나은 중화 반점",  location = "서울 구로구"))
+        val googleMarket = marketRepository.save(Market(name = "구글 중화 반점", location = "서울 구로구"))
+
+        val wonchul = ownerRepository.save(Owner(name = "원철"))
+        wonchul.market = wonchulMarket
+        wonchulMarket.owner = wonchul
+
+        val naeun = ownerRepository.save(Owner(name = "나은"))
+        naeun.market = naeunMarket
+        naeunMarket.owner = naeun
+
+        val google = ownerRepository.save(Owner(name = "구글"))
+        google.market = googleMarket
+        googleMarket.owner = google
 
-        ownerRepository.save(Owner(name = "원철"))
-        ownerRepository.save(Owner(name = "나은"))
-        ownerRepository.save(Owner(name = "구글"))
 
         marketRepository.findAll().forEach { println(it) }
         ownerRepository.findAll().forEach { println(it) }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.example.onetomany.domain;`
	`1`	`+package com.example.java.onetomany.domain;`
`2`	`2`
`3`	`3`	`import javax.persistence.*;`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.example.onetoone.domain;`
	`1`	`+package com.example.java.onetoone.domain;`
`2`	`2`
`3`	`3`	`import javax.persistence.*;`
`4`	`4`
`@@ -67,7 +67,7 @@ public String toString() {`
`67`	`67`	`"idx=" + idx +`
`68`	`68`	`", name='" + name + '\'' +`
`69`	`69`	`", location='" + location + '\'' +`
`70`		`- ", owner=" + owner +`
	`70`	`+ ", owner=" + owner.getName() +`
`71`	`71`	`'}';`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.example.simple.domain;`
	`1`	`+package com.example.java.simple.domain;`
`2`	`2`
`3`	`3`	`import javax.persistence.*;`
`4`	`4`