diff --git a/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMain.java b/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMain.java
index fb99ab1d69..d5c41bcfab 100644
--- a/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMain.java
+++ b/spring-hibernate4/src/main/java/com/baeldung/hibernate/oneToMany/main/HibernateOneToManyAnnotationMain.java
@@ -7,9 +7,9 @@ import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 
-import com.baeldung.hibernate.model.Cart;
-import com.baeldung.hibernate.model.Items;
-import com.baeldung.hibernate.config.HibernateAnnotationUtil;
+import com.baeldung.hibernate.oneToMany.config.HibernateAnnotationUtil;
+import com.baeldung.hibernate.oneToMany.model.Cart;
+import com.baeldung.hibernate.oneToMany.model.Items;
 
 public class HibernateOneToManyAnnotationMain {
 
diff --git a/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/model/ItemsTest.java b/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/model/ItemsTest.java
index eda45ce4f5..c6e792f9bb 100644
--- a/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/model/ItemsTest.java
+++ b/spring-hibernate4/src/test/java/com/baeldung/hibernate/oneToMany/model/ItemsTest.java
@@ -1,131 +1,129 @@
 
 package com.baeldung.hibernate.oneToMany.model;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
-
 
 public class ItemsTest {
-    
-    public ItemsTest() {
-    }
-    
-    @BeforeClass
-    public static void setUpClass() {
-    }
-    
-    @AfterClass
-    public static void tearDownClass() {
-    }
-    
-    @Before
-    public void setUp() {
-    }
-    
-    @After
-    public void tearDown() {
-    }
-    
-    @Test
-    public void testGetItemId() {
-        System.out.println("getItemId");
-        Items instance = new Items();
-        String expResult = "";
-        String result = instance.getItemId();
-        assertEquals(expResult, result);
-        fail("The test failed.");
-    }
 
-    @Test
-    public void testSetItemId() {
-        System.out.println("setItemId");
-        String itemId = "";
-        Items instance = new Items();
-        instance.setItemId(itemId);
-        fail("The test failed.");
-    }
+	public ItemsTest() {
+	}
 
-    @Test
-    public void testGetItemTotal() {
-        System.out.println("getItemTotal");
-        Items instance = new Items();
-        double expResult = 0.0;
-        double result = instance.getItemTotal();
-        assertEquals(expResult, result, 0.0);
-        fail("The test failed.");
-    }
+	@BeforeClass
+	public static void setUpClass() {
+	}
 
-    @Test
-    public void testSetItemTotal() {
-        System.out.println("setItemTotal");
-        double itemTotal = 0.0;
-        Items instance = new Items();
-        instance.setItemTotal(itemTotal);
-        fail("The test failed.");
-    }
+	@AfterClass
+	public static void tearDownClass() {
+	}
 
-    @Test
-    public void testGetQuantity() {
-        System.out.println("getQuantity");
-        Items instance = new Items();
-        int expResult = 0;
-        int result = instance.getQuantity();
-        assertEquals(expResult, result);
-        fail("The test failed.");
-    }
+	@Before
+	public void setUp() {
+	}
 
-    @Test
-    public void testSetQuantity() {
-        System.out.println("setQuantity");
-        int quantity = 0;
-        Items instance = new Items();
-        instance.setQuantity(quantity);
-        fail("The test failed.");
-    }
+	@After
+	public void tearDown() {
+	}
 
-    @Test
-    public void testGetCart() {
-        System.out.println("getCart");
-        Items instance = new Items();
-        Cart expResult = null;
-        Cart result = instance.getCart();
-        assertEquals(expResult, result);
-        fail("The test failed.");
-    }
+	@Test
+	public void testGetItemId() {
+		System.out.println("getItemId");
+		Items instance = new Items();
+		String expResult = "";
+		String result = instance.getItemId();
+		assertEquals(expResult, result);
+		fail("The test failed.");
+	}
 
-    @Test
-    public void testSetCart() {
-        System.out.println("setCart");
-        Cart cart = null;
-        Items instance = new Items();
-        instance.setCart1(cart);
-        fail("The test failed.");
-    }
+	@Test
+	public void testSetItemId() {
+		System.out.println("setItemId");
+		String itemId = "";
+		Items instance = new Items();
+		instance.setItemId(itemId);
+		fail("The test failed.");
+	}
 
-    @Test
-    public void testGetId() {
-        System.out.println("getId");
-        Items instance = new Items();
-        long expResult = 0L;
-        long result = instance.getId();
-        assertEquals(expResult, result);
-        fail("The test failed.");
-    }
+	@Test
+	public void testGetItemTotal() {
+		System.out.println("getItemTotal");
+		Items instance = new Items();
+		double expResult = 0.0;
+		double result = instance.getItemTotal();
+		assertEquals(expResult, result, 0.0);
+		fail("The test failed.");
+	}
+
+	@Test
+	public void testSetItemTotal() {
+		System.out.println("setItemTotal");
+		double itemTotal = 0.0;
+		Items instance = new Items();
+		instance.setItemTotal(itemTotal);
+		fail("The test failed.");
+	}
+
+	@Test
+	public void testGetQuantity() {
+		System.out.println("getQuantity");
+		Items instance = new Items();
+		int expResult = 0;
+		int result = instance.getQuantity();
+		assertEquals(expResult, result);
+		fail("The test failed.");
+	}
+
+	@Test
+	public void testSetQuantity() {
+		System.out.println("setQuantity");
+		int quantity = 0;
+		Items instance = new Items();
+		instance.setQuantity(quantity);
+		fail("The test failed.");
+	}
+
+	@Test
+	public void testGetCart() {
+		System.out.println("getCart");
+		Items instance = new Items();
+		Cart expResult = null;
+		Cart result = instance.getCart();
+		assertEquals(expResult, result);
+		fail("The test failed.");
+	}
+
+	@Test
+	public void testSetCart() {
+		System.out.println("setCart");
+		Cart cart = null;
+		Items instance = new Items();
+		instance.setCart(cart);
+		fail("The test failed.");
+	}
+
+	@Test
+	public void testGetId() {
+		System.out.println("getId");
+		Items instance = new Items();
+		long expResult = 0L;
+		long result = instance.getId();
+		assertEquals(expResult, result);
+		fail("The test failed.");
+	}
+
+	@Test
+	public void testSetId() {
+		System.out.println("setId");
+		long id = 0L;
+		Items instance = new Items();
+		instance.setId(id);
+		fail("The test failed.");
+	}
 
-    @Test
-    public void testSetId() {
-        System.out.println("setId");
-        long id = 0L;
-        Items instance = new Items();
-        instance.setId(id);
-        fail("The test failed.");
-    }
-    
-}
-
-    
 }
