work

thomaswoehlke · thomaswoehlke · commit f2f13e714f91 · 2022-11-21T08:07:31.000+01:00
diff --git a/src/main/java/org/woehlke/greenshop/oodm/admin/service/AdministratorServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/admin/service/AdministratorServiceImpl.java
@@ -33,13 +33,13 @@ public List<Administrator> findAllAdministrators() {
 
     @Override
     public Administrator findAdministratorById(long administratorId) {
-        return administratorRepository.findOne(administratorId);
+        return administratorRepository.getOne(administratorId);
     }
 
     @Override
     @Transactional(readOnly=false,propagation=Propagation.REQUIRES_NEW)
     public void update(Administrator thisAdministrator) {
-        Administrator original = administratorRepository.findOne(thisAdministrator.getId());
+        Administrator original = administratorRepository.getOne(thisAdministrator.getId());
         if(original.getUserPassword().compareTo(thisAdministrator.getUserPassword())!=0){
             thisAdministrator.setUserPassword(encoder.encode(thisAdministrator.getUserPassword()));
         }
diff --git a/src/main/java/org/woehlke/greenshop/oodm/admin/service/TaxClassServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/admin/service/TaxClassServiceImpl.java
@@ -24,7 +24,7 @@ public class TaxClassServiceImpl implements TaxClassService {
 
     @Override
     public TaxClass findById(long taxClassId) {
-        return taxClassRepository.findOne(taxClassId);
+        return taxClassRepository.getOne(taxClassId);
     }
 
     @Override
diff --git a/src/main/java/org/woehlke/greenshop/oodm/admin/service/TaxRateServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/admin/service/TaxRateServiceImpl.java
@@ -28,7 +28,7 @@ public Page<TaxRate> findAll(Pageable pageRequest) {
 
     @Override
     public TaxRate findById(long taxRateId) {
-        return taxRateRepository.findOne(taxRateId);
+        return taxRateRepository.getOne(taxRateId);
     }
 
     @Override
diff --git a/src/main/java/org/woehlke/greenshop/oodm/admin/service/TaxZone2ZoneServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/admin/service/TaxZone2ZoneServiceImpl.java
@@ -50,6 +50,6 @@ public List<TaxZone2Zone> findZonesByTaxZone(TaxZone thisTaxZone) {
 
     @Override
     public TaxZone2Zone findTaxZone2ZoneById(long zoneId) {
-        return taxZone2ZoneRepository.findOne(zoneId);
+        return taxZone2ZoneRepository.getOne(zoneId);
     }
 }
diff --git a/src/main/java/org/woehlke/greenshop/oodm/admin/service/TaxZoneServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/admin/service/TaxZoneServiceImpl.java
@@ -36,16 +36,16 @@ public TaxZone createTaxZone(TaxZone thisTaxZone) {
     @Override
     @Transactional(readOnly=false,propagation=Propagation.REQUIRES_NEW)
     public void deleteTaxZones(TaxZone thisTaxZone) {
-        TaxZone tz =taxZoneRepository.findOne(thisTaxZone.getId());
+        TaxZone tz =taxZoneRepository.getOne(thisTaxZone.getId());
         List<TaxZone2Zone> list = taxZone2ZoneRepository.findByTaxZone(tz);
-        taxZone2ZoneRepository.delete(list);
+        taxZone2ZoneRepository.deleteInBatch(list);
         taxZoneRepository.delete(tz);
     }
 
     @Override
     @Transactional(readOnly=false,propagation=Propagation.REQUIRES_NEW)
     public void updateTaxZone(TaxZone thisTaxZone) {
-        TaxZone tz =taxZoneRepository.findOne(thisTaxZone.getId());
+        TaxZone tz =taxZoneRepository.getOne(thisTaxZone.getId());
         tz.setLastModified(new Date());
         tz.setName(thisTaxZone.getName());
         tz.setDescription(thisTaxZone.getDescription());
@@ -64,6 +64,6 @@ public Page<TaxZone> findAllTaxZones(Pageable pageRequest) {
 
     @Override
     public TaxZone findTaxZoneById(long taxZoneId) {
-        return taxZoneRepository.findOne(taxZoneId);
+        return taxZoneRepository.getOne(taxZoneId);
     }
 }
diff --git a/src/main/java/org/woehlke/greenshop/oodm/catalog/CatalogServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/catalog/CatalogServiceImpl.java
@@ -55,11 +55,11 @@ public ProductAttributes findProductOptionsByProduct(
 			ProductOptionId oid = new ProductOptionId();
 			oid.setId(pa.getOptionId());
 			oid.setLanguage(language);
-			ProductOption po = productOptionRepository.findOne(oid);
+			ProductOption po = productOptionRepository.getOne(oid);
 			ProductOptionValueId povid = new ProductOptionValueId();
 			povid.setId(pa.getValueId());
 			povid.setLanguage(language);
-			ProductOptionValue pov = productOptionValueRepository.findOne(povid);
+			ProductOptionValue pov = productOptionValueRepository.getOne(povid);
 			ProductOptionAttribute poa = new ProductOptionAttribute();
 			poa.setProductAttribute(pa);
 			poa.setProductOption(po);
diff --git a/src/main/java/org/woehlke/greenshop/oodm/catalog/service/CategoryServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/catalog/service/CategoryServiceImpl.java
@@ -210,8 +210,8 @@ public ProductsByCategory getProductsByCategoryAndManufacturer(
             long categoryId, long manufacturerId, Language language) {
         ProductsByCategory productsByCategory = new ProductsByCategory();
         productsByCategory.setManufacturerId(manufacturerId);
-        Category category = categoryRepository.findOne(categoryId);
-        Manufacturer manufacturer = manufacturerRepository.findOne(manufacturerId);
+        Category category = categoryRepository.getOne(categoryId);
+        Manufacturer manufacturer = manufacturerRepository.getOne(manufacturerId);
         List<SpecialProduct> products = new ArrayList<SpecialProduct>();
         List<ProductDescription> productDescriptions=productDescriptionRepositoryDao.findByCategoryAndManufacturer(category,manufacturer,language);
         for(ProductDescription productDescription:productDescriptions){
@@ -232,7 +232,7 @@ public ProductsByCategory getProductsByCategoryAndManufacturer(
         CategoryDescriptionId categoryDescriptionId = new CategoryDescriptionId();
         categoryDescriptionId.setLanguage(language);
         categoryDescriptionId.setCategory(category);
-        CategoryDescription thisCategory = categoryDescriptionRepository.findOne(categoryDescriptionId);
+        CategoryDescription thisCategory = categoryDescriptionRepository.getOne(categoryDescriptionId);
         productsByCategory.setThisCategory(thisCategory);
         List<CategoryDescription> childCategories = categoryDescriptionRepositoryDao.findCategoriesByParentId(categoryId, language);
         productsByCategory.setChildCategories(childCategories);
@@ -242,7 +242,7 @@ public ProductsByCategory getProductsByCategoryAndManufacturer(
     @Override
     public ProductsByCategory getProductsByCategory(long categoryId,Language language){
         ProductsByCategory productsByCategory = new ProductsByCategory();
-        Category category = categoryRepository.findOne(categoryId);
+        Category category = categoryRepository.getOne(categoryId);
         List<SpecialProduct> products = new ArrayList<SpecialProduct>();
         List<ProductDescription> productDescriptions=productDescriptionRepositoryDao.findByCategory(category, language);
         for(ProductDescription productDescription:productDescriptions){
@@ -263,7 +263,7 @@ public ProductsByCategory getProductsByCategory(long categoryId,Language languag
         CategoryDescriptionId categoryDescriptionId = new CategoryDescriptionId();
         categoryDescriptionId.setLanguage(language);
         categoryDescriptionId.setCategory(category);
-        CategoryDescription thisCategory = categoryDescriptionRepository.findOne(categoryDescriptionId);
+        CategoryDescription thisCategory = categoryDescriptionRepository.getOne(categoryDescriptionId);
         productsByCategory.setThisCategory(thisCategory);
         List<CategoryDescription> childCategories = categoryDescriptionRepositoryDao.findCategoriesByParentId(categoryId, language);
         productsByCategory.setChildCategories(childCategories);
diff --git a/src/main/java/org/woehlke/greenshop/oodm/catalog/service/LanguageServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/catalog/service/LanguageServiceImpl.java
@@ -31,6 +31,6 @@ public List<Language> findAllLanguages() {
 
     @Override
     public Language findLanguageById(long languageId) {
-        return languageRepository.findOne(languageId);
+        return languageRepository.getOne(languageId);
     }
 }
diff --git a/src/main/java/org/woehlke/greenshop/oodm/catalog/service/ManufacturerServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/catalog/service/ManufacturerServiceImpl.java
@@ -39,13 +39,13 @@ public List<Manufacturer> getAllManufacturers() {
 
     @Override
     public Manufacturer getManufacturerById(long manufacturerId) {
-        return manufacturerRepository.findOne(manufacturerId);
+        return manufacturerRepository.getOne(manufacturerId);
     }
 
     //TODO: doppelte entfernen
     @Override
     public Manufacturers findManufacturers() {
-        Sort sort = new Sort(Sort.Direction.ASC,"name");
+        Sort sort = Sort.by(Sort.Direction.ASC,"name");
         List<Manufacturer> manufacturers = manufacturerRepository.findAll(sort);
         Manufacturers m = new Manufacturers();
         m.setManufacturers(manufacturers);
@@ -55,16 +55,16 @@ public Manufacturers findManufacturers() {
     //TODO: doppelte entfernen
     @Override
     public Manufacturer findManufacturerById(Long manufacturerId) {
-        return manufacturerRepository.findOne(manufacturerId);
+        return manufacturerRepository.getOne(manufacturerId);
     }
 
     @Override
     public ManufacturerInfo findManufacturerInfo(long manufacturerId, Language language) {
-        Manufacturer manufacturer = manufacturerRepository.findOne(manufacturerId);
+        Manufacturer manufacturer = manufacturerRepository.getOne(manufacturerId);
         ManufacturerInfoId manufacturerInfoId = new ManufacturerInfoId();
         manufacturerInfoId.setLanguage(language);
         manufacturerInfoId.setManufacturer(manufacturer);
-        return manufacturerInfoRepository.findOne(manufacturerInfoId);
+        return manufacturerInfoRepository.getOne(manufacturerInfoId);
     }
 
     @Override
diff --git a/src/main/java/org/woehlke/greenshop/oodm/catalog/service/ProductServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/catalog/service/ProductServiceImpl.java
@@ -53,7 +53,7 @@ public int countProductsOfThisManufacturer(Manufacturer thisManufacturer) {
 
     @Override
     public List<ProductDescription> findProductsViewed(Language language) {
-        Sort sort = new Sort(Sort.Direction.DESC,"viewed");
+        Sort sort = Sort.by(Sort.Direction.DESC,"viewed");
         return productDescriptionRepository.findAll(sort);
     }
 
@@ -65,7 +65,7 @@ public List<ProductDescription> findProductsByCategoryId(long categoryId, Langua
             ProductDescriptionId id = new ProductDescriptionId();
             id.setProduct(product);
             id.setLanguage(language);
-            ProductDescription productDescription = productDescriptionRepository.findOne(id);
+            ProductDescription productDescription = productDescriptionRepository.getOne(id);
             productsByCategoryId.add(productDescription);
         }
         return productsByCategoryId;
@@ -74,15 +74,15 @@ public List<ProductDescription> findProductsByCategoryId(long categoryId, Langua
     @Override
     @Transactional(readOnly=false,propagation=Propagation.REQUIRES_NEW)
     public void setProductActive(long productId) {
-        Product product = productRepository.findOne(productId);
+        Product product = productRepository.getOne(productId);
         product.setStatus(true);
         productRepository.save(product);
     }
 
     @Override
     @Transactional(readOnly=false,propagation=Propagation.REQUIRES_NEW)
     public void setProductInactive(long productId) {
-        Product product = productRepository.findOne(productId);
+        Product product = productRepository.getOne(productId);
         product.setStatus(false);
         productRepository.save(product);
     }
@@ -154,7 +154,7 @@ public ProductsByManufacturer findProductsByManufacturer(
             CategoryDescriptionId id = new CategoryDescriptionId();
             id.setCategory(category);
             id.setLanguage(language);
-            CategoryDescription cd = categoryDescriptionRepository.findOne(id);
+            CategoryDescription cd = categoryDescriptionRepository.getOne(id);
             categoriesOfProducts.add(cd);
         }
         productsByManufacturer.setCategoriesOfProducts(categoriesOfProducts);
@@ -164,7 +164,7 @@ public ProductsByManufacturer findProductsByManufacturer(
     @Override
     public ProductsByManufacturer findProductsByManufacturerAndCategory(
             Manufacturer manufacturer, long categoryId, Language language) {
-        Category thisCategory=categoryRepository.findOne(categoryId);
+        Category thisCategory=categoryRepository.getOne(categoryId);
         List<ProductDescription> products = productDescriptionRepositoryDao.findByCategoryAndManufacturer(thisCategory,manufacturer,language);
         ProductsByManufacturer productsByManufacturer = new ProductsByManufacturer();
         productsByManufacturer.setProducts(products);
@@ -182,7 +182,7 @@ public ProductsByManufacturer findProductsByManufacturerAndCategory(
             CategoryDescriptionId id = new CategoryDescriptionId();
             id.setCategory(category);
             id.setLanguage(language);
-            CategoryDescription cd = categoryDescriptionRepository.findOne(id);
+            CategoryDescription cd = categoryDescriptionRepository.getOne(id);
             categoriesOfProducts.add(cd);
         }
         productsByManufacturer.setCategoriesOfProducts(categoriesOfProducts);
diff --git a/src/main/java/org/woehlke/greenshop/oodm/catalog/service/ReviewServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/catalog/service/ReviewServiceImpl.java
@@ -42,15 +42,15 @@ public class ReviewServiceImpl implements ReviewService {
 
     @Override
     public ReviewProduct getReviewById(long reviewId, Language language) {
-        Review review = reviewRepository.findOne(reviewId);
+        Review review = reviewRepository.getOne(reviewId);
         ReviewDescriptionId reviewDescriptionId = new ReviewDescriptionId();
         reviewDescriptionId.setLanguage(language);
         reviewDescriptionId.setReview(review);
-        ReviewDescription reviewDescription = reviewDescriptionRepository.findOne(reviewDescriptionId);
+        ReviewDescription reviewDescription = reviewDescriptionRepository.getOne(reviewDescriptionId);
         ProductDescriptionId id = new ProductDescriptionId();
         id.setLanguage(language);
         id.setProduct(review.getProduct());
-        ProductDescription productDescription=productDescriptionRepository.findOne(id);
+        ProductDescription productDescription=productDescriptionRepository.getOne(id);
         ReviewProduct reviewProduct = new ReviewProduct();
         reviewProduct.setProduct(productDescription);
         reviewProduct.setReview(reviewDescription);
@@ -86,7 +86,7 @@ public void update(Review review) {
     @Transactional(readOnly=false,propagation=Propagation.REQUIRES_NEW)
     public ReviewDescription saveReview(WriteReviewBean writeReviewBean,
                                         Product product, Customer customer, Language language) {
-        language=languageRepository.findOne(language.getId());
+        language=languageRepository.getOne(language.getId());
         ReviewDescription reviewDescription = new ReviewDescription();
         Review review = new Review();
         if(customer==null){
diff --git a/src/main/java/org/woehlke/greenshop/oodm/checkout/CheckoutServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/checkout/CheckoutServiceImpl.java
@@ -209,8 +209,8 @@ private void copyAddressesToOrder(CheckoutBean checkout, Order order, Customer c
 		order.setDeliverySuburb(checkout.getShippingAddress().getSuburb());
 		order.setDeliveryCountry(checkout.getShippingAddress().getCountryName());
 		order.setCustomersAddressFormat(customer.getDefaultAddress().getCountry().getAddressFormat());
-		order.setBillingAddressFormat(countryRepository.findOne(checkout.getPaymentAddress().getCountryId()).getAddressFormat());
-		order.setDeliveryAddressFormat(countryRepository.findOne(checkout.getShippingAddress().getCountryId()).getAddressFormat());
+		order.setBillingAddressFormat(countryRepository.getOne(checkout.getPaymentAddress().getCountryId()).getAddressFormat());
+		order.setDeliveryAddressFormat(countryRepository.getOne(checkout.getShippingAddress().getCountryId()).getAddressFormat());
 	}
 	
 	
diff --git a/src/main/java/org/woehlke/greenshop/oodm/checkout/OrderService.java b/src/main/java/org/woehlke/greenshop/oodm/checkout/OrderService.java
@@ -1,6 +1,7 @@
 package org.woehlke.greenshop.oodm.checkout;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.woehlke.greenshop.oodm.admin.model.OrderAdminBean;
 import org.woehlke.greenshop.oodm.catalog.entities.Language;
@@ -21,7 +22,7 @@ public interface OrderService {
 
     List<OrderStatus> findAllOrderStatuses(Language language);
 
-    OrderStatus findOrderStatusById(OrderStatusId ordersStatusId);
+    Optional<OrderStatus> findOrderStatusById(OrderStatusId ordersStatusId);
 
     List<OrderAdminBean> getAllOrders(Language language);
 
diff --git a/src/main/java/org/woehlke/greenshop/oodm/checkout/OrderServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/checkout/OrderServiceImpl.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -60,8 +61,8 @@ public List<OrderStatus> findAllOrderStatuses(Language language) {
     }
 
     @Override
-    public OrderStatus findOrderStatusById(OrderStatusId ordersStatusId) {
-        return orderStatusRepository.findOne(ordersStatusId);
+    public Optional<OrderStatus> findOrderStatusById(OrderStatusId ordersStatusId) {
+        return orderStatusRepository.findById(ordersStatusId);
     }
 
     @Override
@@ -78,8 +79,8 @@ public List<OrderAdminBean> getAllOrders(Language language) {
             OrderStatusId orderStatusId = new OrderStatusId();
             orderStatusId.setLanguage(language);
             orderStatusId.setId(myOrder.getOrdersStatus());
-            OrderStatus orderStatus=orderStatusRepository.findOne(orderStatusId);
-            bean.setOrderStatus(orderStatus);
+			Optional<OrderStatus> orderStatus=orderStatusRepository.findById(orderStatusId);
+            bean.setOrderStatus(orderStatus.get());
             bean.setPaymentMethod(myOrder.getPaymentMethod());
             orders.add(bean);
         }
@@ -88,7 +89,8 @@ public List<OrderAdminBean> getAllOrders(Language language) {
 
     @Override
     public OrderAdminBean findOrderById(long orderId, Language language) {
-        Order myOrder = orderRepository.findOne(orderId);
+		Optional<Order> myOrderOptional = orderRepository.findById(orderId);
+		Order myOrder = myOrderOptional.get();
         OrderAdminBean bean = new OrderAdminBean();
         bean.setOrderId(myOrder.getId());
         bean.setCustomerName(myOrder.getCustomersName());
@@ -98,7 +100,8 @@ public OrderAdminBean findOrderById(long orderId, Language language) {
         OrderStatusId orderStatusId = new OrderStatusId();
         orderStatusId.setLanguage(language);
         orderStatusId.setId(myOrder.getOrdersStatus());
-        OrderStatus orderStatus=orderStatusRepository.findOne(orderStatusId);
+		Optional<OrderStatus> orderStatusOptional = orderStatusRepository.findById(orderStatusId);
+        OrderStatus orderStatus=orderStatusOptional.get();
         bean.setOrderStatus(orderStatus);
         bean.setPaymentMethod(myOrder.getPaymentMethod());
         return bean;
@@ -113,12 +116,14 @@ public List<Order> findOrdersForCustomer(Customer customer) {
 	public OrderHistoryDetailsBean findOrderDetailsById(long orderId, Language language) {
 		//Language language = catalogService.findLanguageByCode("en");
 		OrderHistoryDetailsBean o = new OrderHistoryDetailsBean();
-		Order order = orderRepository.findOne(orderId);
+		Optional<Order> orderOptional = orderRepository.findById(orderId);
+		Order order = orderOptional.get();
 		o.setOrder(order);
 		OrderStatusId id = new OrderStatusId();
 		id.setLanguage(language);
 		id.setId(order.getOrdersStatus());
-		OrderStatus orderStatus = orderStatusRepository.findOne(id);
+		Optional<OrderStatus> orderStatusOptional = orderStatusRepository.findById(id);
+		OrderStatus orderStatus = orderStatusOptional.get();
 		o.setOrderStatus(orderStatus);
 		List<OrderProduct> orderProducts = orderProductRepository.findByOrder(order);
 		o.setOrderProducts(orderProducts);
@@ -140,7 +145,8 @@ public List<OrderHistoryBean> getOrderHistoryForCustomer(Customer customer,Langu
 			OrderStatusId orderStatusId = new OrderStatusId();
 			orderStatusId.setLanguage(language);
 			orderStatusId.setId(order.getOrdersStatus());
-			OrderStatus orderStatus=orderStatusRepository.findOne(orderStatusId);
+			Optional<OrderStatus> orderStatusOptional = orderStatusRepository.findById(orderStatusId);
+			OrderStatus orderStatus = orderStatusOptional.get();
 			int quantityOfProducts = 0;
 			for(OrderProduct orderProduct:orderProducts){
 				quantityOfProducts += orderProduct.getProductsQuantity();
diff --git a/src/main/java/org/woehlke/greenshop/oodm/customer/CustomerServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/customer/CustomerServiceImpl.java
diff --git a/src/main/java/org/woehlke/greenshop/oodm/customer/service/CountryServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/customer/service/CountryServiceImpl.java
diff --git a/src/main/java/org/woehlke/greenshop/oodm/customer/service/ZoneServiceImpl.java b/src/main/java/org/woehlke/greenshop/oodm/customer/service/ZoneServiceImpl.java

Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,13 @@ public List<Administrator> findAllAdministrators() {`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public Administrator findAdministratorById(long administratorId) {`
`36`		`- return administratorRepository.findOne(administratorId);`
	`36`	`+ return administratorRepository.getOne(administratorId);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Override`
`40`	`40`	`@Transactional(readOnly=false,propagation=Propagation.REQUIRES_NEW)`
`41`	`41`	`public void update(Administrator thisAdministrator) {`
`42`		`- Administrator original = administratorRepository.findOne(thisAdministrator.getId());`
	`42`	`+ Administrator original = administratorRepository.getOne(thisAdministrator.getId());`
`43`	`43`	`if(original.getUserPassword().compareTo(thisAdministrator.getUserPassword())!=0){`
`44`	`44`	`thisAdministrator.setUserPassword(encoder.encode(thisAdministrator.getUserPassword()));`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public class TaxClassServiceImpl implements TaxClassService {`
`24`	`24`
`25`	`25`	`@Override`
`26`	`26`	`public TaxClass findById(long taxClassId) {`
`27`		`- return taxClassRepository.findOne(taxClassId);`
	`27`	`+ return taxClassRepository.getOne(taxClassId);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public Page<TaxRate> findAll(Pageable pageRequest) {`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public TaxRate findById(long taxRateId) {`
`31`		`- return taxRateRepository.findOne(taxRateId);`
	`31`	`+ return taxRateRepository.getOne(taxRateId);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,6 @@ public List<TaxZone2Zone> findZonesByTaxZone(TaxZone thisTaxZone) {`
`50`	`50`
`51`	`51`	`@Override`
`52`	`52`	`public TaxZone2Zone findTaxZone2ZoneById(long zoneId) {`
`53`		`- return taxZone2ZoneRepository.findOne(zoneId);`
	`53`	`+ return taxZone2ZoneRepository.getOne(zoneId);`
`54`	`54`	`}`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ public List<Language> findAllLanguages() {`
`31`	`31`
`32`	`32`	`@Override`
`33`	`33`	`public Language findLanguageById(long languageId) {`
`34`		`- return languageRepository.findOne(languageId);`
	`34`	`+ return languageRepository.getOne(languageId);`
`35`	`35`	`}`
`36`	`36`	`}`