Merge remote-tracking branch 'eugenp/master'

core-java/src/main/java/com/baeldung/zoneddatetime/OffsetDateTimeExample.java

@@ -0,0 +1,17 @@
+package com.baeldung.zoneddatetime;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+
+public class OffsetDateTimeExample {
+
+    public OffsetDateTime getCurrentTimeByZoneOffset(String region) {
+        LocalDateTime now = LocalDateTime.now();
+        ZoneId zone = ZoneId.of(region);
+        ZoneOffset zoneOffSet= zone.getRules().getOffset(now);
+        OffsetDateTime date = OffsetDateTime.now(zoneOffSet);
+        return date;
+    }
+}

core-java/src/main/java/com/baeldung/zoneddatetime/OffsetTimeExample.java

@@ -0,0 +1,18 @@
+package com.baeldung.zoneddatetime;
+
+import java.time.LocalDateTime;
+import java.time.OffsetTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+
+public class OffsetTimeExample {
+
+    public OffsetTime getCurrentTimeByZoneOffset(String region) {
+        LocalDateTime now = LocalDateTime.now();
+        ZoneId zone = ZoneId.of(region);
+        ZoneOffset zoneOffSet = zone.getRules()
+            .getOffset(now);
+        OffsetTime time = OffsetTime.now(zoneOffSet);
+        return time;
+    }
+}

core-java/src/main/java/com/baeldung/zoneddatetime/ZoneDateTimeExample.java

@@ -0,0 +1,21 @@
+package com.baeldung.zoneddatetime;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+public class ZoneDateTimeExample {
+
+    public ZonedDateTime getCurrentTimeByZoneId(String region) {
+        ZoneId zone = ZoneId.of(region);
+        ZonedDateTime date = ZonedDateTime.now(zone);
+        return date;
+    }
+
+    public ZonedDateTime convertZonedDateTime(ZonedDateTime sourceDate, String destZone) {
+
+        ZoneId destZoneId = ZoneId.of(destZone);
+        ZonedDateTime destDate = sourceDate.withZoneSameInstant(destZoneId);
+
+        return destDate;
+    }
+}

core-java/src/test/java/com/baeldung/zoneddatetime/OffsetDateTimeExampleUnitTest.java

@@ -0,0 +1,25 @@
+package com.baeldung.zoneddatetime;
+
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+
+import org.junit.Test;
+
+public class OffsetDateTimeExampleUnitTest {
+
+    OffsetDateTimeExample offsetDateTimeExample = new OffsetDateTimeExample();
+
+    @Test
+    public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
+        String zone = "Europe/Berlin";
+        OffsetDateTime time = offsetDateTimeExample.getCurrentTimeByZoneOffset(zone);   
+
+        assertTrue(time.getOffset()
+            .equals(ZoneId.of(zone)
+                .getRules()
+                .getOffset(LocalDateTime.now())));
+    }
+}

core-java/src/test/java/com/baeldung/zoneddatetime/OffsetTimeExampleUnitTest.java

@@ -0,0 +1,25 @@
+package com.baeldung.zoneddatetime;
+
+import static org.junit.Assert.assertTrue;
+
+import java.time.LocalDateTime;
+import java.time.OffsetTime;
+import java.time.ZoneId;
+
+import org.junit.Test;
+
+public class OffsetTimeExampleUnitTest {
+
+    OffsetTimeExample offsetTimeExample = new OffsetTimeExample();
+
+    @Test
+    public void givenZoneOffset_whenGetCurrentTime_thenResultHasZone() {
+        String zone = "Europe/Berlin";
+        OffsetTime time = offsetTimeExample.getCurrentTimeByZoneOffset(zone);   
+
+        assertTrue(time.getOffset()
+            .equals(ZoneId.of(zone)
+                .getRules()
+                .getOffset(LocalDateTime.now())));
+    }
+}

core-java/src/test/java/com/baeldung/zoneddatetime/ZoneDateTimeExampleUnitTest.java

@@ -0,0 +1,30 @@
+package com.baeldung.zoneddatetime;
+
+import static org.junit.Assert.assertTrue;
+
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
+import org.junit.Test;
+
+public class ZoneDateTimeExampleUnitTest {
+
+    ZoneDateTimeExample zoneDateTimeExample = new ZoneDateTimeExample();
+
+    @Test
+    public void givenZone_whenGetCurrentTime_thenResultHasZone() {
+        String zone = "Europe/Berlin";
+        ZonedDateTime time = zoneDateTimeExample.getCurrentTimeByZoneId(zone);
+        assertTrue(time.getZone()
+            .equals(ZoneId.of(zone)));
+    }
+    
+    @Test
+    public void givenZones_whenConvertDateByZone_thenGetConstantDiff() {
+        String sourceZone = "Europe/Berlin";
+        String destZone = "Asia/Tokyo";
+        ZonedDateTime sourceDate = zoneDateTimeExample.getCurrentTimeByZoneId(sourceZone);
+        ZonedDateTime destDate = zoneDateTimeExample.convertZonedDateTime(sourceDate, destZone);
+        assertTrue(sourceDate.toInstant().compareTo(destDate.toInstant()) == 0);
+    }
+}

core-kotlin/src/test/kotlin/com/baeldung/kotlin/StringConcatenationTest.kt

@@ -0,0 +1,48 @@
+package com.baeldung.kotlin
+
+import org.junit.Test
+import kotlin.test.assertEquals
+
+class StringConcatenationTest {
+
+    @Test
+    fun givenTwoStrings_concatenateWithTemplates_thenEquals() {
+        val a = "Hello"
+        val b = "Baeldung"
+        val c = "$a $b"
+
+        assertEquals("Hello Baeldung", c)
+    }
+
+    @Test
+    fun givenTwoStrings_concatenateWithPlusOperator_thenEquals() {
+        val a = "Hello"
+        val b = "Baeldung"
+        val c = a + " " + b
+
+        assertEquals("Hello Baeldung", c)
+    }
+
+    @Test
+    fun givenTwoStrings_concatenateWithStringBuilder_thenEquals() {
+        val a = "Hello"
+        val b = "Baeldung"
+
+        val builder = StringBuilder()
+        builder.append(a).append(" ").append(b)
+
+        val c = builder.toString()
+
+        assertEquals("Hello Baeldung", c)
+    }
+
+    @Test
+    fun givenTwoStrings_concatenateWithPlusMethod_thenEquals() {
+        val a = "Hello"
+        val b = "Baeldung"
+        val c = a.plus(" ").plus(b)
+
+        assertEquals("Hello Baeldung", c)
+    }
+
+}

core-kotlin/src/test/kotlin/com/baeldung/kotlin/gson/GsonUnitTest.kt

@@ -0,0 +1,30 @@
+package com.baeldung.kotlin.gson
+
+import com.google.gson.Gson
+
+import org.junit.Assert
+import org.junit.Test
+
+class GsonUnitTest {
+
+    var gson = Gson()
+
+    @Test
+    fun givenObject_thenGetJSONString() {
+        var jsonString = gson.toJson(TestModel(1,"Test"))
+        Assert.assertEquals(jsonString, "{\"id\":1,\"description\":\"Test\"}")
+    }
+
+    @Test
+    fun givenJSONString_thenGetObject() {
+        var jsonString = "{\"id\":1,\"description\":\"Test\"}";
+        var testModel = gson.fromJson(jsonString, TestModel::class.java)
+        Assert.assertEquals(testModel.id, 1)
+        Assert.assertEquals(testModel.description, "Test")
+    }
+
+    data class TestModel(
+        val id: Int,
+        val description: String
+    )
+}

hibernate5/src/main/java/com/baeldung/hibernate/HibernateUtil.java

@@ -1,5 +1,11 @@
 package com.baeldung.hibernate;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Properties;
+
+import com.baeldung.hibernate.entities.DeptEmployee;
 import com.baeldung.hibernate.optimisticlocking.OptimisticLockingCourse;
 import com.baeldung.hibernate.optimisticlocking.OptimisticLockingStudent;
 import com.baeldung.hibernate.pessimisticlocking.Individual;
@@ -16,10 +22,30 @@ import org.hibernate.boot.MetadataSources;
 import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
 import org.hibernate.service.ServiceRegistry;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Properties;