diff --git a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
index f2dfa8caa1..b52e26b93e 100644
--- a/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
+++ b/spring-thymeleaf/src/main/java/com/baeldung/thymeleaf/config/WebMVCConfig.java
@@ -77,14 +77,14 @@ public class WebMVCConfig extends WebMvcConfigurerAdapter implements Application
         return resolver;
     }
 
-    private TemplateEngine templateEngine(ITemplateResolver templateResolver) {
-        SpringTemplateEngine engine = new SpringTemplateEngine();
-        engine.addDialect(new LayoutDialect(new GroupingStrategy()));
-        engine.addDialect(new Java8TimeDialect());
-        engine.setTemplateResolver(templateResolver);
-        engine.setTemplateEngineMessageSource(messageSource());
-        return engine;
-    }
+	private TemplateEngine templateEngine(ITemplateResolver templateResolver) {
+		SpringTemplateEngine engine = new SpringTemplateEngine();
+		engine.addDialect(new LayoutDialect(new GroupingStrategy()));
+		engine.addDialect(new Java8TimeDialect());
+		engine.setTemplateResolver(templateResolver);
+		engine.setTemplateEngineMessageSource(messageSource());
+		return engine;
+	}
 
     private ITemplateResolver htmlTemplateResolver() {
         SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver();