diff --git a/core-java-8/README.md b/core-java-8/README.md index 61f8df8f49..862d8c2224 100644 --- a/core-java-8/README.md +++ b/core-java-8/README.md @@ -33,3 +33,4 @@ - [Display All Time Zones With GMT And UTC in Java](http://www.baeldung.com/java-time-zones) - [Copy a File with Java](http://www.baeldung.com/java-copy-file) - [Generating Prime Numbers in Java](http://www.baeldung.com/java-generate-prime-numbers) +- [Static and Default Methods in Interfaces in Java](http://www.baeldung.com/java-static-default-methods) diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/application/Application.java b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/application/Application.java new file mode 100644 index 0000000000..438ecad140 --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/application/Application.java @@ -0,0 +1,18 @@ +package com.baeldung.defaultstaticinterfacemethods.application; + +import com.baeldung.defaultstaticinterfacemethods.model.Car; +import com.baeldung.defaultstaticinterfacemethods.model.Vehicle; + +public class Application { + + public static void main(String[] args) { + + Vehicle car = new Car("BMW"); + System.out.println(car.getBrand()); + System.out.println(car.speedUp()); + System.out.println(car.slowDown()); + System.out.println(car.turnAlarmOn()); + System.out.println(car.turnAlarmOff()); + System.out.println(Vehicle.getHorsePower(2500, 480)); + } +} \ No newline at end of file diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Alarm.java b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Alarm.java new file mode 100644 index 0000000000..52ec2c3c15 --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Alarm.java @@ -0,0 +1,12 @@ +package com.baeldung.defaultstaticinterfacemethods.model; + +public interface Alarm { + + default String turnAlarmOn() { + return "Turning the alarm on."; + } + + default String turnAlarmOff() { + return "Turning the alarm off."; + } +} \ No newline at end of file diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Car.java b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Car.java new file mode 100644 index 0000000000..6ec6507e59 --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Car.java @@ -0,0 +1,25 @@ +package com.baeldung.defaultstaticinterfacemethods.model; + +public class Car implements Vehicle { + + private final String brand; + + public Car(String brand) { + this.brand = brand; + } + + @Override + public String getBrand() { + return brand; + } + + @Override + public String speedUp() { + return "The car is speeding up."; + } + + @Override + public String slowDown() { + return "The car is slowing down."; + } +} \ No newline at end of file diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Motorbike.java b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Motorbike.java new file mode 100644 index 0000000000..b1de93059a --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Motorbike.java @@ -0,0 +1,25 @@ +package com.baeldung.defaultstaticinterfacemethods.model; + +public class Motorbike implements Vehicle { + + private final String brand; + + public Motorbike(String brand) { + this.brand = brand; + } + + @Override + public String getBrand() { + return brand; + } + + @Override + public String speedUp() { + return "The motorbike is speeding up."; + } + + @Override + public String slowDown() { + return "The motorbike is slowing down."; + } +} \ No newline at end of file diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/MultiAlarmCar.java b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/MultiAlarmCar.java new file mode 100644 index 0000000000..abf329fafd --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/MultiAlarmCar.java @@ -0,0 +1,35 @@ +package com.baeldung.defaultstaticinterfacemethods.model; + +public class MultiAlarmCar implements Vehicle, Alarm { + + private final String brand; + + public MultiAlarmCar(String brand) { + this.brand = brand; + } + + @Override + public String getBrand() { + return brand; + } + + @Override + public String speedUp() { + return "The motorbike is speeding up."; + } + + @Override + public String slowDown() { + return "The mootorbike is slowing down."; + } + + @Override + public String turnAlarmOn() { + return Vehicle.super.turnAlarmOn() + " " + Alarm.super.turnAlarmOn(); + } + + @Override + public String turnAlarmOff() { + return Vehicle.super.turnAlarmOff() + " " + Alarm.super.turnAlarmOff(); + } +} \ No newline at end of file diff --git a/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Vehicle.java b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Vehicle.java new file mode 100644 index 0000000000..b0bdd63c2c --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/defaultstaticinterfacemethods/model/Vehicle.java @@ -0,0 +1,22 @@ +package com.baeldung.defaultstaticinterfacemethods.model; + +public interface Vehicle { + + String getBrand(); + + String speedUp(); + + String slowDown(); + + default String turnAlarmOn() { + return "Turning the vehice alarm on."; + } + + default String turnAlarmOff() { + return "Turning the vehicle alarm off."; + } + + static int getHorsePower(int rpm, int torque) { + return (rpm * torque) / 5252; + } +} \ No newline at end of file diff --git a/core-java-8/src/main/java/com/baeldung/iterators/Iterators.java b/core-java-8/src/main/java/com/baeldung/iterators/Iterators.java new file mode 100644 index 0000000000..5e7cfdb54f --- /dev/null +++ b/core-java-8/src/main/java/com/baeldung/iterators/Iterators.java @@ -0,0 +1,80 @@ +package com.baeldung.iterators; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.concurrent.ConcurrentHashMap; + +/** + * Source code https://github.com/eugenp/tutorials + * + * @author Santosh Thakur + */ + +public class Iterators { + + public static int failFast1() { + ArrayList numbers = new ArrayList<>(); + + numbers.add(10); + numbers.add(20); + numbers.add(30); + numbers.add(40); + + Iterator iterator = numbers.iterator(); + while (iterator.hasNext()) { + Integer number = iterator.next(); + numbers.add(50); + } + + return numbers.size(); + } + + public static int failFast2() { + ArrayList numbers = new ArrayList<>(); + numbers.add(10); + numbers.add(20); + numbers.add(30); + numbers.add(40); + + Iterator iterator = numbers.iterator(); + while (iterator.hasNext()) { + if (iterator.next() == 30) { + // will not throw Exception + iterator.remove(); + } + } + + System.out.println("using iterator's remove method = " + numbers); + + iterator = numbers.iterator(); + while (iterator.hasNext()) { + if (iterator.next() == 40) { + // will throw Exception on + // next call of next() method + numbers.remove(2); + } + } + + return numbers.size(); + } + + public static int failSafe1() { + ConcurrentHashMap map = new ConcurrentHashMap<>(); + + map.put("First", 10); + map.put("Second", 20); + map.put("Third", 30); + map.put("Fourth", 40); + + Iterator iterator = map.keySet() + .iterator(); + + while (iterator.hasNext()) { + String key = iterator.next(); + map.put("Fifth", 50); + } + + return map.size(); + } + +} diff --git a/core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java b/core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java index 2a42a166fa..015ca3f942 100644 --- a/core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java +++ b/core-java-8/src/test/java/com/baeldung/counter/CounterStatistics.java @@ -2,6 +2,7 @@ package com.baeldung.counter; import java.util.HashMap; import java.util.Map; +import java.util.Random; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; @@ -18,8 +19,18 @@ public class CounterStatistics { private static final Map counterWithMutableIntMap = new HashMap<>(); private static final Map counterWithIntArrayMap = new HashMap<>(); private static final Map counterWithLongWrapperMap = new HashMap<>(); + private static final Map counterWithLongWrapperStreamMap = new HashMap<>(); + + static { + CounterUtil.COUNTRY_NAMES = new String[10000]; + final String prefix = "NewString"; + Random random = new Random(); + for (int i=0; i<10000; i++) { + CounterUtil.COUNTRY_NAMES[i] = new String(prefix + random.nextInt(1000)); + } + } - @Benchmark + @Benchmark public void wrapperAsCounter() { CounterUtil.counterWithWrapperObject(counterMap); } @@ -28,6 +39,11 @@ public class CounterStatistics { public void lambdaExpressionWithWrapper() { CounterUtil.counterWithLambdaAndWrapper(counterWithLongWrapperMap); } + + @Benchmark + public void parallelStreamWithWrapper() { + CounterUtil.counterWithParallelStreamAndWrapper(counterWithLongWrapperStreamMap); + } @Benchmark public void mutableIntegerAsCounter() { diff --git a/core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java b/core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java index afd7202892..c2bf47e213 100644 --- a/core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java +++ b/core-java-8/src/test/java/com/baeldung/counter/CounterUtil.java @@ -6,7 +6,7 @@ import java.util.stream.Stream; public class CounterUtil { - private final static String[] COUNTRY_NAMES = { "China", "Australia", "India", "USA", "USSR", "UK", "China", "France", "Poland", "Austria", "India", "USA", "Egypt", "China" }; + public static String[] COUNTRY_NAMES = { "China", "Australia", "India", "USA", "USSR", "UK", "China", "France", "Poland", "Austria", "India", "USA", "Egypt", "China" }; public static void counterWithWrapperObject(Map counterMap) { for (String country : COUNTRY_NAMES) { @@ -15,9 +15,14 @@ public class CounterUtil { } public static void counterWithLambdaAndWrapper(Map counterMap) { - counterMap.putAll(Stream.of(COUNTRY_NAMES) + Stream.of(COUNTRY_NAMES) + .collect(Collectors.groupingBy(k -> k, () -> counterMap, Collectors.counting())); + } + + public static void counterWithParallelStreamAndWrapper(Map counterMap) { + Stream.of(COUNTRY_NAMES) .parallel() - .collect(Collectors.groupingBy(k -> k, Collectors.counting()))); + .collect(Collectors.groupingBy(k -> k, () -> counterMap, Collectors.counting())); } public static class MutableInteger { @@ -49,4 +54,4 @@ public class CounterUtil { } } -} +} \ No newline at end of file diff --git a/core-java-8/src/test/java/com/baeldung/defaultistaticinterfacemethods/test/StaticDefaulInterfaceMethodUnitTest.java b/core-java-8/src/test/java/com/baeldung/defaultistaticinterfacemethods/test/StaticDefaulInterfaceMethodUnitTest.java new file mode 100644 index 0000000000..7d4b06908a --- /dev/null +++ b/core-java-8/src/test/java/com/baeldung/defaultistaticinterfacemethods/test/StaticDefaulInterfaceMethodUnitTest.java @@ -0,0 +1,79 @@ +package com.baeldung.defaultistaticinterfacemethods.test; + +import com.baeldung.defaultstaticinterfacemethods.model.Car; +import com.baeldung.defaultstaticinterfacemethods.model.Motorbike; +import com.baeldung.defaultstaticinterfacemethods.model.Vehicle; +import org.junit.BeforeClass; +import org.junit.Test; +import static org.assertj.core.api.Assertions.*; + +public class StaticDefaulInterfaceMethodUnitTest { + + private static Car car; + private static Motorbike motorbike; + + @BeforeClass + public static void setUpCarInstance() { + car = new Car("BMW"); + } + + @BeforeClass + public static void setUpMotorbikeInstance() { + motorbike = new Motorbike("Yamaha"); + } + + @Test + public void givenCarInstace_whenBrandisBMW_thenOneAssertion() { + assertThat(car.getBrand()).isEqualTo("BMW"); + } + + @Test + public void givenCarInstance_whenCallingSpeedUp_thenOneAssertion() { + assertThat(car.speedUp()).isEqualTo("The car is speeding up."); + } + + @Test + public void givenCarInstance_whenCallingSlowDown_thenOneAssertion() { + assertThat(car.slowDown()).isEqualTo("The car is slowing down."); + } + + @Test + public void givenCarInstance_whenCallingTurnAlarmOn_thenOneAssertion() { + assertThat(car.turnAlarmOn()).isEqualTo("Turning the vehice alarm on."); + } + + @Test + public void givenCarInstance_whenCallingTurnAlarmOff_thenOneAssertion() { + assertThat(car.turnAlarmOff()).isEqualTo("Turning the vehicle alarm off."); + } + + @Test + public void givenVehicleInterface_whenCallinggetHorsePower_thenOneAssertion() { + assertThat(Vehicle.getHorsePower(2500, 480)).isEqualTo(228); + } + + @Test + public void givenMooorbikeInstace_whenBrandisYamaha_thenOneAssertion() { + assertThat(motorbike.getBrand()).isEqualTo("Yamaha"); + } + + @Test + public void givenMotorbikeInstance_whenCallingSpeedUp_thenOneAssertion() { + assertThat(motorbike.speedUp()).isEqualTo("The motorbike is speeding up."); + } + + @Test + public void givenMotorbikeInstance_whenCallingSlowDown_thenOneAssertion() { + assertThat(motorbike.slowDown()).isEqualTo("The motorbike is slowing down."); + } + + @Test + public void givenMotorbikeInstance_whenCallingTurnAlarmOn_thenOneAssertion() { + assertThat(motorbike.turnAlarmOn()).isEqualTo("Turning the vehice alarm on."); + } + + @Test + public void givenMotorbikeInstance_whenCallingTurnAlarmOff_thenOneAssertion() { + assertThat(motorbike.turnAlarmOff()).isEqualTo("Turning the vehicle alarm off."); + } +} \ No newline at end of file diff --git a/core-java-8/src/test/java/com/baeldung/iterators/IteratorsTest.java b/core-java-8/src/test/java/com/baeldung/iterators/IteratorsTest.java new file mode 100644 index 0000000000..73793da7ae --- /dev/null +++ b/core-java-8/src/test/java/com/baeldung/iterators/IteratorsTest.java @@ -0,0 +1,40 @@ +package com.baeldung.iterators; + +import static com.baeldung.iterators.Iterators.failFast1; +import static com.baeldung.iterators.Iterators.failFast2; +import static com.baeldung.iterators.Iterators.failSafe1; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import java.util.ConcurrentModificationException; + +import org.junit.Test; + +/** + * Source code https://github.com/eugenp/tutorials + * + * @author Santosh Thakur + */ + +public class IteratorsTest { + + @Test + public void whenFailFast_ThenThrowsException() { + assertThatThrownBy(() -> { + failFast1(); + }).isInstanceOf(ConcurrentModificationException.class); + } + + @Test + public void whenFailFast_ThenThrowsExceptionInSecondIteration() { + assertThatThrownBy(() -> { + failFast2(); + }).isInstanceOf(ConcurrentModificationException.class); + } + + @Test + public void whenFailSafe_ThenDoesNotThrowException() { + assertThat(failSafe1()).isGreaterThanOrEqualTo(0); + } + +} diff --git a/core-java-9/README.md b/core-java-9/README.md index ce8a140dc0..575376ccb7 100644 --- a/core-java-9/README.md +++ b/core-java-9/README.md @@ -19,3 +19,4 @@ - [Java 9 java.util.Objects Additions](http://www.baeldung.com/java-9-objects-new) - [Compact Strings in Java 9](http://www.baeldung.com/java-9-compact-string) - [Convert Date to LocalDate or LocalDateTime and Back](http://www.baeldung.com/java-date-to-localdate-and-localdatetime) +- [Java 9 Variable Handles Demistyfied](http://www.baeldung.com/java-variable-handles) diff --git a/core-java/README.md b/core-java/README.md index fc724ccf45..b965d25f88 100644 --- a/core-java/README.md +++ b/core-java/README.md @@ -127,3 +127,8 @@ - [Introduction to the Java ArrayDeque](http://www.baeldung.com/java-array-deque) - [Guide to java.util.Formatter](http://www.baeldung.com/java-string-formatter) - [Batch Processing in JDBC](http://www.baeldung.com/jdbc-batch-processing) +- [Check if a Java Array Contains a Value](http://www.baeldung.com/java-array-contains-value) +- [How to Invert an Array in Java](http://www.baeldung.com/java-invert-array) +- [Guide to the Cipher Class](http://www.baeldung.com/java-cipher-class) +- [A Guide to Java Initialization](http://www.baeldung.com/java-initialization) + diff --git a/core-java/src/main/java/com/baeldung/cipher/Encryptor.java b/core-java/src/main/java/com/baeldung/cipher/Encryptor.java new file mode 100644 index 0000000000..901975a5d6 --- /dev/null +++ b/core-java/src/main/java/com/baeldung/cipher/Encryptor.java @@ -0,0 +1,35 @@ +package com.baeldung.cipher; + +import javax.crypto.*; +import javax.crypto.spec.SecretKeySpec; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.Certificate; + +public class Encryptor { + + public byte[] encryptMessage(byte[] message, byte[] keyBytes) throws InvalidKeyException, NoSuchPaddingException, NoSuchAlgorithmException, BadPaddingException, IllegalBlockSizeException { + Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding"); + SecretKey secretKey = new SecretKeySpec(keyBytes, "AES"); + cipher.init(Cipher.ENCRYPT_MODE, secretKey); + byte[] encryptedMessage = cipher.doFinal(message); + return encryptedMessage; + } + + public byte[] encryptMessage(byte[] message, Certificate publicKeyCertificate) throws InvalidKeyException, NoSuchPaddingException, NoSuchAlgorithmException, BadPaddingException, IllegalBlockSizeException { + Cipher cipher = Cipher.getInstance("RSA/ECB/PKCS1Padding"); + cipher.init(Cipher.ENCRYPT_MODE, publicKeyCertificate); + byte[] encryptedMessage = cipher.doFinal(message); + return encryptedMessage; + } + + public byte[] decryptMessage(byte[] encryptedMessage, byte[] keyBytes) throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException { + Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding"); + SecretKey secretKey = new SecretKeySpec(keyBytes, "AES"); + cipher.init(Cipher.DECRYPT_MODE, secretKey); + byte[] clearMessage = cipher.doFinal(encryptedMessage); + return clearMessage; + } + + +} diff --git a/core-java/src/main/java/com/baeldung/initializationguide/User.java b/core-java/src/main/java/com/baeldung/initializationguide/User.java new file mode 100644 index 0000000000..e2e3f051dd --- /dev/null +++ b/core-java/src/main/java/com/baeldung/initializationguide/User.java @@ -0,0 +1,53 @@ +package com.baeldung.initializationguide; + +import java.io.Serializable; + +public class User implements Serializable, Cloneable { + private static final long serialVersionUID = 1L; + static String forum; + private String name; + private int id; + + { + id = 0; + System.out.println("Instance Initializer"); + } + + static { + forum = "Java"; + System.out.println("Static Initializer"); + } + + public User(String name, int id) { + super(); + this.name = name; + this.id = id; + } + + public User() { + System.out.println("Constructor"); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + @Override + protected Object clone() throws CloneNotSupportedException { + return this; + } + +} + diff --git a/core-java/src/main/java/com/baeldung/tree/BinaryTree.java b/core-java/src/main/java/com/baeldung/tree/BinaryTree.java index 285dc12219..e3179dca32 100644 --- a/core-java/src/main/java/com/baeldung/tree/BinaryTree.java +++ b/core-java/src/main/java/com/baeldung/tree/BinaryTree.java @@ -8,15 +8,7 @@ public class BinaryTree { Node root; public void add(int value) { - - Node newNode = new Node(value); - - if (root == null) { - root = newNode; - return; - } - - addRecursive(root, value); + root = addRecursive(root, value); } private Node addRecursive(Node current, int value) { @@ -27,34 +19,41 @@ public class BinaryTree { if (value < current.value) { current.left = addRecursive(current.left, value); - } else { + } else if (value > current.value) { current.right = addRecursive(current.right, value); } return current; - } public boolean isEmpty() { return root == null; } + public int getSize() { + return getSizeRecursive(root); + } + + private int getSizeRecursive(Node current) { + return current == null ? 0 : getSizeRecursive(current.left) + 1 + getSizeRecursive(current.right); + } + public boolean containsNode(int value) { return containsNodeRecursive(root, value); } private boolean containsNodeRecursive(Node current, int value) { - if (current == null) { return false; - } else if (value == current.value) { - return true; - } else if (value < current.value) { - return containsNodeRecursive(current.left, value); - } else { - return containsNodeRecursive(current.right, value); } + if (value == current.value) { + return true; + } + + return value < current.value + ? containsNodeRecursive(current.left, value) + : containsNodeRecursive(current.right, value); } public void delete(int value) { @@ -86,23 +85,18 @@ public class BinaryTree { current.value = smallestValue; current.right = deleteRecursive(current.right, smallestValue); return current; - - } else if (value < current.value) { + } + if (value < current.value) { current.left = deleteRecursive(current.left, value); return current; - } else { - current.right = deleteRecursive(current.right, value); - return current; } + + current.right = deleteRecursive(current.right, value); + return current; } private int findSmallestValue(Node root) { - - if (root.left == null) { - return root.value; - } - - return findSmallestValue(root.left); + return root.left == null ? root.value : findSmallestValue(root.left); } public void traverseInOrder(Node node) { @@ -125,12 +119,15 @@ public class BinaryTree { if (node != null) { traversePostOrder(node.left); traversePostOrder(node.right); - System.out.print(" " + node.value); } } public void traverseLevelOrder() { + if (root == null) { + return; + } + Queue nodes = new LinkedList<>(); nodes.add(root); diff --git a/core-java/src/test/java/com/baeldung/cipher/EncryptorUnitTest.java b/core-java/src/test/java/com/baeldung/cipher/EncryptorUnitTest.java new file mode 100644 index 0000000000..ba8d2ed96f --- /dev/null +++ b/core-java/src/test/java/com/baeldung/cipher/EncryptorUnitTest.java @@ -0,0 +1,70 @@ +package com.baeldung.cipher; + + +import org.junit.Before; +import org.junit.Test; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.security.cert.CertificateFactory; +import java.security.cert.X509Certificate; + +import static org.assertj.core.api.Assertions.assertThat; + +public class EncryptorUnitTest { + private String encKeyString; + private String message; + private String certificateString; + private Encryptor encryptor; + + @Before + public void init(){ + encKeyString = "1234567890123456"; + message = "This is a secret message"; + encryptor = new Encryptor(); + certificateString = "-----BEGIN CERTIFICATE-----\n" + + "MIICVjCCAb8CAg37MA0GCSqGSIb3DQEBBQUAMIGbMQswCQYDVQQGEwJKUDEOMAwG\n" + + "A1UECBMFVG9reW8xEDAOBgNVBAcTB0NodW8ta3UxETAPBgNVBAoTCEZyYW5rNERE\n" + + "MRgwFgYDVQQLEw9XZWJDZXJ0IFN1cHBvcnQxGDAWBgNVBAMTD0ZyYW5rNEREIFdl\n" + + "YiBDQTEjMCEGCSqGSIb3DQEJARYUc3VwcG9ydEBmcmFuazRkZC5jb20wHhcNMTIw\n" + + "ODIyMDUyNzIzWhcNMTcwODIxMDUyNzIzWjBKMQswCQYDVQQGEwJKUDEOMAwGA1UE\n" + + "CAwFVG9reW8xETAPBgNVBAoMCEZyYW5rNEREMRgwFgYDVQQDDA93d3cuZXhhbXBs\n" + + "ZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMYBBrx5PlP0WNI/ZdzD\n" + + "+6Pktmurn+F2kQYbtc7XQh8/LTBvCo+P6iZoLEmUA9e7EXLRxgU1CVqeAi7QcAn9\n" + + "MwBlc8ksFJHB0rtf9pmf8Oza9E0Bynlq/4/Kb1x+d+AyhL7oK9tQwB24uHOueHi1\n" + + "C/iVv8CSWKiYe6hzN1txYe8rAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAASPdjigJ\n" + + "kXCqKWpnZ/Oc75EUcMi6HztaW8abUMlYXPIgkV2F7YanHOB7K4f7OOLjiz8DTPFf\n" + + "jC9UeuErhaA/zzWi8ewMTFZW/WshOrm3fNvcMrMLKtH534JKvcdMg6qIdjTFINIr\n" + + "evnAhf0cwULaebn+lMs8Pdl7y37+sfluVok=\n" + + "-----END CERTIFICATE-----"; + } + + @Test + public void givenEncryptionKey_whenMessageIsPassedToEncryptor_thenMessageIsEncrypted() throws Exception { + byte[] encryptedMessage = encryptor.encryptMessage(message.getBytes(),encKeyString.getBytes()); + + assertThat(encryptedMessage).isNotNull(); + assertThat(encryptedMessage.length % 32).isEqualTo(0); + } + + @Test + public void givenCertificateWithPublicKey_whenMessageIsPassedToEncryptor_thenMessageIsEncrypted() throws Exception { + CertificateFactory factory = CertificateFactory.getInstance("X.509"); + InputStream is = new ByteArrayInputStream(certificateString.getBytes()); + X509Certificate certificate = (X509Certificate) factory.generateCertificate(is); + + byte[] encryptedMessage = encryptor.encryptMessage(message.getBytes(),certificate); + + assertThat(encryptedMessage).isNotNull(); + assertThat(encryptedMessage.length % 128).isEqualTo(0); + } + + @Test + public void givenEncryptionKey_whenMessageIsEncrypted_thenDecryptMessage() throws Exception{ + byte[] encryptedMessageBytes = encryptor.encryptMessage(message.getBytes(),encKeyString.getBytes()); + + byte[] clearMessageBytes = encryptor.decryptMessage(encryptedMessageBytes, encKeyString.getBytes()); + + assertThat(message).isEqualTo(new String(clearMessageBytes)); + } +} diff --git a/core-java/src/test/java/com/baeldung/initializationguide/UserTest.java b/core-java/src/test/java/com/baeldung/initializationguide/UserTest.java new file mode 100644 index 0000000000..8d352ba706 --- /dev/null +++ b/core-java/src/test/java/com/baeldung/initializationguide/UserTest.java @@ -0,0 +1,37 @@ +package com.baeldung.initializationguide; +import org.junit.Before; +import org.junit.Test; + +import static org.assertj.core.api.Assertions.*; + +import java.lang.reflect.InvocationTargetException; + +public class UserTest { + + @Test + public void givenUserInstance_whenIntializedWithNew_thenInstanceIsNotNull() { + User user = new User("Alice", 1); + assertThat(user).isNotNull(); + } + + @Test + public void givenUserInstance_whenInitializedWithReflection_thenInstanceIsNotNull() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException { + User user = User.class.getConstructor(String.class, int.class) + .newInstance("Alice", 2); + assertThat(user).isNotNull(); + } + + @Test + public void givenUserInstance_whenCopiedWithClone_thenExactMatchIsCreated() throws CloneNotSupportedException { + User user = new User("Alice", 3); + User clonedUser = (User) user.clone(); + assertThat(clonedUser).isEqualTo(user); + } + + @Test + public void givenUserInstance_whenValuesAreNotInitialized_thenUserNameAndIdReturnDefault() { + User user = new User(); + assertThat(user.getName()).isNull(); + assertThat(user.getId() == 0); + } +} diff --git a/core-java/src/test/java/com/baeldung/tree/BinaryTreeTest.java b/core-java/src/test/java/com/baeldung/tree/BinaryTreeTest.java index 2c20c730df..99e656fe28 100644 --- a/core-java/src/test/java/com/baeldung/tree/BinaryTreeTest.java +++ b/core-java/src/test/java/com/baeldung/tree/BinaryTreeTest.java @@ -1,5 +1,6 @@ package com.baeldung.tree; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -26,6 +27,26 @@ public class BinaryTreeTest { assertFalse(bt.containsNode(1)); } + @Test + public void givenABinaryTree_WhenAddingExistingElement_ThenElementIsNotAdded() { + + BinaryTree bt = createBinaryTree(); + + int initialSize = bt.getSize(); + + assertTrue(bt.containsNode(3)); + bt.add(3); + assertEquals(initialSize, bt.getSize()); + } + + @Test + public void givenABinaryTree_WhenLookingForNonExistingElement_ThenReturnsFalse() { + + BinaryTree bt = createBinaryTree(); + + assertFalse(bt.containsNode(99)); + } + @Test public void givenABinaryTree_WhenDeletingElements_ThenTreeDoesNotContainThoseElements() { @@ -36,6 +57,19 @@ public class BinaryTreeTest { assertFalse(bt.containsNode(9)); } + @Test + public void givenABinaryTree_WhenDeletingNonExistingElement_ThenTreeDoesNotDelete() { + + BinaryTree bt = createBinaryTree(); + + int initialSize = bt.getSize(); + + assertFalse(bt.containsNode(99)); + bt.delete(99); + assertFalse(bt.containsNode(99)); + assertEquals(initialSize, bt.getSize()); + } + @Test public void givenABinaryTree_WhenTraversingInOrder_ThenPrintValues() { diff --git a/flyway/flyway-callbacks/pom.xml b/flyway/flyway-callbacks/pom.xml deleted file mode 100644 index e61a5742a4..0000000000 --- a/flyway/flyway-callbacks/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - 4.0.0 - - flyway-callbacks - 0.0.1-SNAPSHOT - jar - - flyway-callbacks - Flyway Callbacks Demo - - - flyway - com.baeldung - 1.0 - ../../flyway - - - - UTF-8 - UTF-8 - 1.8 - - - - - org.flywaydb - flyway-core - 5.0.2 - - - - org.springframework.boot - spring-boot-starter-jdbc - - - - com.h2database - h2 - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - - diff --git a/flyway/pom.xml b/flyway/pom.xml new file mode 100644 index 0000000000..a090b9458e --- /dev/null +++ b/flyway/pom.xml @@ -0,0 +1,70 @@ + + + 4.0.0 + + flyway + jar + + flyway + Flyway Callbacks Demo + + + parent-boot-5 + com.baeldung + 0.0.1-SNAPSHOT + ../parent-boot-5 + + + + UTF-8 + UTF-8 + 1.8 + + + + + org.flywaydb + flyway-core + 5.0.2 + + + + org.springframework.boot + spring-boot-starter-jdbc + + + + mysql + mysql-connector-java + 6.0.3 + + + + com.h2database + h2 + test + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + org.flywaydb + flyway-maven-plugin + 5.0.2 + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + diff --git a/flyway/flyway-callbacks/src/main/java/com/baeldung/flywaycallbacks/ExampleFlywayCallback.java b/flyway/src/main/java/com/baeldung/flywaycallbacks/ExampleFlywayCallback.java similarity index 100% rename from flyway/flyway-callbacks/src/main/java/com/baeldung/flywaycallbacks/ExampleFlywayCallback.java rename to flyway/src/main/java/com/baeldung/flywaycallbacks/ExampleFlywayCallback.java diff --git a/flyway/flyway-callbacks/src/main/java/com/baeldung/flywaycallbacks/FlywayApplication.java b/flyway/src/main/java/com/baeldung/flywaycallbacks/FlywayApplication.java similarity index 100% rename from flyway/flyway-callbacks/src/main/java/com/baeldung/flywaycallbacks/FlywayApplication.java rename to flyway/src/main/java/com/baeldung/flywaycallbacks/FlywayApplication.java diff --git a/flyway/flyway-callbacks/src/main/resources/application.properties b/flyway/src/main/resources/application.properties similarity index 100% rename from flyway/flyway-callbacks/src/main/resources/application.properties rename to flyway/src/main/resources/application.properties diff --git a/flyway/flyway-callbacks/src/main/resources/db/callbacks/beforeEachMigrate.sql b/flyway/src/main/resources/db/callbacks/beforeEachMigrate.sql similarity index 100% rename from flyway/flyway-callbacks/src/main/resources/db/callbacks/beforeEachMigrate.sql rename to flyway/src/main/resources/db/callbacks/beforeEachMigrate.sql diff --git a/flyway/flyway-callbacks/src/main/resources/db/callbacks/beforeMigrate.sql b/flyway/src/main/resources/db/callbacks/beforeMigrate.sql similarity index 100% rename from flyway/flyway-callbacks/src/main/resources/db/callbacks/beforeMigrate.sql rename to flyway/src/main/resources/db/callbacks/beforeMigrate.sql diff --git a/flyway/flyway-callbacks/src/main/resources/db/migration/V1_0__add_table_one.sql b/flyway/src/main/resources/db/migration/V1_0__add_table_one.sql similarity index 100% rename from flyway/flyway-callbacks/src/main/resources/db/migration/V1_0__add_table_one.sql rename to flyway/src/main/resources/db/migration/V1_0__add_table_one.sql diff --git a/flyway/flyway-callbacks/src/main/resources/db/migration/V1_1__add_table_two.sql b/flyway/src/main/resources/db/migration/V1_1__add_table_two.sql similarity index 100% rename from flyway/flyway-callbacks/src/main/resources/db/migration/V1_1__add_table_two.sql rename to flyway/src/main/resources/db/migration/V1_1__add_table_two.sql diff --git a/flyway/flyway-callbacks/src/main/resources/logback.xml b/flyway/src/main/resources/logback.xml similarity index 100% rename from flyway/flyway-callbacks/src/main/resources/logback.xml rename to flyway/src/main/resources/logback.xml diff --git a/flyway/flyway-callbacks/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java b/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java similarity index 94% rename from flyway/flyway-callbacks/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java rename to flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java index 22edb5a007..5e96fff64d 100644 --- a/flyway/flyway-callbacks/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java +++ b/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayApplicationTest.java @@ -1,13 +1,10 @@ package com.baeldung.flywaycallbacks; -import java.util.Arrays; - import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.flywaydb.core.Flyway; -import org.flywaydb.core.api.MigrationInfoService; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -15,7 +12,6 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringRunner; -import com.baeldung.flywaycallbacks.FlywayCallbackTestConfig; @RunWith(SpringRunner.class) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) diff --git a/flyway/flyway-callbacks/src/test/java/com/baeldung/flywaycallbacks/FlywayCallbackTestConfig.java b/flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayCallbackTestConfig.java similarity index 100% rename from flyway/flyway-callbacks/src/test/java/com/baeldung/flywaycallbacks/FlywayCallbackTestConfig.java rename to flyway/src/test/java/com/baeldung/flywaycallbacks/FlywayCallbackTestConfig.java diff --git a/hibernate5/pom.xml b/hibernate5/pom.xml index 1b7396fefb..31fe10ee97 100644 --- a/hibernate5/pom.xml +++ b/hibernate5/pom.xml @@ -41,7 +41,7 @@ com.h2database h2 - 1.4.194 + 1.4.196 org.hibernate diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/App.java b/hibernate5/src/main/java/com/baeldung/hibernate/App.java deleted file mode 100644 index 26a40bb782..0000000000 --- a/hibernate5/src/main/java/com/baeldung/hibernate/App.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.hibernate; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.Transaction; - -import com.baeldung.hibernate.pojo.Supplier; - -/** - * Hello world! - * - */ -public class App { - public static void main(String[] args) { - try { - // NOTE: this is just for boostrap testing for multitenancy. - System.out.println("Checking the system."); - SessionFactory sessionFactory = HibernateMultiTenantUtil.getSessionFactory(); - Session currentSession = sessionFactory.withOptions().tenantIdentifier("h2db1").openSession(); - Transaction transaction = currentSession.getTransaction(); - transaction.begin(); - currentSession.createCriteria(Supplier.class).list().stream().forEach(System.out::println); - transaction.commit(); - - } catch (Exception e) { - e.printStackTrace(); - } - - } -} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/ConfigurableMultiTenantConnectionProvider.java b/hibernate5/src/main/java/com/baeldung/hibernate/ConfigurableMultiTenantConnectionProvider.java deleted file mode 100644 index b9ed2bd139..0000000000 --- a/hibernate5/src/main/java/com/baeldung/hibernate/ConfigurableMultiTenantConnectionProvider.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.baeldung.hibernate; - -import java.sql.Connection; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.Map; - -import org.hibernate.engine.jdbc.connections.spi.AbstractMultiTenantConnectionProvider; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; - -public class ConfigurableMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider { - - private final Map connectionProviderMap = - new HashMap<>(); - - - public ConfigurableMultiTenantConnectionProvider( - Map connectionProviderMap) { - this.connectionProviderMap.putAll( connectionProviderMap ); - } - @Override - protected ConnectionProvider getAnyConnectionProvider() { - System.out.println("Any"); - return connectionProviderMap.values().iterator().next(); - } - - @Override - protected ConnectionProvider selectConnectionProvider(String tenantIdentifier) { - System.out.println("Specific"); - return connectionProviderMap.get( tenantIdentifier ); - } - - @Override - public Connection getConnection(String tenantIdentifier) throws SQLException { - Connection connection = super.getConnection(tenantIdentifier); - // uncomment to see option 2 for SCHEMA strategy. - //connection.createStatement().execute("SET SCHEMA '" + tenantIdentifier + "'"); - return connection; - } - -} \ No newline at end of file diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java deleted file mode 100644 index 30f3c3cf53..0000000000 --- a/hibernate5/src/main/java/com/baeldung/hibernate/HibernateMultiTenantUtil.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.baeldung.hibernate; - -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import org.hibernate.SessionFactory; -import org.hibernate.boot.Metadata; -import org.hibernate.boot.MetadataSources; -import org.hibernate.boot.registry.StandardServiceRegistryBuilder; -import org.hibernate.cfg.AvailableSettings; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; -import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl; -import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; -import org.hibernate.service.ServiceRegistry; - -import com.baeldung.hibernate.pojo.Supplier; - -public class HibernateMultiTenantUtil { - private static SessionFactory sessionFactory; - private static Map connectionProviderMap = new HashMap<>(); - private static final String[] tenantDBNames = { "mydb1", "mydb2" }; - - public static SessionFactory getSessionFactory() throws UnsupportedTenancyException, IOException { - if (sessionFactory == null) { - // Configuration configuration = new Configuration().configure(); - ServiceRegistry serviceRegistry = configureServiceRegistry(); - sessionFactory = makeSessionFactory(serviceRegistry); - - } - return sessionFactory; - } - - private static SessionFactory makeSessionFactory(ServiceRegistry serviceRegistry) { - MetadataSources metadataSources = new MetadataSources(serviceRegistry); - for (Class annotatedClasses : getAnnotatedClasses()) { - metadataSources.addAnnotatedClass(annotatedClasses); - } - - Metadata metadata = metadataSources.buildMetadata(); - return metadata.getSessionFactoryBuilder() - .build(); - - } - - private static Class[] getAnnotatedClasses() { - return new Class[] { Supplier.class }; - } - - private static ServiceRegistry configureServiceRegistry() throws UnsupportedTenancyException, IOException { - - // Properties properties = configuration.getProperties(); - Properties properties = getProperties(); - - connectionProviderMap = setUpConnectionProviders(properties, tenantDBNames); - properties.put(AvailableSettings.MULTI_TENANT_CONNECTION_PROVIDER, new ConfigurableMultiTenantConnectionProvider(connectionProviderMap)); - - return new StandardServiceRegistryBuilder().applySettings(properties) - .build(); - } - - private static Properties getProperties() throws IOException { - Properties properties = new Properties(); - URL propertiesURL = Thread.currentThread() - .getContextClassLoader() - .getResource("hibernate-multitenancy.properties"); - FileInputStream inputStream = new FileInputStream(propertiesURL.getFile()); - properties.load(inputStream); - System.out.println("LOADED PROPERTIES FROM hibernate.properties"); - - return properties; - } - - private static Map setUpConnectionProviders(Properties properties, String[] tenantNames) throws UnsupportedTenancyException { - Map providerMap = new HashMap<>(); - for (String tenant : tenantNames) { - DriverManagerConnectionProviderImpl connectionProvider = new DriverManagerConnectionProviderImpl(); - - String tenantStrategy = properties.getProperty("hibernate.multiTenancy"); - System.out.println("Strategy:" + tenantStrategy); - properties.put(Environment.URL, tenantUrl(properties.getProperty(Environment.URL), tenant, tenantStrategy)); - System.out.println("URL:" + properties.getProperty(Environment.URL)); - connectionProvider.configure(properties); - System.out.println("Tenant:" + tenant); - providerMap.put(tenant, connectionProvider); - - } - System.out.println("Added connections for:"); - providerMap.keySet() - .stream() - .forEach(System.out::println); - return providerMap; - } - - private static Object tenantUrl(String originalUrl, String tenant, String tenantStrategy) throws UnsupportedTenancyException { - if (tenantStrategy.toUpperCase() - .equals("DATABASE")) { - return originalUrl.replace(DEFAULT_DB_NAME, tenant); - } else if (tenantStrategy.toUpperCase() - .equals("SCHEMA")) { - return originalUrl + String.format(SCHEMA_TOKEN, tenant); - } else { - throw new UnsupportedTenancyException("Not yet supported"); - } - } - - public static final String SCHEMA_TOKEN = ";INIT=CREATE SCHEMA IF NOT EXISTS %1$s\\;SET SCHEMA %1$s"; - public static final String DEFAULT_DB_NAME = "mydb1"; - -} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/dao/GenericDao.java b/hibernate5/src/main/java/com/baeldung/hibernate/dao/GenericDao.java deleted file mode 100644 index 85c96d8b10..0000000000 --- a/hibernate5/src/main/java/com/baeldung/hibernate/dao/GenericDao.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.baeldung.hibernate.dao; - -import java.util.List; - -public interface GenericDao { - - void save (T entity); - void delete (T Entity); - T findByName(String name); - List findAll(); - void populate(); -} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/dao/SupplierDao.java b/hibernate5/src/main/java/com/baeldung/hibernate/dao/SupplierDao.java deleted file mode 100644 index c0397ee5bb..0000000000 --- a/hibernate5/src/main/java/com/baeldung/hibernate/dao/SupplierDao.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.baeldung.hibernate.dao; - -import java.util.ArrayList; -import java.util.List; - -import org.hibernate.Criteria; -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.hibernate.Transaction; -import org.hibernate.criterion.Expression; - -import com.baeldung.hibernate.pojo.Supplier; - -public class SupplierDao implements GenericDao{ - private SessionFactory sessionFactory; - private String tenant; - - public SupplierDao(SessionFactory sessionFactory, String tenant) { - this.sessionFactory = sessionFactory; - this.tenant = tenant; - populate(); - } - - @Override - public void save(Supplier entity) { - Session session = sessionFactory.withOptions().tenantIdentifier(tenant).openSession(); - session.save(entity); - } - - @Override - public void delete(Supplier supplier) { - Session session = sessionFactory.withOptions().tenantIdentifier(tenant).openSession(); - session.delete(supplier); - } - - @Override - public Supplier findByName(String name) { - Session session = sessionFactory.withOptions().tenantIdentifier(tenant).openSession(); - List fetchedSuppliers = session.createCriteria(Supplier.class).add(Expression.eq("name", name)).list(); - if (fetchedSuppliers.size()>0) { - return fetchedSuppliers.get(0); - }else { - return null; - } - } - - @Override - public List findAll() { - Session session = sessionFactory.withOptions().tenantIdentifier(tenant).openSession(); - return session.createCriteria(Supplier.class).list(); - } - - @Override - public void populate() { - System.out.println("Init DB1"); - Session session = sessionFactory.withOptions().tenantIdentifier(tenant).openSession(); - Transaction transaction = session.getTransaction(); - - transaction.begin(); - session.createSQLQuery("DROP ALL OBJECTS").executeUpdate(); - session - .createSQLQuery( - "create table Supplier (id integer generated by default as identity, country varchar(255), name varchar(255), primary key (id))") - .executeUpdate(); - Supplier genertedSupplier = generateEntityForTenant(tenant); - System.out.println("Inserting Supplier"+genertedSupplier); - save (genertedSupplier); - - } - - private Supplier generateEntityForTenant(String forTenant) { - if (forTenant.equals("mydb1")) { - return new Supplier ("John","USA"); - } - return new Supplier ("Miller","UK"); - } - - - -} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/CustomInterceptor.java b/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/CustomInterceptor.java new file mode 100644 index 0000000000..1d60ccb6c0 --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/CustomInterceptor.java @@ -0,0 +1,32 @@ +package com.baeldung.hibernate.interceptors; + +import java.io.Serializable; +import java.util.Date; + +import org.hibernate.EmptyInterceptor; +import org.hibernate.type.Type; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.baeldung.hibernate.interceptors.entity.User; + +public class CustomInterceptor extends EmptyInterceptor { + private static final Logger logger = LoggerFactory.getLogger(CustomInterceptor.class); + + @Override + public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) { + if (entity instanceof User) { + logger.info(((User) entity).toString()); + } + return super.onSave(entity, id, state, propertyNames, types); + } + + @Override + public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object [] previousState, String[] propertyNames, Type[] types) { + if (entity instanceof User) { + ((User) entity).setLastModified(new Date()); + logger.info(((User) entity).toString()); + } + return super.onFlushDirty(entity, id, currentState, previousState, propertyNames, types); + } +} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/CustomInterceptorImpl.java b/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/CustomInterceptorImpl.java new file mode 100644 index 0000000000..a84a981f7f --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/CustomInterceptorImpl.java @@ -0,0 +1,122 @@ +package com.baeldung.hibernate.interceptors; + +import java.io.Serializable; +import java.util.Iterator; + +import org.hibernate.CallbackException; +import org.hibernate.EntityMode; +import org.hibernate.Interceptor; +import org.hibernate.Transaction; +import org.hibernate.type.Type; + +public class CustomInterceptorImpl implements Interceptor { + + @Override + public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) throws CallbackException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException { + // TODO Auto-generated method stub + return false; + } + + @Override + public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types) throws CallbackException { + // TODO Auto-generated method stub + + } + + @Override + public void onCollectionRecreate(Object collection, Serializable key) throws CallbackException { + // TODO Auto-generated method stub + + } + + @Override + public void onCollectionRemove(Object collection, Serializable key) throws CallbackException { + // TODO Auto-generated method stub + + } + + @Override + public void onCollectionUpdate(Object collection, Serializable key) throws CallbackException { + // TODO Auto-generated method stub + + } + + @Override + public void preFlush(Iterator entities) throws CallbackException { + // TODO Auto-generated method stub + + } + + @Override + public void postFlush(Iterator entities) throws CallbackException { + // TODO Auto-generated method stub + + } + + @Override + public Boolean isTransient(Object entity) { + // TODO Auto-generated method stub + return null; + } + + @Override + public int[] findDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState, String[] propertyNames, Type[] types) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object instantiate(String entityName, EntityMode entityMode, Serializable id) throws CallbackException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getEntityName(Object object) throws CallbackException { + // TODO Auto-generated method stub + return null; + } + + @Override + public Object getEntity(String entityName, Serializable id) throws CallbackException { + // TODO Auto-generated method stub + return null; + } + + @Override + public void afterTransactionBegin(Transaction tx) { + // TODO Auto-generated method stub + + } + + @Override + public void beforeTransactionCompletion(Transaction tx) { + // TODO Auto-generated method stub + + } + + @Override + public void afterTransactionCompletion(Transaction tx) { + // TODO Auto-generated method stub + + } + + @Override + public String onPrepareStatement(String sql) { + // TODO Auto-generated method stub + return null; + } + +} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/HibernateUtil.java b/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/HibernateUtil.java new file mode 100644 index 0000000000..11dce698ca --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/HibernateUtil.java @@ -0,0 +1,79 @@ +package com.baeldung.hibernate.interceptors; + +import org.apache.commons.lang3.StringUtils; +import org.hibernate.Interceptor; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.boot.Metadata; +import org.hibernate.boot.MetadataSources; +import org.hibernate.boot.SessionFactoryBuilder; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; +import org.hibernate.service.ServiceRegistry; + +import com.baeldung.hibernate.interceptors.entity.User; + +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Properties; + +public class HibernateUtil { + private static SessionFactory sessionFactory; + private static String PROPERTY_FILE_NAME; + + public static SessionFactory getSessionFactory() throws IOException { + return getSessionFactory(null); + } + + public static SessionFactory getSessionFactory(String propertyFileName) throws IOException { + PROPERTY_FILE_NAME = propertyFileName; + if (sessionFactory == null) { + ServiceRegistry serviceRegistry = configureServiceRegistry(); + sessionFactory = getSessionFactoryBuilder(serviceRegistry).build(); + } + return sessionFactory; + } + + public static SessionFactory getSessionFactoryWithInterceptor(String propertyFileName, Interceptor interceptor) throws IOException { + PROPERTY_FILE_NAME = propertyFileName; + if (sessionFactory == null) { + ServiceRegistry serviceRegistry = configureServiceRegistry(); + sessionFactory = getSessionFactoryBuilder(serviceRegistry).applyInterceptor(interceptor) + .build(); + } + return sessionFactory; + } + + public static Session getSessionWithInterceptor(Interceptor interceptor) throws IOException { + return getSessionFactory().withOptions() + .interceptor(interceptor) + .openSession(); + } + + private static SessionFactoryBuilder getSessionFactoryBuilder(ServiceRegistry serviceRegistry) { + MetadataSources metadataSources = new MetadataSources(serviceRegistry); + metadataSources.addPackage("com.baeldung.hibernate.interceptors"); + metadataSources.addAnnotatedClass(User.class); + + Metadata metadata = metadataSources.buildMetadata(); + return metadata.getSessionFactoryBuilder(); + + } + + private static ServiceRegistry configureServiceRegistry() throws IOException { + Properties properties = getProperties(); + return new StandardServiceRegistryBuilder().applySettings(properties) + .build(); + } + + private static Properties getProperties() throws IOException { + Properties properties = new Properties(); + URL propertiesURL = Thread.currentThread() + .getContextClassLoader() + .getResource(StringUtils.defaultString(PROPERTY_FILE_NAME, "hibernate-interceptors.properties")); + try (FileInputStream inputStream = new FileInputStream(propertiesURL.getFile())) { + properties.load(inputStream); + } + return properties; + } +} \ No newline at end of file diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/entity/User.java b/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/entity/User.java new file mode 100644 index 0000000000..2b1dbe702b --- /dev/null +++ b/hibernate5/src/main/java/com/baeldung/hibernate/interceptors/entity/User.java @@ -0,0 +1,64 @@ +package com.baeldung.hibernate.interceptors.entity; + +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; + +@Entity(name = "hbi_user") +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private long id; + private String name; + private String about; + @Basic + @Temporal(TemporalType.DATE) + private Date lastModified; + + public User() { + } + + public User(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Date getLastModified() { + return lastModified; + } + + public void setLastModified(Date lastModified) { + this.lastModified = lastModified; + } + + public long getId() { + return id; + } + + public String getAbout() { + return about; + } + + public void setAbout(String about) { + this.about = about; + } + + @Override + public String toString() { + return String.format("ID: %d\nName: %s\nLast Modified: %s\nAbout: %s\n", getId(), getName(), getLastModified(), getAbout()); + } +} diff --git a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Supplier.java b/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Supplier.java deleted file mode 100644 index d0187bba47..0000000000 --- a/hibernate5/src/main/java/com/baeldung/hibernate/pojo/Supplier.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.baeldung.hibernate.pojo; -// Generated Feb 9, 2017 11:31:36 AM by Hibernate Tools 5.1.0.Final - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -import org.junit.runners.Suite.SuiteClasses; - - -/** - * Suppliers generated by hbm2java - */ -@Entity(name = "Supplier") -@Table(name ="Supplier") -public class Supplier implements java.io.Serializable { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Integer id; - private String name; - private String country; - - public Supplier() { - } - - public Supplier(String name, String country) { - this.name = name; - this.country = country; - } - - public Integer getId() { - return this.id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return this.name; - } - - public void setName(String name) { - this.name = name; - } - - public String getCountry() { - return this.country; - } - - public void setCountry(String country) { - this.country = country; - } - - @Override - public String toString() { - return new StringBuffer().append("[").append(id).append(",").append(name).append(",").append(country).append("]").toString(); - } - - @Override - public boolean equals(Object obj) { - return name.equals(((Supplier) obj).getName()); - } -} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantDaoHibernateIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantDaoHibernateIntegrationTest.java deleted file mode 100644 index 82567690ac..0000000000 --- a/hibernate5/src/test/java/com/baeldung/hibernate/MultiTenantDaoHibernateIntegrationTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.baeldung.hibernate; - -import java.io.IOException; - -import org.hibernate.SessionFactory; -import org.junit.Test; - -import com.baeldung.hibernate.dao.SupplierDao; -import com.baeldung.hibernate.pojo.Supplier; - -import static org.junit.Assert.assertNull;; - -public class MultiTenantDaoHibernateIntegrationTest { - @Test - public void givenDBMode_whenFetchingSuppliersByName_thenChecking() throws UnsupportedTenancyException, IOException { - SessionFactory sessionFactory = HibernateMultiTenantUtil.getSessionFactory(); - - SupplierDao myDb1Dao = new SupplierDao(sessionFactory, "mydb1"); - Supplier db1SupplierName = myDb1Dao.findByName("John"); - - // finding the same supplier name in another tenant - // and we should not be able to find in there and both dbs are different. - SupplierDao myDb2Dao = new SupplierDao(sessionFactory, "mydb2"); - Supplier db2SupplierName = myDb2Dao.findByName(db1SupplierName.getName()); - - assertNull(db2SupplierName); - - } - -} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/interceptors/HibernateInterceptorTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/interceptors/HibernateInterceptorTest.java new file mode 100644 index 0000000000..cbf28497bb --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/interceptors/HibernateInterceptorTest.java @@ -0,0 +1,62 @@ +package com.baeldung.hibernate.interceptors; + +import java.io.IOException; +import java.io.Serializable; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.Transaction; +import org.junit.After; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.Test; + +import com.baeldung.hibernate.interceptors.entity.User; + +public class HibernateInterceptorTest { + private static SessionFactory sessionFactory; + private static Serializable userId; + + @Before + public void init() throws IOException { + sessionFactory = HibernateUtil.getSessionFactoryWithInterceptor(null, new CustomInterceptor()); + } + + @AfterClass + public static void finish() { + if(userId != null) { + Session session = sessionFactory.getCurrentSession(); + Transaction transaction = session.beginTransaction(); + User user = session.load(User.class, userId); + if(user != null) { + session.delete(user); + } + transaction.commit(); + session.close(); + } + } + + @Test + public void givenHibernateInterceptorAndSessionScoped_whenUserCreated_shouldSucceed() { + Session session = sessionFactory.withOptions().interceptor(new CustomInterceptor()).openSession(); + User user = new User("Benjamin Franklin"); + Transaction transaction = session.beginTransaction(); + userId = session.save(user); + transaction.commit(); + session.close(); + } + + @Test + public void givenHibernateInterceptorAndSessionFactoryScoped_whenUserModified_shouldSucceed() { + Session session = sessionFactory.openSession(); + Transaction transaction = session.beginTransaction(); + User user = session.load(User.class, userId); + if(user != null) { + user.setAbout("I am a scientist."); + session.update(user); + } + transaction.commit(); + session.close(); + } + +} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/Car.java b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/Car.java new file mode 100644 index 0000000000..1b6cee7e67 --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/Car.java @@ -0,0 +1,26 @@ +package com.baeldung.hibernate.multitenancy; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity(name = "Car") +@Table(name = "Car") +public class Car implements Serializable { + + private static final long serialVersionUID = 1015320564683423342L; + + private String brand; + + @Id + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + +} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/MultitenancyIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/MultitenancyIntegrationTest.java new file mode 100644 index 0000000000..fdc3f9fa81 --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/MultitenancyIntegrationTest.java @@ -0,0 +1,104 @@ +package com.baeldung.hibernate.multitenancy; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import java.io.IOException; +import java.util.Properties; + +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.Transaction; +import org.hibernate.boot.MetadataSources; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; +import org.hibernate.cfg.AvailableSettings; +import org.hibernate.context.spi.CurrentTenantIdentifierResolver; +import org.hibernate.service.ServiceRegistry; +import org.junit.Before; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockitoAnnotations; + +import com.baeldung.hibernate.multitenancy.database.TenantIdNames; + +public abstract class MultitenancyIntegrationTest { + + public abstract String getPropertyFile(); + + @Mock + private CurrentTenantIdentifierResolver currentTenantIdentifierResolver; + + private SessionFactory sessionFactory; + + @Before + public void setup() throws IOException { + MockitoAnnotations.initMocks(this); + + Mockito.when(currentTenantIdentifierResolver.validateExistingCurrentSessions()) + .thenReturn(false); + + Properties properties = getHibernateProperties(); + properties.put(AvailableSettings.MULTI_TENANT_IDENTIFIER_RESOLVER, currentTenantIdentifierResolver); + + sessionFactory = buildSessionFactory(properties); + + initTenant(TenantIdNames.MYDB1); + initTenant(TenantIdNames.MYDB2); + } + + protected void initTenant(String tenantId) { + whenCurrentTenantIs(tenantId); + createCarTable(); + } + + protected void whenCurrentTenantIs(String tenantId) { + Mockito.when(currentTenantIdentifierResolver.resolveCurrentTenantIdentifier()) + .thenReturn(tenantId); + } + + protected void whenAddCar(String brand) { + Session session = sessionFactory.openSession(); + Transaction tx = session.beginTransaction(); + Car car = new Car(); + car.setBrand(brand); + session.save(car); + tx.commit(); + } + + protected void thenCarFound(String brand) { + Session session = sessionFactory.openSession(); + assertNotNull(session.get(Car.class, brand)); + } + + protected void thenCarNotFound(String brand) { + Session session = sessionFactory.openSession(); + assertNull(session.get(Car.class, brand)); + } + + @SuppressWarnings("deprecation") + private void createCarTable() { + Session session = sessionFactory.openSession(); + Transaction tx = session.beginTransaction(); + session.createSQLQuery("drop table Car if exists") + .executeUpdate(); + session.createSQLQuery("create table Car (brand varchar(255) primary key)") + .executeUpdate(); + tx.commit(); + } + + private Properties getHibernateProperties() throws IOException { + Properties properties = new Properties(); + properties.load(getClass().getResourceAsStream(getPropertyFile())); + return properties; + } + + private static SessionFactory buildSessionFactory(Properties properties) { + ServiceRegistry serviceRegistry = new StandardServiceRegistryBuilder().applySettings(properties) + .build(); + MetadataSources metadataSources = new MetadataSources(serviceRegistry); + metadataSources.addAnnotatedClass(Car.class); + return metadataSources.buildMetadata() + .buildSessionFactory(); + } + +} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/database/DatabaseApproachMultitenancyIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/database/DatabaseApproachMultitenancyIntegrationTest.java new file mode 100644 index 0000000000..92f477a646 --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/database/DatabaseApproachMultitenancyIntegrationTest.java @@ -0,0 +1,25 @@ +package com.baeldung.hibernate.multitenancy.database; + +import java.io.IOException; + +import org.junit.Test; + +import com.baeldung.hibernate.multitenancy.MultitenancyIntegrationTest; + +public class DatabaseApproachMultitenancyIntegrationTest extends MultitenancyIntegrationTest { + + @Override + public String getPropertyFile() { + return "/hibernate-database-multitenancy.properties"; + } + + @Test + public void givenDatabaseApproach_whenAddingEntries_thenOnlyAddedToConcreteDatabase() throws IOException { + whenCurrentTenantIs(TenantIdNames.MYDB1); + whenAddCar("myCar"); + thenCarFound("myCar"); + whenCurrentTenantIs(TenantIdNames.MYDB2); + thenCarNotFound("myCar"); + } + +} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/database/MapMultiTenantConnectionProvider.java b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/database/MapMultiTenantConnectionProvider.java new file mode 100644 index 0000000000..eb1f410622 --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/database/MapMultiTenantConnectionProvider.java @@ -0,0 +1,42 @@ +package com.baeldung.hibernate.multitenancy.database; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; + +import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl; +import org.hibernate.engine.jdbc.connections.spi.AbstractMultiTenantConnectionProvider; +import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; + +@SuppressWarnings("serial") +public class MapMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider { + + private final Map connectionProviderMap = new HashMap<>(); + + public MapMultiTenantConnectionProvider() throws IOException { + initConnectionProviderForTenant(TenantIdNames.MYDB1); + initConnectionProviderForTenant(TenantIdNames.MYDB2); + } + + @Override + protected ConnectionProvider getAnyConnectionProvider() { + return connectionProviderMap.values() + .iterator() + .next(); + } + + @Override + protected ConnectionProvider selectConnectionProvider(String tenantIdentifier) { + return connectionProviderMap.get(tenantIdentifier); + } + + private void initConnectionProviderForTenant(String tenantId) throws IOException { + Properties properties = new Properties(); + properties.load(getClass().getResourceAsStream(String.format("/hibernate-database-%s.properties", tenantId))); + DriverManagerConnectionProviderImpl connectionProvider = new DriverManagerConnectionProviderImpl(); + connectionProvider.configure(properties); + this.connectionProviderMap.put(tenantId, connectionProvider); + } + +} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/database/TenantIdNames.java b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/database/TenantIdNames.java new file mode 100644 index 0000000000..231272fa63 --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/database/TenantIdNames.java @@ -0,0 +1,6 @@ +package com.baeldung.hibernate.multitenancy.database; + +public class TenantIdNames { + public static final String MYDB1 = "mydb1"; + public static final String MYDB2 = "mydb2"; +} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaApproachMultitenancyIntegrationTest.java b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaApproachMultitenancyIntegrationTest.java new file mode 100644 index 0000000000..304af65fca --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaApproachMultitenancyIntegrationTest.java @@ -0,0 +1,26 @@ +package com.baeldung.hibernate.multitenancy.schema; + +import java.io.IOException; + +import org.junit.Test; + +import com.baeldung.hibernate.multitenancy.MultitenancyIntegrationTest; +import com.baeldung.hibernate.multitenancy.database.TenantIdNames; + +public class SchemaApproachMultitenancyIntegrationTest extends MultitenancyIntegrationTest { + + @Override + public String getPropertyFile() { + return "/hibernate-schema-multitenancy.properties"; + } + + @Test + public void givenSchemaApproach_whenAddingEntries_thenOnlyAddedToConcreteSchema() throws IOException { + whenCurrentTenantIs(TenantIdNames.MYDB1); + whenAddCar("Ferrari"); + thenCarFound("Ferrari"); + whenCurrentTenantIs(TenantIdNames.MYDB2); + thenCarNotFound("Ferrari"); + } + +} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaMultiTenantConnectionProvider.java b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaMultiTenantConnectionProvider.java new file mode 100644 index 0000000000..5045c3ee8e --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/schema/SchemaMultiTenantConnectionProvider.java @@ -0,0 +1,49 @@ +package com.baeldung.hibernate.multitenancy.schema; + +import java.io.IOException; +import java.sql.Connection; +import java.sql.SQLException; +import java.util.Properties; + +import org.hibernate.engine.jdbc.connections.internal.DriverManagerConnectionProviderImpl; +import org.hibernate.engine.jdbc.connections.spi.AbstractMultiTenantConnectionProvider; +import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider; +import org.junit.Assert; + +@SuppressWarnings("serial") +public class SchemaMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider { + + private final ConnectionProvider connectionProvider = initConnectionProvider(); + + @Override + protected ConnectionProvider getAnyConnectionProvider() { + return connectionProvider; + } + + @Override + protected ConnectionProvider selectConnectionProvider(String tenantIdentifier) { + return connectionProvider; + } + + @Override + public Connection getConnection(String tenantIdentifier) throws SQLException { + Connection connection = super.getConnection(tenantIdentifier); + connection.createStatement() + .execute(String.format("SET SCHEMA %s;", tenantIdentifier)); + return connection; + } + + private ConnectionProvider initConnectionProvider() { + Properties properties = new Properties(); + try { + properties.load(getClass().getResourceAsStream("/hibernate-schema-multitenancy.properties")); + } catch (IOException e) { + Assert.fail("Error loading resource. Cause: " + e.getMessage()); + } + + DriverManagerConnectionProviderImpl connectionProvider = new DriverManagerConnectionProviderImpl(); + connectionProvider.configure(properties); + return connectionProvider; + } + +} diff --git a/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/schema/TenantIdNames.java b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/schema/TenantIdNames.java new file mode 100644 index 0000000000..2eba94e307 --- /dev/null +++ b/hibernate5/src/test/java/com/baeldung/hibernate/multitenancy/schema/TenantIdNames.java @@ -0,0 +1,6 @@ +package com.baeldung.hibernate.multitenancy.schema; + +public class TenantIdNames { + public static final String MYDB1 = "mydb1"; + public static final String MYDB2 = "mydb2"; +} diff --git a/hibernate5/src/test/resources/hibernate-database-multitenancy.properties b/hibernate5/src/test/resources/hibernate-database-multitenancy.properties new file mode 100644 index 0000000000..853fa80dfc --- /dev/null +++ b/hibernate5/src/test/resources/hibernate-database-multitenancy.properties @@ -0,0 +1,2 @@ +hibernate.multiTenancy=DATABASE +hibernate.multi_tenant_connection_provider=com.baeldung.hibernate.multitenancy.database.MapMultiTenantConnectionProvider \ No newline at end of file diff --git a/hibernate5/src/test/resources/hibernate-database-mydb1.properties b/hibernate5/src/test/resources/hibernate-database-mydb1.properties new file mode 100644 index 0000000000..345f1dbbea --- /dev/null +++ b/hibernate5/src/test/resources/hibernate-database-mydb1.properties @@ -0,0 +1,4 @@ +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1 +hibernate.connection.username=sa +hibernate.dialect=org.hibernate.dialect.H2Dialect \ No newline at end of file diff --git a/hibernate5/src/test/resources/hibernate-database-mydb2.properties b/hibernate5/src/test/resources/hibernate-database-mydb2.properties new file mode 100644 index 0000000000..626b7853c6 --- /dev/null +++ b/hibernate5/src/test/resources/hibernate-database-mydb2.properties @@ -0,0 +1,4 @@ +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:mem:mydb2;DB_CLOSE_DELAY=-1 +hibernate.connection.username=sa +hibernate.dialect=org.hibernate.dialect.H2Dialect \ No newline at end of file diff --git a/hibernate5/src/test/resources/hibernate-multitenancy.properties b/hibernate5/src/test/resources/hibernate-interceptors.properties similarity index 67% rename from hibernate5/src/test/resources/hibernate-multitenancy.properties rename to hibernate5/src/test/resources/hibernate-interceptors.properties index 298ecd05d3..58b55d0a09 100644 --- a/hibernate5/src/test/resources/hibernate-multitenancy.properties +++ b/hibernate5/src/test/resources/hibernate-interceptors.properties @@ -6,4 +6,5 @@ jdbc.password= hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.show_sql=true -hibernate.multiTenancy=DATABASE +hibernate.hbm2ddl.auto=create-drop +hibernate.current_session_context_class=org.hibernate.context.internal.ThreadLocalSessionContext \ No newline at end of file diff --git a/hibernate5/src/test/resources/hibernate-schema-multitenancy.properties b/hibernate5/src/test/resources/hibernate-schema-multitenancy.properties new file mode 100644 index 0000000000..4abb621355 --- /dev/null +++ b/hibernate5/src/test/resources/hibernate-schema-multitenancy.properties @@ -0,0 +1,7 @@ +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:mem:mydb1;DB_CLOSE_DELAY=-1;INIT=CREATE SCHEMA IF NOT EXISTS MYDB1\\;CREATE SCHEMA IF NOT EXISTS MYDB2\\; +hibernate.connection.username=sa +hibernate.connection.autocommit=true +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.multiTenancy=SCHEMA +hibernate.multi_tenant_connection_provider=com.baeldung.hibernate.multitenancy.schema.SchemaMultiTenantConnectionProvider \ No newline at end of file diff --git a/influxdb/README.md b/influxdb/README.md new file mode 100644 index 0000000000..f2c421580e --- /dev/null +++ b/influxdb/README.md @@ -0,0 +1,17 @@ +## Influx SDK Tutorial Project + +### Relevant Article: +- [Introduction to using InfluxDB with Java](http://www.baeldung.com/using-influxdb-with-java/) + +### Overview +This Maven project contains the Java code for the article linked above. + +### Package Organization +Java classes for the intro tutorial are in the +org.baeldung.influxdb package. + + +### Running the tests +The test class expects an InfluxDB server to be available on localhost, at the default port of 8086 and with the default "admin" credentials. + +``` diff --git a/influxdb/pom.xml b/influxdb/pom.xml new file mode 100644 index 0000000000..05a8e00fa0 --- /dev/null +++ b/influxdb/pom.xml @@ -0,0 +1,44 @@ + + + 4.0.0 + influxdb + 0.1-SNAPSHOT + jar + influxdb + InfluxDB SDK Tutorial + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + + org.influxdb + influxdb-java + ${influxdb.sdk.version} + + + + org.projectlombok + lombok + + ${lombok.version} + provided + + + + + + + + 1.8 + UTF-8 + 2.8 + 1.16.18 + + + + diff --git a/influxdb/src/main/java/com/baeldung/influxdb/MemoryPoint.java b/influxdb/src/main/java/com/baeldung/influxdb/MemoryPoint.java new file mode 100644 index 0000000000..fb05a70867 --- /dev/null +++ b/influxdb/src/main/java/com/baeldung/influxdb/MemoryPoint.java @@ -0,0 +1,28 @@ +package com.baeldung.influxdb; + +import lombok.Data; +import org.influxdb.annotation.Column; +import org.influxdb.annotation.Measurement; + +import java.time.Instant; + +@Data +@Measurement(name = "memory") +public class MemoryPoint { + + @Column(name = "time") + private Instant time; + + @Column(name = "name") + private String name; + + @Column(name = "free") + private Long free; + + @Column(name = "used") + private Long used; + + @Column(name = "buffer") + private Long buffer; + +} diff --git a/influxdb/src/test/java/com/baeldung/influxdb/InfluxDBConnectionLiveTest.java b/influxdb/src/test/java/com/baeldung/influxdb/InfluxDBConnectionLiveTest.java new file mode 100644 index 0000000000..50d35b9b1c --- /dev/null +++ b/influxdb/src/test/java/com/baeldung/influxdb/InfluxDBConnectionLiveTest.java @@ -0,0 +1,179 @@ +package com.baeldung.influxdb; + +import lombok.extern.slf4j.Slf4j; +import org.influxdb.InfluxDB; +import org.influxdb.InfluxDBFactory; +import org.influxdb.InfluxDBIOException; +import org.influxdb.dto.*; +import org.influxdb.impl.InfluxDBResultMapper; +import org.junit.Test; + +import java.io.IOException; +import java.util.List; +import java.util.concurrent.TimeUnit; + +import static junit.framework.TestCase.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +@Slf4j +public class InfluxDBConnectionLiveTest { + + @Test + public void whenCorrectInfoDatabaseConnects() { + + InfluxDB connection = connectDatabase(); + assertTrue(pingServer(connection)); + } + + private InfluxDB connectDatabase() { + + // Connect to database assumed on localhost with default credentials. + return InfluxDBFactory.connect("http://127.0.0.1:8086", "admin", "admin"); + + } + + private boolean pingServer(InfluxDB influxDB) { + try { + // Ping and check for version string + Pong response = influxDB.ping(); + if (response.getVersion().equalsIgnoreCase("unknown")) { + log.error("Error pinging server."); + return false; + } else { + log.info("Database version: {}", response.getVersion()); + return true; + } + } catch (InfluxDBIOException idbo) { + log.error("Exception while pinging database: ", idbo); + return false; + } + } + + @Test + public void whenDatabaseCreatedDatabaseChecksOk() { + + InfluxDB connection = connectDatabase(); + + // Create "baeldung and check for it + connection.createDatabase("baeldung"); + assertTrue(connection.databaseExists("baeldung")); + + // Verify that nonsense databases are not there + assertFalse(connection.databaseExists("foobar")); + + // Drop "baeldung" and check again + connection.deleteDatabase("baeldung"); + assertFalse(connection.databaseExists("baeldung")); + } + + @Test + public void whenPointsWrittenPointsExists() throws Exception { + + InfluxDB connection = connectDatabase(); + + String dbName = "baeldung"; + connection.createDatabase(dbName); + + // Need a retention policy before we can proceed + connection.createRetentionPolicy("defaultPolicy", "baeldung", "30d", 1, true); + + // Since we are doing a batch thread, we need to set this as a default + connection.setRetentionPolicy("defaultPolicy"); + + // Enable batch mode + connection.enableBatch(10, 10, TimeUnit.MILLISECONDS); + + for (int i = 0; i < 10; i++) { + Point point = Point.measurement("memory") + .time(System.currentTimeMillis(), TimeUnit.MILLISECONDS) + .addField("name", "server1") + .addField("free", 4743656L) + .addField("used", 1015096L) + .addField("buffer", 1010467L) + .build(); + + connection.write(dbName, "defaultPolicy", point); + Thread.sleep(2); + + } + + // Unfortunately, the sleep inside the loop doesn't always add enough time to insure + // that Influx's batch thread flushes all of the writes and this sometimes fails without + // another brief pause. + Thread.sleep(10); + + List memoryPointList = getPoints(connection, "Select * from memory", "baeldung"); + + assertEquals(10, memoryPointList.size()); + + // Turn off batch and clean up + connection.disableBatch(); + connection.deleteDatabase("baeldung"); + connection.close(); + + } + + private List getPoints(InfluxDB connection, String query, String databaseName) { + + // Run the query + Query queryObject = new Query(query, databaseName); + QueryResult queryResult = connection.query(queryObject); + + // Map it + InfluxDBResultMapper resultMapper = new InfluxDBResultMapper(); + return resultMapper.toPOJO(queryResult, MemoryPoint.class); + } + + + + @Test + public void whenBatchWrittenBatchExists() { + + InfluxDB connection = connectDatabase(); + + String dbName = "baeldung"; + connection.createDatabase(dbName); + + // Need a retention policy before we can proceed + // Since we are doing batches, we need not set it + connection.createRetentionPolicy("defaultPolicy", "baeldung", "30d", 1, true); + + + BatchPoints batchPoints = BatchPoints + .database(dbName) + .retentionPolicy("defaultPolicy") + .build(); + Point point1 = Point.measurement("memory") + .time(System.currentTimeMillis(), TimeUnit.MILLISECONDS) + .addField("free", 4743656L) + .addField("used", 1015096L) + .addField("buffer", 1010467L) + .build(); + Point point2 = Point.measurement("memory") + .time(System.currentTimeMillis() - 100, TimeUnit.MILLISECONDS) + .addField("free", 4743696L) + .addField("used", 1016096L) + .addField("buffer", 1008467L) + .build(); + batchPoints.point(point1); + batchPoints.point(point2); + connection.write(batchPoints); + + List memoryPointList = getPoints(connection, "Select * from memory", "baeldung"); + + assertEquals(2, memoryPointList.size()); + assertTrue(4743696L == memoryPointList.get(0).getFree()); + + + memoryPointList = getPoints(connection, "Select * from memory order by time desc", "baeldung"); + + assertEquals(2, memoryPointList.size()); + assertTrue(4743656L == memoryPointList.get(0).getFree()); + + // Clean up database + connection.deleteDatabase("baeldung"); + connection.close(); + } + +} diff --git a/influxdb/src/test/resources/logback.xml b/influxdb/src/test/resources/logback.xml new file mode 100644 index 0000000000..f8ebaf1ebd --- /dev/null +++ b/influxdb/src/test/resources/logback.xml @@ -0,0 +1,13 @@ + + + + + web - %date [%thread] %-5level %logger{36} - %message%n + + + + + + + + \ No newline at end of file diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml index 63cf60ac36..4727ca2222 100644 --- a/libraries-data/pom.xml +++ b/libraries-data/pom.xml @@ -1,5 +1,6 @@ - + 4.0.0 com.baeldung @@ -15,18 +16,18 @@ kryo ${kryo.version} - + com.h2database h2 ${h2.version} - + junit junit ${junit.version} test - + com.goldmansachs.reladomo reladomo ${reladomo.version} @@ -41,8 +42,31 @@ ormlite-jdbc ${ormlite.version} + + org.apache.kafka + kafka-streams + ${kafka.version} + + + org.apache.kafka + kafka-clients + ${kafka.version} + + + org.slf4j + slf4j-log4j12 + + + + + org.apache.kafka + kafka-clients + ${kafka.version} + test + test + - + @@ -68,24 +92,24 @@ - + + classname="com.gs.fw.common.mithra.generator.MithraGenerator"/> + xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml" + generateGscListMethod="true" + generatedDir="${project.build.directory}/generated-sources/reladomo" + nonGeneratedDir="${project.basedir}/src/main/java"/> - + classname="com.gs.fw.common.mithra.generator.dbgenerator.MithraDbDefinitionGenerator" + loaderRef="reladomoGenerator"> + + xml="${project.basedir}/src/main/resources/reladomo/ReladomoClassList.xml" + generatedDir="${project.build.directory}/generated-db/sql" + databaseType="postgres"/> @@ -139,10 +163,16 @@ - + - + + + + Apache Staging + https://repository.apache.org/content/groups/staging + + 4.0.1 1.4.196 @@ -150,5 +180,6 @@ 4.12 3.7.0 5.0 + 1.0.0 \ No newline at end of file diff --git a/libraries-data/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java b/libraries-data/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java new file mode 100644 index 0000000000..32568e9ea5 --- /dev/null +++ b/libraries-data/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java @@ -0,0 +1,62 @@ +package com.baeldung.kafkastreams; + +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.common.serialization.Serde; +import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.streams.KafkaStreams; +import org.apache.kafka.streams.StreamsConfig; +import org.apache.kafka.streams.kstream.KStream; +import org.apache.kafka.streams.kstream.KStreamBuilder; +import org.apache.kafka.streams.kstream.KTable; +import org.apache.kafka.test.TestUtils; +import org.junit.Ignore; +import org.junit.Test; + +import java.util.Arrays; +import java.util.Properties; +import java.util.regex.Pattern; + +public class KafkaStreamsLiveTest { + private String bootstrapServers = "localhost:9092"; + + @Test + @Ignore("it needs to have kafka broker running on local") + public void shouldTestKafkaStreams() throws InterruptedException { + //given + String inputTopic = "inputTopic"; + + Properties streamsConfiguration = new Properties(); + streamsConfiguration.put(StreamsConfig.APPLICATION_ID_CONFIG, "wordcount-live-test"); + streamsConfiguration.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); + streamsConfiguration.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName()); + streamsConfiguration.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName()); + streamsConfiguration.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, 1000); + streamsConfiguration.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); + // Use a temporary directory for storing state, which will be automatically removed after the test. + streamsConfiguration.put(StreamsConfig.STATE_DIR_CONFIG, TestUtils.tempDirectory().getAbsolutePath()); + + //when + KStreamBuilder builder = new KStreamBuilder(); + KStream textLines = builder.stream(inputTopic); + Pattern pattern = Pattern.compile("\\W+", Pattern.UNICODE_CHARACTER_CLASS); + + KTable wordCounts = textLines + .flatMapValues(value -> Arrays.asList(pattern.split(value.toLowerCase()))) + .groupBy((key, word) -> word) + .count(); + + wordCounts.foreach((word, count) -> System.out.println("word: " + word + " -> " + count)); + + String outputTopic = "outputTopic"; + final Serde stringSerde = Serdes.String(); + final Serde longSerde = Serdes.Long(); + wordCounts.to(stringSerde, longSerde, outputTopic); + + KafkaStreams streams = new KafkaStreams(builder, streamsConfiguration); + streams.start(); + + //then + Thread.sleep(30000); + streams.close(); + } +} diff --git a/libraries/pom.xml b/libraries/pom.xml index e4383eaadc..712a7df786 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -613,16 +613,16 @@ caffeine ${caffeine.version} - - org.bouncycastle - bcprov-jdk15on - 1.58 - - - org.bouncycastle - bcpkix-jdk15on - 1.58 - + + org.bouncycastle + bcprov-jdk15on + 1.58 + + + org.bouncycastle + bcpkix-jdk15on + 1.58 + com.google.http-client google-http-client @@ -655,6 +655,29 @@ google-api-services-sheets ${google-sheets.version} + + org.apache.kafka + kafka-streams + ${kafka.version} + + + org.apache.kafka + kafka-clients + ${kafka.version} + + + org.slf4j + slf4j-log4j12 + + + + + org.apache.kafka + kafka-clients + ${kafka.version} + test + test + @@ -670,6 +693,10 @@ bintray http://dl.bintray.com/cuba-platform/main + + Apache Staging + https://repository.apache.org/content/groups/staging + 1.23.0 @@ -730,5 +757,6 @@ 2.5.5 1.23.0 v4-rev493-1.21.0 + 1.0.0 \ No newline at end of file diff --git a/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java b/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java new file mode 100644 index 0000000000..32568e9ea5 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/kafkastreams/KafkaStreamsLiveTest.java @@ -0,0 +1,62 @@ +package com.baeldung.kafkastreams; + +import org.apache.kafka.clients.consumer.ConsumerConfig; +import org.apache.kafka.common.serialization.Serde; +import org.apache.kafka.common.serialization.Serdes; +import org.apache.kafka.streams.KafkaStreams; +import org.apache.kafka.streams.StreamsConfig; +import org.apache.kafka.streams.kstream.KStream; +import org.apache.kafka.streams.kstream.KStreamBuilder; +import org.apache.kafka.streams.kstream.KTable; +import org.apache.kafka.test.TestUtils; +import org.junit.Ignore; +import org.junit.Test; + +import java.util.Arrays; +import java.util.Properties; +import java.util.regex.Pattern; + +public class KafkaStreamsLiveTest { + private String bootstrapServers = "localhost:9092"; + + @Test + @Ignore("it needs to have kafka broker running on local") + public void shouldTestKafkaStreams() throws InterruptedException { + //given + String inputTopic = "inputTopic"; + + Properties streamsConfiguration = new Properties(); + streamsConfiguration.put(StreamsConfig.APPLICATION_ID_CONFIG, "wordcount-live-test"); + streamsConfiguration.put(StreamsConfig.BOOTSTRAP_SERVERS_CONFIG, bootstrapServers); + streamsConfiguration.put(StreamsConfig.DEFAULT_KEY_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName()); + streamsConfiguration.put(StreamsConfig.DEFAULT_VALUE_SERDE_CLASS_CONFIG, Serdes.String().getClass().getName()); + streamsConfiguration.put(StreamsConfig.COMMIT_INTERVAL_MS_CONFIG, 1000); + streamsConfiguration.put(ConsumerConfig.AUTO_OFFSET_RESET_CONFIG, "earliest"); + // Use a temporary directory for storing state, which will be automatically removed after the test. + streamsConfiguration.put(StreamsConfig.STATE_DIR_CONFIG, TestUtils.tempDirectory().getAbsolutePath()); + + //when + KStreamBuilder builder = new KStreamBuilder(); + KStream textLines = builder.stream(inputTopic); + Pattern pattern = Pattern.compile("\\W+", Pattern.UNICODE_CHARACTER_CLASS); + + KTable wordCounts = textLines + .flatMapValues(value -> Arrays.asList(pattern.split(value.toLowerCase()))) + .groupBy((key, word) -> word) + .count(); + + wordCounts.foreach((word, count) -> System.out.println("word: " + word + " -> " + count)); + + String outputTopic = "outputTopic"; + final Serde stringSerde = Serdes.String(); + final Serde longSerde = Serdes.Long(); + wordCounts.to(stringSerde, longSerde, outputTopic); + + KafkaStreams streams = new KafkaStreams(builder, streamsConfiguration); + streams.start(); + + //then + Thread.sleep(30000); + streams.close(); + } +} diff --git a/flyway/flyway-callbacks/.gitignore b/orientdb/.gitignore similarity index 100% rename from flyway/flyway-callbacks/.gitignore rename to orientdb/.gitignore diff --git a/orientdb/.mvn/wrapper/maven-wrapper.jar b/orientdb/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000000..5fd4d5023f Binary files /dev/null and b/orientdb/.mvn/wrapper/maven-wrapper.jar differ diff --git a/orientdb/.mvn/wrapper/maven-wrapper.properties b/orientdb/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000000..c954cec91c --- /dev/null +++ b/orientdb/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1 @@ +distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.9/apache-maven-3.3.9-bin.zip diff --git a/orientdb/README.md b/orientdb/README.md new file mode 100644 index 0000000000..152ad392dd --- /dev/null +++ b/orientdb/README.md @@ -0,0 +1,25 @@ +Introduction to the OrientDB Java APIs +====================================== + +This is a simple maven project that shows how to use OrientDB's Java APIs. + +### Requirements + +- Maven +- Java 7 or higher +- OrientDB + +### Build + +To build and start the server simply type + +```bash +$ mvn clean install +``` + +### Run Tests + +Before launching unit tests: +- Install OrientDB +- Create BaeldungDB, BaeldungDBTwo and BaeldungDBThree databases +- Uncomment annotations on the test files \ No newline at end of file diff --git a/orientdb/mvnw b/orientdb/mvnw new file mode 100755 index 0000000000..a1ba1bf554 --- /dev/null +++ b/orientdb/mvnw @@ -0,0 +1,233 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven2 Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # + # Look for the Apple JDKs first to preserve the existing behaviour, and then look + # for the new JDKs provided by Oracle. + # + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then + # + # Apple JDKs + # + export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then + # + # Oracle JDKs + # + export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home + fi + + if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then + # + # Apple JDKs + # + export JAVA_HOME=`/usr/libexec/java_home` + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Migwn, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" + # TODO classpath? +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` +fi + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + local basedir=$(pwd) + local wdir=$(pwd) + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + wdir=$(cd "$wdir/.."; pwd) + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)} +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} "$@" diff --git a/orientdb/mvnw.cmd b/orientdb/mvnw.cmd new file mode 100644 index 0000000000..2b934e89dd --- /dev/null +++ b/orientdb/mvnw.cmd @@ -0,0 +1,145 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven2 Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat" +if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd" +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +set MAVEN_CMD_LINE_ARGS=%* + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" + +set WRAPPER_JAR="".\.mvn\wrapper\maven-wrapper.jar"" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CMD_LINE_ARGS% +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat" +if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%" == "on" pause + +if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE% + +exit /B %ERROR_CODE% \ No newline at end of file diff --git a/orientdb/pom.xml b/orientdb/pom.xml new file mode 100644 index 0000000000..3d3cb36a91 --- /dev/null +++ b/orientdb/pom.xml @@ -0,0 +1,57 @@ + + + 4.0.0 + + orientdb + 0.0.1-SNAPSHOT + jar + + intro-orientdb + introduction to the OrientDB Java APIs + + + com.baeldung + parent-modules + 1.0.0-SNAPSHOT + + + + UTF-8 + UTF-8 + 1.8 + 2.2.31 + 2.6.0 + 4.12 + + + + + com.orientechnologies + orientdb-core + ${orientdb.version} + + + com.orientechnologies + orientdb-graphdb + ${orientdb.version} + + + com.orientechnologies + orientdb-object + ${orientdb.version} + + + com.tinkerpop.blueprints + blueprints-core + ${blueprints.version} + + + + junit + junit + ${junit.version} + test + + + diff --git a/orientdb/src/main/java/com/baeldung/orientdb/Author.java b/orientdb/src/main/java/com/baeldung/orientdb/Author.java new file mode 100644 index 0000000000..8366fa301f --- /dev/null +++ b/orientdb/src/main/java/com/baeldung/orientdb/Author.java @@ -0,0 +1,54 @@ +package com.baeldung.orientdb; + +import javax.persistence.Id; + +public class Author { + @Id + private Object id; + + private String firstName; + private String lastName; + private int level; + + public Author() { + } + + public Author(String firstName, String lastName, int level) { + this.firstName = firstName; + this.lastName = lastName; + this.level = level; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } + + @java.lang.Override + public java.lang.String toString() { + return "Author{" + + "firstName='" + firstName + '\'' + + ", lastName='" + lastName + '\'' + + ", level=" + level + + '}'; + } +} diff --git a/orientdb/src/test/java/com/baeldung/orientdb/OrientDBDocumentAPITest.java b/orientdb/src/test/java/com/baeldung/orientdb/OrientDBDocumentAPITest.java new file mode 100644 index 0000000000..c51ff6928f --- /dev/null +++ b/orientdb/src/test/java/com/baeldung/orientdb/OrientDBDocumentAPITest.java @@ -0,0 +1,60 @@ +package com.baeldung.orientdb; + +import com.orientechnologies.orient.core.db.document.ODatabaseDocumentTx; +import com.orientechnologies.orient.core.record.impl.ODocument; +import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.util.List; + +import static junit.framework.Assert.assertEquals; + +public class OrientDBDocumentAPITest { + private static ODatabaseDocumentTx db = null; + + // @BeforeClass + public static void setup() { + String orientDBFolder = System.getenv("ORIENTDB_HOME"); + db = new ODatabaseDocumentTx("plocal:" + orientDBFolder + "/databases/BaeldungDBTwo").open("admin", "admin"); + } + + // @Test + public void givenDB_whenSavingDocument_thenClassIsAutoCreated() { + ODocument author = new ODocument("Author"); + author.field("firstName", "Paul"); + author.field("lastName", "Smith"); + author.field("country", "USA"); + author.field("publicProfile", false); + author.field("level", 7); + author.save(); + + assertEquals("Author", author.getSchemaClass().getName()); + } + + // @Test + public void givenDB_whenSavingAuthors_thenWeGetOnesWithLevelSeven() { + for (ODocument author : db.browseClass("Author")) author.delete(); + + ODocument authorOne = new ODocument("Author"); + authorOne.field("firstName", "Leo"); + authorOne.field("level", 7); + authorOne.save(); + + ODocument authorTwo = new ODocument("Author"); + authorTwo.field("firstName", "Lucien"); + authorTwo.field("level", 9); + authorTwo.save(); + + List result = db.query( + new OSQLSynchQuery("select * from Author where level = 7")); + + assertEquals(1, result.size()); + } + + // @AfterClass + public static void closeDB() { + db.close(); + } +} diff --git a/orientdb/src/test/java/com/baeldung/orientdb/OrientDBGraphAPITest.java b/orientdb/src/test/java/com/baeldung/orientdb/OrientDBGraphAPITest.java new file mode 100644 index 0000000000..fe16564755 --- /dev/null +++ b/orientdb/src/test/java/com/baeldung/orientdb/OrientDBGraphAPITest.java @@ -0,0 +1,89 @@ +package com.baeldung.orientdb; + +import com.orientechnologies.orient.core.metadata.schema.OType; +import com.tinkerpop.blueprints.Vertex; +import com.tinkerpop.blueprints.impls.orient.OrientGraphNoTx; +import com.tinkerpop.blueprints.impls.orient.OrientVertexType; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import static junit.framework.Assert.assertEquals; + +public class OrientDBGraphAPITest { + private static OrientGraphNoTx graph = null; + + // @BeforeClass + public static void setup() { + String orientDBFolder = System.getenv("ORIENTDB_HOME"); + graph = new OrientGraphNoTx("plocal:" + orientDBFolder + "/databases/BaeldungDB", "admin", "admin"); + } + + // @BeforeClass + public static void init() { + graph.createVertexType("Article"); + + OrientVertexType writerType = graph.createVertexType("Writer"); + writerType.setStrictMode(true); + writerType.createProperty("firstName", OType.STRING); + writerType.createProperty("lastName", OType.STRING); + writerType.createProperty("country", OType.STRING); + + OrientVertexType authorType = graph.createVertexType("Author", "Writer"); + authorType.createProperty("level", OType.INTEGER).setMax("3"); + + OrientVertexType editorType = graph.createVertexType("Editor", "Writer"); + editorType.createProperty("level", OType.INTEGER).setMin("3"); + + Vertex vEditor = graph.addVertex("class:Editor"); + vEditor.setProperty("firstName", "Maxim"); + vEditor.setProperty("lastName", "Mink's"); + vEditor.setProperty("country", "Cameroon"); + vEditor.setProperty("publicProfile", true); + vEditor.setProperty("level", "7"); + + Vertex vAuthor = graph.addVertex("class:Author"); + vAuthor.setProperty("firstName", "Jerome"); + vAuthor.setProperty("country", "Romania"); + vAuthor.setProperty("publicProfile", false); + vAuthor.setProperty("level", "3"); + + Vertex vArticle = graph.addVertex("class:Article"); + vArticle.setProperty("title", "Introduction to the OrientDB Java APIs."); + vArticle.setProperty("priority", "High"); + vArticle.setProperty("type", "Article"); + vArticle.setProperty("level", "+L4"); + + graph.addEdge(null, vAuthor, vEditor, "has"); + graph.addEdge(null, vAuthor, vArticle, "wrote"); + } + + // @Test + public void givenBaeldungDB_checkWeHaveThreeRecords() { + long size = graph.countVertices(); + + assertEquals(3, size); + } + + // @Test + public void givenBaeldungDB_checkWeHaveTwoWriters() { + long size = graph.countVertices("Writer"); + + assertEquals(2, size); + } + + // @Test + public void givenBaeldungDB_getEditorWithLevelSeven() { + String onlyEditor = ""; + for(Vertex v : graph.getVertices("Editor.level", 7)) { + onlyEditor = v.getProperty("firstName").toString(); + } + + assertEquals("Maxim", onlyEditor); + } + + // @AfterClass + public static void closeDB() { + graph.getRawGraph().getStorage().close(true, false); + } +} diff --git a/orientdb/src/test/java/com/baeldung/orientdb/OrientDBObjectAPITest.java b/orientdb/src/test/java/com/baeldung/orientdb/OrientDBObjectAPITest.java new file mode 100644 index 0000000000..71be159107 --- /dev/null +++ b/orientdb/src/test/java/com/baeldung/orientdb/OrientDBObjectAPITest.java @@ -0,0 +1,56 @@ +package com.baeldung.orientdb; + +import com.orientechnologies.orient.core.sql.query.OSQLSynchQuery; +import com.orientechnologies.orient.object.db.OObjectDatabaseTx; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.util.List; + +import static junit.framework.Assert.assertEquals; + +public class OrientDBObjectAPITest { + private static OObjectDatabaseTx db = null; + + // @BeforeClass + public static void setup() { + String orientDBFolder = System.getenv("ORIENTDB_HOME"); + db = new OObjectDatabaseTx("plocal:" + orientDBFolder + "/databases/BaeldungDBThree").open("admin", "admin"); + db.setSaveOnlyDirty(true); + db.getEntityManager().registerEntityClass(Author.class); + } + + // @Test + public void givenDB_whenSavingObject_thenHisIdExists() { + Author author = db.newInstance(Author.class); + author.setFirstName("Luke"); + author.setLastName("Sky"); + author.setLevel(9); + + long authors = db.countClass(Author.class); + + db.save(author); + } + + // @Test + public void givenDB_whenSavingAuthors_thenWeGetOnesWithLevelSeven() { + for (Author author : db.browseClass(Author.class)) db.delete(author); + + Author authorOne = db.newInstance(Author.class, "Leo", "Marta", 7); + db.save(authorOne); + + Author authorTwo = db.newInstance(Author.class, "Lucien", "Aurelien", 9); + db.save(authorTwo); + + List result = db.query( + new OSQLSynchQuery("select * from Author where level = 7")); + + assertEquals(1, result.size()); + } + + // @AfterClass + public static void closeDB() { + db.close(); + } +} diff --git a/persistence-modules/spring-data-eclipselink/README.md b/persistence-modules/spring-data-eclipselink/README.md new file mode 100644 index 0000000000..7981470488 --- /dev/null +++ b/persistence-modules/spring-data-eclipselink/README.md @@ -0,0 +1,3 @@ +### Relevant articles + +- [A Guide to EclipseLink with Spring](http://www.baeldung.com/spring-eclipselink) diff --git a/pom.xml b/pom.xml index 5276076bd5..8906b1c8d2 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,7 @@ image-processing immutables + influxdb jackson @@ -115,7 +116,7 @@ testing-modules/mocks mustache noexception - + orientdb osgi orika diff --git a/spring-5-mvc/pom.xml b/spring-5-mvc/pom.xml index b188ee590a..850661836b 100644 --- a/spring-5-mvc/pom.xml +++ b/spring-5-mvc/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.0.M3 + 2.0.0.M7 @@ -190,6 +190,7 @@ UTF-8 UTF-8 1.8 + 5.0.2.RELEASE 1.1.2 diff --git a/spring-5-reactive-client/pom.xml b/spring-5-reactive-client/pom.xml index 8aa579b724..22a027a58e 100644 --- a/spring-5-reactive-client/pom.xml +++ b/spring-5-reactive-client/pom.xml @@ -191,7 +191,7 @@ 1.0.0 5.0.0 2.20 - 5.0.1.RELEASE + 5.0.2.RELEASE 1.0.1.RELEASE 1.1.3 1.0 diff --git a/spring-5-reactive/pom.xml b/spring-5-reactive/pom.xml index c1c18fbc82..5d7cf0d7e5 100644 --- a/spring-5-reactive/pom.xml +++ b/spring-5-reactive/pom.xml @@ -191,7 +191,7 @@ 1.0.0 5.0.0 2.20 - 5.0.1.RELEASE + 5.0.2.RELEASE 1.0.1.RELEASE 1.1.3 1.0 diff --git a/spring-5/pom.xml b/spring-5/pom.xml index b6b6f9d370..ac49e8d6f4 100644 --- a/spring-5/pom.xml +++ b/spring-5/pom.xml @@ -194,7 +194,7 @@ 1.0.0 5.0.0 2.20 - 5.0.1.RELEASE + 5.0.2.RELEASE 1.0.1.RELEASE 1.1.3 1.0 diff --git a/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java b/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java index a218c6b7cf..1082765c63 100644 --- a/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java +++ b/spring-5/src/main/java/com/baeldung/web/reactive/client/WebClientController.java @@ -50,7 +50,7 @@ public class WebClientController { map.add("key1", "value1"); map.add("key2", "value2"); - BodyInserter, ClientHttpRequest> inserter2 = BodyInserters.fromMultipartData(map); + // BodyInserter, ClientHttpRequest> inserter2 = BodyInserters.fromMultipartData(map); BodyInserter inserter3 = BodyInserters.fromObject("body"); // responses diff --git a/spring-jenkins-pipeline/scripted-pipeline-unix-nonunix b/spring-jenkins-pipeline/scripted-pipeline-unix-nonunix index fab940ad3d..b76bb8a81a 100644 --- a/spring-jenkins-pipeline/scripted-pipeline-unix-nonunix +++ b/spring-jenkins-pipeline/scripted-pipeline-unix-nonunix @@ -31,38 +31,48 @@ node { stage("Tests and Deployment") { parallel 'Unit tests': { - stage("Runing unit tests") { - if (isUnix()) { - sh "./mvnw test -Punit" - } else { - bat "./mvnw.cmd test -Punit" + stage("Running unit tests") { + try { + if (isUnix()) { + sh "./mvnw test -Punit" + } else { + bat "./mvnw.cmd test -Punit" + } + } catch(err) { + step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*UnitTest.xml']) + throw err } step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*UnitTest.xml']) } }, 'Integration tests': { - stage("Runing integration tests") { - if (isUnix()) { - sh "./mvnw test -Pintegration" - } else { - bat "./mvnw.cmd test -Pintegration" + stage("Running integration tests") { + try { + if (isUnix()) { + sh "./mvnw test -Pintegration" + } else { + bat "./mvnw.cmd test -Pintegration" + } + } catch(err) { + step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*IntegrationTest.xml']) + throw err } step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*IntegrationTest.xml']) } - }, 'Deployment': { - stage("Staging") { - if (isUnix()) { - sh "pid=\$(lsof -i:8989 -t); kill -TERM \$pid || kill -KILL \$pid" - } else { - bat "FOR /F \"tokens=5 delims= \" %%G IN (\"netstat -a | findstr :8989\") DO TaskKill.exe /PID %%G /fi \"memusage gt 0\"" - } + } - withEnv(['JENKINS_NODE_COOKIE=dontkill']) { - if (isUnix()) { - sh 'nohup ./mvnw spring-boot:run -Dserver.port=8989 &' - } else { - bat 'start ./mvnw.cmd spring-boot:run -Dserver.port=8989' - } + stage("Staging") { + if (isUnix()) { + sh "pid=\$(lsof -i:8989 -t); kill -TERM \$pid || kill -KILL \$pid" + } else { + bat "FOR /F \"tokens=5 delims= \" %%G IN (\"netstat -a | findstr :8989\") DO TaskKill.exe /PID %%G /fi \"memusage gt 0\"" + } + + withEnv(['JENKINS_NODE_COOKIE=dontkill']) { + if (isUnix()) { + sh 'nohup ./mvnw spring-boot:run -Dserver.port=8989 &' + } else { + bat 'start ./mvnw.cmd spring-boot:run -Dserver.port=8989' } } } diff --git a/spring-katharsis/pom.xml b/spring-katharsis/pom.xml index 822eac7873..a5e79e138b 100644 --- a/spring-katharsis/pom.xml +++ b/spring-katharsis/pom.xml @@ -36,12 +36,16 @@ katharsis-servlet ${katharsis.version} - + + org.reflections + reflections + 0.9.10 + - 1.0.1 + 2.1.3 1.6.1 diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java index da59d505e4..101e4c2b7e 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java +++ b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/RoleResourceRepository.java @@ -1,6 +1,6 @@ package org.baeldung.persistence.katharsis; -import io.katharsis.queryParams.RequestParams; +import io.katharsis.queryParams.QueryParams; import io.katharsis.repository.ResourceRepository; import org.baeldung.persistence.dao.RoleRepository; @@ -15,17 +15,17 @@ public class RoleResourceRepository implements ResourceRepository { private RoleRepository roleRepository; @Override - public Role findOne(Long id, RequestParams params) { + public Role findOne(Long id, QueryParams params) { return roleRepository.findOne(id); } @Override - public Iterable findAll(RequestParams params) { + public Iterable findAll(QueryParams params) { return roleRepository.findAll(); } @Override - public Iterable findAll(Iterable ids, RequestParams params) { + public Iterable findAll(Iterable ids, QueryParams params) { return roleRepository.findAll(ids); } diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java index 4c7ce70765..b6d519ab80 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java +++ b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserResourceRepository.java @@ -1,6 +1,6 @@ package org.baeldung.persistence.katharsis; -import io.katharsis.queryParams.RequestParams; +import io.katharsis.queryParams.QueryParams; import io.katharsis.repository.ResourceRepository; import org.baeldung.persistence.dao.UserRepository; @@ -15,17 +15,17 @@ public class UserResourceRepository implements ResourceRepository { private UserRepository userRepository; @Override - public User findOne(Long id, RequestParams params) { + public User findOne(Long id, QueryParams params) { return userRepository.findOne(id); } @Override - public Iterable findAll(RequestParams params) { + public Iterable findAll(QueryParams params) { return userRepository.findAll(); } @Override - public Iterable findAll(Iterable ids, RequestParams params) { + public Iterable findAll(Iterable ids, QueryParams params) { return userRepository.findAll(ids); } diff --git a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java index e10c29aece..168cd1c866 100644 --- a/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java +++ b/spring-katharsis/src/main/java/org/baeldung/persistence/katharsis/UserToRoleRelationshipRepository.java @@ -1,6 +1,6 @@ package org.baeldung.persistence.katharsis; -import io.katharsis.queryParams.RequestParams; +import io.katharsis.queryParams.QueryParams; import io.katharsis.repository.RelationshipRepository; import java.util.HashSet; @@ -52,13 +52,13 @@ public class UserToRoleRelationshipRepository implements RelationshipRepository< } @Override - public Role findOneTarget(Long sourceId, String fieldName, RequestParams requestParams) { + public Role findOneTarget(Long sourceId, String fieldName, QueryParams QueryParams) { // not for many-to-many return null; } @Override - public Iterable findManyTargets(Long sourceId, String fieldName, RequestParams requestParams) { + public Iterable findManyTargets(Long sourceId, String fieldName, QueryParams QueryParams) { final User user = userRepository.findOne(sourceId); return user.getRoles(); } diff --git a/testing-modules/testing/README.md b/testing-modules/testing/README.md index 143cb792cf..3511bb1bb9 100644 --- a/testing-modules/testing/README.md +++ b/testing-modules/testing/README.md @@ -16,3 +16,4 @@ - [Introduction to Lambda Behave](http://www.baeldung.com/lambda-behave) - [Introduction to Jukito](http://www.baeldung.com/jukito) - [Custom JUnit 4 Test Runners](http://www.baeldung.com/junit-4-custom-runners) +- [Guide to JSpec](http://www.baeldung.com/jspec)