+import com.baeldung.hibernate.pojo.Course;
+import com.baeldung.hibernate.pojo.Employee;
+import com.baeldung.hibernate.pojo.EntityDescription;
+import com.baeldung.hibernate.pojo.OrderEntry;
+import com.baeldung.hibernate.pojo.OrderEntryIdClass;
+import com.baeldung.hibernate.pojo.OrderEntryPK;
+import com.baeldung.hibernate.pojo.Person;
+import com.baeldung.hibernate.pojo.Phone;
+import com.baeldung.hibernate.pojo.PointEntity;
+import com.baeldung.hibernate.pojo.PolygonEntity;
+import com.baeldung.hibernate.pojo.Product;
+import com.baeldung.hibernate.pojo.Student;
+import com.baeldung.hibernate.pojo.TemporalValues;
+import com.baeldung.hibernate.pojo.User;
+import com.baeldung.hibernate.pojo.UserProfile;
+import com.baeldung.hibernate.pojo.inheritance.Animal;
+import com.baeldung.hibernate.pojo.inheritance.Bag;
+import com.baeldung.hibernate.pojo.inheritance.Book;
+import com.baeldung.hibernate.pojo.inheritance.Car;
+import com.baeldung.hibernate.pojo.inheritance.MyEmployee;
+import com.baeldung.hibernate.pojo.inheritance.MyProduct;
+import com.baeldung.hibernate.pojo.inheritance.Pen;
+import com.baeldung.hibernate.pojo.inheritance.Pet;
+import com.baeldung.hibernate.pojo.inheritance.Vehicle;
 
 public class HibernateUtil {
     private static SessionFactory sessionFactory;
@@ -72,6 +98,8 @@ public class HibernateUtil {
         metadataSources.addAnnotatedClass(PessimisticLockingCourse.class);
         metadataSources.addAnnotatedClass(com.baeldung.hibernate.pessimisticlocking.Customer.class);
         metadataSources.addAnnotatedClass(com.baeldung.hibernate.pessimisticlocking.Address.class);
+        metadataSources.addAnnotatedClass(DeptEmployee.class);
+        metadataSources.addAnnotatedClass(com.baeldung.hibernate.entities.Department.class);
         metadataSources.addAnnotatedClass(OptimisticLockingCourse.class);
         metadataSources.addAnnotatedClass(OptimisticLockingStudent.class);
 

hibernate5/src/main/java/com/baeldung/hibernate/entities/Department.java

@@ -0,0 +1,45 @@
+package com.baeldung.hibernate.entities;
+
+import java.util.List;
+
+import javax.persistence.*;
+
+@Entity
+public class Department {
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private long id;
+
+    private String name;
+
+    @OneToMany(mappedBy="department")
+    private List<DeptEmployee> employees;
+
+    public Department(String name) {
+        this.name = name;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<DeptEmployee> getEmployees() {
+        return employees;
+    }
+
+    public void setEmployees(List<DeptEmployee> employees) {
+        this.employees = employees;
+    }
+}

hibernate5/src/main/java/com/baeldung/hibernate/entities/DeptEmployee.java

@@ -0,0 +1,65 @@
+package com.baeldung.hibernate.entities;
+
+import javax.persistence.*;
+
+@Entity
+public class DeptEmployee {
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE)
+    private long id;
+
+    private String employeeNumber;
+
+    private String designation;
+
+    private String name;
+
+    @ManyToOne
+    private Department department;
+    
+    public DeptEmployee(String name, String employeeNumber, Department department) {
+        this.name = name;
+        this.employeeNumber = employeeNumber;
+        this.department = department;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getEmployeeNumber() {
+        return employeeNumber;
+    }
+
+    public void setEmployeeNumber(String employeeNumber) {
+        this.employeeNumber = employeeNumber;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Department getDepartment() {
+        return department;
+    }
+
+    public void setDepartment(Department department) {
+        this.department = department;
+    }
+
+    public String getDesignation() {
+        return designation;
+    }
+
+    public void setDesignation(String designation) {
+        this.designation = designation;
+    }
+}

hibernate5/src/main/java/com/baeldung/hibernate/pojo/Result.java

@@ -0,0 +1,31 @@
+package com.baeldung.hibernate.pojo;
+
+public class Result {
+    private String employeeName;
+
+    private String departmentName;
+    
+    public Result(String employeeName, String departmentName) {
+        this.employeeName = employeeName;
+        this.departmentName = departmentName;
+    }
+
+    public Result() {
+    }
+
+    public String getEmployeeName() {
+        return employeeName;
+    }
+
+    public void setEmployeeName(String employeeName) {
+        this.employeeName = employeeName;
+    }
+
+    public String getDepartmentName() {
+        return departmentName;
+    }
+
+    public void setDepartmentName(String departmentName) {
+        this.departmentName = departmentName;
+    }
+}

hibernate5/src/test/java/com/baeldung/hibernate/CustomClassIntegrationTest.java

@@ -0,0 +1,77 @@
+package com.baeldung.hibernate;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.baeldung.hibernate.entities.DeptEmployee;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+import org.hibernate.query.Query;
+import org.hibernate.transform.Transformers;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import com.baeldung.hibernate.entities.Department;
+import com.baeldung.hibernate.pojo.Result;
+
+public class CustomClassIntegrationTest {
+
+    private Session session;
+
+    private Transaction transaction;
+
+    @BeforeEach
+    public void setUp() throws IOException {
+        session = HibernateUtil.getSessionFactory().openSession();
+        transaction = session.beginTransaction();
+        session.createNativeQuery("delete from manager").executeUpdate();
+        session.createNativeQuery("delete from department").executeUpdate();
+        Department department = new Department("Sales");
+        DeptEmployee employee = new DeptEmployee("John Smith", "001", department);
+        session.persist(department);
+        session.persist(employee);
+        transaction.commit();
+        transaction = session.beginTransaction();
+    }
+    
+    @Test
+    public void whenAllManagersAreSelected_ThenObjectGraphIsReturned() {
+        Query<DeptEmployee> query = session.createQuery("from com.baeldung.hibernate.entities.DeptEmployee");
+        List<DeptEmployee> deptEmployees = query.list();
+        DeptEmployee deptEmployee = deptEmployees.get(0);
+        assertEquals("John Smith", deptEmployee.getName());
+        assertEquals("Sales", deptEmployee.getDepartment().getName());
+    }
+    
+    @Test
+    public void whenIndividualPropertiesAreSelected_ThenObjectArrayIsReturned() {
+        Query query = session.createQuery("select m.name, m.department.name from com.baeldung.hibernate.entities.DeptEmployee m");
+        List managers = query.list();
+        Object[] manager = (Object[]) managers.get(0);
+        assertEquals("John Smith", manager[0]);
+        assertEquals("Sales", manager[1]);
+    }
+    
+    @Test
+    public void whenResultConstructorInSelect_ThenListOfResultIsReturned() {
+        Query<Result> query = session.createQuery("select new com.baeldung.hibernate.pojo.Result(m.name, m.department.name) "
+                + "from DeptEmployee m");
+        List<Result> results = query.list();
+        Result result = results.get(0);
+        assertEquals("John Smith", result.getEmployeeName());
+        assertEquals("Sales", result.getDepartmentName());
+    }
+    
+    @Test
+    public void whenResultTransformerOnQuery_ThenListOfResultIsReturned() {
+        Query query = session.createQuery("select m.name as employeeName, m.department.name as departmentName "
+                + "from com.baeldung.hibernate.entities.DeptEmployee m");
+        query.setResultTransformer(Transformers.aliasToBean(Result.class));
+        List<Result> results = query.list();
+        Result result = results.get(0);
+        assertEquals("John Smith", result.getEmployeeName());
+        assertEquals("Sales", result.getDepartmentName());   
+    }
+}

kotlin-libraries/README.md

@@ -6,5 +6,4 @@
 - [Writing Specifications with Kotlin and Spek](http://www.baeldung.com/kotlin-spek)
 - [Processing JSON with Kotlin and Klaxson](http://www.baeldung.com/kotlin-json-klaxson)
 - [Kotlin with Ktor](http://www.baeldung.com/kotlin-ktor)
-- [Idiomatic Logging in Kotlin](http://www.baeldung.com/kotlin-logging)
-- [Guide to the Kotlin Exposed Framework](https://www.baeldung.com/kotlin-exposed-persistence)
+- [Guide to the Kotlin Exposed Framework](https://www.baeldung.com/kotlin-exposed-persistence)

libraries-data/pom.xml

@@ -147,7 +147,6 @@
             <artifactId>jmapper-core</artifactId>
             <version>${jmapper.version}</version>
         </dependency>
-
         <!--  crunch project  -->
 		<dependency>
 			<groupId>org.apache.crunch</groupId>
@@ -185,7 +184,72 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-                
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-connector-kafka-0.11_2.11</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-streaming-java_2.11</artifactId>
+            <version>${flink.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-core</artifactId>
+            <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-java</artifactId>
+            <version>${flink.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.flink</groupId>
+            <artifactId>flink-test-utils_2.11</artifactId>
+            <version>${flink.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>${assertj.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility-proxy</artifactId>
+            <version>${awaitility.version}</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -336,6 +400,10 @@
         <ignite.version>2.4.0</ignite.version>
         <gson.version>2.8.2</gson.version>
         <cache.version>1.1.0</cache.version>
+        <flink.version>1.5.0</flink.version>
+        <jackson.version>2.8.5</jackson.version>
+        <awaitility.version>3.0.0</awaitility.version>
+        <assertj.version>3.6.2</assertj.version>
         <hazelcast.version>3.8.4</hazelcast.version>
         <maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>

libraries-data/src/main/java/com/baeldung/flink/model/InputMessage.java

@@ -18,7 +18,6 @@ public class InputMessage {
     public String getSender() {
         return sender;
     }
-
     public void setSender(String sender) {
         this.sender = sender;
     }

libraries-data/src/main/java/com/baeldung/flink/schema/InputMessageDeserializationSchema.java

@@ -1,8 +1,6 @@
 package com.baeldung.flink.schema;
 
 import com.baeldung.flink.model.InputMessage;
-import com.fasterxml.jackson.annotation.JsonAutoDetect;
-import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import org.apache.flink.api.common.serialization.DeserializationSchema;