diff --git a/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java new file mode 100644 index 0000000000..a5c4b325a4 --- /dev/null +++ b/algorithms-miscellaneous-5/src/main/java/com/baeldung/algorithms/combinatorics/Combinatorics.java @@ -0,0 +1,67 @@ +package com.baeldung.algorithms.combinatorics; + +import java.util.*; + +import static java.util.Collections.swap; + +public class Combinatorics { + + public static List> permutations(List sequence) { + List> results = new ArrayList<>(); + permutationsInternal(sequence, results, 0); + return results; + } + + private static void permutationsInternal(List sequence, List> results, int index) { + if (index == sequence.size() - 1) { + results.add(new ArrayList<>(sequence)); + } + + for (int i = index; i < sequence.size(); i++) { + swap(sequence, i, index); + permutationsInternal(sequence, results, index + 1); + swap(sequence, i, index); + } + } + + public static List> combinations(List inputSet, int k) { + List> results = new ArrayList<>(); + combinationsInternal(inputSet, k, results, new ArrayList<>(), 0); + return results; + } + + private static void combinationsInternal( + List inputSet, int k, List> results, ArrayList accumulator, int index) { + int leftToAccumulate = k - accumulator.size(); + int possibleToAcculumate = inputSet.size() - index; + + if (accumulator.size() == k) { + results.add(new ArrayList<>(accumulator)); + } else if (leftToAccumulate <= possibleToAcculumate) { + combinationsInternal(inputSet, k, results, accumulator, index + 1); + + accumulator.add(inputSet.get(index)); + combinationsInternal(inputSet, k, results, accumulator, index + 1); + accumulator.remove(accumulator.size() - 1); + } + } + + public static List> powerSet(List sequence) { + List> results = new ArrayList<>(); + powerSetInternal(sequence, results, new ArrayList<>(), 0); + return results; + } + + private static void powerSetInternal( + List set, List> powerSet, List accumulator, int index) { + if (index == set.size()) { + powerSet.add(new ArrayList<>(accumulator)); + } else { + accumulator.add(set.get(index)); + + powerSetInternal(set, powerSet, accumulator, index + 1); + accumulator.remove(accumulator.size() - 1); + powerSetInternal(set, powerSet, accumulator, index + 1); + } + } +} diff --git a/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java new file mode 100644 index 0000000000..95ffdec239 --- /dev/null +++ b/algorithms-miscellaneous-5/src/test/java/com/baeldung/algorithms/combinatorics/CombinatoricsUnitTest.java @@ -0,0 +1,80 @@ +package com.baeldung.algorithms.combinatorics; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; + +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + +public class CombinatoricsUnitTest { + + @Test + public void givenEmptySequence_whenCallingPermutations_ShouldReturnEmptyList() { + List sequence = Arrays.asList(); + + List> permutations = Combinatorics.permutations(sequence); + + assertEquals(0, permutations.size()); + } + + @Test + public void givenOneElementSequence_whenCallingPermutations_ShouldReturnPermutations() { + List sequence = Arrays.asList(1); + + List> permutations = Combinatorics.permutations(sequence); + + assertEquals(1, permutations.size()); + assertEquals(1, permutations.get(0).size()); + assertSame(1, permutations.get(0).get(0)); + } + + @Test + public void givenFourElementsSequence_whenCallingPermutations_ShouldReturnPermutations() { + List sequence = Arrays.asList(1, 2, 3, 4); + + List> permutations = Combinatorics.permutations(sequence); + + assertEquals(24, permutations.size()); + assertEquals(24, new HashSet<>(permutations).size()); + } + + @Test + public void givenTwoElements_whenCalling3Combinations_ShouldReturnEmptyList() { + List set = Arrays.asList(1, 2); + + List> combinations = Combinatorics.combinations(set, 3); + + assertEquals(0, combinations.size()); + } + + @Test + public void givenThreeElements_whenCalling3Combinations_ShouldReturnOneCombination() { + List set = Arrays.asList(1, 2, 3); + + List> combinations = Combinatorics.combinations(set, 3); + + assertEquals(1, combinations.size()); + assertEquals(combinations.get(0), Arrays.asList(1, 2, 3)); + } + + @Test + public void givenFourElements_whenCalling2Combinations_ShouldReturnCombinations() { + List set = Arrays.asList(1, 2, 3, 4); + + List> combinations = Combinatorics.combinations(set, 2); + + assertEquals(6, combinations.size()); + assertEquals(6, new HashSet<>(combinations).size()); + } + + @Test + public void givenFourElements_whenCallingPowerSet_ShouldReturn15Sets() { + List sequence = Arrays.asList('a', 'b', 'c', 'd'); + + List> combinations = Combinatorics.powerSet(sequence); + + assertEquals(16, combinations.size()); + } +} diff --git a/core-java-modules/core-java-11/README.md b/core-java-modules/core-java-11/README.md index 514f24a4ae..93a2c6faf5 100644 --- a/core-java-modules/core-java-11/README.md +++ b/core-java-modules/core-java-11/README.md @@ -12,4 +12,3 @@ This module contains articles about Java 11 core features - [An Introduction to Epsilon GC: A No-Op Experimental Garbage Collector](https://www.baeldung.com/jvm-epsilon-gc-garbage-collector) - [Guide to jlink](https://www.baeldung.com/jlink) - [Negate a Predicate Method Reference with Java 11](https://www.baeldung.com/java-negate-predicate-method-reference) -- [Transforming an Empty String into an Empty Optional](https://www.baeldung.com/java-empty-string-to-empty-optional) diff --git a/core-java-modules/core-java-8-2/src/main/resources/META-INF/persistence.xml b/core-java-modules/core-java-8-2/src/main/resources/META-INF/persistence.xml index e8cd723ec2..c412ca0839 100644 --- a/core-java-modules/core-java-8-2/src/main/resources/META-INF/persistence.xml +++ b/core-java-modules/core-java-8-2/src/main/resources/META-INF/persistence.xml @@ -5,14 +5,14 @@ version="2.0"> Persist Optional Return Type Demo org.hibernate.jpa.HibernatePersistenceProvider - com.baeldung.optionalReturnType.User - com.baeldung.optionalReturnType.UserOptional + com.baeldung.optionalreturntype.User + com.baeldung.optionalreturntype.UserOptional true diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/Rating.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/Rating.java new file mode 100644 index 0000000000..c4d0276256 --- /dev/null +++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/Rating.java @@ -0,0 +1,39 @@ +package com.baeldung.streamreduce.entities; + +import java.util.ArrayList; +import java.util.List; + +public class Rating { + + double points; + List reviews = new ArrayList<>(); + + public Rating() {} + + public void add(Review review) { + reviews.add(review); + computeRating(); + } + + private double computeRating() { + double totalPoints = reviews.stream().map(Review::getPoints).reduce(0, Integer::sum); + this.points = totalPoints / reviews.size(); + return this.points; + } + + public static Rating average(Rating r1, Rating r2) { + Rating combined = new Rating(); + combined.reviews = new ArrayList<>(r1.reviews); + combined.reviews.addAll(r2.reviews); + combined.computeRating(); + return combined; + } + + public double getPoints() { + return points; + } + + public List getReviews() { + return reviews; + } +} diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/Review.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/Review.java new file mode 100644 index 0000000000..03cde8a9c8 --- /dev/null +++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/Review.java @@ -0,0 +1,28 @@ +package com.baeldung.streamreduce.entities; + +public class Review { + + int points; + String review; + + public Review(int points, String review) { + this.points = points; + this.review = review; + } + + public int getPoints() { + return points; + } + + public void setPoints(int points) { + this.points = points; + } + + public String getReview() { + return review; + } + + public void setReview(String review) { + this.review = review; + } +} diff --git a/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java index 39a42beab7..20c12d7920 100644 --- a/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java +++ b/core-java-modules/core-java-8/src/main/java/com/baeldung/streamreduce/entities/User.java @@ -4,6 +4,7 @@ public class User { private final String name; private final int age; + private final Rating rating = new Rating(); public User(String name, int age) { this.name = name; @@ -17,7 +18,11 @@ public class User { public int getAge() { return age; } - + + public Rating getRating() { + return rating; + } + @Override public String toString() { return "User{" + "name=" + name + ", age=" + age + '}'; diff --git a/core-java-modules/core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java b/core-java-modules/core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java index 0bf1a5837e..602bdd069e 100644 --- a/core-java-modules/core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java +++ b/core-java-modules/core-java-8/src/test/java/com/baeldung/streamreduce/tests/StreamReduceManualTest.java @@ -1,5 +1,7 @@ package com.baeldung.streamreduce.tests; +import com.baeldung.streamreduce.entities.Rating; +import com.baeldung.streamreduce.entities.Review; import com.baeldung.streamreduce.entities.User; import com.baeldung.streamreduce.utilities.NumberUtils; import java.util.ArrayList; @@ -64,6 +66,31 @@ public class StreamReduceManualTest { assertThat(result).isEqualTo(65); } + @Test + public void givenUserList_whenReduceWithGreaterAgeAccumulator_thenFindsOldest() { + List users = Arrays.asList(new User("John", 30), new User("Alex", 40), new User("Julie", 35)); + + User oldest = users.stream().reduce(users.get(0), (user1, user2) -> user1.getAge() >= user2.getAge() ? user1 : user2); + + assertThat(oldest).isEqualTo(users.get(1)); + } + + @Test + public void givenUserListWithRatings_whenReduceWithGreaterAgeAccumulator_thenFindsOldest() { + User john = new User("John", 30); + john.getRating().add(new Review(5, "")); + john.getRating().add(new Review(3, "not bad")); + User julie = new User("Julie", 35); + john.getRating().add(new Review(4, "great!")); + john.getRating().add(new Review(2, "terrible experience")); + john.getRating().add(new Review(4, "")); + List users = Arrays.asList(john, julie); + + Rating averageRating = users.stream().reduce(new Rating(), (rating, user) -> Rating.average(rating, user.getRating()), Rating::average); + + assertThat(averageRating.getPoints()).isEqualTo(3.6); + } + @Test public void givenStringList_whenReduceWithParallelStream_thenCorrect() { List letters = Arrays.asList("a", "b", "c", "d", "e"); diff --git a/core-java-modules/core-java-9-improvements/README.md b/core-java-modules/core-java-9-improvements/README.md index b0baccba7f..5864170e85 100644 --- a/core-java-modules/core-java-9-improvements/README.md +++ b/core-java-modules/core-java-9-improvements/README.md @@ -5,7 +5,6 @@ This module contains articles about the improvements to core Java features intro ### Relevant Articles: - [New Stream Collectors in Java 9](http://www.baeldung.com/java9-stream-collectors) -- [Java 9 Optional API Additions](https://www.baeldung.com/java-9-optional) - [Java 9 Convenience Factory Methods for Collections](https://www.baeldung.com/java-9-collections-factory-methods) - [Java 9 Stream API Improvements](https://www.baeldung.com/java-9-stream-api) - [Java 9 java.util.Objects Additions](https://www.baeldung.com/java-9-objects-new) diff --git a/core-java-modules/core-java-9-improvements/src/test/java/com/baeldung/java9/Java9OptionalTest.java b/core-java-modules/core-java-9-improvements/src/test/java/com/baeldung/java9/Java9OptionalTest.java deleted file mode 100644 index cd0efb028d..0000000000 --- a/core-java-modules/core-java-9-improvements/src/test/java/com/baeldung/java9/Java9OptionalTest.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.baeldung.java9; - -public class Java9OptionalTest { - @Test - public void givenOptionalOfSome_whenToStream_thenShouldTreatItAsOneElementStream() { - //given - Optional value = Optional.of("a"); - - //when - List collect = value.stream().map(String::toUpperCase).collect(Collectors.toList()); - - //then - assertThat(collect).hasSameElementsAs(List.of("A")); - } - - @Test - public void givenOptionalOfNone_whenToStream_thenShouldTreatItAsZeroElementStream() { - //given - Optional value = Optional.empty(); - - //when - List collect = value.stream().map(String::toUpperCase).collect(Collectors.toList()); - - //then - assertThat(collect).isEmpty(); - } - - @Test - public void givenOptional_whenPresent_thenShouldExecuteProperCallback() { - //given - Optional value = Optional.of("properValue"); - AtomicInteger successCounter = new AtomicInteger(0); - AtomicInteger onEmptyOptionalCounter = new AtomicInteger(0); - - //when - value.ifPresentOrElse((v) -> successCounter.incrementAndGet(), onEmptyOptionalCounter::incrementAndGet); - - //then - assertThat(successCounter.get()).isEqualTo(1); - assertThat(onEmptyOptionalCounter.get()).isEqualTo(0); - } - - @Test - public void givenOptional_whenNotPresent_thenShouldExecuteProperCallback() { - //given - Optional value = Optional.empty(); - AtomicInteger successCounter = new AtomicInteger(0); - AtomicInteger onEmptyOptionalCounter = new AtomicInteger(0); - - //when - value.ifPresentOrElse((v) -> successCounter.incrementAndGet(), onEmptyOptionalCounter::incrementAndGet); - - //then - assertThat(successCounter.get()).isEqualTo(0); - assertThat(onEmptyOptionalCounter.get()).isEqualTo(1); - } - - @Test - public void givenOptional_whenPresent_thenShouldTakeAValueFromIt() { - //given - String expected = "properValue"; - Optional value = Optional.of(expected); - Optional defaultValue = Optional.of("default"); - - //when - Optional result = value.or(() -> defaultValue); - - //then - assertThat(result.get()).isEqualTo(expected); - } - - @Test - public void givenOptional_whenEmpty_thenShouldTakeAValueFromOr() { - //given - String defaultString = "default"; - Optional value = Optional.empty(); - Optional defaultValue = Optional.of(defaultString); - - //when - Optional result = value.or(() -> defaultValue); - - //then - assertThat(result.get()).isEqualTo(defaultString); - } -} \ No newline at end of file diff --git a/core-java-modules/core-java-9/README.md b/core-java-modules/core-java-9/README.md index 94f480db67..e2bea5f7e2 100644 --- a/core-java-modules/core-java-9/README.md +++ b/core-java-modules/core-java-9/README.md @@ -4,13 +4,11 @@ This module contains articles about Java 9 core features ### Relevant Articles: -- [Method Handles in Java](http://www.baeldung.com/java-method-handles) -- [Introduction to Chronicle Queue](http://www.baeldung.com/java-chronicle-queue) -- [Optional orElse Optional](http://www.baeldung.com/java-optional-or-else-optional) +- [Method Handles in Java](https://www.baeldung.com/java-method-handles) +- [Introduction to Chronicle Queue](https://www.baeldung.com/java-chronicle-queue) - [Iterate Through a Range of Dates in Java](https://www.baeldung.com/java-iterate-date-range) - [Initialize a HashMap in Java](https://www.baeldung.com/java-initialize-hashmap) - [Immutable Set in Java](https://www.baeldung.com/java-immutable-set) -- [Filtering a Stream of Optionals in Java](https://www.baeldung.com/java-filter-stream-of-optional) Note: also contains part of the code for the article [How to Filter a Collection in Java](https://www.baeldung.com/java-collection-filtering). diff --git a/core-java-modules/core-java-9/src/test/java/com/baeldung/optionals/OptionalsTest.java b/core-java-modules/core-java-9/src/test/java/com/baeldung/optionals/OptionalsTest.java deleted file mode 100644 index 4e5f94c0db..0000000000 --- a/core-java-modules/core-java-9/src/test/java/com/baeldung/optionals/OptionalsTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.baeldung.optionals; - -import static org.junit.Assert.assertEquals; - -import java.util.Optional; - -import org.junit.Test; - -public class OptionalsTest { - - @Test - public void givenOptional_whenEmptyValue_thenCustomMessage() { - assertEquals(Optional.of("Name not provided"), Optionals.getName(Optional.ofNullable(null))); - } - - @Test - public void givenOptional_whenValue_thenOptional() { - String name = "Filan Fisteku"; - Optional optionalString = Optional.ofNullable(name); - assertEquals(optionalString, Optionals.getName(optionalString)); - } - - @Test - public void givenOptional_whenValue_thenOptionalGeneralMethod() { - String name = "Filan Fisteku"; - String missingOptional = "Name not provided"; - Optional optionalString = Optional.ofNullable(name); - Optional fallbackOptionalString = Optional.ofNullable(missingOptional); - assertEquals(optionalString, Optionals.or(optionalString, fallbackOptionalString)); - } - - @Test - public void givenEmptyOptional_whenValue_thenOptionalGeneralMethod() { - String missingOptional = "Name not provided"; - Optional optionalString = Optional.empty(); - Optional fallbackOptionalString = Optional.ofNullable(missingOptional); - assertEquals(fallbackOptionalString, Optionals.or(optionalString, fallbackOptionalString)); - } - - @Test - public void givenGuavaOptional_whenInvoke_thenOptional() { - String name = "Filan Fisteku"; - com.google.common.base.Optional stringOptional = com.google.common.base.Optional.of(name); - assertEquals(stringOptional, Optionals.getOptionalGuavaName(stringOptional)); - } - - @Test - public void givenGuavaOptional_whenNull_thenDefaultText() { - assertEquals(com.google.common.base.Optional.of("Name not provided"), Optionals.getOptionalGuavaName(com.google.common.base.Optional.fromNullable(null))); - } -} \ No newline at end of file diff --git a/core-java-modules/core-java-concurrency-advanced-3/pom.xml b/core-java-modules/core-java-concurrency-advanced-3/pom.xml index 5858232001..77b86d7d58 100644 --- a/core-java-modules/core-java-concurrency-advanced-3/pom.xml +++ b/core-java-modules/core-java-concurrency-advanced-3/pom.xml @@ -1,7 +1,9 @@ - + + 4.0.0 - com.baeldung core-java-concurrency-advanced-3 0.1.0-SNAPSHOT core-java-concurrency-advanced-3 @@ -14,6 +16,15 @@ ../../parent-java + + + org.assertj + assertj-core + ${assertj.version} + test + + + core-java-concurrency-advanced-3 @@ -35,6 +46,7 @@ + 3.14.0 1.8 1.8 diff --git a/core-java-modules/core-java-concurrency-advanced-3/src/test/java/com/baeldung/rejection/SaturationPolicyUnitTest.java b/core-java-modules/core-java-concurrency-advanced-3/src/test/java/com/baeldung/rejection/SaturationPolicyUnitTest.java new file mode 100644 index 0000000000..5016cc1d06 --- /dev/null +++ b/core-java-modules/core-java-concurrency-advanced-3/src/test/java/com/baeldung/rejection/SaturationPolicyUnitTest.java @@ -0,0 +1,136 @@ +package com.baeldung.rejection; + +import org.junit.After; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.*; +import java.util.concurrent.ThreadPoolExecutor.AbortPolicy; +import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy; +import java.util.concurrent.ThreadPoolExecutor.DiscardOldestPolicy; +import java.util.concurrent.ThreadPoolExecutor.DiscardPolicy; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +import static java.util.concurrent.TimeUnit.MILLISECONDS; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +public class SaturationPolicyUnitTest { + + private ThreadPoolExecutor executor; + + @After + public void shutdownExecutor() { + if (executor != null && !executor.isTerminated()) { + executor.shutdownNow(); + } + } + + @Test + public void givenAbortPolicy_WhenSaturated_ThenShouldThrowRejectedExecutionException() { + executor = new ThreadPoolExecutor(1, 1, 0, MILLISECONDS, new SynchronousQueue<>(), new AbortPolicy()); + executor.execute(() -> waitFor(100)); + + assertThatThrownBy(() -> executor.execute(() -> System.out.println("Will be rejected"))).isInstanceOf(RejectedExecutionException.class); + } + + @Test + public void givenCallerRunsPolicy_WhenSaturated_ThenTheCallerThreadRunsTheTask() { + executor = new ThreadPoolExecutor(1, 1, 0, MILLISECONDS, new SynchronousQueue<>(), new CallerRunsPolicy()); + executor.execute(() -> waitFor(100)); + + long startTime = System.nanoTime(); + executor.execute(() -> waitFor(100)); + double blockedDuration = (System.nanoTime() - startTime) / 1_000_000.0; + + assertThat(blockedDuration).isGreaterThanOrEqualTo(100); + } + + @Test + public void givenDiscardPolicy_WhenSaturated_ThenExecutorDiscardsTheNewTask() throws InterruptedException { + executor = new ThreadPoolExecutor(1, 1, 0, MILLISECONDS, new SynchronousQueue<>(), new DiscardPolicy()); + executor.execute(() -> waitFor(100)); + + BlockingQueue queue = new LinkedBlockingDeque<>(); + executor.execute(() -> queue.offer("Result")); + + assertThat(queue.poll(200, MILLISECONDS)).isNull(); + } + + @Test + public void givenDiscardOldestPolicy_WhenSaturated_ThenExecutorDiscardsTheOldestTask() { + executor = new ThreadPoolExecutor(1, 1, 0, MILLISECONDS, new ArrayBlockingQueue<>(2), new DiscardOldestPolicy()); + executor.execute(() -> waitFor(100)); + + BlockingQueue queue = new LinkedBlockingDeque<>(); + executor.execute(() -> queue.offer("First")); + executor.execute(() -> queue.offer("Second")); + executor.execute(() -> queue.offer("Third")); + + waitFor(150); + List results = new ArrayList<>(); + queue.drainTo(results); + assertThat(results).containsExactlyInAnyOrder("Second", "Third"); + } + + @Test + public void givenGrowPolicy_WhenSaturated_ThenExecutorIncreaseTheMaxPoolSize() { + executor = new ThreadPoolExecutor(1, 1, 0, MILLISECONDS, new ArrayBlockingQueue<>(2), new GrowPolicy()); + executor.execute(() -> waitFor(100)); + + BlockingQueue queue = new LinkedBlockingDeque<>(); + executor.execute(() -> queue.offer("First")); + executor.execute(() -> queue.offer("Second")); + executor.execute(() -> queue.offer("Third")); + + waitFor(150); + List results = new ArrayList<>(); + queue.drainTo(results); + assertThat(results).containsExactlyInAnyOrder("First", "Second", "Third"); + } + + @Test + public void givenExecutorIsTerminated_WhenSubmittedNewTask_ThenTheSaturationPolicyApplies() { + ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 0, MILLISECONDS, new LinkedBlockingQueue<>()); + executor.shutdownNow(); + + assertThatThrownBy(() -> executor.execute(() -> { + })).isInstanceOf(RejectedExecutionException.class); + } + + @Test + public void givenExecutorIsTerminating_WhenSubmittedNewTask_ThenTheSaturationPolicyApplies() { + ThreadPoolExecutor executor = new ThreadPoolExecutor(1, 1, 0, MILLISECONDS, new LinkedBlockingQueue<>()); + executor.execute(() -> waitFor(100)); + executor.shutdown(); + + assertThatThrownBy(() -> executor.execute(() -> { + })).isInstanceOf(RejectedExecutionException.class); + } + + private static class GrowPolicy implements RejectedExecutionHandler { + + private final Lock lock = new ReentrantLock(); + + @Override + public void rejectedExecution(Runnable r, ThreadPoolExecutor executor) { + lock.lock(); + try { + executor.setMaximumPoolSize(executor.getMaximumPoolSize() + 1); + } finally { + lock.unlock(); + } + + executor.submit(r); + } + } + + private void waitFor(int millis) { + try { + Thread.sleep(millis); + } catch (InterruptedException ignored) { + } + } +} diff --git a/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/CounterUnitTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/CounterUnitTest.java index 6761b05282..d8f8ff2b7d 100644 --- a/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/CounterUnitTest.java +++ b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/CounterUnitTest.java @@ -18,8 +18,11 @@ public class CounterUnitTest { Counter counter = new Counter(); Future future1 = (Future) executorService.submit(new CounterCallable(counter)); Future future2 = (Future) executorService.submit(new CounterCallable(counter)); - - assertThat(future1.get()).isEqualTo(1); - assertThat(future2.get()).isEqualTo(2); + + // Just to make sure both are completed + future1.get(); + future2.get(); + + assertThat(counter.getCounter()).isEqualTo(2); } } diff --git a/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ExtrinsicLockCounterUnitTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ExtrinsicLockCounterUnitTest.java index 2dcb846bf4..0fc3dd3a54 100644 --- a/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ExtrinsicLockCounterUnitTest.java +++ b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ExtrinsicLockCounterUnitTest.java @@ -18,8 +18,11 @@ public class ExtrinsicLockCounterUnitTest { ExtrinsicLockCounter counter = new ExtrinsicLockCounter(); Future future1 = (Future) executorService.submit(new ExtrinsicLockCounterCallable(counter)); Future future2 = (Future) executorService.submit(new ExtrinsicLockCounterCallable(counter)); - - assertThat(future1.get()).isEqualTo(1); - assertThat(future2.get()).isEqualTo(2); + + // Just to make sure both are completed + future1.get(); + future2.get(); + + assertThat(counter.getCounter()).isEqualTo(2); } } diff --git a/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ReentrantLockCounterUnitTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ReentrantLockCounterUnitTest.java index 330d2d4c86..9932aa9bbc 100644 --- a/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ReentrantLockCounterUnitTest.java +++ b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ReentrantLockCounterUnitTest.java @@ -11,15 +11,18 @@ import java.util.concurrent.Future; import static org.assertj.core.api.Assertions.assertThat; public class ReentrantLockCounterUnitTest { - + @Test public void whenCalledIncrementCounter_thenCorrect() throws Exception { ExecutorService executorService = Executors.newFixedThreadPool(2); ReentrantLockCounter counter = new ReentrantLockCounter(); Future future1 = (Future) executorService.submit(new ReentrantLockCounterCallable(counter)); Future future2 = (Future) executorService.submit(new ReentrantLockCounterCallable(counter)); - - assertThat(future1.get()).isEqualTo(1); - assertThat(future2.get()).isEqualTo(2); + + // Just to make sure both are completed + future1.get(); + future2.get(); + + assertThat(counter.getCounter()).isEqualTo(2); } } diff --git a/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ReentrantReadWriteLockCounterUnitTest.java b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ReentrantReadWriteLockCounterUnitTest.java index 71fad2c87f..c82cd39074 100644 --- a/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ReentrantReadWriteLockCounterUnitTest.java +++ b/core-java-modules/core-java-concurrency-basic/src/test/java/com/baeldung/concurrent/threadsafety/ReentrantReadWriteLockCounterUnitTest.java @@ -11,16 +11,19 @@ import java.util.concurrent.Future; import static org.assertj.core.api.Assertions.assertThat; public class ReentrantReadWriteLockCounterUnitTest { - + @Test public void whenCalledIncrementCounter_thenCorrect() throws Exception { ExecutorService executorService = Executors.newFixedThreadPool(2); ReentrantReadWriteLockCounter counter = new ReentrantReadWriteLockCounter(); - Future future1 = (Future) executorService.submit(new ReentranReadWriteLockCounterCallable(counter)); - Future future2 = (Future) executorService.submit(new ReentranReadWriteLockCounterCallable(counter)); + Future future1 = (Future) executorService.submit(new ReentranReadWriteLockCounterCallable(counter)); + Future future2 = (Future) executorService.submit(new ReentranReadWriteLockCounterCallable(counter)); - assertThat(future2.get()).isEqualTo(2); - assertThat(future1.get()).isEqualTo(1); + // Just to make sure both are completed + future1.get(); + future2.get(); + + assertThat(counter.getCounter()).isEqualTo(2); } - + } diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java index a04f64f6dd..945086c86f 100644 --- a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/datetime/sql/DateUtilsUnitTest.java @@ -2,18 +2,16 @@ package com.baeldung.datetime.sql; import static org.junit.Assert.assertEquals; -import org.junit.Test; - -import com.baeldung.datetime.sql.DateUtils; - import java.text.ParseException; -import java.util.Date; +import java.time.LocalDate; + +import org.junit.Test; public class DateUtilsUnitTest { @Test public void givenCurrentDate_thenTodayIsReturned() { - assertEquals(DateUtils.getNow(), new Date()); + assertEquals(DateUtils.getNow().toLocalDate(), LocalDate.now()); } @Test(expected = IllegalArgumentException.class) diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java new file mode 100644 index 0000000000..05d36d2c6c --- /dev/null +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyDefaultTimezoneUnitTest.java @@ -0,0 +1,22 @@ +package com.baeldung.timezone; + +import org.junit.Test; + +import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; + +public class ModifyDefaultTimezoneUnitTest { + + @Test + public void givenDefaultTimezoneSet_thenDateTimezoneIsCorrect() { + TimeZone.setDefault(TimeZone.getTimeZone("Portugal")); + Date date = new Date(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("Portugal")); + } + +} diff --git a/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java new file mode 100644 index 0000000000..8f65f520f8 --- /dev/null +++ b/core-java-modules/core-java-date-operations/src/test/java/com/baeldung/timezone/ModifyTimezonePropertyUnitTest.java @@ -0,0 +1,34 @@ +package com.baeldung.timezone; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + +import java.util.Calendar; +import java.util.Date; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; + +public class ModifyTimezonePropertyUnitTest { + + @Before + public void setup() { + System.setProperty("user.timezone", "IST"); + TimeZone.setDefault(null); + } + + @After + public void teardown() { + System.clearProperty("user.timezone"); + } + + @Test + public void givenTimezonePropertySet_thenDateTimezoneIsCorrect() { + Date date = new Date(); + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + assertEquals(calendar.getTimeZone(), TimeZone.getTimeZone("IST")); + } + +} \ No newline at end of file diff --git a/core-java-modules/core-java-exceptions/README.md b/core-java-modules/core-java-exceptions/README.md index 429474003c..63a3eb19a1 100644 --- a/core-java-modules/core-java-exceptions/README.md +++ b/core-java-modules/core-java-exceptions/README.md @@ -15,6 +15,5 @@ This module contains articles about core java exceptions - [Java – Try with Resources](https://www.baeldung.com/java-try-with-resources) - [Java Global Exception Handler](https://www.baeldung.com/java-global-exception-handler) - [Common Java Exceptions](https://www.baeldung.com/java-common-exceptions) -- [Throw Exception in Optional in Java 8](https://www.baeldung.com/java-optional-throw-exception) - [How to Find an Exception’s Root Cause in Java](https://www.baeldung.com/java-exception-root-cause) - [Is It a Bad Practice to Catch Throwable?](https://www.baeldung.com/java-catch-throwable-bad-practice) diff --git a/core-java-modules/core-java-optional/README.md b/core-java-modules/core-java-optional/README.md index 22ac8736fa..d9d2fe813b 100644 --- a/core-java-modules/core-java-optional/README.md +++ b/core-java-modules/core-java-optional/README.md @@ -1,8 +1,13 @@ -========= +## Java Optional -## Core Java Optional +This module contains articles about Java Optional. ### Relevant Articles: - [Java Optional as Return Type](https://www.baeldung.com/java-optional-return) -- [Guide To Java 8 Optional](https://www.baeldung.com/java-optional) -- [Java Optional – orElse() vs orElseGet()](https://www.baeldung.com/java-optional-or-else-vs-or-else-get) \ No newline at end of file +- [Guide to Java 8 Optional](https://www.baeldung.com/java-optional) +- [Java Optional – orElse() vs orElseGet()](https://www.baeldung.com/java-optional-or-else-vs-or-else-get) +- [Transforming an Empty String into an Empty Optional](https://www.baeldung.com/java-empty-string-to-empty-optional) +- [Filtering a Stream of Optionals in Java](https://www.baeldung.com/java-filter-stream-of-optional) +- [Java 9 Optional API Additions](https://www.baeldung.com/java-9-optional) +- [Throw Exception in Optional in Java 8](https://www.baeldung.com/java-optional-throw-exception) +- [Optional orElse Optional](https://www.baeldung.com/java-optional-or-else-optional) diff --git a/core-java-modules/core-java-optional/pom.xml b/core-java-modules/core-java-optional/pom.xml index 38d7565282..3c556012da 100644 --- a/core-java-modules/core-java-optional/pom.xml +++ b/core-java-modules/core-java-optional/pom.xml @@ -42,11 +42,31 @@ jmh-generator-bytecode ${jmh-generator.version} + + com.google.guava + guava + ${guava.version} + + + io.rest-assured + json-path + ${rest-assured.version} + test + + + org.assertj + assertj-core + ${assertj.version} + test + 5.4.0.Final 1.19 1.19 + 27.1-jre + 3.10.0 + 3.1.1 \ No newline at end of file diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/OrElseAndOrElseGet.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/orelse/OrElseAndOrElseGet.java similarity index 96% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/OrElseAndOrElseGet.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/orelse/OrElseAndOrElseGet.java index d4d07291d5..45b47c745e 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/OrElseAndOrElseGet.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/orelse/OrElseAndOrElseGet.java @@ -1,4 +1,4 @@ -package com.baeldung.optional; +package com.baeldung.optional.orelse; import java.util.Arrays; import java.util.List; diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/OrElseAndOrElseGetBenchmarkRunner.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/orelse/OrElseAndOrElseGetBenchmarkRunner.java similarity index 96% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/OrElseAndOrElseGetBenchmarkRunner.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/orelse/OrElseAndOrElseGetBenchmarkRunner.java index 8bf0b0b25d..1cbb8803d0 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/OrElseAndOrElseGetBenchmarkRunner.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optional/orelse/OrElseAndOrElseGetBenchmarkRunner.java @@ -1,4 +1,4 @@ -package com.baeldung.optional; +package com.baeldung.optional.orelse; import java.io.IOException; import java.util.concurrent.TimeUnit; diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/HandleOptionalTypeExample.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/HandleOptionalTypeExample.java similarity index 96% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/HandleOptionalTypeExample.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/HandleOptionalTypeExample.java index c472bab077..a280957a3c 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/HandleOptionalTypeExample.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/HandleOptionalTypeExample.java @@ -1,4 +1,4 @@ -package com.baeldung.optionalReturnType; +package com.baeldung.optionalreturntype; import java.util.HashMap; import java.util.Map; diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/OptionalToJsonExample.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/OptionalToJsonExample.java similarity index 93% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/OptionalToJsonExample.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/OptionalToJsonExample.java index b44a35fae1..1852ecbf65 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/OptionalToJsonExample.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/OptionalToJsonExample.java @@ -1,4 +1,4 @@ -package com.baeldung.optionalReturnType; +package com.baeldung.optionalreturntype; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/PersistOptionalTypeExample.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample.java similarity index 82% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/PersistOptionalTypeExample.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample.java index 85c96b9bc3..a0c182bb7d 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/PersistOptionalTypeExample.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample.java @@ -1,4 +1,4 @@ -package com.baeldung.optionalReturnType; +package com.baeldung.optionalreturntype; import java.util.Optional; @@ -7,13 +7,13 @@ import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; public class PersistOptionalTypeExample { - static String persistenceUnit = "com.baeldung.optionalReturnType"; + static String persistenceUnit = "com.baeldung.optionalreturntype"; static EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit); static EntityManager entityManager = emf.createEntityManager(); // to run this app, uncomment the follow line in META-INF/persistence.xml - // com.baeldung.optionalReturnType.UserOptionalField + // com.baeldung.optionalreturntype.UserOptionalField public static void main(String[] args) { UserOptionalField user1 = new UserOptionalField(); user1.setUserId(1l); diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/PersistOptionalTypeExample2.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample2.java similarity index 85% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/PersistOptionalTypeExample2.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample2.java index 3114e7cefb..5671266b68 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/PersistOptionalTypeExample2.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistOptionalTypeExample2.java @@ -1,11 +1,11 @@ -package com.baeldung.optionalReturnType; +package com.baeldung.optionalreturntype; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; public class PersistOptionalTypeExample2 { - static String persistenceUnit = "com.baeldung.optionalReturnType"; + static String persistenceUnit = "com.baeldung.optionalreturntype"; static EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit); static EntityManager em = emf.createEntityManager(); diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/PersistUserExample.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistUserExample.java similarity index 84% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/PersistUserExample.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistUserExample.java index f1284958e7..e26268d8e6 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/PersistUserExample.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/PersistUserExample.java @@ -1,11 +1,11 @@ -package com.baeldung.optionalReturnType; +package com.baeldung.optionalreturntype; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; public class PersistUserExample { - static String persistenceUnit = "com.baeldung.optionalReturnType"; + static String persistenceUnit = "com.baeldung.optionalreturntype"; static EntityManagerFactory emf = Persistence.createEntityManagerFactory(persistenceUnit); static EntityManager em = emf.createEntityManager(); diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/SerializeOptionalTypeExample.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/SerializeOptionalTypeExample.java similarity index 96% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/SerializeOptionalTypeExample.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/SerializeOptionalTypeExample.java index d67337ad98..8566e49a21 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/SerializeOptionalTypeExample.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/SerializeOptionalTypeExample.java @@ -1,4 +1,4 @@ -package com.baeldung.optionalReturnType; +package com.baeldung.optionalreturntype; import java.io.FileOutputStream; import java.io.IOException; diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/User.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/User.java similarity index 92% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/User.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/User.java index 7aa11d78cb..b754b41787 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/User.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/User.java @@ -1,4 +1,4 @@ -package com.baeldung.optionalReturnType; +package com.baeldung.optionalreturntype; import java.io.Serializable; diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/UserOptional.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptional.java similarity index 94% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/UserOptional.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptional.java index 0138a84ab9..081553dbe5 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/UserOptional.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptional.java @@ -1,4 +1,4 @@ -package com.baeldung.optionalReturnType; +package com.baeldung.optionalreturntype; import java.io.Serializable; import java.util.Optional; diff --git a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/UserOptionalField.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptionalField.java similarity index 93% rename from core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/UserOptionalField.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptionalField.java index c02430b1ba..e8c16bfa02 100644 --- a/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalReturnType/UserOptionalField.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/optionalreturntype/UserOptionalField.java @@ -1,4 +1,4 @@ -package com.baeldung.optionalReturnType; +package com.baeldung.optionalreturntype; import java.io.Serializable; import java.util.Optional; diff --git a/core-java-modules/core-java-9/src/main/java/com/baeldung/optionals/Optionals.java b/core-java-modules/core-java-optional/src/main/java/com/baeldung/orelseoptional/OptionalUtils.java similarity index 54% rename from core-java-modules/core-java-9/src/main/java/com/baeldung/optionals/Optionals.java rename to core-java-modules/core-java-optional/src/main/java/com/baeldung/orelseoptional/OptionalUtils.java index 5efa607f94..f2bf1637dc 100644 --- a/core-java-modules/core-java-9/src/main/java/com/baeldung/optionals/Optionals.java +++ b/core-java-modules/core-java-optional/src/main/java/com/baeldung/orelseoptional/OptionalUtils.java @@ -1,20 +1,20 @@ -package com.baeldung.optionals; +package com.baeldung.orelseoptional; import java.util.Optional; -public class Optionals { +public class OptionalUtils { public static Optional or(Optional optional, Optional fallback) { return optional.isPresent() ? optional : fallback; } - public static Optional getName(Optional name) { - return name.or(() -> getCustomMessage()); - } - - public static com.google.common.base.Optional getOptionalGuavaName(com.google.common.base.Optional name) { - return name.or(getCustomMessageGuava()); - } +// public static Optional getName(Optional name) { +// return name.or(() -> getCustomMessage()); +// } +// +// public static com.google.common.base.Optional getOptionalGuavaName(com.google.common.base.Optional name) { +// return name.or(getCustomMessageGuava()); +// } private static Optional getCustomMessage() { return Optional.of("Name not provided"); diff --git a/core-java-modules/core-java-11/src/test/java/com/baeldung/EmptyStringToEmptyOptionalUnitTest.java b/core-java-modules/core-java-optional/src/test/java/com/baeldung/emptystringoptional/EmptyStringToEmptyOptionalUnitTest.java similarity index 65% rename from core-java-modules/core-java-11/src/test/java/com/baeldung/EmptyStringToEmptyOptionalUnitTest.java rename to core-java-modules/core-java-optional/src/test/java/com/baeldung/emptystringoptional/EmptyStringToEmptyOptionalUnitTest.java index cc429209d4..22e11c9a0b 100644 --- a/core-java-modules/core-java-11/src/test/java/com/baeldung/EmptyStringToEmptyOptionalUnitTest.java +++ b/core-java-modules/core-java-optional/src/test/java/com/baeldung/emptystringoptional/EmptyStringToEmptyOptionalUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung; +package com.baeldung.emptystringoptional; import com.google.common.base.Strings; import org.junit.Assert; @@ -16,12 +16,13 @@ public class EmptyStringToEmptyOptionalUnitTest { Assert.assertFalse(opt.isPresent()); } - @Test - public void givenEmptyString_whenFilteringOnOptionalInJava11_thenEmptyOptionalIsReturned() { - String str = ""; - Optional opt = Optional.ofNullable(str).filter(Predicate.not(String::isEmpty)); - Assert.assertFalse(opt.isPresent()); - } +// Uncomment code when code base is compatible with Java 11 +// @Test +// public void givenEmptyString_whenFilteringOnOptionalInJava11_thenEmptyOptionalIsReturned() { +// String str = ""; +// Optional opt = Optional.ofNullable(str).filter(Predicate.not(String::isEmpty)); +// Assert.assertFalse(opt.isPresent()); +// } @Test public void givenEmptyString_whenPassingResultOfEmptyToNullToOfNullable_thenEmptyOptionalIsReturned() { diff --git a/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java b/core-java-modules/core-java-optional/src/test/java/com/baeldung/filterstream/Java9OptionalsStreamUnitTest.java similarity index 76% rename from core-java-modules/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java rename to core-java-modules/core-java-optional/src/test/java/com/baeldung/filterstream/Java9OptionalsStreamUnitTest.java index 7a28a4b977..5341813164 100644 --- a/core-java-modules/core-java-9/src/test/java/com/baeldung/java9/Java9OptionalsStreamUnitTest.java +++ b/core-java-modules/core-java-optional/src/test/java/com/baeldung/filterstream/Java9OptionalsStreamUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.java9; +package com.baeldung.filterstream; import static org.junit.Assert.assertEquals; @@ -47,15 +47,17 @@ public class Java9OptionalsStreamUnitTest { assertEquals("bar", filteredList.get(1)); } - @Test - public void filterOutPresentOptionalsWithJava9() { - assertEquals(4, listOfOptionals.size()); - List filteredList = listOfOptionals.stream().flatMap(Optional::stream).collect(Collectors.toList()); - - assertEquals(2, filteredList.size()); - assertEquals("foo", filteredList.get(0)); - assertEquals("bar", filteredList.get(1)); - } +// Uncomment code when code base is compatible with Java 9 +// @Test +// public void filterOutPresentOptionalsWithJava9() { +// assertEquals(4, listOfOptionals.size()); +// +// List filteredList = listOfOptionals.stream().flatMap(Optional::stream).collect(Collectors.toList()); +// +// assertEquals(2, filteredList.size()); +// assertEquals("foo", filteredList.get(0)); +// assertEquals("bar", filteredList.get(1)); +// } } diff --git a/core-java-modules/core-java-optional/src/test/java/com/baeldung/java9additions/Java9OptionalUnitTest.java b/core-java-modules/core-java-optional/src/test/java/com/baeldung/java9additions/Java9OptionalUnitTest.java new file mode 100644 index 0000000000..ee04432e44 --- /dev/null +++ b/core-java-modules/core-java-optional/src/test/java/com/baeldung/java9additions/Java9OptionalUnitTest.java @@ -0,0 +1,95 @@ +package com.baeldung.java9additions; + +import org.junit.Test; +import static org.assertj.core.api.Assertions.assertThat; + +import java.util.List; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +// Uncomment code when code base is compatible with Java 9 +//public class Java9OptionalUnitTest { +// +// @Test +// public void givenOptionalOfSome_whenToStream_thenShouldTreatItAsOneElementStream() { +// //given +// Optional value = Optional.of("a"); +// +// //when +// List collect = value.stream().map(String::toUpperCase).collect(Collectors.toList()); +// +// //then +// assertThat(collect).hasSameElementsAs(List.of("A")); +// } +// +// @Test +// public void givenOptionalOfNone_whenToStream_thenShouldTreatItAsZeroElementStream() { +// //given +// Optional value = Optional.empty(); +// +// //when +// List collect = value.stream().map(String::toUpperCase).collect(Collectors.toList()); +// +// //then +// assertThat(collect).isEmpty(); +// } +// +// @Test +// public void givenOptional_whenPresent_thenShouldExecuteProperCallback() { +// //given +// Optional value = Optional.of("properValue"); +// AtomicInteger successCounter = new AtomicInteger(0); +// AtomicInteger onEmptyOptionalCounter = new AtomicInteger(0); +// +// //when +// value.ifPresentOrElse((v) -> successCounter.incrementAndGet(), onEmptyOptionalCounter::incrementAndGet); +// +// //then +// assertThat(successCounter.get()).isEqualTo(1); +// assertThat(onEmptyOptionalCounter.get()).isEqualTo(0); +// } +// +// @Test +// public void givenOptional_whenNotPresent_thenShouldExecuteProperCallback() { +// //given +// Optional value = Optional.empty(); +// AtomicInteger successCounter = new AtomicInteger(0); +// AtomicInteger onEmptyOptionalCounter = new AtomicInteger(0); +// +// //when +// value.ifPresentOrElse((v) -> successCounter.incrementAndGet(), onEmptyOptionalCounter::incrementAndGet); +// +// //then +// assertThat(successCounter.get()).isEqualTo(0); +// assertThat(onEmptyOptionalCounter.get()).isEqualTo(1); +// } +// +// @Test +// public void givenOptional_whenPresent_thenShouldTakeAValueFromIt() { +// //given +// String expected = "properValue"; +// Optional value = Optional.of(expected); +// Optional defaultValue = Optional.of("default"); +// +// //when +// Optional result = value.or(() -> defaultValue); +// +// //then +// assertThat(result.get()).isEqualTo(expected); +// } +// +// @Test +// public void givenOptional_whenEmpty_thenShouldTakeAValueFromOr() { +// //given +// String defaultString = "default"; +// Optional value = Optional.empty(); +// Optional defaultValue = Optional.of(defaultString); +// +// //when +// Optional result = value.or(() -> defaultValue); +// +// //then +// assertThat(result.get()).isEqualTo(defaultString); +// } +//} \ No newline at end of file diff --git a/core-java-modules/core-java-optional/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java b/core-java-modules/core-java-optional/src/test/java/com/baeldung/optional/OptionalChainingUnitTest.java similarity index 98% rename from core-java-modules/core-java-optional/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java rename to core-java-modules/core-java-optional/src/test/java/com/baeldung/optional/OptionalChainingUnitTest.java index 3e0d752bb6..9ef156501b 100644 --- a/core-java-modules/core-java-optional/src/test/java/com/baeldung/java8/optional/OptionalChainingUnitTest.java +++ b/core-java-modules/core-java-optional/src/test/java/com/baeldung/optional/OptionalChainingUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.java8.optional; +package com.baeldung.optional; import org.junit.Before; import org.junit.Test; diff --git a/core-java-modules/core-java-optional/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java b/core-java-modules/core-java-optional/src/test/java/com/baeldung/optional/OptionalUnitTest.java similarity index 97% rename from core-java-modules/core-java-optional/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java rename to core-java-modules/core-java-optional/src/test/java/com/baeldung/optional/OptionalUnitTest.java index bf594610bb..e5c4319bf7 100644 --- a/core-java-modules/core-java-optional/src/test/java/com/baeldung/java8/optional/OptionalUnitTest.java +++ b/core-java-modules/core-java-optional/src/test/java/com/baeldung/optional/OptionalUnitTest.java @@ -1,7 +1,5 @@ -package com.baeldung.java8.optional; +package com.baeldung.optional; -import com.baeldung.optional.Modem; -import com.baeldung.optional.Person; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -260,7 +258,7 @@ public class OptionalUnitTest { return "Default Value"; } -// Uncomment code when code base is compatiable with Java 11 +// Uncomment code when code base is compatible with Java 11 // @Test // public void givenAnEmptyOptional_thenIsEmptyBehavesAsExpected() { // Optional opt = Optional.of("Baeldung"); diff --git a/core-java-modules/core-java-optional/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java b/core-java-modules/core-java-optional/src/test/java/com/baeldung/optional/orelse/OrElseAndOrElseGetUnitTest.java similarity index 94% rename from core-java-modules/core-java-optional/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java rename to core-java-modules/core-java-optional/src/test/java/com/baeldung/optional/orelse/OrElseAndOrElseGetUnitTest.java index c8a631d9f0..8f175c30eb 100644 --- a/core-java-modules/core-java-optional/src/test/java/com/baeldung/java8/optional/OrElseAndOrElseGetUnitTest.java +++ b/core-java-modules/core-java-optional/src/test/java/com/baeldung/optional/orelse/OrElseAndOrElseGetUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.java8.optional; +package com.baeldung.optional.orelse; import org.junit.Test; import org.slf4j.Logger; @@ -6,8 +6,6 @@ import org.slf4j.LoggerFactory; import static org.junit.Assert.*; -import com.baeldung.optional.OrElseAndOrElseGet; - public class OrElseAndOrElseGetUnitTest { private OrElseAndOrElseGet orElsevsOrElseGet = new OrElseAndOrElseGet(); diff --git a/core-java-modules/core-java-optional/src/test/java/com/baeldung/orelseoptional/OrElseOptionalUnitTest.java b/core-java-modules/core-java-optional/src/test/java/com/baeldung/orelseoptional/OrElseOptionalUnitTest.java new file mode 100644 index 0000000000..91aebbeebd --- /dev/null +++ b/core-java-modules/core-java-optional/src/test/java/com/baeldung/orelseoptional/OrElseOptionalUnitTest.java @@ -0,0 +1,52 @@ +package com.baeldung.orelseoptional; + +import static org.junit.Assert.assertEquals; + +import java.util.Optional; + +import org.junit.Test; + +public class OrElseOptionalUnitTest { + + @Test + public void givenOptional_whenValue_thenOptionalGeneralMethod() { + String name = "Filan Fisteku"; + String missingOptional = "Name not provided"; + Optional optionalString = Optional.ofNullable(name); + Optional fallbackOptionalString = Optional.ofNullable(missingOptional); + assertEquals(optionalString, OptionalUtils.or(optionalString, fallbackOptionalString)); + } + + @Test + public void givenEmptyOptional_whenValue_thenOptionalGeneralMethod() { + String missingOptional = "Name not provided"; + Optional optionalString = Optional.empty(); + Optional fallbackOptionalString = Optional.ofNullable(missingOptional); + assertEquals(fallbackOptionalString, OptionalUtils.or(optionalString, fallbackOptionalString)); + } + +// Uncomment code when code base is compatible with Java 9 +// @Test +// public void givenOptional_whenEmptyValue_thenCustomMessage() { +// assertEquals(Optional.of("Name not provided"), OptionalUtils.getName(Optional.ofNullable(null))); +// } +// +// @Test +// public void givenOptional_whenValue_thenOptional() { +// String name = "Filan Fisteku"; +// Optional optionalString = Optional.ofNullable(name); +// assertEquals(optionalString, OptionalUtils.getName(optionalString)); +// } +// +// @Test +// public void givenGuavaOptional_whenInvoke_thenOptional() { +// String name = "Filan Fisteku"; +// com.google.common.base.Optional stringOptional = com.google.common.base.Optional.of(name); +// assertEquals(stringOptional, OptionalUtils.getOptionalGuavaName(stringOptional)); +// } +// +// @Test +// public void givenGuavaOptional_whenNull_thenDefaultText() { +// assertEquals(com.google.common.base.Optional.of("Name not provided"), OptionalUtils.getOptionalGuavaName(com.google.common.base.Optional.fromNullable(null))); +// } +} \ No newline at end of file diff --git a/core-java-modules/core-java/README.md b/core-java-modules/core-java/README.md index dd5e7dc14e..c7ae946ab5 100644 --- a/core-java-modules/core-java/README.md +++ b/core-java-modules/core-java/README.md @@ -23,7 +23,6 @@ - [Java Global Exception Handler](http://www.baeldung.com/java-global-exception-handler) - [How to Get the Size of an Object in Java](http://www.baeldung.com/java-size-of-object) - [Common Java Exceptions](http://www.baeldung.com/java-common-exceptions) -- [Throw Exception in Optional in Java 8](https://www.baeldung.com/java-optional-throw-exception) - [Merging java.util.Properties Objects](https://www.baeldung.com/java-merging-properties) - [Java – Try with Resources](https://www.baeldung.com/java-try-with-resources) - [Guide to Character Encoding](https://www.baeldung.com/java-char-encoding) diff --git a/data-structures/src/main/java/com/baeldung/list/CircularLinkedList.java b/data-structures/src/main/java/com/baeldung/list/CircularLinkedList.java new file mode 100644 index 0000000000..d17134a32d --- /dev/null +++ b/data-structures/src/main/java/com/baeldung/list/CircularLinkedList.java @@ -0,0 +1,90 @@ +package com.baeldung.list; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class CircularLinkedList { + + final Logger LOGGER = LoggerFactory.getLogger(CircularLinkedList.class); + + private Node head = null; + private Node tail = null; + + public void addNode(int value) { + + Node newNode = new Node(value); + + if (head == null) { + head = newNode; + } else { + tail.nextNode = newNode; + } + + tail = newNode; + tail.nextNode = head; + } + + public boolean containsNode(int searchValue) { + + Node currentNode = head; + + if (head == null) { + return false; + } else { + do { + if (currentNode.value == searchValue) { + return true; + } + currentNode = currentNode.nextNode; + } while (currentNode != head); + return false; + } + } + + public void deleteNode(int valueToDelete) { + + Node currentNode = head; + + if (head != null) { + if (currentNode.value == valueToDelete) { + head = head.nextNode; + tail.nextNode = head; + currentNode = null; + } else { + do { + Node nextNode = currentNode.nextNode; + if (nextNode.value == valueToDelete) { + currentNode.nextNode = nextNode.nextNode; + nextNode = null; + break; + } + currentNode = currentNode.nextNode; + } while (currentNode != head); + } + } + } + + public void traverseList() { + + Node currentNode = head; + + if (head != null) { + do { + LOGGER.info(currentNode.value + " "); + currentNode = currentNode.nextNode; + } while (currentNode != head); + } + } + +} + +class Node { + + int value; + Node nextNode; + + public Node(int value) { + this.value = value; + } + +} diff --git a/data-structures/src/test/java/com/baeldung/list/CircularLinkedListUnitTest.java b/data-structures/src/test/java/com/baeldung/list/CircularLinkedListUnitTest.java new file mode 100644 index 0000000000..3251182864 --- /dev/null +++ b/data-structures/src/test/java/com/baeldung/list/CircularLinkedListUnitTest.java @@ -0,0 +1,56 @@ +package com.baeldung.list; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.junit.Test; + +public class CircularLinkedListUnitTest { + + @Test + public void givenACircularLinkedList_WhenAddingElements_ThenListContainsThoseElements() { + CircularLinkedList cll = createCircularLinkedList(); + + assertTrue(cll.containsNode(8)); + assertTrue(cll.containsNode(37)); + } + + @Test + public void givenACircularLinkedList_WhenLookingForNonExistingElement_ThenReturnsFalse() { + CircularLinkedList cll = createCircularLinkedList(); + + assertFalse(cll.containsNode(11)); + } + + @Test + public void givenACircularLinkedList_WhenDeletingElements_ThenListDoesNotContainThoseElements() { + CircularLinkedList cll = createCircularLinkedList(); + + assertTrue(cll.containsNode(13)); + cll.deleteNode(13); + assertFalse(cll.containsNode(13)); + + assertTrue(cll.containsNode(1)); + cll.deleteNode(1); + assertFalse(cll.containsNode(1)); + + assertTrue(cll.containsNode(46)); + cll.deleteNode(46); + assertFalse(cll.containsNode(46)); + } + + private CircularLinkedList createCircularLinkedList() { + CircularLinkedList cll = new CircularLinkedList(); + + cll.addNode(13); + cll.addNode(7); + cll.addNode(24); + cll.addNode(1); + cll.addNode(8); + cll.addNode(37); + cll.addNode(46); + + return cll; + } + +} diff --git a/jackson-2/README.md b/jackson-2/README.md index 5e0cb4ec37..b583b588ef 100644 --- a/jackson-2/README.md +++ b/jackson-2/README.md @@ -6,10 +6,7 @@ This module contains articles about Jackson. The "REST With Spring" Classes: http://bit.ly/restwithspring ### Relevant Articles: -- [Mapping Multiple JSON Fields to a Single Java Field](https://www.baeldung.com/json-multiple-fields-single-java-field) -- [How to Process YAML with Jackson](https://www.baeldung.com/jackson-yaml) - [Working with Tree Model Nodes in Jackson](https://www.baeldung.com/jackson-json-node-tree-model) -- [Converting JSON to CSV in Java](https://www.baeldung.com/java-converting-json-to-csv) - [Compare Two JSON Objects with Jackson](https://www.baeldung.com/jackson-compare-two-json-objects) - [Calling Default Serializer from Custom Serializer in Jackson](https://www.baeldung.com/jackson-call-default-serializer-from-custom-serializer) - More articles: [[<-- prev]](/../jackson) diff --git a/jackson-2/pom.xml b/jackson-2/pom.xml index 0d612c175d..87a050417c 100644 --- a/jackson-2/pom.xml +++ b/jackson-2/pom.xml @@ -14,20 +14,6 @@ - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - ${jackson.version} - - - - - com.fasterxml.jackson.dataformat - jackson-dataformat-csv - ${jackson.version} - - com.fasterxml.jackson.datatype diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java b/jackson-annotations/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java index ab51fc11e7..c96eef4b05 100644 --- a/jackson-annotations/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java +++ b/jackson-annotations/src/test/java/com/baeldung/jackson/ignore/JacksonSerializationIgnoreUnitTest.java @@ -18,7 +18,6 @@ import com.baeldung.jackson.ignore.dtos.MyMixInForIgnoreType; import com.baeldung.jackson.ignore.dtos.MyDtoIgnoreField; import com.baeldung.jackson.ignore.dtos.MyDtoIgnoreFieldByName; import com.baeldung.jackson.ignore.dtos.MyDtoIgnoreNull; -import com.baeldung.jackson.ignore.dtos.MyDtoNullKeySerializer; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParseException; @@ -191,88 +190,4 @@ public class JacksonSerializationIgnoreUnitTest { System.out.println(dtoAsString); } - // map - - @Test - public final void givenIgnoringMapNullValue_whenWritingMapObjectWithNullValue_thenIgnored() throws JsonProcessingException { - final ObjectMapper mapper = new ObjectMapper(); - // mapper.configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false); - mapper.setSerializationInclusion(Include.NON_NULL); - - final MyDto dtoObject1 = new MyDto(); - - final Map dtoMap = new HashMap(); - dtoMap.put("dtoObject1", dtoObject1); - dtoMap.put("dtoObject2", null); - - final String dtoMapAsString = mapper.writeValueAsString(dtoMap); - - assertThat(dtoMapAsString, containsString("dtoObject1")); - assertThat(dtoMapAsString, not(containsString("dtoObject2"))); - System.out.println(dtoMapAsString); - } - - @Test - public final void givenIgnoringMapValueObjectWithNullField_whenWritingMapValueObjectWithNullField_thenIgnored() throws JsonProcessingException { - final ObjectMapper mapper = new ObjectMapper(); - mapper.setSerializationInclusion(Include.NON_NULL); - - final MyDto dtoObject = new MyDto(); - - final Map dtoMap = new HashMap(); - dtoMap.put("dtoObject", dtoObject); - - final String dtoMapAsString = mapper.writeValueAsString(dtoMap); - - assertThat(dtoMapAsString, containsString("dtoObject")); - assertThat(dtoMapAsString, not(containsString("stringValue"))); - System.out.println(dtoMapAsString); - } - - @Test - public final void givenAllowingMapObjectWithNullKey_whenWriting_thenCorrect() throws JsonProcessingException { - final ObjectMapper mapper = new ObjectMapper(); - mapper.getSerializerProvider() - .setNullKeySerializer(new MyDtoNullKeySerializer()); - - final MyDto dtoObject1 = new MyDto(); - dtoObject1.setStringValue("dtoObjectString1"); - final MyDto dtoObject2 = new MyDto(); - dtoObject2.setStringValue("dtoObjectString2"); - - final Map dtoMap = new HashMap(); - dtoMap.put(null, dtoObject1); - dtoMap.put("obj2", dtoObject2); - - final String dtoMapAsString = mapper.writeValueAsString(dtoMap); - - System.out.println(dtoMapAsString); - assertThat(dtoMapAsString, containsString("\"\"")); - assertThat(dtoMapAsString, containsString("dtoObjectString1")); - assertThat(dtoMapAsString, containsString("obj2")); - } - - @Test - public final void givenAllowingMapObjectOneNullKey_whenWritingMapObjectWithTwoNullKeys_thenOverride() throws JsonProcessingException { - final ObjectMapper mapper = new ObjectMapper(); - mapper.getSerializerProvider() - .setNullKeySerializer(new MyDtoNullKeySerializer()); - - final MyDto dtoObject1 = new MyDto(); - dtoObject1.setStringValue("dtoObject1String"); - - final MyDto dtoObject2 = new MyDto(); - dtoObject2.setStringValue("dtoObject2String"); - - final Map dtoMap = new HashMap(); - dtoMap.put(null, dtoObject1); - dtoMap.put(null, dtoObject2); - - final String dtoMapAsString = mapper.writeValueAsString(dtoMap); - - assertThat(dtoMapAsString, not(containsString("dtoObject1String"))); - assertThat(dtoMapAsString, containsString("dtoObject2String")); - System.out.println(dtoMapAsString); - } - } diff --git a/jackson-conversions-2/README.md b/jackson-conversions-2/README.md new file mode 100644 index 0000000000..210f5cd5bb --- /dev/null +++ b/jackson-conversions-2/README.md @@ -0,0 +1,14 @@ +## Jackson Conversions + +This module contains articles about Jackson conversions. + +### Relevant Articles: +- [Mapping a Dynamic JSON Object with Jackson](https://www.baeldung.com/jackson-mapping-dynamic-object) +- [Jackson Unmarshalling JSON with Unknown Properties](https://www.baeldung.com/jackson-deserialize-json-unknown-properties) +- [Ignore Null Fields with Jackson](https://www.baeldung.com/jackson-ignore-null-fields) +- [Mapping Multiple JSON Fields to a Single Java Field](https://www.baeldung.com/json-multiple-fields-single-java-field) +- [Convert XML to JSON Using Jackson](https://www.baeldung.com/jackson-convert-xml-json) +- [Converting JSON to CSV in Java](https://www.baeldung.com/java-converting-json-to-csv) +- [How to Process YAML with Jackson](https://www.baeldung.com/jackson-yaml) +- [Jackson Streaming API](https://www.baeldung.com/jackson-streaming-api) +- More articles: [[<-- prev]](../jackson-conversions) diff --git a/jackson-conversions-2/pom.xml b/jackson-conversions-2/pom.xml new file mode 100644 index 0000000000..07104a8972 --- /dev/null +++ b/jackson-conversions-2/pom.xml @@ -0,0 +1,67 @@ + + 4.0.0 + jackson-conversions-2 + 0.0.1-SNAPSHOT + jackson-conversions-2 + + + com.baeldung + parent-java + 0.0.1-SNAPSHOT + ../parent-java + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + ${jackson.version} + + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.9.8 + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-csv + ${jackson.version} + + + org.assertj + assertj-core + ${assertj.version} + test + + + + + jackson-conversions-2 + + + src/main/resources + true + + + + + + 3.11.0 + + + diff --git a/jackson-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java similarity index 95% rename from jackson-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java index 71c6de4d7e..9d500bf263 100644 --- a/jackson-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/JsonCsvConverter.java @@ -3,8 +3,6 @@ package com.baeldung.jackson.csv; import java.io.File; import java.io.IOException; -import com.baeldung.jackson.entities.OrderLine; -import com.baeldung.jackson.mixin.OrderLineForCsv; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.MappingIterator; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jackson-2/src/main/java/com/baeldung/jackson/entities/OrderLine.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLine.java similarity index 96% rename from jackson-2/src/main/java/com/baeldung/jackson/entities/OrderLine.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLine.java index 858d094dd1..b6c22b0b1d 100644 --- a/jackson-2/src/main/java/com/baeldung/jackson/entities/OrderLine.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLine.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.entities; +package com.baeldung.jackson.csv; import java.math.BigDecimal; diff --git a/jackson-2/src/main/java/com/baeldung/jackson/mixin/OrderLineForCsv.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLineForCsv.java similarity index 92% rename from jackson-2/src/main/java/com/baeldung/jackson/mixin/OrderLineForCsv.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLineForCsv.java index 05d70a8053..94a1573a84 100644 --- a/jackson-2/src/main/java/com/baeldung/jackson/mixin/OrderLineForCsv.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/csv/OrderLineForCsv.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.mixin; +package com.baeldung.jackson.csv; import java.math.BigDecimal; diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/Product.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/Product.java similarity index 92% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/Product.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/Product.java index 9c997886e5..89a57a124c 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/Product.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/Product.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.dynamicobject; +package com.baeldung.jackson.dynamicobject; import java.util.LinkedHashMap; import java.util.Map; diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/ProductJsonNode.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductJsonNode.java similarity index 90% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/ProductJsonNode.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductJsonNode.java index 729d542df3..b9142ae6e7 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/ProductJsonNode.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductJsonNode.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.dynamicobject; +package com.baeldung.jackson.dynamicobject; import com.fasterxml.jackson.databind.JsonNode; diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/ProductMap.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductMap.java similarity index 91% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/ProductMap.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductMap.java index 65d225f49b..62b7a43eae 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/dynamicobject/ProductMap.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/dynamicobject/ProductMap.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.dynamicobject; +package com.baeldung.jackson.dynamicobject; import java.util.Map; diff --git a/jackson-2/src/main/java/com/baeldung/jackson/entities/Weather.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/multiplefields/Weather.java similarity index 94% rename from jackson-2/src/main/java/com/baeldung/jackson/entities/Weather.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/multiplefields/Weather.java index 4a8cea052f..d1d6905d53 100644 --- a/jackson-2/src/main/java/com/baeldung/jackson/entities/Weather.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/multiplefields/Weather.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.entities; +package com.baeldung.jackson.multiplefields; import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java new file mode 100644 index 0000000000..7c8046f6be --- /dev/null +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/unknownproperties/MyDto.java @@ -0,0 +1,54 @@ +package com.baeldung.jackson.unknownproperties; + +public class MyDto { + + private String stringValue; + private int intValue; + private boolean booleanValue; + + public MyDto() { + super(); + } + + public MyDto(final String stringValue, final int intValue, final boolean booleanValue) { + super(); + + this.stringValue = stringValue; + this.intValue = intValue; + this.booleanValue = booleanValue; + } + + // API + + public String getStringValue() { + return stringValue; + } + + public void setStringValue(final String stringValue) { + this.stringValue = stringValue; + } + + public int getIntValue() { + return intValue; + } + + public void setIntValue(final int intValue) { + this.intValue = intValue; + } + + public boolean isBooleanValue() { + return booleanValue; + } + + public void setBooleanValue(final boolean booleanValue) { + this.booleanValue = booleanValue; + } + + // + + @Override + public String toString() { + return "MyDto [stringValue=" + stringValue + ", intValue=" + intValue + ", booleanValue=" + booleanValue + "]"; + } + +} diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/ignore/MyDtoIgnoreType.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java similarity index 95% rename from jackson/src/test/java/com/baeldung/jackson/dtos/ignore/MyDtoIgnoreType.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java index 3c813145f6..89456020b2 100644 --- a/jackson/src/test/java/com/baeldung/jackson/dtos/ignore/MyDtoIgnoreType.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreType.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.dtos.ignore; +package com.baeldung.jackson.unknownproperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/ignore/MyDtoIgnoreUnknown.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java similarity index 95% rename from jackson/src/test/java/com/baeldung/jackson/dtos/ignore/MyDtoIgnoreUnknown.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java index c1174a12f5..ebbe528c83 100644 --- a/jackson/src/test/java/com/baeldung/jackson/dtos/ignore/MyDtoIgnoreUnknown.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/unknownproperties/MyDtoIgnoreUnknown.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.dtos.ignore; +package com.baeldung.jackson.unknownproperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/jackson/src/main/java/com/baeldung/jackson/xmlToJson/Color.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Color.java similarity index 100% rename from jackson/src/main/java/com/baeldung/jackson/xmlToJson/Color.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Color.java diff --git a/jackson/src/main/java/com/baeldung/jackson/xmlToJson/Flower.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Flower.java similarity index 100% rename from jackson/src/main/java/com/baeldung/jackson/xmlToJson/Flower.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/xmlToJson/Flower.java diff --git a/jackson-2/src/main/java/com/baeldung/jackson/entities/Order.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/Order.java similarity index 97% rename from jackson-2/src/main/java/com/baeldung/jackson/entities/Order.java rename to jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/Order.java index 2075b7879b..8c62a0bd3f 100644 --- a/jackson-2/src/main/java/com/baeldung/jackson/entities/Order.java +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/Order.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.entities; +package com.baeldung.jackson.yaml; import java.time.LocalDate; import java.util.ArrayList; diff --git a/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/OrderLine.java b/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/OrderLine.java new file mode 100644 index 0000000000..c64eaa3832 --- /dev/null +++ b/jackson-conversions-2/src/main/java/com/baeldung/jackson/yaml/OrderLine.java @@ -0,0 +1,49 @@ +package com.baeldung.jackson.yaml; + +import java.math.BigDecimal; + +public class OrderLine { + private String item; + private int quantity; + private BigDecimal unitPrice; + + public OrderLine() { + + } + + public OrderLine(String item, int quantity, BigDecimal unitPrice) { + super(); + this.item = item; + this.quantity = quantity; + this.unitPrice = unitPrice; + } + + public String getItem() { + return item; + } + + public void setItem(String item) { + this.item = item; + } + + public int getQuantity() { + return quantity; + } + + public void setQuantity(int quantity) { + this.quantity = quantity; + } + + public BigDecimal getUnitPrice() { + return unitPrice; + } + + public void setUnitPrice(BigDecimal unitPrice) { + this.unitPrice = unitPrice; + } + + @Override + public String toString() { + return "OrderLine [item=" + item + ", quantity=" + quantity + ", unitPrice=" + unitPrice + "]"; + } +} diff --git a/jackson-2/src/main/resources/orderLines.csv b/jackson-conversions-2/src/main/resources/csv/orderLines.csv similarity index 100% rename from jackson-2/src/main/resources/orderLines.csv rename to jackson-conversions-2/src/main/resources/csv/orderLines.csv diff --git a/jackson-2/src/main/resources/orderLines.json b/jackson-conversions-2/src/main/resources/csv/orderLines.json similarity index 100% rename from jackson-2/src/main/resources/orderLines.json rename to jackson-conversions-2/src/main/resources/csv/orderLines.json diff --git a/jackson-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java similarity index 61% rename from jackson-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java rename to jackson-conversions-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java index 60c8ce79f3..c257cb7dc9 100644 --- a/jackson-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java +++ b/jackson-conversions-2/src/test/java/com/baeldung/jackson/csv/CsvUnitTest.java @@ -18,30 +18,30 @@ public class CsvUnitTest { @Test public void givenJsonInput_thenWriteCsv() throws JsonParseException, JsonMappingException, IOException { - JsonCsvConverter.JsonToCsv(new File("src/main/resources/orderLines.json"), - new File("src/main/resources/csvFromJson.csv")); + JsonCsvConverter.JsonToCsv(new File("src/main/resources/csv/orderLines.json"), + new File("src/main/resources/csv/csvFromJson.csv")); - assertEquals(readFile("src/main/resources/csvFromJson.csv"), - readFile("src/test/resources/expectedCsvFromJson.csv")); + assertEquals(readFile("src/main/resources/csv/csvFromJson.csv"), + readFile("src/test/resources/csv/expectedCsvFromJson.csv")); } @Test public void givenCsvInput_thenWritesJson() throws JsonParseException, JsonMappingException, IOException { - JsonCsvConverter.csvToJson(new File("src/main/resources/orderLines.csv"), - new File("src/main/resources/jsonFromCsv.json")); + JsonCsvConverter.csvToJson(new File("src/main/resources/csv/orderLines.csv"), + new File("src/main/resources/csv/jsonFromCsv.json")); - assertEquals(readFile("src/main/resources/jsonFromCsv.json"), - readFile("src/test/resources/expectedJsonFromCsv.json")); + assertEquals(readFile("src/main/resources/csv/jsonFromCsv.json"), + readFile("src/test/resources/csv/expectedJsonFromCsv.json")); } @Test public void givenJsonInput_thenWriteFormattedCsvOutput() throws JsonParseException, JsonMappingException, IOException { - JsonCsvConverter.JsonToFormattedCsv(new File("src/main/resources/orderLines.json"), - new File("src/main/resources/formattedCsvFromJson.csv")); + JsonCsvConverter.JsonToFormattedCsv(new File("src/main/resources/csv/orderLines.json"), + new File("src/main/resources/csv/formattedCsvFromJson.csv")); - assertEquals(readFile("src/main/resources/formattedCsvFromJson.csv"), - readFile("src/test/resources/expectedFormattedCsvFromJson.csv")); + assertEquals(readFile("src/main/resources/csv/formattedCsvFromJson.csv"), + readFile("src/test/resources/csv/expectedFormattedCsvFromJson.csv")); } diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/dynamicobject/DynamicObjectDeserializationUnitTest.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/dynamicobject/DynamicObjectDeserializationUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/dynamicobject/DynamicObjectDeserializationUnitTest.java rename to jackson-conversions-2/src/test/java/com/baeldung/jackson/dynamicobject/DynamicObjectDeserializationUnitTest.java index c9536bc35a..0c222bffcc 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/dynamicobject/DynamicObjectDeserializationUnitTest.java +++ b/jackson-conversions-2/src/test/java/com/baeldung/jackson/dynamicobject/DynamicObjectDeserializationUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.dynamicobject; +package com.baeldung.jackson.dynamicobject; import static org.assertj.core.api.Assertions.assertThat; diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java new file mode 100644 index 0000000000..192fe61889 --- /dev/null +++ b/jackson-conversions-2/src/test/java/com/baeldung/jackson/ignorenullfields/IgnoreNullFieldsUnitTest.java @@ -0,0 +1,52 @@ +package com.baeldung.jackson.ignorenullfields; + +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.BeanPropertyWriter; +import com.fasterxml.jackson.databind.ser.FilterProvider; +import com.fasterxml.jackson.databind.ser.PropertyFilter; +import com.fasterxml.jackson.databind.ser.PropertyWriter; +import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; +import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; +import org.junit.Test; + +import java.io.IOException; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertThat; + +public class IgnoreNullFieldsUnitTest { + + @Test + public final void givenNullsIgnoredOnClass_whenWritingObjectWithNullField_thenIgnored() throws JsonProcessingException { + final ObjectMapper mapper = new ObjectMapper(); + final MyDtoIgnoreNull dtoObject = new MyDtoIgnoreNull(); + + final String dtoAsString = mapper.writeValueAsString(dtoObject); + + assertThat(dtoAsString, containsString("intValue")); + assertThat(dtoAsString, containsString("booleanValue")); + assertThat(dtoAsString, not(containsString("stringValue"))); + System.out.println(dtoAsString); + } + + @Test + public final void givenNullsIgnoredGlobally_whenWritingObjectWithNullField_thenIgnored() throws JsonProcessingException { + final ObjectMapper mapper = new ObjectMapper(); + mapper.setSerializationInclusion(Include.NON_NULL); + final MyDto dtoObject = new MyDto(); + + final String dtoAsString = mapper.writeValueAsString(dtoObject); + + assertThat(dtoAsString, containsString("intValue")); + assertThat(dtoAsString, containsString("booleanValue")); + assertThat(dtoAsString, not(containsString("stringValue"))); + System.out.println(dtoAsString); + } + +} diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/ignorenullfields/MyDto.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/ignorenullfields/MyDto.java new file mode 100644 index 0000000000..3737dd35f6 --- /dev/null +++ b/jackson-conversions-2/src/test/java/com/baeldung/jackson/ignorenullfields/MyDto.java @@ -0,0 +1,54 @@ +package com.baeldung.jackson.ignorenullfields; + +public class MyDto { + + private String stringValue; + private int intValue; + private boolean booleanValue; + + public MyDto() { + super(); + } + + public MyDto(final String stringValue, final int intValue, final boolean booleanValue) { + super(); + + this.stringValue = stringValue; + this.intValue = intValue; + this.booleanValue = booleanValue; + } + + // API + + public String getStringValue() { + return stringValue; + } + + public void setStringValue(final String stringValue) { + this.stringValue = stringValue; + } + + public int getIntValue() { + return intValue; + } + + public void setIntValue(final int intValue) { + this.intValue = intValue; + } + + public boolean isBooleanValue() { + return booleanValue; + } + + public void setBooleanValue(final boolean booleanValue) { + this.booleanValue = booleanValue; + } + + // + + @Override + public String toString() { + return "MyDto [stringValue=" + stringValue + ", intValue=" + intValue + ", booleanValue=" + booleanValue + "]"; + } + +} diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java new file mode 100644 index 0000000000..6aad3a3413 --- /dev/null +++ b/jackson-conversions-2/src/test/java/com/baeldung/jackson/ignorenullfields/MyDtoIgnoreNull.java @@ -0,0 +1,51 @@ +package com.baeldung.jackson.ignorenullfields; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; + +@JsonInclude(Include.NON_NULL) +public class MyDtoIgnoreNull { + + private String stringValue; + private int intValue; + private boolean booleanValue; + + public MyDtoIgnoreNull() { + super(); + } + + public MyDtoIgnoreNull(final String stringValue, final int intValue, final boolean booleanValue) { + super(); + + this.stringValue = stringValue; + this.intValue = intValue; + this.booleanValue = booleanValue; + } + + // API + + public String getStringValue() { + return stringValue; + } + + public void setStringValue(final String stringValue) { + this.stringValue = stringValue; + } + + public int getIntValue() { + return intValue; + } + + public void setIntValue(final int intValue) { + this.intValue = intValue; + } + + public boolean isBooleanValue() { + return booleanValue; + } + + public void setBooleanValue(final boolean booleanValue) { + this.booleanValue = booleanValue; + } + +} diff --git a/jackson-2/src/test/java/com/baeldung/jackson/deserialization/jsonalias/JsonAliasUnitTest.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/multiplefields/MapMultipleFieldsToSingleFieldUnitTest.java similarity index 88% rename from jackson-2/src/test/java/com/baeldung/jackson/deserialization/jsonalias/JsonAliasUnitTest.java rename to jackson-conversions-2/src/test/java/com/baeldung/jackson/multiplefields/MapMultipleFieldsToSingleFieldUnitTest.java index b5940a7bd7..1a50f6cfc1 100644 --- a/jackson-2/src/test/java/com/baeldung/jackson/deserialization/jsonalias/JsonAliasUnitTest.java +++ b/jackson-conversions-2/src/test/java/com/baeldung/jackson/multiplefields/MapMultipleFieldsToSingleFieldUnitTest.java @@ -1,13 +1,12 @@ -package com.baeldung.jackson.deserialization.jsonalias; +package com.baeldung.jackson.multiplefields; import static org.junit.Assert.assertEquals; import org.junit.Test; -import com.baeldung.jackson.entities.Weather; import com.fasterxml.jackson.databind.ObjectMapper; -public class JsonAliasUnitTest { +public class MapMultipleFieldsToSingleFieldUnitTest { @Test public void givenTwoJsonFormats_whenDeserialized_thenWeatherObjectsCreated() throws Exception { diff --git a/jackson/src/test/java/com/baeldung/jackson/streaming/JacksonStreamingAPIUnitTest.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/streaming/StreamingAPIUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/streaming/JacksonStreamingAPIUnitTest.java rename to jackson-conversions-2/src/test/java/com/baeldung/jackson/streaming/StreamingAPIUnitTest.java index ff22682f37..5deb279c5c 100644 --- a/jackson/src/test/java/com/baeldung/jackson/streaming/JacksonStreamingAPIUnitTest.java +++ b/jackson-conversions-2/src/test/java/com/baeldung/jackson/streaming/StreamingAPIUnitTest.java @@ -13,7 +13,7 @@ import static junit.framework.Assert.assertNull; import static junit.framework.Assert.assertTrue; import static junit.framework.TestCase.assertEquals; -public class JacksonStreamingAPIUnitTest { +public class StreamingAPIUnitTest { @Test public void givenJsonGenerator_whenAppendJsonToIt_thenGenerateJson() throws IOException { diff --git a/jackson-conversions-2/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java new file mode 100644 index 0000000000..ecdde4736d --- /dev/null +++ b/jackson-conversions-2/src/test/java/com/baeldung/jackson/unknownproperties/UnknownPropertiesUnitTest.java @@ -0,0 +1,80 @@ +package com.baeldung.jackson.unknownproperties; + +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException; +import org.junit.Test; + +import java.io.IOException; + +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; + +public class UnknownPropertiesUnitTest { + + @Test + public final void givenNotAllFieldsHaveValuesInJson_whenDeserializingAJsonToAClass_thenCorrect() throws JsonParseException, JsonMappingException, IOException { + final String jsonAsString = "{\"stringValue\":\"a\",\"booleanValue\":true}"; + final ObjectMapper mapper = new ObjectMapper(); + + final MyDto readValue = mapper.readValue(jsonAsString, MyDto.class); + + assertNotNull(readValue); + assertThat(readValue.getStringValue(), equalTo("a")); + assertThat(readValue.isBooleanValue(), equalTo(true)); + } + + // tests - json with unknown fields + + @Test(expected = UnrecognizedPropertyException.class) + public final void givenJsonHasUnknownValues_whenDeserializingAJsonToAClass_thenExceptionIsThrown() throws JsonParseException, JsonMappingException, IOException { + final String jsonAsString = "{\"stringValue\":\"a\",\"intValue\":1,\"booleanValue\":true,\"stringValue2\":\"something\"}"; + final ObjectMapper mapper = new ObjectMapper(); + + final MyDto readValue = mapper.readValue(jsonAsString, MyDto.class); + + assertNotNull(readValue); + assertThat(readValue.getStringValue(), equalTo("a")); + assertThat(readValue.isBooleanValue(), equalTo(true)); + assertThat(readValue.getIntValue(), equalTo(1)); + } + + @Test + public final void givenJsonHasUnknownValuesButJacksonIsIgnoringUnknownFields_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException { + final String jsonAsString = // @formatter:off + "{\"stringValue\":\"a\"," + + "\"intValue\":1," + + "\"booleanValue\":true," + + "\"stringValue2\":\"something\"}"; // @formatter:on + final ObjectMapper mapper = new ObjectMapper(); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + + final MyDto readValue = mapper.readValue(jsonAsString, MyDto.class); + + assertNotNull(readValue); + assertThat(readValue.getStringValue(), equalTo("a")); + assertThat(readValue.isBooleanValue(), equalTo(true)); + assertThat(readValue.getIntValue(), equalTo(1)); + } + + @Test + public final void givenJsonHasUnknownValuesButUnknownFieldsAreIgnoredOnClass_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException { + final String jsonAsString = // @formatter:off + "{\"stringValue\":\"a\"," + + "\"intValue\":1," + + "\"booleanValue\":true," + + "\"stringValue2\":\"something\"}"; // @formatter:on + final ObjectMapper mapper = new ObjectMapper(); + + final MyDtoIgnoreUnknown readValue = mapper.readValue(jsonAsString, MyDtoIgnoreUnknown.class); + + assertNotNull(readValue); + assertThat(readValue.getStringValue(), equalTo("a")); + assertThat(readValue.isBooleanValue(), equalTo(true)); + assertThat(readValue.getIntValue(), equalTo(1)); + } + +} diff --git a/jackson/src/test/java/com/baeldung/jackson/xmlToJson/XmlToJsonUnitTest.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/xmlToJson/XmlToJsonUnitTest.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/xmlToJson/XmlToJsonUnitTest.java rename to jackson-conversions-2/src/test/java/com/baeldung/jackson/xmlToJson/XmlToJsonUnitTest.java diff --git a/jackson-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java b/jackson-conversions-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java similarity index 86% rename from jackson-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java rename to jackson-conversions-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java index 3ed84db60e..17c487ff26 100644 --- a/jackson-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java +++ b/jackson-conversions-2/src/test/java/com/baeldung/jackson/yaml/YamlUnitTest.java @@ -15,8 +15,6 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import com.baeldung.jackson.entities.Order; -import com.baeldung.jackson.entities.OrderLine; import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; @@ -37,7 +35,7 @@ public class YamlUnitTest { @Test public void givenYamlInput_ObjectCreated() throws JsonParseException, JsonMappingException, IOException { - Order order = mapper.readValue(new File("src/main/resources/orderInput.yaml"), Order.class); + Order order = mapper.readValue(new File("src/test/resources/yaml/orderInput.yaml"), Order.class); assertEquals("A001", order.getOrderNo()); assertEquals(LocalDate.parse("2019-04-17", DateTimeFormatter.ISO_DATE), order.getDate()); assertEquals("Customer, Joe", order.getCustomerName()); @@ -55,9 +53,9 @@ public class YamlUnitTest { LocalDate.parse("2019-04-18", DateTimeFormatter.ISO_DATE), "Customer, Jane", lines); - mapper.writeValue(new File("src/main/resources/orderOutput.yaml"), order); + mapper.writeValue(new File("src/test/resources/yaml/orderOutput.yaml"), order); - File outputYaml = new File("src/main/resources/orderOutput.yaml"); + File outputYaml = new File("src/test/resources/yaml/orderOutput.yaml"); assertTrue(outputYaml.exists()); } } diff --git a/jackson-2/src/test/resources/expectedCsvFromJson.csv b/jackson-conversions-2/src/test/resources/csv/expectedCsvFromJson.csv similarity index 100% rename from jackson-2/src/test/resources/expectedCsvFromJson.csv rename to jackson-conversions-2/src/test/resources/csv/expectedCsvFromJson.csv diff --git a/jackson-2/src/test/resources/expectedFormattedCsvFromJson.csv b/jackson-conversions-2/src/test/resources/csv/expectedFormattedCsvFromJson.csv similarity index 100% rename from jackson-2/src/test/resources/expectedFormattedCsvFromJson.csv rename to jackson-conversions-2/src/test/resources/csv/expectedFormattedCsvFromJson.csv diff --git a/jackson-2/src/test/resources/expectedJsonFromCsv.json b/jackson-conversions-2/src/test/resources/csv/expectedJsonFromCsv.json similarity index 100% rename from jackson-2/src/test/resources/expectedJsonFromCsv.json rename to jackson-conversions-2/src/test/resources/csv/expectedJsonFromCsv.json diff --git a/jackson/src/test/resources/deserialize-dynamic-object/embedded.json b/jackson-conversions-2/src/test/resources/deserialize-dynamic-object/embedded.json similarity index 100% rename from jackson/src/test/resources/deserialize-dynamic-object/embedded.json rename to jackson-conversions-2/src/test/resources/deserialize-dynamic-object/embedded.json diff --git a/jackson/src/test/resources/deserialize-dynamic-object/flat.json b/jackson-conversions-2/src/test/resources/deserialize-dynamic-object/flat.json similarity index 100% rename from jackson/src/test/resources/deserialize-dynamic-object/flat.json rename to jackson-conversions-2/src/test/resources/deserialize-dynamic-object/flat.json diff --git a/jackson-2/src/main/resources/orderInput.yaml b/jackson-conversions-2/src/test/resources/yaml/orderInput.yaml similarity index 100% rename from jackson-2/src/main/resources/orderInput.yaml rename to jackson-conversions-2/src/test/resources/yaml/orderInput.yaml diff --git a/jackson-conversions/README.md b/jackson-conversions/README.md new file mode 100644 index 0000000000..8e8e4af73f --- /dev/null +++ b/jackson-conversions/README.md @@ -0,0 +1,16 @@ +## Jackson Conversions + +This module contains articles about Jackson conversions. + +### Relevant Articles: +- [Jackson – Unmarshall to Collection/Array](https://www.baeldung.com/jackson-collection-array) +- [Jackson Date](https://www.baeldung.com/jackson-serialize-dates) +- [Jackson – Working with Maps and Nulls](https://www.baeldung.com/jackson-map-null-values-or-null-key) +- [Jackson – Decide What Fields Get Serialized/Deserialized](https://www.baeldung.com/jackson-field-serializable-deserializable-or-not) +- [XML Serialization and Deserialization with Jackson](https://www.baeldung.com/jackson-xml-serialization-and-deserialization) +- [Map Serialization and Deserialization with Jackson](https://www.baeldung.com/jackson-map) +- [How to Serialize and Deserialize Enums with Jackson](https://www.baeldung.com/jackson-serialize-enums) +- [Jackson – Marshall String to JsonNode](https://www.baeldung.com/jackson-json-to-jsonnode) +- [Mapping Nested Values with Jackson](https://www.baeldung.com/jackson-nested-values) +- [Deserialize Immutable Objects with Jackson](https://www.baeldung.com/jackson-deserialize-immutable-objects) +- More articles: [[next -->]](../jackson-conversions-2) diff --git a/jackson-conversions/pom.xml b/jackson-conversions/pom.xml new file mode 100644 index 0000000000..58489fc7b5 --- /dev/null +++ b/jackson-conversions/pom.xml @@ -0,0 +1,49 @@ + + 4.0.0 + jackson-conversions + 0.0.1-SNAPSHOT + jackson-conversions + + + com.baeldung + parent-java + 0.0.1-SNAPSHOT + ../parent-java + + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-joda + ${jackson.version} + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + ${jackson.version} + + + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + + + + + jackson-conversions + + + src/main/resources + true + + + + + diff --git a/jackson/src/test/java/com/baeldung/jackson/date/CustomDateDeserializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateDeserializer.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/date/CustomDateDeserializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateDeserializer.java diff --git a/jackson/src/test/java/com/baeldung/jackson/date/CustomDateSerializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateSerializer.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/date/CustomDateSerializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateSerializer.java diff --git a/jackson/src/test/java/com/baeldung/jackson/date/CustomDateTimeSerializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateTimeSerializer.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/date/CustomDateTimeSerializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomDateTimeSerializer.java diff --git a/jackson/src/test/java/com/baeldung/jackson/date/CustomLocalDateTimeSerializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomLocalDateTimeSerializer.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/date/CustomLocalDateTimeSerializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/date/CustomLocalDateTimeSerializer.java diff --git a/jackson/src/test/java/com/baeldung/jackson/date/Event.java b/jackson-conversions/src/main/java/com/baeldung/jackson/date/Event.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/date/Event.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/date/Event.java diff --git a/jackson/src/test/java/com/baeldung/jackson/date/EventWithFormat.java b/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithFormat.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/date/EventWithFormat.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithFormat.java diff --git a/jackson/src/test/java/com/baeldung/jackson/date/EventWithJodaTime.java b/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithJodaTime.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/date/EventWithJodaTime.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithJodaTime.java diff --git a/jackson/src/test/java/com/baeldung/jackson/date/EventWithLocalDateTime.java b/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithLocalDateTime.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/date/EventWithLocalDateTime.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithLocalDateTime.java diff --git a/jackson/src/test/java/com/baeldung/jackson/date/EventWithSerializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithSerializer.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/date/EventWithSerializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/date/EventWithSerializer.java diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/City.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/City.java similarity index 80% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/City.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/City.java index 2bbef534c3..794c73738a 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/City.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/City.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums; +package com.baeldung.jackson.enums.deserialization; public class City { diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/Distance.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/Distance.java similarity index 92% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/Distance.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/Distance.java index 2c96b6eb80..4e5a62a0a5 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/Distance.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/Distance.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums; +package com.baeldung.jackson.enums.deserialization; public enum Distance { diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/City.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/City.java similarity index 77% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/City.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/City.java index 36ef7e244a..d998c555d1 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/City.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/City.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums.customdeserializer; +package com.baeldung.jackson.enums.deserialization.customdeserializer; public class City { diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/CustomEnumDeserializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/CustomEnumDeserializer.java similarity index 94% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/CustomEnumDeserializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/CustomEnumDeserializer.java index bae0c0df34..5068e7e6ad 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/CustomEnumDeserializer.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/CustomEnumDeserializer.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums.customdeserializer; +package com.baeldung.jackson.enums.deserialization.customdeserializer; import java.io.IOException; import com.fasterxml.jackson.core.JsonParser; diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/Distance.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/Distance.java similarity index 91% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/Distance.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/Distance.java index 9cb3a0c391..a9b552a38d 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/customdeserializer/Distance.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/customdeserializer/Distance.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums.customdeserializer; +package com.baeldung.jackson.enums.deserialization.customdeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/City.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/City.java similarity index 77% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/City.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/City.java index 6a478dd263..a4fe575fa2 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/City.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/City.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums.jsoncreator; +package com.baeldung.jackson.enums.deserialization.jsoncreator; public class City { diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/Distance.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/Distance.java similarity index 94% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/Distance.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/Distance.java index 18235fb5c6..5a49b105d6 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsoncreator/Distance.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsoncreator/Distance.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums.jsoncreator; +package com.baeldung.jackson.enums.deserialization.jsoncreator; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/City.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/City.java similarity index 77% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/City.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/City.java index 7f763f97c4..2de67dbdc8 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/City.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/City.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums.jsonproperty; +package com.baeldung.jackson.enums.deserialization.jsonproperty; public class City { diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/Distance.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/Distance.java similarity index 93% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/Distance.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/Distance.java index e671a9ae5b..991aa38e25 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonproperty/Distance.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonproperty/Distance.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums.jsonproperty; +package com.baeldung.jackson.enums.deserialization.jsonproperty; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/City.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/City.java similarity index 78% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/City.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/City.java index 014668ea8c..e69fed642e 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/City.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/City.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums.jsonvalue; +package com.baeldung.jackson.enums.deserialization.jsonvalue; public class City { diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/Distance.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/Distance.java similarity index 91% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/Distance.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/Distance.java index 44bb5f20c3..c905868a9a 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/enums/jsonvalue/Distance.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/deserialization/jsonvalue/Distance.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.enums.jsonvalue; +package com.baeldung.jackson.enums.deserialization.jsonvalue; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/jackson/src/main/java/com/baeldung/jackson/enums/Distance.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/Distance.java similarity index 91% rename from jackson/src/main/java/com/baeldung/jackson/enums/Distance.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/Distance.java index 8026eedc44..18b154aaf1 100644 --- a/jackson/src/main/java/com/baeldung/jackson/enums/Distance.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/Distance.java @@ -1,6 +1,6 @@ -package com.baeldung.jackson.enums; +package com.baeldung.jackson.enums.serialization; -import com.baeldung.jackson.serialization.DistanceSerializer; +import com.baeldung.jackson.enums.serialization.DistanceSerializer; import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** diff --git a/jackson/src/main/java/com/baeldung/jackson/serialization/DistanceSerializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/DistanceSerializer.java similarity index 92% rename from jackson/src/main/java/com/baeldung/jackson/serialization/DistanceSerializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/DistanceSerializer.java index f5951dfd8e..5b7e6374b9 100644 --- a/jackson/src/main/java/com/baeldung/jackson/serialization/DistanceSerializer.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/serialization/DistanceSerializer.java @@ -1,8 +1,7 @@ -package com.baeldung.jackson.serialization; +package com.baeldung.jackson.enums.serialization; import java.io.IOException; -import com.baeldung.jackson.enums.Distance; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/DistanceEnumSimple.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumSimple.java similarity index 92% rename from jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/DistanceEnumSimple.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumSimple.java index 1118fb349a..e148f1b481 100644 --- a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/DistanceEnumSimple.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumSimple.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.dtos.withEnum; +package com.baeldung.jackson.enums.withEnum; public enum DistanceEnumSimple { KILOMETER("km", 1000), MILE("miles", 1609.34), METER("meters", 1), INCH("inches", 0.0254), CENTIMETER("cm", 0.01), MILLIMETER("mm", 0.001); diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/DistanceEnumWithJsonFormat.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithJsonFormat.java similarity index 93% rename from jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/DistanceEnumWithJsonFormat.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithJsonFormat.java index 7dc6bb559b..2961320e1e 100644 --- a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/DistanceEnumWithJsonFormat.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithJsonFormat.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.dtos.withEnum; +package com.baeldung.jackson.enums.withEnum; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/DistanceEnumWithValue.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithValue.java similarity index 93% rename from jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/DistanceEnumWithValue.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithValue.java index 69c476d8a5..6275efc7db 100644 --- a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/DistanceEnumWithValue.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/DistanceEnumWithValue.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.dtos.withEnum; +package com.baeldung.jackson.enums.withEnum; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/MyDtoWithEnumCustom.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumCustom.java similarity index 91% rename from jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/MyDtoWithEnumCustom.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumCustom.java index bf9b7db395..1fe09f22cb 100644 --- a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/MyDtoWithEnumCustom.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumCustom.java @@ -1,6 +1,6 @@ -package com.baeldung.jackson.dtos.withEnum; +package com.baeldung.jackson.enums.withEnum; -import com.baeldung.jackson.enums.Distance; +import com.baeldung.jackson.enums.serialization.Distance; public class MyDtoWithEnumCustom { diff --git a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/MyDtoWithEnumJsonFormat.java b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumJsonFormat.java similarity index 96% rename from jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/MyDtoWithEnumJsonFormat.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumJsonFormat.java index 8e2f1b835f..d80f457d4b 100644 --- a/jackson/src/test/java/com/baeldung/jackson/dtos/withEnum/MyDtoWithEnumJsonFormat.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/enums/withEnum/MyDtoWithEnumJsonFormat.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.dtos.withEnum; +package com.baeldung.jackson.enums.withEnum; public class MyDtoWithEnumJsonFormat { diff --git a/jackson/src/test/java/com/baeldung/jackson/field/MyDto.java b/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDto.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/field/MyDto.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDto.java diff --git a/jackson/src/test/java/com/baeldung/jackson/field/MyDtoAccessLevel.java b/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoAccessLevel.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/field/MyDtoAccessLevel.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoAccessLevel.java diff --git a/jackson/src/test/java/com/baeldung/jackson/field/MyDtoWithGetter.java b/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithGetter.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/field/MyDtoWithGetter.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithGetter.java diff --git a/jackson/src/test/java/com/baeldung/jackson/field/MyDtoWithSetter.java b/jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithSetter.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/field/MyDtoWithSetter.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/field/MyDtoWithSetter.java diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/immutable/Employee.java b/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Employee.java similarity index 89% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/immutable/Employee.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Employee.java index 44b10ee39b..3196f5962e 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/immutable/Employee.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Employee.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.immutable; +package com.baeldung.jackson.immutable; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/jackson/src/main/java/com/baeldung/jackson/deserialization/immutable/Person.java b/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Person.java similarity index 93% rename from jackson/src/main/java/com/baeldung/jackson/deserialization/immutable/Person.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Person.java index d9041720b6..17000734fe 100644 --- a/jackson/src/main/java/com/baeldung/jackson/deserialization/immutable/Person.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/immutable/Person.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.immutable; +package com.baeldung.jackson.immutable; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder; diff --git a/jackson/src/main/java/com/baeldung/jackson/entities/ClassWithAMap.java b/jackson-conversions/src/main/java/com/baeldung/jackson/map/ClassWithAMap.java similarity index 83% rename from jackson/src/main/java/com/baeldung/jackson/entities/ClassWithAMap.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/map/ClassWithAMap.java index 107d75eb0d..d945b34cdb 100644 --- a/jackson/src/main/java/com/baeldung/jackson/entities/ClassWithAMap.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/map/ClassWithAMap.java @@ -1,8 +1,7 @@ -package com.baeldung.jackson.entities; +package com.baeldung.jackson.map; import java.util.Map; -import com.baeldung.jackson.serialization.MyPairDeserializer; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; diff --git a/jackson/src/main/java/com/baeldung/jackson/entities/MyPair.java b/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPair.java similarity index 97% rename from jackson/src/main/java/com/baeldung/jackson/entities/MyPair.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPair.java index ca5960e0cf..867eb23bc2 100644 --- a/jackson/src/main/java/com/baeldung/jackson/entities/MyPair.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPair.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.entities; +package com.baeldung.jackson.map; import com.fasterxml.jackson.annotation.JsonValue; diff --git a/jackson/src/main/java/com/baeldung/jackson/serialization/MyPairDeserializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairDeserializer.java similarity index 82% rename from jackson/src/main/java/com/baeldung/jackson/serialization/MyPairDeserializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairDeserializer.java index 43bdc1c500..c631f47ffc 100644 --- a/jackson/src/main/java/com/baeldung/jackson/serialization/MyPairDeserializer.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairDeserializer.java @@ -1,8 +1,7 @@ -package com.baeldung.jackson.serialization; +package com.baeldung.jackson.map; import java.io.IOException; -import com.baeldung.jackson.entities.MyPair; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.KeyDeserializer; diff --git a/jackson/src/main/java/com/baeldung/jackson/serialization/MyPairSerializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairSerializer.java similarity index 89% rename from jackson/src/main/java/com/baeldung/jackson/serialization/MyPairSerializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairSerializer.java index fee1cafe16..c84bab104c 100644 --- a/jackson/src/main/java/com/baeldung/jackson/serialization/MyPairSerializer.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/map/MyPairSerializer.java @@ -1,9 +1,8 @@ -package com.baeldung.jackson.serialization; +package com.baeldung.jackson.map; import java.io.IOException; import java.io.StringWriter; -import com.baeldung.jackson.entities.MyPair; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonSerializer; diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDto.java b/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDto.java new file mode 100644 index 0000000000..cb026a50f8 --- /dev/null +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDto.java @@ -0,0 +1,54 @@ +package com.baeldung.jackson.mapnull; + +public class MyDto { + + private String stringValue; + private int intValue; + private boolean booleanValue; + + public MyDto() { + super(); + } + + public MyDto(final String stringValue, final int intValue, final boolean booleanValue) { + super(); + + this.stringValue = stringValue; + this.intValue = intValue; + this.booleanValue = booleanValue; + } + + // API + + public String getStringValue() { + return stringValue; + } + + public void setStringValue(final String stringValue) { + this.stringValue = stringValue; + } + + public int getIntValue() { + return intValue; + } + + public void setIntValue(final int intValue) { + this.intValue = intValue; + } + + public boolean isBooleanValue() { + return booleanValue; + } + + public void setBooleanValue(final boolean booleanValue) { + this.booleanValue = booleanValue; + } + + // + + @Override + public String toString() { + return "MyDto [stringValue=" + stringValue + ", intValue=" + intValue + ", booleanValue=" + booleanValue + "]"; + } + +} diff --git a/jackson-annotations/src/test/java/com/baeldung/jackson/ignore/dtos/MyDtoNullKeySerializer.java b/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDtoNullKeySerializer.java similarity index 94% rename from jackson-annotations/src/test/java/com/baeldung/jackson/ignore/dtos/MyDtoNullKeySerializer.java rename to jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDtoNullKeySerializer.java index dcd4070dba..1a5d794fac 100644 --- a/jackson-annotations/src/test/java/com/baeldung/jackson/ignore/dtos/MyDtoNullKeySerializer.java +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/mapnull/MyDtoNullKeySerializer.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.ignore.dtos; +package com.baeldung.jackson.mapnull; import java.io.IOException; diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/tocollection/MyDto.java b/jackson-conversions/src/main/java/com/baeldung/jackson/tocollection/MyDto.java new file mode 100644 index 0000000000..368dea5317 --- /dev/null +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/tocollection/MyDto.java @@ -0,0 +1,54 @@ +package com.baeldung.jackson.tocollection; + +public class MyDto { + + private String stringValue; + private int intValue; + private boolean booleanValue; + + public MyDto() { + super(); + } + + public MyDto(final String stringValue, final int intValue, final boolean booleanValue) { + super(); + + this.stringValue = stringValue; + this.intValue = intValue; + this.booleanValue = booleanValue; + } + + // API + + public String getStringValue() { + return stringValue; + } + + public void setStringValue(final String stringValue) { + this.stringValue = stringValue; + } + + public int getIntValue() { + return intValue; + } + + public void setIntValue(final int intValue) { + this.intValue = intValue; + } + + public boolean isBooleanValue() { + return booleanValue; + } + + public void setBooleanValue(final boolean booleanValue) { + this.booleanValue = booleanValue; + } + + // + + @Override + public String toString() { + return "MyDto [stringValue=" + stringValue + ", intValue=" + intValue + ", booleanValue=" + booleanValue + "]"; + } + +} diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Address.java b/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Address.java new file mode 100644 index 0000000000..1d6b24c9c7 --- /dev/null +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Address.java @@ -0,0 +1,33 @@ +package com.baeldung.jackson.xml; + +public class Address { + + String streetNumber; + String streetName; + String city; + + public String getStreetNumber() { + return streetNumber; + } + + public void setStreetNumber(String streetNumber) { + this.streetNumber = streetNumber; + } + + public String getStreetName() { + return streetName; + } + + public void setStreetName(String streetName) { + this.streetName = streetName; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + +} diff --git a/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Person.java b/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Person.java new file mode 100644 index 0000000000..add53a1cfd --- /dev/null +++ b/jackson-conversions/src/main/java/com/baeldung/jackson/xml/Person.java @@ -0,0 +1,47 @@ +package com.baeldung.jackson.xml; + +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; + +import java.util.ArrayList; +import java.util.List; + +@JacksonXmlRootElement(localName = "person") +public final class Person { + private String firstName; + private String lastName; + private List phoneNumbers = new ArrayList<>(); + private List
address = new ArrayList<>(); + + public List
getAddress() { + return address; + } + + public void setAddress(List
address) { + this.address = address; + } + + 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 List getPhoneNumbers() { + return phoneNumbers; + } + + public void setPhoneNumbers(List phoneNumbers) { + this.phoneNumbers = phoneNumbers; + } + +} \ No newline at end of file diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonDateUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/date/JacksonDateUnitTest.java similarity index 99% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonDateUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/date/JacksonDateUnitTest.java index 672ff5c6fd..a264dd52f2 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonDateUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/date/JacksonDateUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.test; +package com.baeldung.jackson.date; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertEquals; diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/DefaultEnumDeserializationUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/DefaultEnumDeserializationUnitTest.java similarity index 91% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/enums/DefaultEnumDeserializationUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/DefaultEnumDeserializationUnitTest.java index c7ce96e013..43e21100ea 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/DefaultEnumDeserializationUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/DefaultEnumDeserializationUnitTest.java @@ -1,7 +1,8 @@ -package com.baeldung.jackson.deserialization.enums; +package com.baeldung.jackson.enums.deserialization; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; + import org.junit.Test; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/customdeserializer/EnumCustomDeserializationUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/customdeserializer/EnumCustomDeserializationUnitTest.java similarity index 90% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/enums/customdeserializer/EnumCustomDeserializationUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/customdeserializer/EnumCustomDeserializationUnitTest.java index e8dbfa8df8..b0ceb5a6d8 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/customdeserializer/EnumCustomDeserializationUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/customdeserializer/EnumCustomDeserializationUnitTest.java @@ -1,7 +1,8 @@ -package com.baeldung.jackson.deserialization.enums.customdeserializer; +package com.baeldung.jackson.enums.deserialization.customdeserializer; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; + import org.junit.Test; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java similarity index 90% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java index d778cbe26b..1885040916 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsoncreator/EnumDeserializationUsingJsonCreatorUnitTest.java @@ -1,7 +1,8 @@ -package com.baeldung.jackson.deserialization.enums.jsoncreator; +package com.baeldung.jackson.enums.deserialization.jsoncreator; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; + import org.junit.Test; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java similarity index 90% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java index 134f4a29cc..3697669447 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonproperty/EnumDeserializationUsingJsonPropertyUnitTest.java @@ -1,7 +1,8 @@ -package com.baeldung.jackson.deserialization.enums.jsonproperty; +package com.baeldung.jackson.enums.deserialization.jsonproperty; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; + import org.junit.Test; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java similarity index 90% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java index 85afcb9a69..84ba40d018 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/enums/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/deserialization/jsonvalue/EnumDeserializationUsingJsonValueUnitTest.java @@ -1,7 +1,8 @@ -package com.baeldung.jackson.deserialization.enums.jsonvalue; +package com.baeldung.jackson.enums.deserialization.jsonvalue; import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; + import org.junit.Test; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonEnumSerializationUnitTest.java similarity index 92% rename from jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonEnumSerializationUnitTest.java index d4fb2401ed..b2cce15cfc 100644 --- a/jackson/src/test/java/com/baeldung/jackson/enums/JacksonEnumSerializationUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonEnumSerializationUnitTest.java @@ -1,8 +1,9 @@ -package com.baeldung.jackson.enums; +package com.baeldung.jackson.enums.serialization; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; import java.io.IOException; + import org.junit.Test; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonSerializationEnumsUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonSerializationEnumsUnitTest.java similarity index 85% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonSerializationEnumsUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonSerializationEnumsUnitTest.java index 0f57d26d8b..6b4a1ee3d4 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonSerializationEnumsUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/enums/serialization/JacksonSerializationEnumsUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.test; +package com.baeldung.jackson.enums.serialization; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.is; @@ -8,12 +8,12 @@ import java.io.IOException; import org.junit.Test; -import com.baeldung.jackson.dtos.withEnum.DistanceEnumSimple; -import com.baeldung.jackson.dtos.withEnum.DistanceEnumWithJsonFormat; -import com.baeldung.jackson.dtos.withEnum.DistanceEnumWithValue; -import com.baeldung.jackson.dtos.withEnum.MyDtoWithEnumCustom; -import com.baeldung.jackson.dtos.withEnum.MyDtoWithEnumJsonFormat; -import com.baeldung.jackson.enums.Distance; +import com.baeldung.jackson.enums.withEnum.DistanceEnumSimple; +import com.baeldung.jackson.enums.withEnum.DistanceEnumWithJsonFormat; +import com.baeldung.jackson.enums.withEnum.DistanceEnumWithValue; +import com.baeldung.jackson.enums.withEnum.MyDtoWithEnumCustom; +import com.baeldung.jackson.enums.withEnum.MyDtoWithEnumJsonFormat; +import com.baeldung.jackson.enums.serialization.Distance; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonFieldUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/field/JacksonFieldUnitTest.java similarity index 95% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonFieldUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/field/JacksonFieldUnitTest.java index ccc5905e88..4eb3cd5e0a 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonFieldUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/field/JacksonFieldUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.test; +package com.baeldung.jackson.field; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; @@ -7,10 +7,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import java.io.IOException; - -import com.baeldung.jackson.field.MyDtoAccessLevel; -import com.baeldung.jackson.field.MyDtoWithSetter; -import com.baeldung.jackson.field.MyDtoWithGetter; import org.junit.Test; import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/immutable/ImmutableObjectDeserializationUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/immutable/ImmutableObjectDeserializationUnitTest.java similarity index 95% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/immutable/ImmutableObjectDeserializationUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/immutable/ImmutableObjectDeserializationUnitTest.java index 1252179e3a..ed80b15b4f 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/immutable/ImmutableObjectDeserializationUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/immutable/ImmutableObjectDeserializationUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization.immutable; +package com.baeldung.jackson.immutable; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonMapDeserializeUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapDeserializeUnitTest.java similarity index 93% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonMapDeserializeUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapDeserializeUnitTest.java index 1c3e95241a..0e59eb68bf 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/JacksonMapDeserializeUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapDeserializeUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.deserialization; +package com.baeldung.jackson.map; import java.io.IOException; import java.util.HashMap; @@ -7,8 +7,6 @@ import java.util.Map; import org.junit.Assert; import org.junit.Test; -import com.baeldung.jackson.entities.ClassWithAMap; -import com.baeldung.jackson.entities.MyPair; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.JsonMappingException; diff --git a/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonMapSerializeUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapSerializeUnitTest.java similarity index 95% rename from jackson/src/test/java/com/baeldung/jackson/serialization/JacksonMapSerializeUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapSerializeUnitTest.java index e67336f6f3..0545e53201 100644 --- a/jackson/src/test/java/com/baeldung/jackson/serialization/JacksonMapSerializeUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/map/JacksonMapSerializeUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.serialization; +package com.baeldung.jackson.map; import java.util.HashMap; import java.util.Map; @@ -6,7 +6,6 @@ import java.util.Map; import org.junit.Assert; import org.junit.Test; -import com.baeldung.jackson.entities.MyPair; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/mapnull/JacksonMapNullUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/mapnull/JacksonMapNullUnitTest.java new file mode 100644 index 0000000000..274100162a --- /dev/null +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/mapnull/JacksonMapNullUnitTest.java @@ -0,0 +1,109 @@ +package com.baeldung.jackson.mapnull; + +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.BeanPropertyWriter; +import com.fasterxml.jackson.databind.ser.FilterProvider; +import com.fasterxml.jackson.databind.ser.PropertyFilter; +import com.fasterxml.jackson.databind.ser.PropertyWriter; +import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter; +import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider; +import org.junit.Test; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.not; +import static org.junit.Assert.assertThat; + +public class JacksonMapNullUnitTest { + + @Test + public final void givenIgnoringMapNullValue_whenWritingMapObjectWithNullValue_thenIgnored() throws JsonProcessingException { + final ObjectMapper mapper = new ObjectMapper(); + // mapper.configure(SerializationFeature.WRITE_NULL_MAP_VALUES, false); + mapper.setSerializationInclusion(Include.NON_NULL); + + final MyDto dtoObject1 = new MyDto(); + + final Map dtoMap = new HashMap(); + dtoMap.put("dtoObject1", dtoObject1); + dtoMap.put("dtoObject2", null); + + final String dtoMapAsString = mapper.writeValueAsString(dtoMap); + + assertThat(dtoMapAsString, containsString("dtoObject1")); + assertThat(dtoMapAsString, not(containsString("dtoObject2"))); + System.out.println(dtoMapAsString); + } + + @Test + public final void givenIgnoringMapValueObjectWithNullField_whenWritingMapValueObjectWithNullField_thenIgnored() throws JsonProcessingException { + final ObjectMapper mapper = new ObjectMapper(); + mapper.setSerializationInclusion(Include.NON_NULL); + + final MyDto dtoObject = new MyDto(); + + final Map dtoMap = new HashMap(); + dtoMap.put("dtoObject", dtoObject); + + final String dtoMapAsString = mapper.writeValueAsString(dtoMap); + + assertThat(dtoMapAsString, containsString("dtoObject")); + assertThat(dtoMapAsString, not(containsString("stringValue"))); + System.out.println(dtoMapAsString); + } + + @Test + public final void givenAllowingMapObjectWithNullKey_whenWriting_thenCorrect() throws JsonProcessingException { + final ObjectMapper mapper = new ObjectMapper(); + mapper.getSerializerProvider() + .setNullKeySerializer(new MyDtoNullKeySerializer()); + + final MyDto dtoObject1 = new MyDto(); + dtoObject1.setStringValue("dtoObjectString1"); + final MyDto dtoObject2 = new MyDto(); + dtoObject2.setStringValue("dtoObjectString2"); + + final Map dtoMap = new HashMap(); + dtoMap.put(null, dtoObject1); + dtoMap.put("obj2", dtoObject2); + + final String dtoMapAsString = mapper.writeValueAsString(dtoMap); + + System.out.println(dtoMapAsString); + assertThat(dtoMapAsString, containsString("\"\"")); + assertThat(dtoMapAsString, containsString("dtoObjectString1")); + assertThat(dtoMapAsString, containsString("obj2")); + } + + @Test + public final void givenAllowingMapObjectOneNullKey_whenWritingMapObjectWithTwoNullKeys_thenOverride() throws JsonProcessingException { + final ObjectMapper mapper = new ObjectMapper(); + mapper.getSerializerProvider() + .setNullKeySerializer(new MyDtoNullKeySerializer()); + + final MyDto dtoObject1 = new MyDto(); + dtoObject1.setStringValue("dtoObject1String"); + + final MyDto dtoObject2 = new MyDto(); + dtoObject2.setStringValue("dtoObject2String"); + + final Map dtoMap = new HashMap(); + dtoMap.put(null, dtoObject1); + dtoMap.put(null, dtoObject2); + + final String dtoMapAsString = mapper.writeValueAsString(dtoMap); + + assertThat(dtoMapAsString, not(containsString("dtoObject1String"))); + assertThat(dtoMapAsString, containsString("dtoObject2String")); + System.out.println(dtoMapAsString); + } + +} diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/nested/DeserializeWithNestedPropertiesUnitTest.java similarity index 95% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/nested/DeserializeWithNestedPropertiesUnitTest.java index 037bc7e880..18fd2463e9 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/DeserializeWithNestedPropertiesUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/nested/DeserializeWithNestedPropertiesUnitTest.java @@ -1,70 +1,70 @@ -package com.baeldung.jackson.deserialization.nested; - -import static org.junit.Assert.*; - -import java.io.IOException; - -import org.junit.Test; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; - -public class DeserializeWithNestedPropertiesUnitTest { - - private String SOURCE_JSON = "{\"id\":\"957c43f2-fa2e-42f9-bf75-6e3d5bb6960a\",\"name\":\"The Best Product\",\"brand\":{\"id\":\"9bcd817d-0141-42e6-8f04-e5aaab0980b6\",\"name\":\"ACME Products\",\"owner\":{\"id\":\"b21a80b1-0c09-4be3-9ebd-ea3653511c13\",\"name\":\"Ultimate Corp, Inc.\"}}}"; - - @Test - public void whenUsingAnnotations_thenOk() throws IOException { - Product product = new ObjectMapper().readerFor(Product.class) - .readValue(SOURCE_JSON); - - assertEquals(product.getName(), "The Best Product"); - assertEquals(product.getBrandName(), "ACME Products"); - assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); - } - - @Test - public void whenUsingJsonNode_thenOk() throws IOException { - JsonNode productNode = new ObjectMapper().readTree(SOURCE_JSON); - - Product product = new Product(); - product.setId(productNode.get("id") - .textValue()); - product.setName(productNode.get("name") - .textValue()); - product.setBrandName(productNode.get("brand") - .get("name") - .textValue()); - product.setOwnerName(productNode.get("brand") - .get("owner") - .get("name") - .textValue()); - - assertEquals(product.getName(), "The Best Product"); - assertEquals(product.getBrandName(), "ACME Products"); - assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); - } - - @Test - public void whenUsingDeserializerManuallyRegistered_thenOk() throws IOException { - ObjectMapper mapper = new ObjectMapper(); - SimpleModule module = new SimpleModule(); - module.addDeserializer(Product.class, new ProductDeserializer()); - mapper.registerModule(module); - - Product product = mapper.readValue(SOURCE_JSON, Product.class); - assertEquals(product.getName(), "The Best Product"); - assertEquals(product.getBrandName(), "ACME Products"); - assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); - } - - @Test - public void whenUsingDeserializerAutoRegistered_thenOk() throws IOException { - ObjectMapper mapper = new ObjectMapper(); - Product product = mapper.readValue(SOURCE_JSON, Product.class); - assertEquals(product.getName(), "The Best Product"); - assertEquals(product.getBrandName(), "ACME Products"); - assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); - } -} +package com.baeldung.jackson.nested; + +import static org.junit.Assert.*; + +import java.io.IOException; + +import org.junit.Test; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.module.SimpleModule; + +public class DeserializeWithNestedPropertiesUnitTest { + + private String SOURCE_JSON = "{\"id\":\"957c43f2-fa2e-42f9-bf75-6e3d5bb6960a\",\"name\":\"The Best Product\",\"brand\":{\"id\":\"9bcd817d-0141-42e6-8f04-e5aaab0980b6\",\"name\":\"ACME Products\",\"owner\":{\"id\":\"b21a80b1-0c09-4be3-9ebd-ea3653511c13\",\"name\":\"Ultimate Corp, Inc.\"}}}"; + + @Test + public void whenUsingAnnotations_thenOk() throws IOException { + Product product = new ObjectMapper().readerFor(Product.class) + .readValue(SOURCE_JSON); + + assertEquals(product.getName(), "The Best Product"); + assertEquals(product.getBrandName(), "ACME Products"); + assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); + } + + @Test + public void whenUsingJsonNode_thenOk() throws IOException { + JsonNode productNode = new ObjectMapper().readTree(SOURCE_JSON); + + Product product = new Product(); + product.setId(productNode.get("id") + .textValue()); + product.setName(productNode.get("name") + .textValue()); + product.setBrandName(productNode.get("brand") + .get("name") + .textValue()); + product.setOwnerName(productNode.get("brand") + .get("owner") + .get("name") + .textValue()); + + assertEquals(product.getName(), "The Best Product"); + assertEquals(product.getBrandName(), "ACME Products"); + assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); + } + + @Test + public void whenUsingDeserializerManuallyRegistered_thenOk() throws IOException { + ObjectMapper mapper = new ObjectMapper(); + SimpleModule module = new SimpleModule(); + module.addDeserializer(Product.class, new ProductDeserializer()); + mapper.registerModule(module); + + Product product = mapper.readValue(SOURCE_JSON, Product.class); + assertEquals(product.getName(), "The Best Product"); + assertEquals(product.getBrandName(), "ACME Products"); + assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); + } + + @Test + public void whenUsingDeserializerAutoRegistered_thenOk() throws IOException { + ObjectMapper mapper = new ObjectMapper(); + Product product = mapper.readValue(SOURCE_JSON, Product.class); + assertEquals(product.getName(), "The Best Product"); + assertEquals(product.getBrandName(), "ACME Products"); + assertEquals(product.getOwnerName(), "Ultimate Corp, Inc."); + } +} diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/Product.java b/jackson-conversions/src/test/java/com/baeldung/jackson/nested/Product.java similarity index 91% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/nested/Product.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/nested/Product.java index 0020afea0f..5aeb53f7e8 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/Product.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/nested/Product.java @@ -1,55 +1,55 @@ -package com.baeldung.jackson.deserialization.nested; - -import java.util.Map; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -@JsonDeserialize(using = ProductDeserializer.class) -public class Product { - - private String id; - private String name; - private String brandName; - private String ownerName; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getBrandName() { - return brandName; - } - - public void setBrandName(String brandName) { - this.brandName = brandName; - } - - public String getOwnerName() { - return ownerName; - } - - public void setOwnerName(String ownerName) { - this.ownerName = ownerName; - } - - @SuppressWarnings("unchecked") - @JsonProperty("brand") - private void unpackNested(Map brand) { - this.brandName = (String) brand.get("name"); - Map owner = (Map) brand.get("owner"); - this.ownerName = owner.get("name"); - } +package com.baeldung.jackson.nested; + +import java.util.Map; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; + +@JsonDeserialize(using = ProductDeserializer.class) +public class Product { + + private String id; + private String name; + private String brandName; + private String ownerName; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getBrandName() { + return brandName; + } + + public void setBrandName(String brandName) { + this.brandName = brandName; + } + + public String getOwnerName() { + return ownerName; + } + + public void setOwnerName(String ownerName) { + this.ownerName = ownerName; + } + + @SuppressWarnings("unchecked") + @JsonProperty("brand") + private void unpackNested(Map brand) { + this.brandName = (String) brand.get("name"); + Map owner = (Map) brand.get("owner"); + this.ownerName = owner.get("name"); + } } \ No newline at end of file diff --git a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/ProductDeserializer.java b/jackson-conversions/src/test/java/com/baeldung/jackson/nested/ProductDeserializer.java similarity index 92% rename from jackson/src/test/java/com/baeldung/jackson/deserialization/nested/ProductDeserializer.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/nested/ProductDeserializer.java index daabae6cda..191bfbf0d8 100644 --- a/jackson/src/test/java/com/baeldung/jackson/deserialization/nested/ProductDeserializer.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/nested/ProductDeserializer.java @@ -1,40 +1,40 @@ -package com.baeldung.jackson.deserialization.nested; - -import java.io.IOException; - -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; - -@SuppressWarnings("serial") -public class ProductDeserializer extends StdDeserializer { - - public ProductDeserializer() { - this(null); - } - - public ProductDeserializer(Class vc) { - super(vc); - } - - @Override - public Product deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { - JsonNode productNode = jp.getCodec() - .readTree(jp); - Product product = new Product(); - product.setId(productNode.get("id") - .textValue()); - product.setName(productNode.get("name") - .textValue()); - product.setBrandName(productNode.get("brand") - .get("name") - .textValue()); - product.setOwnerName(productNode.get("brand") - .get("owner") - .get("name") - .textValue()); - return product; - } -} +package com.baeldung.jackson.nested; + +import java.io.IOException; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; + +@SuppressWarnings("serial") +public class ProductDeserializer extends StdDeserializer { + + public ProductDeserializer() { + this(null); + } + + public ProductDeserializer(Class vc) { + super(vc); + } + + @Override + public Product deserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException { + JsonNode productNode = jp.getCodec() + .readTree(jp); + Product product = new Product(); + product.setId(productNode.get("id") + .textValue()); + product.setName(productNode.get("name") + .textValue()); + product.setBrandName(productNode.get("brand") + .get("name") + .textValue()); + product.setOwnerName(productNode.get("brand") + .get("owner") + .get("name") + .textValue()); + return product; + } +} diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonCollectionDeserializationUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/tocollection/JacksonCollectionDeserializationUnitTest.java similarity index 97% rename from jackson/src/test/java/com/baeldung/jackson/test/JacksonCollectionDeserializationUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/tocollection/JacksonCollectionDeserializationUnitTest.java index 0de3a1de82..b1e8e48a95 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonCollectionDeserializationUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/tocollection/JacksonCollectionDeserializationUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.jackson.test; +package com.baeldung.jackson.tocollection; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertThat; @@ -6,8 +6,6 @@ import static org.junit.Assert.assertThat; import java.io.IOException; import java.util.LinkedHashMap; import java.util.List; - -import com.baeldung.jackson.dtos.MyDto; import org.junit.Test; import com.fasterxml.jackson.core.JsonParseException; diff --git a/jackson-conversions/src/test/java/com/baeldung/jackson/tojsonnode/StringToJsonNodeUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/tojsonnode/StringToJsonNodeUnitTest.java new file mode 100644 index 0000000000..3d2423c85c --- /dev/null +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/tojsonnode/StringToJsonNodeUnitTest.java @@ -0,0 +1,51 @@ +package com.baeldung.jackson.tojsonnode; + +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonParser; +import org.junit.Test; + +import java.io.IOException; + +import static org.hamcrest.Matchers.equalTo; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertThat; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; + +public class StringToJsonNodeUnitTest { + + @Test + public final void whenParsingJsonStringIntoJsonNode_thenCorrect() throws JsonParseException, IOException { + final String jsonString = "{\"k1\":\"v1\",\"k2\":\"v2\"}"; + + final ObjectMapper mapper = new ObjectMapper(); + final JsonNode actualObj = mapper.readTree(jsonString); + + assertNotNull(actualObj); + } + + @Test + public final void givenUsingLowLevelDetails_whenParsingJsonStringIntoJsonNode_thenCorrect() throws JsonParseException, IOException { + final String jsonString = "{\"k1\":\"v1\",\"k2\":\"v2\"}"; + + final ObjectMapper mapper = new ObjectMapper(); + final JsonFactory factory = mapper.getFactory(); + final JsonParser parser = factory.createParser(jsonString); + final JsonNode actualObj = mapper.readTree(parser); + + assertNotNull(actualObj); + } + + @Test + public final void givenTheJsonNode_whenRetrievingDataFromId_thenCorrect() throws JsonParseException, IOException { + final String jsonString = "{\"k1\":\"v1\",\"k2\":\"v2\"}"; + final ObjectMapper mapper = new ObjectMapper(); + final JsonNode actualObj = mapper.readTree(jsonString); + + // When + final JsonNode jsonNode1 = actualObj.get("k1"); + assertThat(jsonNode1.textValue(), equalTo("v1")); + } + +} diff --git a/jackson/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java b/jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java similarity index 98% rename from jackson/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java rename to jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java index 1d430e9758..74ba28d996 100644 --- a/jackson/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java +++ b/jackson-conversions/src/test/java/com/baeldung/jackson/xml/XMLSerializeDeserializeUnitTest.java @@ -16,8 +16,6 @@ import java.util.List; import org.junit.Test; -import com.baeldung.jackson.dtos.Address; -import com.baeldung.jackson.dtos.Person; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.dataformat.xml.XmlMapper; diff --git a/jackson/src/test/resources/simple_bean.xml b/jackson-conversions/src/test/resources/simple_bean.xml similarity index 100% rename from jackson/src/test/resources/simple_bean.xml rename to jackson-conversions/src/test/resources/simple_bean.xml diff --git a/jackson-simple/README.md b/jackson-simple/README.md index 8a37dd073f..558b506c8a 100644 --- a/jackson-simple/README.md +++ b/jackson-simple/README.md @@ -7,6 +7,3 @@ This module contains articles about Jackson that are also part of the Jackson Eb The "REST With Spring" Classes: http://bit.ly/restwithspring ### Relevant Articles: -- [Jackson Unmarshalling json with Unknown Properties](https://www.baeldung.com/jackson-deserialize-json-unknown-properties) -- [Intro to the Jackson ObjectMapper](https://www.baeldung.com/jackson-object-mapper-tutorial) -- [Ignore Null Fields with Jackson](https://www.baeldung.com/jackson-ignore-null-fields) diff --git a/jackson/README.md b/jackson/README.md index f2aed46145..72e82c26db 100644 --- a/jackson/README.md +++ b/jackson/README.md @@ -8,26 +8,12 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring ### Relevant Articles: -- [Jackson – Unmarshall to Collection/Array](https://www.baeldung.com/jackson-collection-array) - [Jackson – Custom Serializer](https://www.baeldung.com/jackson-custom-serialization) - [Getting Started with Custom Deserialization in Jackson](https://www.baeldung.com/jackson-deserialization) -- [Jackson Date](https://www.baeldung.com/jackson-serialize-dates) - [Jackson JSON Tutorial](https://www.baeldung.com/jackson) -- [Jackson – Working with Maps and nulls](https://www.baeldung.com/jackson-map-null-values-or-null-key) -- [Jackson – Decide What Fields Get Serialized/Deserialized](https://www.baeldung.com/jackson-field-serializable-deserializable-or-not) - [Jackson vs Gson](https://www.baeldung.com/jackson-vs-gson) -- [XML Serialization and Deserialization with Jackson](https://www.baeldung.com/jackson-xml-serialization-and-deserialization) -- [Inheritance with Jackson](https://www.baeldung.com/jackson-inheritance) - [Using Optional with Jackson](https://www.baeldung.com/jackson-optional) -- [Map Serialization and Deserialization with Jackson](https://www.baeldung.com/jackson-map) -- [Jackson Streaming API](https://www.baeldung.com/jackson-streaming-api) -- [How To Serialize and Deserialize Enums with Jackson](https://www.baeldung.com/jackson-serialize-enums) -- [Jackson – Marshall String to JsonNode](https://www.baeldung.com/jackson-json-to-jsonnode) -- [Jackson – Unmarshall to Collection/Array](https://www.baeldung.com/jackson-collection-array) - [Serialize Only Fields that meet a Custom Criteria with Jackson](https://www.baeldung.com/jackson-serialize-field-custom-criteria) -- [Mapping Nested Values with Jackson](https://www.baeldung.com/jackson-nested-values) -- [Convert XML to JSON Using Jackson](https://www.baeldung.com/jackson-convert-xml-json) -- [Deserialize Immutable Objects with Jackson](https://www.baeldung.com/jackson-deserialize-immutable-objects) -- [Mapping a Dynamic JSON Object with Jackson](https://www.baeldung.com/jackson-mapping-dynamic-object) +- [Intro to the Jackson ObjectMapper](https://www.baeldung.com/jackson-object-mapper-tutorial) +- [Inheritance with Jackson](https://www.baeldung.com/jackson-inheritance) - More articles: [[next -->]](/../jackson-2) - diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceAnnotationStructure.java b/jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceAnnotationStructure.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceAnnotationStructure.java rename to jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceAnnotationStructure.java diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceMixinOrIntrospection.java b/jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceMixinOrIntrospection.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/IgnoranceMixinOrIntrospection.java rename to jackson/src/main/java/com/baeldung/jackson/inheritance/IgnoranceMixinOrIntrospection.java diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeConstructorStructure.java b/jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConstructorStructure.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeConstructorStructure.java rename to jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConstructorStructure.java diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeConversionStructure.java b/jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConversionStructure.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/SubTypeConversionStructure.java rename to jackson/src/main/java/com/baeldung/jackson/inheritance/SubTypeConversionStructure.java diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoAnnotatedStructure.java b/jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoAnnotatedStructure.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoAnnotatedStructure.java rename to jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoAnnotatedStructure.java diff --git a/jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoStructure.java b/jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoStructure.java similarity index 100% rename from jackson/src/test/java/com/baeldung/jackson/inheritance/TypeInfoStructure.java rename to jackson/src/main/java/com/baeldung/jackson/inheritance/TypeInfoStructure.java diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java b/jackson/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java similarity index 100% rename from jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java rename to jackson/src/main/java/com/baeldung/jackson/objectmapper/CustomCarDeserializer.java diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java b/jackson/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java similarity index 100% rename from jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java rename to jackson/src/main/java/com/baeldung/jackson/objectmapper/CustomCarSerializer.java diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/dto/Car.java b/jackson/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java similarity index 100% rename from jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/dto/Car.java rename to jackson/src/main/java/com/baeldung/jackson/objectmapper/dto/Car.java diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/dto/Request.java b/jackson/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java similarity index 100% rename from jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/dto/Request.java rename to jackson/src/main/java/com/baeldung/jackson/objectmapper/dto/Request.java diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java similarity index 99% rename from jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java rename to jackson/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java index a339ddf2c5..77940df60b 100644 --- a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/objectmapper/JavaReadWriteJsonExampleUnitTest.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; public class JavaReadWriteJsonExampleUnitTest { + @Rule public TemporaryFolder folder = new TemporaryFolder(); diff --git a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java similarity index 99% rename from jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java rename to jackson/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java index fcfee98123..52ebd05bfe 100644 --- a/jackson-simple/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/objectmapper/SerializationDeserializationFeatureUnitTest.java @@ -19,6 +19,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; public class SerializationDeserializationFeatureUnitTest { + final String EXAMPLE_JSON = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }"; final String JSON_CAR = "{ \"color\" : \"Black\", \"type\" : \"Fiat\", \"year\" : \"1970\" }"; final String JSON_ARRAY = "[{ \"color\" : \"Black\", \"type\" : \"BMW\" }, { \"color\" : \"Red\", \"type\" : \"BMW\" }]"; diff --git a/jackson/src/test/java/com/baeldung/jackson/test/JacksonDeserializationUnitTest.java b/jackson/src/test/java/com/baeldung/jackson/test/JacksonDeserializationUnitTest.java index 035ff8ca9c..7bb40cbef9 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/JacksonDeserializationUnitTest.java +++ b/jackson/src/test/java/com/baeldung/jackson/test/JacksonDeserializationUnitTest.java @@ -17,7 +17,6 @@ import com.baeldung.jackson.deserialization.ItemDeserializer; import com.baeldung.jackson.dtos.Item; import com.baeldung.jackson.dtos.ItemWithSerializer; import com.baeldung.jackson.dtos.MyDto; -import com.baeldung.jackson.dtos.ignore.MyDtoIgnoreUnknown; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; @@ -54,91 +53,6 @@ public class JacksonDeserializationUnitTest { assertThat(readValue.isBooleanValue(), equalTo(true)); } - // tests - json with unknown fields - - @Test(expected = UnrecognizedPropertyException.class) - public final void givenJsonHasUnknownValues_whenDeserializingAJsonToAClass_thenExceptionIsThrown() throws JsonParseException, JsonMappingException, IOException { - final String jsonAsString = "{\"stringValue\":\"a\",\"intValue\":1,\"booleanValue\":true,\"stringValue2\":\"something\"}"; - final ObjectMapper mapper = new ObjectMapper(); - - final MyDto readValue = mapper.readValue(jsonAsString, MyDto.class); - - assertNotNull(readValue); - assertThat(readValue.getStringValue(), equalTo("a")); - assertThat(readValue.isBooleanValue(), equalTo(true)); - assertThat(readValue.getIntValue(), equalTo(1)); - } - - @Test - public final void givenJsonHasUnknownValuesButJacksonIsIgnoringUnknownFields_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException { - final String jsonAsString = // @formatter:off - "{\"stringValue\":\"a\"," + - "\"intValue\":1," + - "\"booleanValue\":true," + - "\"stringValue2\":\"something\"}"; // @formatter:on - final ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - - final MyDto readValue = mapper.readValue(jsonAsString, MyDto.class); - - assertNotNull(readValue); - assertThat(readValue.getStringValue(), equalTo("a")); - assertThat(readValue.isBooleanValue(), equalTo(true)); - assertThat(readValue.getIntValue(), equalTo(1)); - } - - @Test - public final void givenJsonHasUnknownValuesButUnknownFieldsAreIgnoredOnClass_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException { - final String jsonAsString = // @formatter:off - "{\"stringValue\":\"a\"," + - "\"intValue\":1," + - "\"booleanValue\":true," + - "\"stringValue2\":\"something\"}"; // @formatter:on - final ObjectMapper mapper = new ObjectMapper(); - - final MyDtoIgnoreUnknown readValue = mapper.readValue(jsonAsString, MyDtoIgnoreUnknown.class); - - assertNotNull(readValue); - assertThat(readValue.getStringValue(), equalTo("a")); - assertThat(readValue.isBooleanValue(), equalTo(true)); - assertThat(readValue.getIntValue(), equalTo(1)); - } - - // to JsonNode - - @Test - public final void whenParsingJsonStringIntoJsonNode_thenCorrect() throws JsonParseException, IOException { - final String jsonString = "{\"k1\":\"v1\",\"k2\":\"v2\"}"; - - final ObjectMapper mapper = new ObjectMapper(); - final JsonNode actualObj = mapper.readTree(jsonString); - - assertNotNull(actualObj); - } - - @Test - public final void givenUsingLowLevelDetails_whenParsingJsonStringIntoJsonNode_thenCorrect() throws JsonParseException, IOException { - final String jsonString = "{\"k1\":\"v1\",\"k2\":\"v2\"}"; - - final ObjectMapper mapper = new ObjectMapper(); - final JsonFactory factory = mapper.getFactory(); - final JsonParser parser = factory.createParser(jsonString); - final JsonNode actualObj = mapper.readTree(parser); - - assertNotNull(actualObj); - } - - @Test - public final void givenTheJsonNode_whenRetrievingDataFromId_thenCorrect() throws JsonParseException, IOException { - final String jsonString = "{\"k1\":\"v1\",\"k2\":\"v2\"}"; - final ObjectMapper mapper = new ObjectMapper(); - final JsonNode actualObj = mapper.readTree(jsonString); - - // When - final JsonNode jsonNode1 = actualObj.get("k1"); - assertThat(jsonNode1.textValue(), equalTo("v1")); - } - // custom deserialization @Test diff --git a/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java b/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java index e783c67f5b..af99fed5d8 100644 --- a/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java +++ b/jackson/src/test/java/com/baeldung/jackson/test/UnitTestSuite.java @@ -7,13 +7,10 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({ // @formatter:off - JacksonCollectionDeserializationUnitTest.class - ,JacksonSerializationEnumsUnitTest.class - ,JacksonDeserializationUnitTest.class + JacksonDeserializationUnitTest.class ,JacksonDeserializationUnitTest.class ,JacksonPrettyPrintUnitTest.class ,SandboxUnitTest.class - ,JacksonFieldUnitTest.class }) // @formatter:on public class UnitTestSuite { } \ No newline at end of file diff --git a/jackson-simple/src/test/resources/json_car.json b/jackson/src/test/resources/json_car.json similarity index 100% rename from jackson-simple/src/test/resources/json_car.json rename to jackson/src/test/resources/json_car.json diff --git a/json/pom.xml b/json/pom.xml index eddbdee81e..3ed13d0800 100644 --- a/json/pom.xml +++ b/json/pom.xml @@ -29,6 +29,11 @@ fastjson ${fastjson.version} + + org.json + json + ${json.version} + com.google.code.gson gson diff --git a/kotlin-libraries/pom.xml b/kotlin-libraries/pom.xml index 7099166674..5fb8049a8e 100644 --- a/kotlin-libraries/pom.xml +++ b/kotlin-libraries/pom.xml @@ -56,7 +56,6 @@ org.junit.platform junit-platform-runner - ${junit.platform.version} test @@ -78,7 +77,6 @@ org.assertj assertj-core - ${assertj.version} test @@ -94,8 +92,7 @@ com.h2database h2 - ${h2.version} - + io.arrow-kt @@ -125,7 +122,6 @@ junit junit - ${junit.version} test @@ -133,13 +129,11 @@ net.bytebuddy byte-buddy - ${byte-buddy.version} compile net.bytebuddy byte-buddy-agent - ${byte-buddy.version} compile diff --git a/libraries-3/pom.xml b/libraries-3/pom.xml index 214e87287d..c8980fd309 100644 --- a/libraries-3/pom.xml +++ b/libraries-3/pom.xml @@ -12,22 +12,6 @@ 1.0.0-SNAPSHOT - - - jboss-public-repository-group - JBoss Public Repository Group - http://repository.jboss.org/nexus/content/groups/public/ - - true - never - - - true - daily - - - - com.beust @@ -44,8 +28,5 @@ 1.78 1.18.6 - UTF-8 - 1.8 - 1.8 diff --git a/libraries-apache-commons/pom.xml b/libraries-apache-commons/pom.xml index f83a8c7304..a6dc82b479 100644 --- a/libraries-apache-commons/pom.xml +++ b/libraries-apache-commons/pom.xml @@ -48,15 +48,10 @@ ${common-math3.version} - commons-net - commons-net - ${commons-net.version} - - com.h2database h2 ${h2.version} - + org.knowm.xchart xchart @@ -71,9 +66,7 @@ 1.2 3.6.2 1.6 - 1.10.L001 3.5.2 - 3.6 3.6.1 diff --git a/libraries-data-2/pom.xml b/libraries-data-2/pom.xml index e79a2d98e0..00c6f1b4fc 100644 --- a/libraries-data-2/pom.xml +++ b/libraries-data-2/pom.xml @@ -87,11 +87,6 @@ spring-web ${spring.version} - - com.google.api-client - google-api-client - ${google-api.version} - com.googlecode.jmapper-framework jmapper-core @@ -153,7 +148,6 @@ 9.1.5.Final 2.9.8 4.3.8.RELEASE - 1.23.0 1.6.0.1 4.0.0 1.1.0 diff --git a/libraries-data-db/pom.xml b/libraries-data-db/pom.xml index 185f23124d..767b8b79ba 100644 --- a/libraries-data-db/pom.xml +++ b/libraries-data-db/pom.xml @@ -54,21 +54,11 @@ datanucleus-maven-plugin ${datanucleus-maven-plugin.version} - - org.datanucleus - datanucleus-xml - ${datanucleus-xml.version} - org.datanucleus datanucleus-jdo-query ${datanucleus-jdo-query.version} - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - com.h2database h2 @@ -218,10 +208,8 @@ 5.0 5.1.1 5.0.2 - 5.0.0-release 5.0.4 3.2.0-m7 - 1.7.25 2.7.2 11.22.4 diff --git a/libraries-data-io/pom.xml b/libraries-data-io/pom.xml index 0e3029f565..dcc8fee3ad 100644 --- a/libraries-data-io/pom.xml +++ b/libraries-data-io/pom.xml @@ -35,11 +35,6 @@ ${opencsv.version} - - com.google.api-client - google-api-client - ${google-api.version} - com.google.oauth-client google-oauth-client-jetty diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml index 8e5360dea3..6f9b6388fc 100644 --- a/libraries-data/pom.xml +++ b/libraries-data/pom.xml @@ -13,11 +13,6 @@ - - com.h2database - h2 - ${h2.version} - junit junit @@ -29,17 +24,6 @@ kafka-streams ${kafka.version} - - org.apache.kafka - kafka-clients - ${kafka.version} - - - org.slf4j - slf4j-log4j12 - - - org.apache.kafka kafka-clients @@ -57,11 +41,6 @@ ignite-spring-data ${ignite.version} - - org.apache.ignite - ignite-indexing - ${ignite.version} - com.google.code.gson gson @@ -116,59 +95,17 @@ - - org.apache.flink - flink-connector-kafka-0.11_2.11 - ${flink.version} - - - org.apache.flink - flink-streaming-java_2.11 - ${flink.version} - - - com.fasterxml.jackson.datatype - jackson-datatype-jsr310 - ${jackson.version} - com.fasterxml.jackson.core jackson-databind ${jackson.version} - - org.apache.flink - flink-core - ${flink.version} - - - commons-logging - commons-logging - - - - - org.apache.flink - flink-java - ${flink.version} - - - commons-logging - commons-logging - - - org.apache.flink flink-test-utils_2.11 ${flink.version} test - - org.assertj - assertj-core - ${assertj.version} - org.slf4j slf4j-api @@ -189,22 +126,6 @@ - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - ${logback.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - @@ -243,14 +164,10 @@ 2.8.2 1.1.0 1.5.0 - 3.6.2 3.8.4 - 1.8 - 3.0.0 0.15.0 2.2.0 1.7.25 - 1.0.1 diff --git a/libraries-http/pom.xml b/libraries-http/pom.xml index 44280d848c..86f5390c3a 100644 --- a/libraries-http/pom.xml +++ b/libraries-http/pom.xml @@ -38,11 +38,6 @@ google-http-client-jackson2 ${googleclient.version} - - com.google.http-client - google-http-client-gson - ${googleclient.version} - diff --git a/libraries-primitive/pom.xml b/libraries-primitive/pom.xml index 30f683a544..9eecda2a22 100644 --- a/libraries-primitive/pom.xml +++ b/libraries-primitive/pom.xml @@ -13,43 +13,42 @@ it.unimi.dsi fastutil - 8.2.2 + ${fastutil.version} junit junit - 4.12 + ${junit.version} test org.openjdk.jmh jmh-core - 1.19 + ${jmh.version} test org.openjdk.jmh jmh-generator-annprocess - 1.19 + ${jmh.version} test - - org.eclipse.collections - eclipse-collections-api - 10.0.0 - org.eclipse.collections eclipse-collections - 10.0.0 + ${eclipse-collections.version} + 8.2.2 + 4.12 + 1.19 + 10.0.0 1.8 - 1.8 + 1.8 \ No newline at end of file diff --git a/libraries-security/pom.xml b/libraries-security/pom.xml index eb16575be8..ae08de9a4d 100644 --- a/libraries-security/pom.xml +++ b/libraries-security/pom.xml @@ -23,12 +23,10 @@ org.springframework.security.oauth spring-security-oauth2 - ${spring-security-oauth2.version} org.springframework spring-web - ${spring.version} @@ -55,7 +53,6 @@ junit junit - ${junit.version} test @@ -76,14 +73,11 @@ - 2.0.4.RELEASE 5.6.0 - 2.3.3.RELEASE 1.3.1 1.2.2 1.2.2 1.9.2 1.58 - 4.3.8.RELEASE diff --git a/libraries-server/pom.xml b/libraries-server/pom.xml index 9bed5e211b..45069fe4f7 100644 --- a/libraries-server/pom.xml +++ b/libraries-server/pom.xml @@ -79,12 +79,6 @@ ${smack.version} - - org.igniterealtime.smack - smack-im - ${smack.version} - - org.igniterealtime.smack smack-extensions @@ -116,7 +110,6 @@ 4.5.3 9.4.8.v20171121 4.1.20.Final - 4.1 8.5.24 4.3.1 1.2.0 diff --git a/libraries/pom.xml b/libraries/pom.xml index 9511563817..7d20f1778a 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -52,22 +52,12 @@ javatuples ${javatuples.version} - - org.javassist - javassist - ${javaassist.version} - org.assertj assertj-core ${assertj.version} - - org.skyscreamer - jsonassert - ${jsonassert.version} - org.javers javers-core @@ -85,22 +75,6 @@ rome ${rome.version} - - io.specto - hoverfly-java - ${hoverfly-java.version} - - - org.apache.httpcomponents - httpclient - ${httpclient.version} - - - commons-logging - commons-logging - - - net.serenity-bdd serenity-core @@ -137,11 +111,6 @@ ${serenity.jira.version} test - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - @@ -226,11 +195,6 @@ jets3t ${jets3t-version} - - org.lucee - commons-codec - ${commons-codec-version} - io.rest-assured @@ -243,17 +207,6 @@ multiverse-core ${multiverse.version} - - com.zaxxer - HikariCP - ${HikariCP.version} - compile - - - com.h2database - h2 - ${h2.version} - pl.pragmatists JUnitParams @@ -280,11 +233,6 @@ jmh-core ${jmh.version} - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - junit junit @@ -308,12 +256,6 @@ - - org.codehaus.groovy - groovy-all - pom - ${groovy.version} - org.awaitility awaitility @@ -363,17 +305,6 @@ ${vavr.version} - - - com.squareup.okhttp3 - logging-interceptor - ${logging-interceptor.version} - - - com.darwinsys - hirondelle-date4j - ${hirondelle-date4j.version} - com.haulmont.yarg yarg @@ -394,61 +325,16 @@ protonpack ${protonpack.version} - - org.functionaljava - functionaljava - ${functionaljava.version} - org.functionaljava functionaljava-java8 ${functionaljava.version} - - org.functionaljava - functionaljava-quickcheck - ${functionaljava.version} - - - org.functionaljava - functionaljava-java-core - ${functionaljava.version} - - - javax.cache - cache-api - ${cache.version} - - - com.hazelcast - hazelcast - ${hazelcast.version} - - - org.jgrapht - jgrapht-core - ${jgrapht.version} - com.github.ben-manes.caffeine caffeine ${caffeine.version} - - com.google.http-client - google-http-client - ${googleclient.version} - - - com.google.http-client - google-http-client-jackson2 - ${googleclient.version} - - - com.google.http-client - google-http-client-gson - ${googleclient.version} - @@ -470,19 +356,9 @@ - - com.sun.jersey - jersey-client - ${jersey.version} - - - com.google.api-client - google-api-client - ${google-api.version} - com.google.oauth-client google-oauth-client-jetty @@ -493,17 +369,6 @@ kafka-streams ${kafka.version} - - org.apache.kafka - kafka-clients - ${kafka.version} - - - org.slf4j - slf4j-log4j12 - - - org.apache.kafka kafka-clients @@ -533,11 +398,6 @@ resilience4j-circuitbreaker ${resilience4j.version} - - io.github.resilience4j - resilience4j-ratelimiter - ${resilience4j.version} - io.github.resilience4j resilience4j-bulkhead @@ -548,11 +408,6 @@ resilience4j-retry ${resilience4j.version} - - io.github.resilience4j - resilience4j-cache - ${resilience4j.version} - io.github.resilience4j resilience4j-timelimiter @@ -576,11 +431,6 @@ ${mockftpserver.version} test - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor-maven-plugin.version} - org.reflections @@ -710,19 +560,14 @@ - 1.23.0 0.7.0 3.2.7 1.2 - 3.21.0-GA 3.6.2 - 1.5.0 3.1.0 - 4.5.3 1.0 - 4.5.3 2.92 1.9.26 1.41.0 @@ -739,29 +584,19 @@ 8.2.0 0.6.5 0.9.0 - 15.2 - 1.5.1 - 2.10 - 1.5.1 1.15 - 1.0.0 - 3.10.2 2.5.5 1.23.0 - v4-rev493-1.21.0 2.0.0 3.0.14 - 2.1.2 - 1.10.L001 0.9.4.0006L 2.1.2 2.5.11 0.12.1 1.10.0 1.3 - 0.8.1 3.2.0-m7 5.1.1 5.0.2 @@ -770,26 +605,19 @@ 3.6.4 4.3.8.RELEASE 3.0.3 - 2.6.3 2.3.0 0.9.12 1.19 - 2.5.2 1.1.0 - 3.9.0 2.0.4 1.3.1 1.2.6 4.8.1 - 1.0.1 - 1.19.4 4.5.1 - 3.3.0 3.0.2 2.7.1 3.6 0.9.11 - 1.5.7.1 diff --git a/linkrest/pom.xml b/linkrest/pom.xml index b3d3bd374e..c40cad41c8 100644 --- a/linkrest/pom.xml +++ b/linkrest/pom.xml @@ -23,16 +23,6 @@ jersey-container-servlet ${jersey.version} - - org.glassfish.jersey.media - jersey-media-moxy - ${jersey.version} - - - com.h2database - h2 - ${h2.version} - diff --git a/lucene/pom.xml b/lucene/pom.xml index 3d1ce61782..921832e280 100644 --- a/lucene/pom.xml +++ b/lucene/pom.xml @@ -32,10 +32,6 @@ - - 1.0.0.Final - - 1.16.10.0 7.4.0 diff --git a/maven-all/maven/pom.xml b/maven-all/maven/pom.xml index d34be04fcf..117a8a7002 100644 --- a/maven-all/maven/pom.xml +++ b/maven-all/maven/pom.xml @@ -1,7 +1,6 @@ 4.0.0 - com.baeldung maven 0.0.1-SNAPSHOT maven @@ -307,7 +306,6 @@ 1.1 3.0.0 3.0.0 - Baeldung 9.4.11.v20180605 2.27 diff --git a/maven-polyglot/maven-polyglot-json-extension/pom.xml b/maven-polyglot/maven-polyglot-json-extension/pom.xml index 1170fe7aa6..13f05c743f 100644 --- a/maven-polyglot/maven-polyglot-json-extension/pom.xml +++ b/maven-polyglot/maven-polyglot-json-extension/pom.xml @@ -47,8 +47,6 @@ - 1.8 - 1.8 3.5.4 diff --git a/mesos-marathon/pom.xml b/mesos-marathon/pom.xml index dee8eca10d..0e9bc321ef 100644 --- a/mesos-marathon/pom.xml +++ b/mesos-marathon/pom.xml @@ -2,10 +2,8 @@ 4.0.0 - com.baeldung mesos-marathon - 0.0.1-SNAPSHOT - mesos-marathon + mesos-marathon parent-boot-1 diff --git a/metrics/pom.xml b/metrics/pom.xml index 4cd9f3de79..d193745620 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -57,47 +57,12 @@ ${micrometer.ver} - - io.micrometer - micrometer-spring-legacy - ${micrometer.ver} - - org.springframework.boot spring-boot-starter-web ${spring-boot-starter-web.version} - - com.fasterxml.jackson.core - jackson-databind - ${fasterxml.jackson.version} - - - com.fasterxml.jackson.dataformat - jackson-dataformat-smile - ${fasterxml.jackson.version} - - - - com.netflix.spectator - spectator-api - ${spectator-api.version} - - - - io.astefanutti.metrics.aspectj - metrics-aspectj - ${metrics-aspectj.version} - - - org.slf4j - slf4j-api - - - - io.astefanutti.metrics.aspectj metrics-aspectj-deps @@ -118,8 +83,6 @@ 3.1.0 0.12.17 0.12.0.RELEASE - 2.9.1 - 0.57.1 2.0.7.RELEASE 3.11.1 1.1.0 diff --git a/microprofile/pom.xml b/microprofile/pom.xml index 52df348ace..9150a6adb1 100644 --- a/microprofile/pom.xml +++ b/microprofile/pom.xml @@ -2,7 +2,6 @@ 4.0.0 - com.baeldung microprofile 1.0-SNAPSHOT microprofile diff --git a/mustache/pom.xml b/mustache/pom.xml index 027d62ebc4..0e382ae14b 100644 --- a/mustache/pom.xml +++ b/mustache/pom.xml @@ -24,12 +24,6 @@ org.assertj assertj-core - - - log4j - log4j - ${log4j.version} - org.springframework.boot @@ -70,9 +64,6 @@ 0.9.2 - 1.2.16 - - 0.8 3.3.7 diff --git a/mybatis/pom.xml b/mybatis/pom.xml index 4e63d14ded..b3149dc342 100644 --- a/mybatis/pom.xml +++ b/mybatis/pom.xml @@ -2,10 +2,8 @@ 4.0.0 - com.baeldung mybatis - 1.0.0-SNAPSHOT - mybatis + mybatis com.baeldung @@ -14,11 +12,6 @@ - - org.apache.derby - derby - ${derby.version} - org.mybatis mybatis @@ -27,7 +20,6 @@ - 10.13.1.1 3.2.2 diff --git a/parent-java/pom.xml b/parent-java/pom.xml index fd3028680d..5b8b7ceb9b 100644 --- a/parent-java/pom.xml +++ b/parent-java/pom.xml @@ -11,6 +11,7 @@ com.baeldung parent-modules 1.0.0-SNAPSHOT + ../ diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PineTree.java b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PineTree.java new file mode 100644 index 0000000000..03f0ebfe7f --- /dev/null +++ b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PineTree.java @@ -0,0 +1,23 @@ +package com.baeldung.prototype; + +public class PineTree extends Tree { + + private String type; + + public PineTree(double mass, double height) { + super(mass, height); + this.type = "Pine"; + } + + public String getType() { + return type; + } + + @Override + public Tree copy() { + PineTree pineTreeClone = new PineTree(this.getMass(), this.getHeight()); + pineTreeClone.setPosition(this.getPosition()); + return pineTreeClone; + } + +} diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PlasticTree.java b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PlasticTree.java new file mode 100644 index 0000000000..aea805dd47 --- /dev/null +++ b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/PlasticTree.java @@ -0,0 +1,23 @@ +package com.baeldung.prototype; + +public class PlasticTree extends Tree { + + private String name; + + public PlasticTree(double mass, double height) { + super(mass, height); + this.name = "PlasticTree"; + } + + public String getName() { + return name; + } + + @Override + public Tree copy() { + PlasticTree plasticTreeClone = new PlasticTree(this.getMass(), this.getHeight()); + plasticTreeClone.setPosition(this.getPosition()); + return plasticTreeClone; + } + +} diff --git a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java index f95d568647..dffb573057 100644 --- a/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java +++ b/patterns/design-patterns-creational/src/main/java/com/baeldung/prototype/Tree.java @@ -1,6 +1,6 @@ package com.baeldung.prototype; -public class Tree implements Cloneable { +public abstract class Tree { private double mass; private double height; @@ -35,20 +35,10 @@ public class Tree implements Cloneable { return position; } - @Override - public Tree clone() { - Tree tree = null; - try { - tree = (Tree) super.clone(); - } catch (CloneNotSupportedException e) { - e.printStackTrace(); - } - return tree; - } - @Override public String toString() { return "Tree [mass=" + mass + ", height=" + height + ", position=" + position + "]"; } + public abstract Tree copy(); } diff --git a/patterns/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java b/patterns/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java index 0d06da53d6..1fb1fbfea6 100644 --- a/patterns/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java +++ b/patterns/design-patterns-creational/src/test/java/com/baeldung/prototype/TreePrototypeUnitTest.java @@ -2,23 +2,67 @@ package com.baeldung.prototype; import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.Arrays; +import java.util.List; +import static java.util.stream.Collectors.toList; + import org.junit.jupiter.api.Test; public class TreePrototypeUnitTest { @Test - public void givenATreePrototypeWhenClonedThenCreateA_Clone() { + public void givenAPlasticTreePrototypeWhenClonedThenCreateA_Clone() { double mass = 10.0; double height = 3.7; Position position = new Position(3, 7); Position otherPosition = new Position(4, 8); - Tree tree = new Tree(mass, height); - tree.setPosition(position); - Tree anotherTree = tree.clone(); - anotherTree.setPosition(otherPosition); + PlasticTree plasticTree = new PlasticTree(mass, height); + plasticTree.setPosition(position); + PlasticTree anotherPlasticTree = (PlasticTree) plasticTree.copy(); + anotherPlasticTree.setPosition(otherPosition); - assertEquals(position, tree.getPosition()); - assertEquals(otherPosition, anotherTree.getPosition()); + assertEquals(position, plasticTree.getPosition()); + assertEquals(otherPosition, anotherPlasticTree.getPosition()); + + } + + @Test + public void givenAPineTreePrototypeWhenClonedThenCreateA_Clone() { + double mass = 10.0; + double height = 3.7; + Position position = new Position(3, 7); + Position otherPosition = new Position(4, 8); + + PineTree pineTree = new PineTree(mass, height); + pineTree.setPosition(position); + PineTree anotherPineTree = (PineTree) pineTree.copy(); + anotherPineTree.setPosition(otherPosition); + + assertEquals(position, pineTree.getPosition()); + assertEquals(otherPosition, anotherPineTree.getPosition()); + } + + @Test + public void givenA_ListOfTreesWhenClonedThenCreateListOfClones() { + double mass = 10.0; + double height = 3.7; + Position position = new Position(3, 7); + Position otherPosition = new Position(4, 8); + + PlasticTree plasticTree = new PlasticTree(mass, height); + plasticTree.setPosition(position); + PineTree pineTree = new PineTree(mass, height); + pineTree.setPosition(otherPosition); + + List trees = Arrays.asList(plasticTree, pineTree); + + List treeClones = trees.stream().map(Tree::copy).collect(toList()); + + Tree plasticTreeClone = treeClones.get(0); + + assertEquals(mass, plasticTreeClone.getMass()); + assertEquals(height, plasticTreeClone.getHeight()); + assertEquals(position, plasticTreeClone.getPosition()); } } diff --git a/persistence-modules/flyway/src/main/java/com/baeldung/flywaycallbacks/EmptyMigrationStrategyConfig.java b/persistence-modules/flyway/src/main/java/com/baeldung/flywaycallbacks/EmptyMigrationStrategyConfig.java new file mode 100644 index 0000000000..8f733364b7 --- /dev/null +++ b/persistence-modules/flyway/src/main/java/com/baeldung/flywaycallbacks/EmptyMigrationStrategyConfig.java @@ -0,0 +1,20 @@ +package com.baeldung.flywaycallbacks; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class EmptyMigrationStrategyConfig { + + private Log log = LogFactory.getLog("EmptyMigrationStrategy"); + + @Bean + public FlywayMigrationStrategy flywayMigrationStrategy() { + return flyway -> { + log.info("Skipping Flyway migration!"); + }; + } +} diff --git a/persistence-modules/flyway/src/main/resources/application.properties b/persistence-modules/flyway/src/main/resources/application.properties index e69de29bb2..4d339eca5c 100644 --- a/persistence-modules/flyway/src/main/resources/application.properties +++ b/persistence-modules/flyway/src/main/resources/application.properties @@ -0,0 +1 @@ +#flyway.enabled=false \ No newline at end of file diff --git a/persistence-modules/flyway/src/test/java/com/baeldung/flywaycallbacks/ManualFlywayMigrationIntegrationTest.java b/persistence-modules/flyway/src/test/java/com/baeldung/flywaycallbacks/ManualFlywayMigrationIntegrationTest.java new file mode 100644 index 0000000000..12edec39e7 --- /dev/null +++ b/persistence-modules/flyway/src/test/java/com/baeldung/flywaycallbacks/ManualFlywayMigrationIntegrationTest.java @@ -0,0 +1,36 @@ +package com.baeldung.flywaycallbacks; + +import org.flywaydb.core.Flyway; +import org.flywaydb.core.api.MigrationInfo; +import org.flywaydb.core.api.MigrationState; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class ManualFlywayMigrationIntegrationTest { + + @Autowired + private Flyway flyway; + + @Test + public void skipAutomaticAndTriggerManualFlywayMigration() { + + assertAllMigrationsAre(MigrationState.PENDING); + + flyway.migrate(); + + assertAllMigrationsAre(MigrationState.SUCCESS); + } + + private void assertAllMigrationsAre(MigrationState expectedState) { + for (MigrationInfo migrationInfo : flyway.info().all()) { + assertThat(migrationInfo.getState()).isEqualTo(expectedState); + } + } +} diff --git a/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index cf964b5011..0000000000 --- a/persistence-modules/spring-boot-persistence-h2/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; -import org.springframework.test.context.web.WebAppConfiguration; - - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(loader = AnnotationConfigContextLoader.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 46ee3cd368..0000000000 --- a/persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.baeldung; - -import java.io.IOException; -import java.util.HashMap; - -import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.thrift.transport.TTransportException; -import org.baeldung.spring.data.cassandra.config.CassandraConfig; -import org.baeldung.spring.data.cassandra.model.Book; -import org.cassandraunit.utils.EmbeddedCassandraServerHelper; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cassandra.core.cql.CqlIdentifier; -import org.springframework.data.cassandra.core.CassandraAdminOperations; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Session; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = CassandraConfig.class) -public class SpringContextIntegrationTest { - - public static final String KEYSPACE_CREATION_QUERY = "CREATE KEYSPACE IF NOT EXISTS testKeySpace " + "WITH replication = { 'class': 'SimpleStrategy', 'replication_factor': '3' };"; - - public static final String KEYSPACE_ACTIVATE_QUERY = "USE testKeySpace;"; - - public static final String DATA_TABLE_NAME = "book"; - - @Autowired - private CassandraAdminOperations adminTemplate; - - @BeforeClass - public static void startCassandraEmbedded() throws InterruptedException, TTransportException, ConfigurationException, IOException { - EmbeddedCassandraServerHelper.startEmbeddedCassandra(); - final Cluster cluster = Cluster.builder().addContactPoints("127.0.0.1").withPort(9142).build(); - final Session session = cluster.connect(); - session.execute(KEYSPACE_CREATION_QUERY); - session.execute(KEYSPACE_ACTIVATE_QUERY); - Thread.sleep(5000); - } - - @Before - public void createTable() throws InterruptedException, TTransportException, ConfigurationException, IOException { - adminTemplate.createTable(true, CqlIdentifier.cqlId(DATA_TABLE_NAME), Book.class, new HashMap()); - } - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - - @After - public void dropTable() { - adminTemplate.dropTable(CqlIdentifier.cqlId(DATA_TABLE_NAME)); - } - - @AfterClass - public static void stopCassandraEmbedded() { - EmbeddedCassandraServerHelper.cleanEmbeddedCassandra(); - } -} diff --git a/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 7f906bdbcd..0000000000 --- a/persistence-modules/spring-data-dynamodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-data-eclipselink/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-eclipselink/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 4be5891e3e..0000000000 --- a/persistence-modules/spring-data-eclipselink/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.eclipselink.springdata.EclipselinkSpringDataApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = EclipselinkSpringDataApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2f0557ccc1..0000000000 --- a/persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -import com.baeldung.spring.data.gemfire.function.GemfireConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes=GemfireConfiguration.class, loader=AnnotationConfigContextLoader.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index a986cc7e21..0000000000 --- a/persistence-modules/spring-data-jpa-3/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.boot.Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index e885d0fe51..0000000000 --- a/persistence-modules/spring-data-jpa/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.boot.Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-data-keyvalue/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-keyvalue/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index d28bdcbc89..0000000000 --- a/persistence-modules/spring-data-keyvalue/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.data.keyvalue.SpringDataKeyValueApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringDataKeyValueApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ea32ed324b..0000000000 --- a/persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.spring.data.neo4j.config.MovieDatabaseNeo4jTestConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = MovieDatabaseNeo4jTestConfiguration.class) -@ActiveProfiles(profiles = "test") -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index f5c8177cbe..0000000000 --- a/persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.baeldung; - -import com.baeldung.spring.data.redis.config.RedisConfig; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import redis.embedded.RedisServerBuilder; - -import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_CLASS; - -@RunWith(SpringJUnit4ClassRunner.class) -@DirtiesContext(classMode = BEFORE_CLASS) -@ContextConfiguration(classes = RedisConfig.class) -public class SpringContextIntegrationTest { - - private static redis.embedded.RedisServer redisServer; - - @BeforeClass - public static void startRedisServer() { - redisServer = new RedisServerBuilder().port(6379).setting("maxmemory 256M").build(); - redisServer.start(); - } - - @AfterClass - public static void stopRedisServer() { - redisServer.stop(); - } - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-data-solr/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-data-solr/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index e76967ae8a..0000000000 --- a/persistence-modules/spring-data-solr/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.spring.data.solr.config.SolrConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = SolrConfig.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-hibernate-3/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-hibernate-3/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index a81a4eedb1..0000000000 --- a/persistence-modules/spring-hibernate-3/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.PersistenceConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-hibernate-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-hibernate-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index af4618d0f3..0000000000 --- a/persistence-modules/spring-hibernate-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -import com.baeldung.spring.PersistenceConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-hibernate4/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-hibernate4/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index af4618d0f3..0000000000 --- a/persistence-modules/spring-hibernate4/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; - -import com.baeldung.spring.PersistenceConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceConfig.class }, loader = AnnotationConfigContextLoader.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/persistence-modules/spring-jpa/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/persistence-modules/spring-jpa/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 9b0cdf180f..0000000000 --- a/persistence-modules/spring-jpa/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung; - -import org.baeldung.config.PersistenceJPAConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { PersistenceJPAConfig.class }, loader = AnnotationConfigContextLoader.class) -@WebAppConfiguration -@DirtiesContext -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/pom.xml b/pom.xml index ce8e031904..65e3c96704 100644 --- a/pom.xml +++ b/pom.xml @@ -484,7 +484,7 @@ guava-io guava-collections guava-collections-map - guava-collections-set + guava-collections-set guava-modules guice @@ -503,6 +503,8 @@ jackson-simple jackson-annotations jackson-exceptions + jackson-conversions + jackson-conversions-2 java-collections-conversions java-collections-conversions-2 java-collections-maps @@ -512,7 +514,7 @@ java-lite java-math - java-math-2 + java-math-2 java-numbers java-numbers-2 java-rmi @@ -554,8 +556,8 @@ libraries-data libraries-data-2 libraries-data-db - libraries-data-io - libraries-apache-commons + libraries-data-io + libraries-apache-commons libraries-apache-commons-collections libraries-apache-commons-io libraries-primitive @@ -710,7 +712,7 @@ spring-boot-camel spring-boot-config-jpa-error - spring-boot-client + spring-boot-client spring-boot-crud spring-boot-ctx-fluent @@ -723,10 +725,10 @@ spring-boot-mvc spring-boot-mvc-birt spring-boot-environment - spring-boot-deployment - spring-boot-runtime - spring-boot-runtime/disabling-console-jul - spring-boot-runtime/disabling-console-log4j2 + spring-boot-deployment + spring-boot-runtime + spring-boot-runtime/disabling-console-jul + spring-boot-runtime/disabling-console-log4j2 spring-boot-runtime/disabling-console-logback spring-boot-artifacts spring-boot-rest @@ -749,7 +751,7 @@ spring-core spring-core-2 spring-core-3 - spring-cucumber + spring-cucumber spring-data-rest spring-data-rest-querydsl @@ -781,7 +783,7 @@ spring-mobile spring-mockito spring-mvc-basics-2 - spring-mvc-forms-jsp + spring-mvc-forms-jsp spring-mvc-forms-thymeleaf spring-mvc-java spring-mvc-kotlin @@ -802,7 +804,7 @@ spring-rest spring-rest-angular spring-rest-compress - spring-rest-full + spring-rest-testing spring-rest-hal-browser spring-rest-query-language spring-rest-shell @@ -834,7 +836,7 @@ spring-security-x509 spring-session spring-shell - spring-sleuth + spring-sleuth spring-soap spring-social-login spring-spel @@ -882,146 +884,6 @@ - - spring-context - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - 3 - true - - **/*SpringContextIntegrationTest.java - - - - - - - - - spring-5 - spring-5-data-reactive - spring-5-reactive - spring-5-reactive-2 - spring-5-reactive-client - spring-5-reactive-security - spring-5-security - spring-5-security-oauth - spring-5-security-cognito - spring-activiti - spring-akka - spring-aop - spring-apache-camel - spring-batch - spring-bom - spring-boot-admin - spring-boot-bootstrap - spring-boot-bootstrap - spring-boot-camel - spring-boot-client - spring-boot-custom-starter - spring-boot-di - greeter-spring-boot-autoconfigure - greeter-spring-boot-sample-app - spring-boot-jasypt - spring-boot-keycloak - spring-boot-mvc - spring-boot-property-exp - spring-boot-springdoc - spring-boot-vue - spring-cloud - spring-cloud/spring-cloud-archaius/basic-config - spring-cloud/spring-cloud-archaius/extra-configs - spring-cloud/spring-cloud-bootstrap/config - spring-cloud/spring-cloud-contract - spring-cloud/spring-cloud-gateway - spring-cloud/spring-cloud-kubernetes/demo-backend - spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server - spring-cloud/spring-cloud-ribbon-client - spring-cloud/spring-cloud-security - spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit - spring-cloud/spring-cloud-task/springcloudtasksink - spring-cloud/spring-cloud-zookeeper - spring-cloud/spring-cloud-bus/spring-cloud-config-server - spring-cloud/spring-cloud-data-flow/log-sink - spring-cloud/spring-cloud-data-flow/time-processor - spring-cloud/spring-cloud-data-flow/time-source - spring-cucumber - spring-data-rest - spring-dispatcher-servlet - spring-drools - spring-di - spring-ehcache - spring-freemarker - spring-integration - spring-jenkins-pipeline - spring-jersey - spring-jinq - spring-jms - spring-kafka - spring-katharsis - spring-ldap - spring-mobile - spring-mockito - spring-mvc-forms-thymeleaf - spring-mvc-java - spring-mvc-velocity - spring-mvc-webflow - spring-protobuf - spring-quartz - remoting-hessian-burlap/spring-remoting-hessian-burlap-client - remoting-hessian-burlap/remoting-hessian-burlap-server - spring-reactor - spring-remoting/ - spring-remoting/remoting-http/remoting-http-server - spring-remoting/remoting-jms/remoting-jms-client - spring-remoting/remoting-rmi/remoting-rmi-server - spring-rest - spring-rest-angular - spring-rest-compress - spring-rest-full - spring-rest-simple - spring-resttemplate - spring-security-acl - spring-security-angular - spring-security-cache-control - spring-security-core - spring-security-mvc-boot - spring-security-mvc-custom - spring-security-mvc-digest-auth - spring-security-mvc-ldap - spring-security-mvc-persisted-remember-me - spring-security-mvc - spring-security-mvc-socket - spring-security-rest - spring-security-sso - spring-security-thymeleaf/spring-security-thymeleaf-authentication - spring-security-thymeleaf/spring-security-thymeleaf-authorize - spring-security-thymeleaf/spring-security-thymeleaf-config - spring-security-x509 - spring-session/spring-session-jdbc - spring-sleuth - spring-social-login - spring-spel - spring-state-machine - spring-swagger-codegen/spring-swagger-codegen-app - spring-thymeleaf - spring-vault - spring-vertx - spring-zuul/spring-zuul-foos-resource - - spring-boot-flowable - spring-security-kerberos - spring-boot-nashorn - - - - default-heavy @@ -1063,7 +925,7 @@ core-java-modules/core-java-concurrency-advanced core-java-modules/core-java-concurrency-advanced-2 core-java-modules/core-java-concurrency-advanced-3 - core-kotlin + core-kotlin core-kotlin-2 core-kotlin-io @@ -1206,7 +1068,7 @@ core-java-modules/core-java-nio core-java-modules/core-java-nio-2 core-java-modules/core-java-security - core-java-modules/core-java-exceptions + core-java-modules/core-java-exceptions core-java-modules/core-java-lang-syntax core-java-modules/core-java-lang-syntax-2 core-java-modules/core-java-lang @@ -1257,7 +1119,7 @@ guava-io guava-collections guava-collections-map - guava-collections-set + guava-collections-set guava-modules guice @@ -1276,6 +1138,8 @@ jackson-simple jackson-annotations jackson-exceptions + jackson-conversions + jackson-conversions-2 java-collections-conversions java-collections-conversions-2 java-collections-maps @@ -1285,7 +1149,7 @@ java-ee-8-security-api java-lite java-math - java-math-2 + java-math-2 java-numbers java-numbers-2 java-rmi @@ -1325,8 +1189,8 @@ libraries-data libraries-data-2 libraries-data-db - libraries-data-io - libraries-apache-commons + libraries-data-io + libraries-apache-commons libraries-apache-commons-collections libraries-apache-commons-io libraries-testing @@ -1468,10 +1332,10 @@ spring-boot-mvc spring-boot-mvc-birt spring-boot-environment - spring-boot-deployment - spring-boot-runtime - spring-boot-runtime/disabling-console-jul - spring-boot-runtime/disabling-console-log4j2 + spring-boot-deployment + spring-boot-runtime + spring-boot-runtime/disabling-console-jul + spring-boot-runtime/disabling-console-log4j2 spring-boot-runtime/disabling-console-logback spring-boot-artifacts spring-boot-rest @@ -1490,7 +1354,7 @@ spring-core spring-core-2 spring-core-3 - spring-cucumber + spring-cucumber spring-data-rest spring-data-rest-querydsl @@ -1522,7 +1386,7 @@ spring-mobile spring-mockito spring-mvc-basics-2 - spring-mvc-forms-jsp + spring-mvc-forms-jsp spring-mvc-forms-thymeleaf spring-mvc-java spring-mvc-kotlin @@ -1543,7 +1407,7 @@ spring-rest spring-rest-angular spring-rest-compress - spring-rest-full + spring-rest-testing spring-rest-hal-browser spring-rest-query-language spring-rest-shell @@ -1552,7 +1416,7 @@ spring-roo spring-scheduling - spring-security-acl + spring-security-acl spring-security-angular/server spring-security-cache-control spring-security-core @@ -1574,7 +1438,7 @@ spring-security-thymeleaf spring-security-x509 spring-session - spring-shell + spring-shell spring-sleuth spring-soap spring-social-login @@ -1660,7 +1524,7 @@ libraries persistence-modules/hibernate5 - persistence-modules/hibernate-mapping + persistence-modules/hibernate-mapping persistence-modules/java-jpa persistence-modules/java-jpa-2 persistence-modules/java-mongodb @@ -1743,4 +1607,3 @@ - diff --git a/spring-4/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-4/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index d646e22511..0000000000 --- a/spring-4/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -import com.baeldung.flips.ApplicationConfig; - - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = ApplicationConfig.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ce4c172960..0000000000 --- a/spring-5-data-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.reactive.Spring5ReactiveApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Spring5ReactiveApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 7843a8968d..0000000000 --- a/spring-5-reactive-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.reactive.Spring5ReactiveTestApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Spring5ReactiveTestApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2bcd974510..0000000000 --- a/spring-5-reactive-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.reactive.security.SpringSecurity5Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringSecurity5Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-5-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ce4c172960..0000000000 --- a/spring-5-reactive/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.reactive.Spring5ReactiveApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Spring5ReactiveApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-5-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 967f67e760..0000000000 --- a/spring-5-security/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.dsl.CustomConfigurerApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = CustomConfigurerApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 75b3df4978..0000000000 --- a/spring-5/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.Spring5Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Spring5Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-activiti/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-activiti/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 89411df976..0000000000 --- a/spring-activiti/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.activitiwithspring.ActivitiWithSpringApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ActivitiWithSpringApplication.class) -@AutoConfigureTestDatabase -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-aop/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-aop/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index cf1ac7de89..0000000000 --- a/spring-aop/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-apache-camel/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-apache-camel/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index efd0603c76..0000000000 --- a/spring-apache-camel/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.baeldung; - -import org.junit.Test; - -import com.baeldung.camel.main.App; - -public class SpringContextIntegrationTest { - - @Test - public final void testMain() throws Exception { - App.main(null); - } -} diff --git a/spring-batch/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-batch/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 0898603083..0000000000 --- a/spring-batch/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.baeldung; - -import org.baeldung.batch.App; -import org.junit.Test; - -public class SpringContextIntegrationTest { - - @Test - public void testMain() throws Exception { - App.main(null); - } -} diff --git a/spring-bom/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-bom/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 6dee4b808e..0000000000 --- a/spring-bom/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.baeldung; - -import org.junit.Test; - -import com.baeldung.spring.bom.HelloWorldApp; - -public class SpringContextIntegrationTest { - - @Test - public final void testMain() throws Exception { - HelloWorldApp.main(null); - } -} diff --git a/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 1f1fae17bc..0000000000 --- a/spring-boot-admin/spring-boot-admin-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.springbootadminclient.SpringBootAdminClientApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringBootAdminClientApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 4c151d97df..0000000000 --- a/spring-boot-admin/spring-boot-admin-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.springbootadminserver.SpringBootAdminServerApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringBootAdminServerApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-angular/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-angular/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 4f595916f7..0000000000 --- a/spring-boot-angular/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.ecommerce.EcommerceApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = EcommerceApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-bootstrap/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-boot-bootstrap/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 08c6692689..0000000000 --- a/spring-boot-bootstrap/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } -} diff --git a/spring-boot-camel/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-camel/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 6eee0abf1e..0000000000 --- a/spring-boot-camel/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.camel.Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 97debc5b63..0000000000 --- a/spring-boot-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung; - -import org.baeldung.boot.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index c9f7220ab9..0000000000 --- a/spring-boot-ctx-fluent/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.baeldung; - -import org.junit.Test; - -import com.baeldung.parent.App; - -public class SpringContextIntegrationTest { - - @Test - public final void testMain() throws Exception { - App.main(new String[] {}); - } -} diff --git a/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 9c8d825ea4..0000000000 --- a/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.greeter.autoconfigure.GreeterAutoConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = GreeterAutoConfiguration.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 23f285238b..0000000000 --- a/spring-boot-custom-starter/greeter-spring-boot-sample-app/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.greeter.sample.GreeterSampleApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = GreeterSampleApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-deployment/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java b/spring-boot-deployment/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java deleted file mode 100644 index 24bef73ef9..0000000000 --- a/spring-boot-deployment/src/test/java/com/baeldung/springbootconfiguration/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.springbootconfiguration; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } -} diff --git a/spring-boot-jasypt/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-jasypt/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index dce3819a26..0000000000 --- a/spring-boot-jasypt/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.jasypt.Main; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Main.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-keycloak/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-keycloak/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 7367568611..0000000000 --- a/spring-boot-keycloak/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.keycloak.SpringBoot; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringBoot.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-logging-log4j2/pom.xml b/spring-boot-logging-log4j2/pom.xml index 8e4bf60f91..0bc8c2dd08 100644 --- a/spring-boot-logging-log4j2/pom.xml +++ b/spring-boot-logging-log4j2/pom.xml @@ -12,7 +12,7 @@ spring-boot-starter-parent org.springframework.boot - 2.0.5.RELEASE + 2.2.1.RELEASE diff --git a/spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2d46b21ba5..0000000000 --- a/spring-boot-logging-log4j2/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.springbootlogging.SpringBootLoggingApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringBootLoggingApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-mvc/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-mvc/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 6ed93e8c44..0000000000 --- a/spring-boot-mvc/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.springbootmvc.SpringBootMvcApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringBootMvcApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-property-exp/property-exp-custom-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-property-exp/property-exp-custom-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 6dd3419d39..0000000000 --- a/spring-boot-property-exp/property-exp-custom-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.propertyexpansion.SpringBootPropertyExpansionApp; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringBootPropertyExpansionApp.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-property-exp/property-exp-default-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-property-exp/property-exp-default-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 6dd3419d39..0000000000 --- a/spring-boot-property-exp/property-exp-default-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.propertyexpansion.SpringBootPropertyExpansionApp; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringBootPropertyExpansionApp.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-boot-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 3db1ecb462..0000000000 --- a/spring-boot-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = {SpringBootRestApplication.class}) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-boot-springdoc/src/test/java/com/baeldung/springdoc/SpringContextIntegrationTest.java b/spring-boot-springdoc/src/test/java/com/baeldung/springdoc/SpringContextTest.java similarity index 88% rename from spring-boot-springdoc/src/test/java/com/baeldung/springdoc/SpringContextIntegrationTest.java rename to spring-boot-springdoc/src/test/java/com/baeldung/springdoc/SpringContextTest.java index 58c12dc3bc..4cd84477b9 100644 --- a/spring-boot-springdoc/src/test/java/com/baeldung/springdoc/SpringContextIntegrationTest.java +++ b/spring-boot-springdoc/src/test/java/com/baeldung/springdoc/SpringContextTest.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest -public class SpringContextIntegrationTest { +public class SpringContextTest { @Test public void whenSpringContextIsBootstrapped_thenNoExceptions() { diff --git a/spring-boot-testing/src/test/java/com/baeldung/boot/SpringContextIntegrationTest.java b/spring-boot-testing/src/test/java/com/baeldung/boot/SpringContextIntegrationTest.java deleted file mode 100644 index 63ab07fdb7..0000000000 --- a/spring-boot-testing/src/test/java/com/baeldung/boot/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.boot; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-boot-vue/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-boot-vue/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 6ed93e8c44..0000000000 --- a/spring-boot-vue/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.springbootmvc.SpringBootMvcApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringBootMvcApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud-bus/spring-cloud-config-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-bus/spring-cloud-config-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index c43bb9f067..0000000000 --- a/spring-cloud-bus/spring-cloud-config-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.SpringCloudConfigServerApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringCloudConfigServerApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud-data-flow/batch-job/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/batch-job/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index b87ace74a4..0000000000 --- a/spring-cloud-data-flow/batch-job/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.cloud.JobConfiguration; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -@ContextConfiguration(classes = JobConfiguration.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java similarity index 90% rename from spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java rename to spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java index eb2a5c54ef..83cb8067cf 100644 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/data-flow-server/src/test/java/org/baeldung/SpringContextTest.java @@ -8,7 +8,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(classes = DataFlowServerApplication.class) -public class SpringContextIntegrationTest { +public class SpringContextTest { @Test public void whenSpringContextIsBootstrapped_thenNoExceptions() { diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 8dc814ddce..0000000000 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/log-sink/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.cloud.LogSinkApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = LogSinkApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index dcfeafa2bb..0000000000 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-processor/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.cloud.TimeProcessorApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = TimeProcessorApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2c402824f0..0000000000 --- a/spring-cloud-data-flow/spring-cloud-data-flow-stream-processing/time-source/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.cloud.TimeSourceApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = TimeSourceApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextIntegrationTest.java deleted file mode 100644 index 4811ebaa13..0000000000 --- a/spring-cloud/spring-cloud-archaius/additional-sources-simple/src/test/java/com/baeldung/spring/cloud/archaius/additionalsources/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.spring.cloud.archaius.additionalsources; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AdditionalSourcesSimpleApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextIntegrationTest.java deleted file mode 100644 index 818e313c98..0000000000 --- a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/com/baeldung/spring/cloud/archaius/basic/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.archaius.basic; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 16542981e8..0000000000 --- a/spring-cloud/spring-cloud-archaius/basic-config/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.archaius.basic.BasicArchaiusApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = BasicArchaiusApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 4c2531f490..0000000000 --- a/spring-cloud/spring-cloud-archaius/extra-configs/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.archaius.extraconfigs.ExtraConfigsApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ExtraConfigsApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextIntegrationTest.java deleted file mode 100644 index b3cd01e684..0000000000 --- a/spring-cloud/spring-cloud-archaius/jdbc-config/src/test/java/com/baeldung/spring/cloud/archaius/jdbconfig/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.spring.cloud.archaius.jdbconfig; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = JdbcSourcesApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} \ No newline at end of file diff --git a/spring-cloud/spring-cloud-bootstrap/config/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-bootstrap/config/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 6016788eab..0000000000 --- a/spring-cloud/spring-cloud-bootstrap/config/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.bootstrap.config.ConfigApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ConfigApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 4403d9e93b..0000000000 --- a/spring-cloud/spring-cloud-bootstrap/zipkin/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.bootstrap.zipkin.ZipkinApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ZipkinApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextIntegrationTest.java deleted file mode 100644 index b2c6ef85ea..0000000000 --- a/spring-cloud/spring-cloud-config/server/src/test/java/com/baeldung/spring/cloud/config/server/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.config.server; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest(classes = ConfigServer.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextIntegrationTest.java deleted file mode 100644 index dca4c25c71..0000000000 --- a/spring-cloud/spring-cloud-connectors-heroku/src/test/java/com/baeldung/spring/cloud/connectors/heroku/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.spring.cloud.connectors.heroku; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.connectors.heroku.ConnectorsHerokuApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ConnectorsHerokuApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 1c1192cc3f..0000000000 --- a/spring-cloud/spring-cloud-contract/spring-cloud-contract-consumer/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.springcloudcontractconsumer.SpringCloudContractConsumerApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringCloudContractConsumerApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2b6703ae5c..0000000000 --- a/spring-cloud/spring-cloud-contract/spring-cloud-contract-producer/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.springcloudcontractproducer.SpringCloudContractProducerApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringCloudContractProducerApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextIntegrationTest.java deleted file mode 100644 index 8e379fd5a0..0000000000 --- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.eureka.client; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextIntegrationTest.java deleted file mode 100644 index ff742735b3..0000000000 --- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-feign-client/src/test/java/com/baeldung/spring/cloud/feign/client/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.feign.client; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextIntegrationTest.java deleted file mode 100644 index f03913b474..0000000000 --- a/spring-cloud/spring-cloud-eureka/spring-cloud-eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.eureka.server; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextIntegrationTest.java deleted file mode 100644 index beee84246d..0000000000 --- a/spring-cloud/spring-cloud-functions/src/test/java/com/baeldung/spring/cloudfunction/aws/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.spring.cloudfunction.aws; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = CloudFunctionAwsApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} \ No newline at end of file diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/factories/ChainRequestGatewayFilterFactory.java b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/factories/ChainRequestGatewayFilterFactory.java index f7e754fd70..1f4e2a96cb 100644 --- a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/factories/ChainRequestGatewayFilterFactory.java +++ b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/factories/ChainRequestGatewayFilterFactory.java @@ -28,14 +28,14 @@ public class ChainRequestGatewayFilterFactory extends AbstractGatewayFilterFacto @Override public List shortcutFieldOrder() { - return Arrays.asList("endpoint", "defaultLanguage"); + return Arrays.asList("languageServiceEndpoint", "defaultLanguage"); } @Override public GatewayFilter apply(Config config) { return (exchange, chain) -> { return client.get() - .uri(config.getEndpoint()) + .uri(config.getLanguageServiceEndpoint()) .exchange() .flatMap(response -> { return (response.statusCode() @@ -45,8 +45,7 @@ public class ChainRequestGatewayFilterFactory extends AbstractGatewayFilterFacto .map(range -> { exchange.getRequest() .mutate() - .headers(h -> h.setAcceptLanguage(range)) - .build(); + .headers(h -> h.setAcceptLanguage(range)); String allOutgoingRequestLanguages = exchange.getRequest() .getHeaders() @@ -65,18 +64,18 @@ public class ChainRequestGatewayFilterFactory extends AbstractGatewayFilterFacto } public static class Config { - private String endpoint; + private String languageServiceEndpoint; private String defaultLanguage; public Config() { } - public String getEndpoint() { - return endpoint; + public String getLanguageServiceEndpoint() { + return languageServiceEndpoint; } - public void setEndpoint(String endpoint) { - this.endpoint = endpoint; + public void setLanguageServiceEndpoint(String languageServiceEndpoint) { + this.languageServiceEndpoint = languageServiceEndpoint; } public String getDefaultLanguage() { diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/factories/LoggingGatewayFilterFactory.java b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/factories/LoggingGatewayFilterFactory.java index db73ba99c0..18532e34a8 100644 --- a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/factories/LoggingGatewayFilterFactory.java +++ b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/factories/LoggingGatewayFilterFactory.java @@ -40,7 +40,7 @@ public class LoggingGatewayFilterFactory extends AbstractGatewayFilterFactory { @@ -45,8 +48,7 @@ public class ModifyRequestGatewayFilterFactory extends AbstractGatewayFilterFact exchange.getRequest() .mutate() - .headers(h -> h.setAcceptLanguageAsLocales(Collections.singletonList(requestLocale))) - .build(); + .headers(h -> h.setAcceptLanguageAsLocales(Collections.singletonList(requestLocale))); } String allOutgoingRequestLanguages = exchange.getRequest() @@ -56,8 +58,20 @@ public class ModifyRequestGatewayFilterFactory extends AbstractGatewayFilterFact .map(range -> range.getRange()) .collect(Collectors.joining(",")); - logger.info("Modify Request output - Request contains Accept-Language header: " + allOutgoingRequestLanguages); - return chain.filter(exchange); + logger.info("Modify request output - Request contains Accept-Language header: {}", allOutgoingRequestLanguages); + + ServerWebExchange modifiedExchange = exchange.mutate() + .request(originalRequest -> originalRequest.uri(UriComponentsBuilder.fromUri(exchange.getRequest() + .getURI()) + .replaceQueryParams(new LinkedMultiValueMap()) + .build() + .toUri())) + .build(); + + logger.info("Removed all query params: {}", modifiedExchange.getRequest() + .getURI()); + + return chain.filter(modifiedExchange); }; } diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/FirstPreLastPostGlobalFilter.java b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/FirstPreLastPostGlobalFilter.java new file mode 100644 index 0000000000..5b58eee8a6 --- /dev/null +++ b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/FirstPreLastPostGlobalFilter.java @@ -0,0 +1,31 @@ +package com.baeldung.springcloudgateway.customfilters.filters.global; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.cloud.gateway.filter.GatewayFilterChain; +import org.springframework.cloud.gateway.filter.GlobalFilter; +import org.springframework.core.Ordered; +import org.springframework.stereotype.Component; +import org.springframework.web.server.ServerWebExchange; + +import reactor.core.publisher.Mono; + +@Component +public class FirstPreLastPostGlobalFilter implements GlobalFilter, Ordered { + + final Logger logger = LoggerFactory.getLogger(FirstPreLastPostGlobalFilter.class); + + @Override + public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { + logger.info("First Pre Global Filter"); + return chain.filter(exchange) + .then(Mono.fromRunnable(() -> { + logger.info("Last Post Global Filter"); + })); + } + + @Override + public int getOrder() { + return -1; + } +} diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/LoggingGlobalFiltersConfigurations.java b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/LoggingGlobalFiltersConfigurations.java index cf2ff3af16..8edcf2a073 100644 --- a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/LoggingGlobalFiltersConfigurations.java +++ b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/LoggingGlobalFiltersConfigurations.java @@ -5,7 +5,6 @@ import org.slf4j.LoggerFactory; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.annotation.Order; import reactor.core.publisher.Mono; @@ -23,17 +22,4 @@ public class LoggingGlobalFiltersConfigurations { })); }; } - - @Bean - @Order(-1) - public GlobalFilter FirstPreLastPostGlobalFilter() { - return (exchange, chain) -> { - logger.info("First Pre Global Filter"); - return chain.filter(exchange) - .then(Mono.fromRunnable(() -> { - logger.info("Last Post Global Filter"); - })); - }; - } - } diff --git a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/LoggingGlobalPreFilter.java b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/LoggingGlobalPreFilter.java index d91075e4b6..bd29499868 100644 --- a/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/LoggingGlobalPreFilter.java +++ b/spring-cloud/spring-cloud-gateway/src/main/java/com/baeldung/springcloudgateway/customfilters/filters/global/LoggingGlobalPreFilter.java @@ -4,14 +4,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.GlobalFilter; -import org.springframework.core.Ordered; import org.springframework.stereotype.Component; import org.springframework.web.server.ServerWebExchange; import reactor.core.publisher.Mono; @Component -public class LoggingGlobalPreFilter implements GlobalFilter, Ordered { +public class LoggingGlobalPreFilter implements GlobalFilter { final Logger logger = LoggerFactory.getLogger(LoggingGlobalPreFilter.class); @@ -20,9 +19,4 @@ public class LoggingGlobalPreFilter implements GlobalFilter, Ordered { logger.info("Global Pre Filter executed"); return chain.filter(exchange); } - - @Override - public int getOrder() { - return 0; - } } diff --git a/spring-cloud/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties b/spring-cloud/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties index 116bc706cb..08421a0653 100644 --- a/spring-cloud/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties +++ b/spring-cloud/spring-cloud-gateway/src/main/resources/customfilters-global-application.properties @@ -9,8 +9,8 @@ spring.cloud.gateway.routes[0].filters[1]=Logging=My Custom Message, true, true #spring.cloud.gateway.routes[0].filters[1].args[preLogger]=true #spring.cloud.gateway.routes[0].filters[1].args[postLogger]=true -spring.cloud.gateway.routes[0].filters[2]=ModifyRequest=en -spring.cloud.gateway.routes[0].filters[3]=ModifyResponse +spring.cloud.gateway.routes[0].filters[2]=ModifyResponse +spring.cloud.gateway.routes[0].filters[3]=ModifyRequest=en spring.cloud.gateway.routes[0].filters[4]=ChainRequest=http://localhost:8082/resource/language, fr management.endpoints.web.exposure.include=* diff --git a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/CustomFiltersLiveTest.java b/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/CustomFiltersLiveTest.java index 40275bd206..b24db70e4f 100644 --- a/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/CustomFiltersLiveTest.java +++ b/spring-cloud/spring-cloud-gateway/src/test/java/com/baeldung/springcloudgateway/customfilters/CustomFiltersLiveTest.java @@ -45,6 +45,8 @@ public class CustomFiltersLiveTest { response.expectStatus() .isOk() + .expectHeader() + .doesNotExist("Bael-Custom-Language-Header") .expectBody(String.class) .isEqualTo("Service Resource"); @@ -60,7 +62,8 @@ public class CustomFiltersLiveTest { .haveAtLeastOne(eventContains("Pre GatewayFilter logging: My Custom Message")) .haveAtLeastOne(eventContains("Post GatewayFilter logging: My Custom Message")) // Modify Request - .haveAtLeastOne(eventContains("Modify Request output - Request contains Accept-Language header:")) + .haveAtLeastOne(eventContains("Modify request output - Request contains Accept-Language header:")) + .haveAtLeastOne(eventContainsExcept("Removed all query params: ", "locale")) // Modify Response .areNot(eventContains("Added custom header to Response")) // Chain Request @@ -75,16 +78,33 @@ public class CustomFiltersLiveTest { response.expectStatus() .isOk() + .expectHeader() + .exists("Bael-Custom-Language-Header") .expectBody(String.class) .isEqualTo("Service Resource"); assertThat(LoggerListAppender.getEvents()) // Modify Response - .haveAtLeastOne(eventContains("Added custom header to Response")); + .haveAtLeastOne(eventContains("Added custom header to Response")) + .haveAtLeastOne(eventContainsExcept("Removed all query params: ", "locale")); } + /** + * This condition will be successful if the event contains a substring + */ private Condition eventContains(String substring) { return new Condition(entry -> (substring == null || (entry.getFormattedMessage() != null && entry.getFormattedMessage() .contains(substring))), String.format("entry with message '%s'", substring)); } + + /** + * This condition will be successful if the event contains a substring, but not another one + */ + private Condition eventContainsExcept(String substring, String except) { + return new Condition(entry -> (substring == null || (entry.getFormattedMessage() != null && entry.getFormattedMessage() + .contains(substring) + && !entry.getFormattedMessage() + .contains(except))), + String.format("entry with message '%s'", substring)); + } } diff --git a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextIntegrationTest.java deleted file mode 100644 index 47ee5dcd49..0000000000 --- a/spring-cloud/spring-cloud-hystrix/feign-rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.baeldung.spring.cloud.hystrix.rest.consumer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = RestConsumerFeignApplication.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextIntegrationTest.java deleted file mode 100644 index 3af30acc51..0000000000 --- a/spring-cloud/spring-cloud-hystrix/rest-consumer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/consumer/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.baeldung.spring.cloud.hystrix.rest.consumer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = RestConsumerApplication.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextIntegrationTest.java deleted file mode 100644 index de696dc2b1..0000000000 --- a/spring-cloud/spring-cloud-hystrix/rest-producer/src/test/java/com/baeldung/spring/cloud/hystrix/rest/producer/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.hystrix.rest.producer; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-kubernetes/client-service/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-kubernetes/client-service/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index a6a978a354..0000000000 --- a/spring-cloud/spring-cloud-kubernetes/client-service/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.kubernetes.client.Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } -} diff --git a/spring-cloud/spring-cloud-kubernetes/demo-backend/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-kubernetes/demo-backend/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ce57cf5052..0000000000 --- a/spring-cloud/spring-cloud-kubernetes/demo-backend/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.kubernetes.backend.KubernetesBackendApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = KubernetesBackendApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud/spring-cloud-kubernetes/demo-frontend/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-kubernetes/demo-frontend/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index f7e9e35540..0000000000 --- a/spring-cloud/spring-cloud-kubernetes/demo-frontend/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.kubernetes.frontend.KubernetesFrontendApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = KubernetesFrontendApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud/spring-cloud-kubernetes/liveness-example/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-kubernetes/liveness-example/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 60b4a28aa6..0000000000 --- a/spring-cloud/spring-cloud-kubernetes/liveness-example/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung; - -import com.baeldung.liveness.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud/spring-cloud-kubernetes/readiness-example/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-kubernetes/readiness-example/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 18458182c7..0000000000 --- a/spring-cloud/spring-cloud-kubernetes/readiness-example/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung; - -import com.baeldung.readiness.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud/spring-cloud-kubernetes/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-kubernetes/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextIntegrationTest.java deleted file mode 100644 index 2f901d39f6..0000000000 --- a/spring-cloud/spring-cloud-kubernetes/travel-agency-service/src/test/java/com/baeldung/spring/cloud/kubernetes/travelagency/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.kubernetes.travelagency; - - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} \ No newline at end of file diff --git a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextIntegrationTest.java deleted file mode 100644 index 77d294093c..0000000000 --- a/spring-cloud/spring-cloud-openfeign/src/test/java/com/baeldung/cloud/openfeign/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.cloud.openfeign; - - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ExampleApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} \ No newline at end of file diff --git a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 28c6e67377..0000000000 --- a/spring-cloud/spring-cloud-rest/spring-cloud-rest-config-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringCloudRestConfigApplication.class) -public class SpringContextIntegrationTest { - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud/spring-cloud-ribbon-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-ribbon-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index baa1b12eff..0000000000 --- a/spring-cloud/spring-cloud-ribbon-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.ribbon.client.ServerLocationApp; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ServerLocationApp.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-security/auth-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-security/auth-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 60a208d6f4..0000000000 --- a/spring-cloud/spring-cloud-security/auth-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.CloudSite; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = CloudSite.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-security/auth-resource/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 4d4c312bce..0000000000 --- a/spring-cloud/spring-cloud-security/auth-resource/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud/spring-cloud-security/auth-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-security/auth-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 63a89ac45c..0000000000 --- a/spring-cloud/spring-cloud-security/auth-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.AuthServer; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AuthServer.class) -public class SpringContextIntegrationTest { - - @Test - public void contextLoads() { - } - -} diff --git a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextIntegrationTest.java deleted file mode 100644 index b5cef1b5ed..0000000000 --- a/spring-cloud/spring-cloud-stream-starters/twitterhdfs/src/test/java/com/baeldung/twitterhdfs/aggregate/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.baeldung.twitterhdfs.aggregate; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AggregateApp.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 70c5f46aa1..0000000000 --- a/spring-cloud/spring-cloud-stream/spring-cloud-stream-rabbit/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.stream.rabbit.MultipleOutputsServiceApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = MultipleOutputsServiceApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/org/baeldung/SpringContextTest.java similarity index 94% rename from spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/org/baeldung/SpringContextIntegrationTest.java rename to spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/org/baeldung/SpringContextTest.java index 0caa626c14..3dd350b571 100644 --- a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ b/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/org/baeldung/SpringContextTest.java @@ -13,7 +13,7 @@ import com.baeldung.task.TaskDemo; @RunWith(SpringJUnit4ClassRunner.class) @SpringBootApplication @ContextConfiguration(classes = { JobConfiguration.class, TaskDemo.class }, initializers = { ConfigFileApplicationContextInitializer.class }) -public class SpringContextIntegrationTest { +public class SpringContextTest { @Test public void whenSpringContextIsBootstrapped_thenNoExceptions() { diff --git a/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index b8dd03d65f..0000000000 --- a/spring-cloud/spring-cloud-task/springcloudtasksink/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.SpringCloudTaskFinal.SpringCloudTaskSinkApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringCloudTaskSinkApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-zookeeper/Greeting/src/test/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zookeeper/Greeting/src/test/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 0f544b3ed1..0000000000 --- a/spring-cloud/spring-cloud-zookeeper/Greeting/src/test/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.ribbon.client.ServerLocationApp; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = GreetingApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextIntegrationTest.java deleted file mode 100644 index 2770649aa3..0000000000 --- a/spring-cloud/spring-cloud-zookeeper/HelloWorld/src/test/java/com/baeldung/spring/cloud/helloworld/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.helloworld; - - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = HelloWorldApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextIntegrationTest.java deleted file mode 100644 index 9eaff8f510..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-client/src/test/java/com/baeldung/spring/cloud/eureka/client/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.eureka.client; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextIntegrationTest.java deleted file mode 100644 index f03913b474..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/eureka-server/src/test/java/com/baeldung/spring/cloud/eureka/server/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.eureka.server; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextIntegrationTest.java deleted file mode 100644 index cfd362edf8..0000000000 --- a/spring-cloud/spring-cloud-zuul-eureka-integration/zuul-server/src/test/java/com/baeldung/spring/cloud/zuul/config/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.spring.cloud.zuul.config; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - -} diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index efa29b1431..0000000000 --- a/spring-cloud/spring-cloud-zuul/spring-zuul-foos-resource/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung; - -import com.baeldung.config.ResourceServerApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ResourceServerApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextIntegrationTest.java deleted file mode 100644 index dbcdbdd434..0000000000 --- a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/src/test/java/com/baeldung/spring/cloud/zuulratelimitdemo/controller/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung.spring.cloud.zuulratelimitdemo.controller; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.cloud.zuulratelimitdemo.ZuulRatelimitDemoApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = ZuulRatelimitDemoApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} \ No newline at end of file diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 694708e9f1..0000000000 --- a/spring-cloud/spring-cloud-zuul/spring-zuul-ui/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung; - -import com.baeldung.config.UiApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = UiApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-cucumber/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-cucumber/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 80efd86f13..0000000000 --- a/spring-cucumber/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.SpringDemoApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringDemoApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-data-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-data-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index c2682855b8..0000000000 --- a/spring-data-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.books.SpringDataRestApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringDataRestApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-dispatcher-servlet/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-dispatcher-servlet/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 8a9d3421c2..0000000000 --- a/spring-dispatcher-servlet/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -import com.baeldung.springdispatcherservlet.configuration.AppConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = AppConfig.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-drools/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-drools/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 68325682e5..0000000000 --- a/spring-drools/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.spring.drools.service.TaxiFareConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = TaxiFareConfiguration.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-freemarker/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-freemarker/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ab0e6e8f49..0000000000 --- a/spring-freemarker/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -import com.baeldung.freemarker.config.SpringWebConfig; -import com.baeldung.freemarker.config.WebConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { SpringWebConfig.class, WebConfiguration.class }) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-integration/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-integration/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 92e80a0903..0000000000 --- a/spring-integration/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.si.security.MessageConsumer; -import com.baeldung.si.security.SecuredDirectChannel; -import com.baeldung.si.security.SecurityConfig; -import com.baeldung.si.security.SecurityPubSubChannel; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { SecurityConfig.class, SecuredDirectChannel.class, SecurityPubSubChannel.class, - MessageConsumer.class }) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-jenkins-pipeline/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-jenkins-pipeline/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 0354f7211c..0000000000 --- a/spring-jenkins-pipeline/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.SpringJenkinsPipelineApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringJenkinsPipelineApplication.class) -@DirtiesContext -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-jersey/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-jersey/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 21f180854c..0000000000 --- a/spring-jersey/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.server.config.RestConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = RestConfig.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-jinq/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-jinq/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ccf774330f..0000000000 --- a/spring-jinq/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.jinq.JinqApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = JinqApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-jms/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-jms/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 483ffec208..0000000000 --- a/spring-jms/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = { "classpath:applicationContext.xml" }) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-katharsis/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-katharsis/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 48081903b6..0000000000 --- a/spring-katharsis/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung; - -import org.baeldung.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-ldap/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-ldap/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 9c233e6562..0000000000 --- a/spring-ldap/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.ldap.javaconfig.AppConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = AppConfig.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-mobile/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-mobile/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 7f906bdbcd..0000000000 --- a/spring-mobile/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-mockito/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-mockito/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 7ce9f70302..0000000000 --- a/spring-mockito/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.MocksApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = MocksApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-mvc-basics/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-mvc-basics/src/test/java/com/baeldung/SpringContextTest.java similarity index 83% rename from spring-mvc-basics/src/test/java/com/baeldung/SpringContextIntegrationTest.java rename to spring-mvc-basics/src/test/java/com/baeldung/SpringContextTest.java index 2feb9efce1..f475e5d626 100644 --- a/spring-mvc-basics/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ b/spring-mvc-basics/src/test/java/com/baeldung/SpringContextTest.java @@ -4,7 +4,7 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest -public class SpringContextIntegrationTest { +public class SpringContextTest { @Test public void whenSpringContextIsBootstrapped_thenNoExceptions() { diff --git a/spring-mvc-forms-jsp/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-mvc-forms-jsp/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index c1e9b71550..0000000000 --- a/spring-mvc-forms-jsp/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.baeldung; - -import com.baeldung.springmvcforms.configuration.ApplicationConfiguration; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = ApplicationConfiguration.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/listbindingexample/SpringContextIntegrationTest.java b/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/listbindingexample/SpringContextIntegrationTest.java deleted file mode 100644 index da87a6830a..0000000000 --- a/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/listbindingexample/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung.listbindingexample; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.listbindingexample.ListBindingApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = {ListBindingApplication.class}) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/sessionattrs/SpringContextIntegrationTest.java b/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/sessionattrs/SpringContextIntegrationTest.java deleted file mode 100644 index e6b0dbf98c..0000000000 --- a/spring-mvc-forms-thymeleaf/src/test/java/org/baeldung/sessionattrs/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung.sessionattrs; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.sessionattrs.SessionAttrsApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = {SessionAttrsApplication.class}) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-mvc-java/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-mvc-java/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ae91d4dc1e..0000000000 --- a/spring-mvc-java/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.config.TestConfig; - -@RunWith(SpringRunner.class) -@ContextConfiguration(classes = {TestConfig.class}) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - - } -} diff --git a/spring-mvc-simple/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-mvc-simple/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 994c4865f7..0000000000 --- a/spring-mvc-simple/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -import com.baeldung.spring.configuration.ApplicationConfiguration; - - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes={ApplicationConfiguration.class}) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} - diff --git a/spring-mvc-velocity/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-mvc-velocity/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 3649332870..0000000000 --- a/spring-mvc-velocity/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -import com.baeldung.mvc.velocity.spring.config.WebConfig; -import com.baeldung.mvc.velocity.test.config.TestConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { TestConfig.class, WebConfig.class }) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-mvc-webflow/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-mvc-webflow/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 6f028c78d8..0000000000 --- a/spring-mvc-webflow/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.WebFlowConfig; -import org.baeldung.spring.WebMvcConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = {WebFlowConfig.class, WebMvcConfig.class}) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-mvc-xml/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-mvc-xml/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ec34abd367..0000000000 --- a/spring-mvc-xml/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -import com.baeldung.spring.ClientWebConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = ClientWebConfig.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-protobuf/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-protobuf/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 8315d0ff6c..0000000000 --- a/spring-protobuf/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import com.baeldung.protobuf.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.junit4.SpringRunner; - -@DirtiesContext -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-quartz/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-quartz/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index fec47f045c..0000000000 --- a/spring-quartz/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.baeldung; - -import org.baeldung.springquartz.SpringQuartzApp; -import org.baeldung.springquartz.basics.service.SampleJobService; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import static org.assertj.core.api.Assertions.assertThat; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringQuartzApp.class) -public class SpringContextIntegrationTest { - - @Autowired - private SampleJobService sampleJobService; - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } - - @Test - public void whenSchedulerStarts_thenJobsRun() throws InterruptedException { - assertThat(sampleJobService.getNumberOfInvocations()).isEqualTo(0); - Thread.sleep(SampleJobService.EXECUTION_TIME); - assertThat(sampleJobService.getNumberOfInvocations()).isEqualTo(1); - } -} diff --git a/spring-reactor/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-reactor/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 7f906bdbcd..0000000000 --- a/spring-reactor/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.Application; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2de3ed94d1..0000000000 --- a/spring-remoting/remoting-amqp/remoting-amqp-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.client.AmqpClient; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AmqpClient.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 1aec444aa0..0000000000 --- a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.client.BurlapClient; -import com.baeldung.client.HessianClient; - -@SpringBootTest(classes = {BurlapClient.class, HessianClient.class}) -@RunWith(SpringRunner.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index f1aad1f601..0000000000 --- a/spring-remoting/remoting-hessian-burlap/remoting-hessian-burlap-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.server.Server; - -@SpringBootTest(classes = Server.class) -@RunWith(SpringRunner.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index f1aad1f601..0000000000 --- a/spring-remoting/remoting-http/remoting-http-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.server.Server; - -@SpringBootTest(classes = Server.class) -@RunWith(SpringRunner.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index a94e639dc8..0000000000 --- a/spring-remoting/remoting-jms/remoting-jms-client/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.client.JmsClient; - -@SpringBootTest(classes = JmsClient.class) -@RunWith(SpringRunner.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2063dd5e6e..0000000000 --- a/spring-remoting/remoting-rmi/remoting-rmi-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.server.RmiServer; - -@SpringBootTest(classes = RmiServer.class) -@RunWith(SpringRunner.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-rest-angular/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-rest-angular/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 228d0019bd..0000000000 --- a/spring-rest-angular/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung; - -import org.baeldung.web.main.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-rest-simple/README.md b/spring-rest-simple/README.md index cb52e9118c..5e92865cfa 100644 --- a/spring-rest-simple/README.md +++ b/spring-rest-simple/README.md @@ -9,4 +9,9 @@ This module contains articles about REST APIs in Spring - [Spring RequestMapping](https://www.baeldung.com/spring-requestmapping) - [Spring and Apache FileUpload](https://www.baeldung.com/spring-apache-file-upload) - [Test a REST API with curl](https://www.baeldung.com/curl-rest) -- [Best Practices for REST API Error Handling](https://www.baeldung.com/rest-api-error-handling-best-practices) \ No newline at end of file +- [Best Practices for REST API Error Handling](https://www.baeldung.com/rest-api-error-handling-best-practices) + +### NOTE: + +This module is closed and should **not** be used to store the code +for any further articles. \ No newline at end of file diff --git a/spring-rest-simple/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-rest-simple/src/test/java/com/baeldung/SpringContextTest.java similarity index 89% rename from spring-rest-simple/src/test/java/com/baeldung/SpringContextIntegrationTest.java rename to spring-rest-simple/src/test/java/com/baeldung/SpringContextTest.java index b66e642b80..13c1c162f1 100644 --- a/spring-rest-simple/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ b/spring-rest-simple/src/test/java/com/baeldung/SpringContextTest.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { +public class SpringContextTest { @Test public void whenSpringContextIsBootstrapped_thenNoExceptions() { diff --git a/spring-rest-full/.gitignore b/spring-rest-testing/.gitignore similarity index 100% rename from spring-rest-full/.gitignore rename to spring-rest-testing/.gitignore diff --git a/spring-rest-full/README.md b/spring-rest-testing/README.md similarity index 89% rename from spring-rest-full/README.md rename to spring-rest-testing/README.md index 70ab6b2c80..18bfeddc7c 100644 --- a/spring-rest-full/README.md +++ b/spring-rest-testing/README.md @@ -1,6 +1,6 @@ -## Spring REST Full +## Spring REST Testing -This module contains articles about REST APIs with Spring +This module contains articles about testing REST APIs with Spring ### Courses @@ -17,7 +17,6 @@ The "Learn Spring Security" Classes: http://github.learnspringsecurity.com mvn clean install ``` - ### Set up MySQL ``` mysql -u root -p diff --git a/spring-rest-full/pom.xml b/spring-rest-testing/pom.xml similarity index 99% rename from spring-rest-full/pom.xml rename to spring-rest-testing/pom.xml index a2736ba03c..6475281d18 100644 --- a/spring-rest-full/pom.xml +++ b/spring-rest-testing/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 com.baeldung - spring-rest-full + spring-rest-testing 0.1-SNAPSHOT - spring-rest-full + spring-rest-testing war diff --git a/spring-rest-full/src/main/java/org/baeldung/persistence/IOperations.java b/spring-rest-testing/src/main/java/org/baeldung/persistence/IOperations.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/persistence/IOperations.java rename to spring-rest-testing/src/main/java/org/baeldung/persistence/IOperations.java diff --git a/spring-rest-full/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/spring-rest-testing/src/main/java/org/baeldung/persistence/dao/IFooDao.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/persistence/dao/IFooDao.java rename to spring-rest-testing/src/main/java/org/baeldung/persistence/dao/IFooDao.java diff --git a/spring-rest-full/src/main/java/org/baeldung/persistence/model/Foo.java b/spring-rest-testing/src/main/java/org/baeldung/persistence/model/Foo.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/persistence/model/Foo.java rename to spring-rest-testing/src/main/java/org/baeldung/persistence/model/Foo.java diff --git a/spring-rest-full/src/main/java/org/baeldung/persistence/model/User.java b/spring-rest-testing/src/main/java/org/baeldung/persistence/model/User.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/persistence/model/User.java rename to spring-rest-testing/src/main/java/org/baeldung/persistence/model/User.java diff --git a/spring-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java b/spring-rest-testing/src/main/java/org/baeldung/persistence/service/IFooService.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/persistence/service/IFooService.java rename to spring-rest-testing/src/main/java/org/baeldung/persistence/service/IFooService.java diff --git a/spring-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java b/spring-rest-testing/src/main/java/org/baeldung/persistence/service/common/AbstractService.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/persistence/service/common/AbstractService.java rename to spring-rest-testing/src/main/java/org/baeldung/persistence/service/common/AbstractService.java diff --git a/spring-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java b/spring-rest-testing/src/main/java/org/baeldung/persistence/service/impl/FooService.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/persistence/service/impl/FooService.java rename to spring-rest-testing/src/main/java/org/baeldung/persistence/service/impl/FooService.java diff --git a/spring-rest-full/src/main/java/org/baeldung/spring/Application.java b/spring-rest-testing/src/main/java/org/baeldung/spring/Application.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/spring/Application.java rename to spring-rest-testing/src/main/java/org/baeldung/spring/Application.java diff --git a/spring-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java b/spring-rest-testing/src/main/java/org/baeldung/spring/PersistenceConfig.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/spring/PersistenceConfig.java rename to spring-rest-testing/src/main/java/org/baeldung/spring/PersistenceConfig.java diff --git a/spring-rest-full/src/main/java/org/baeldung/spring/WebConfig.java b/spring-rest-testing/src/main/java/org/baeldung/spring/WebConfig.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/spring/WebConfig.java rename to spring-rest-testing/src/main/java/org/baeldung/spring/WebConfig.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/controller/FooController.java b/spring-rest-testing/src/main/java/org/baeldung/web/controller/FooController.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/controller/FooController.java rename to spring-rest-testing/src/main/java/org/baeldung/web/controller/FooController.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/controller/HomeController.java b/spring-rest-testing/src/main/java/org/baeldung/web/controller/HomeController.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/controller/HomeController.java rename to spring-rest-testing/src/main/java/org/baeldung/web/controller/HomeController.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/controller/RootController.java b/spring-rest-testing/src/main/java/org/baeldung/web/controller/RootController.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/controller/RootController.java rename to spring-rest-testing/src/main/java/org/baeldung/web/controller/RootController.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java b/spring-rest-testing/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java rename to spring-rest-testing/src/main/java/org/baeldung/web/exception/MyResourceNotFoundException.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java b/spring-rest-testing/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java rename to spring-rest-testing/src/main/java/org/baeldung/web/metric/ActuatorMetricService.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java b/spring-rest-testing/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java rename to spring-rest-testing/src/main/java/org/baeldung/web/metric/CustomActuatorMetricService.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java b/spring-rest-testing/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java rename to spring-rest-testing/src/main/java/org/baeldung/web/metric/IActuatorMetricService.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java b/spring-rest-testing/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java rename to spring-rest-testing/src/main/java/org/baeldung/web/metric/ICustomActuatorMetricService.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/metric/IMetricService.java b/spring-rest-testing/src/main/java/org/baeldung/web/metric/IMetricService.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/metric/IMetricService.java rename to spring-rest-testing/src/main/java/org/baeldung/web/metric/IMetricService.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/metric/MetricFilter.java b/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricFilter.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/metric/MetricFilter.java rename to spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricFilter.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/metric/MetricService.java b/spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricService.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/metric/MetricService.java rename to spring-rest-testing/src/main/java/org/baeldung/web/metric/MetricService.java diff --git a/spring-rest-full/src/main/java/org/baeldung/web/util/RestPreconditions.java b/spring-rest-testing/src/main/java/org/baeldung/web/util/RestPreconditions.java similarity index 100% rename from spring-rest-full/src/main/java/org/baeldung/web/util/RestPreconditions.java rename to spring-rest-testing/src/main/java/org/baeldung/web/util/RestPreconditions.java diff --git a/spring-rest-full/src/main/resources/application.properties b/spring-rest-testing/src/main/resources/application.properties similarity index 100% rename from spring-rest-full/src/main/resources/application.properties rename to spring-rest-testing/src/main/resources/application.properties diff --git a/spring-rest-full/src/main/resources/logback.xml b/spring-rest-testing/src/main/resources/logback.xml similarity index 100% rename from spring-rest-full/src/main/resources/logback.xml rename to spring-rest-testing/src/main/resources/logback.xml diff --git a/spring-rest-full/src/main/resources/persistence-h2.properties b/spring-rest-testing/src/main/resources/persistence-h2.properties similarity index 100% rename from spring-rest-full/src/main/resources/persistence-h2.properties rename to spring-rest-testing/src/main/resources/persistence-h2.properties diff --git a/spring-rest-full/src/main/resources/persistence-mysql.properties b/spring-rest-testing/src/main/resources/persistence-mysql.properties similarity index 100% rename from spring-rest-full/src/main/resources/persistence-mysql.properties rename to spring-rest-testing/src/main/resources/persistence-mysql.properties diff --git a/spring-rest-full/src/main/resources/springDataPersistenceConfig.xml b/spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml similarity index 100% rename from spring-rest-full/src/main/resources/springDataPersistenceConfig.xml rename to spring-rest-testing/src/main/resources/springDataPersistenceConfig.xml diff --git a/spring-rest-full/src/main/webapp/WEB-INF/api-servlet.xml b/spring-rest-testing/src/main/webapp/WEB-INF/api-servlet.xml similarity index 100% rename from spring-rest-full/src/main/webapp/WEB-INF/api-servlet.xml rename to spring-rest-testing/src/main/webapp/WEB-INF/api-servlet.xml diff --git a/spring-rest-full/src/main/webapp/WEB-INF/view/graph.jsp b/spring-rest-testing/src/main/webapp/WEB-INF/view/graph.jsp similarity index 100% rename from spring-rest-full/src/main/webapp/WEB-INF/view/graph.jsp rename to spring-rest-testing/src/main/webapp/WEB-INF/view/graph.jsp diff --git a/spring-rest-full/src/main/webapp/WEB-INF/view/homepage.jsp b/spring-rest-testing/src/main/webapp/WEB-INF/view/homepage.jsp similarity index 100% rename from spring-rest-full/src/main/webapp/WEB-INF/view/homepage.jsp rename to spring-rest-testing/src/main/webapp/WEB-INF/view/homepage.jsp diff --git a/spring-rest-full/src/main/webapp/WEB-INF/web.xml b/spring-rest-testing/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-rest-full/src/main/webapp/WEB-INF/web.xml rename to spring-rest-testing/src/main/webapp/WEB-INF/web.xml diff --git a/spring-rest-full/src/test/java/org/baeldung/Consts.java b/spring-rest-testing/src/test/java/org/baeldung/Consts.java similarity index 100% rename from spring-rest-full/src/test/java/org/baeldung/Consts.java rename to spring-rest-testing/src/test/java/org/baeldung/Consts.java diff --git a/spring-rest-full/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-rest-testing/src/test/java/org/baeldung/SpringContextIntegrationTest.java similarity index 100% rename from spring-rest-full/src/test/java/org/baeldung/SpringContextIntegrationTest.java rename to spring-rest-testing/src/test/java/org/baeldung/SpringContextIntegrationTest.java diff --git a/spring-rest-full/src/test/java/org/baeldung/SpringContextTest.java b/spring-rest-testing/src/test/java/org/baeldung/SpringContextTest.java similarity index 100% rename from spring-rest-full/src/test/java/org/baeldung/SpringContextTest.java rename to spring-rest-testing/src/test/java/org/baeldung/SpringContextTest.java diff --git a/spring-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java b/spring-rest-testing/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java similarity index 100% rename from spring-rest-full/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java rename to spring-rest-testing/src/test/java/org/baeldung/persistence/PersistenceTestSuite.java diff --git a/spring-rest-full/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java b/spring-rest-testing/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java similarity index 100% rename from spring-rest-full/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java rename to spring-rest-testing/src/test/java/org/baeldung/persistence/service/AbstractServicePersistenceIntegrationTest.java diff --git a/spring-rest-full/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-rest-testing/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java similarity index 100% rename from spring-rest-full/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java rename to spring-rest-testing/src/test/java/org/baeldung/persistence/service/FooServicePersistenceIntegrationTest.java diff --git a/spring-rest-full/src/test/java/org/baeldung/util/IDUtil.java b/spring-rest-testing/src/test/java/org/baeldung/util/IDUtil.java similarity index 100% rename from spring-rest-full/src/test/java/org/baeldung/util/IDUtil.java rename to spring-rest-testing/src/test/java/org/baeldung/util/IDUtil.java diff --git a/spring-rest-full/src/test/resources/.gitignore b/spring-rest-testing/src/test/resources/.gitignore similarity index 100% rename from spring-rest-full/src/test/resources/.gitignore rename to spring-rest-testing/src/test/resources/.gitignore diff --git a/spring-rest-full/src/testFile b/spring-rest-testing/src/testFile similarity index 100% rename from spring-rest-full/src/testFile rename to spring-rest-testing/src/testFile diff --git a/spring-resttemplate/README.md b/spring-resttemplate/README.md index 054071a4df..aee02416f4 100644 --- a/spring-resttemplate/README.md +++ b/spring-resttemplate/README.md @@ -17,3 +17,8 @@ The "REST With Spring" Classes: http://bit.ly/restwithspring - [Uploading MultipartFile with Spring RestTemplate](https://www.baeldung.com/spring-rest-template-multipart-upload) - [Get and Post Lists of Objects with RestTemplate](https://www.baeldung.com/spring-rest-template-list) - [Copy of RestTemplate Post Request with JSON](https://www.baeldung.com/spring-resttemplate-post-json-test) + +### NOTE: + +This module is closed and should **not** be used to store the code +for any further articles. diff --git a/spring-resttemplate/src/main/java/com/baeldung/SpringContextIntegrationTest.java b/spring-resttemplate/src/main/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 6801b694c4..0000000000 --- a/spring-resttemplate/src/main/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.produceimage.ImageApplication; -import com.baeldung.responseheaders.ResponseHeadersApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = { ImageApplication.class, - ResponseHeadersApplication.class, com.baeldung.web.upload.app.UploadApplication.class, - }) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-resttemplate/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-resttemplate/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 3c762b894b..0000000000 --- a/spring-resttemplate/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung; - -import org.baeldung.resttemplate.RestTemplateConfigurationApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = RestTemplateConfigurationApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-acl/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-acl/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index c7890d79ac..0000000000 --- a/spring-security-acl/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung; - -import org.baeldung.acl.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-angular/server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-angular/server/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 8c62ac5e91..0000000000 --- a/spring-security-angular/server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.springbootsecurityrest.basicauth.SpringBootSecurityApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringBootSecurityApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-cache-control/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-cache-control/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index c047fc6210..0000000000 --- a/spring-security-cache-control/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.cachecontrol.AppRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AppRunner.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-core/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-security-core/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 1cdff1342c..0000000000 --- a/spring-security-core/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.app.App; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = App.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index f01cac1c87..0000000000 --- a/spring-security-mvc-boot/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung; - -import org.baeldung.custom.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-mvc-boot/src/test/java/org/baeldung/jdbcauthentication/h2/SpringContextIntegrationTest.java b/spring-security-mvc-boot/src/test/java/org/baeldung/jdbcauthentication/h2/SpringContextTest.java similarity index 90% rename from spring-security-mvc-boot/src/test/java/org/baeldung/jdbcauthentication/h2/SpringContextIntegrationTest.java rename to spring-security-mvc-boot/src/test/java/org/baeldung/jdbcauthentication/h2/SpringContextTest.java index 55a7b9e2be..7aa26ff031 100644 --- a/spring-security-mvc-boot/src/test/java/org/baeldung/jdbcauthentication/h2/SpringContextIntegrationTest.java +++ b/spring-security-mvc-boot/src/test/java/org/baeldung/jdbcauthentication/h2/SpringContextTest.java @@ -7,7 +7,7 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest(classes = H2JdbcAuthenticationApplication.class) -public class SpringContextIntegrationTest { +public class SpringContextTest { @Test public void whenSpringContextIsBootstrapped_thenNoExceptions() { diff --git a/spring-security-mvc-custom/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-custom/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 9e74e83a53..0000000000 --- a/spring-security-mvc-custom/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.MvcConfig; -import org.baeldung.spring.SecSecurityConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { MvcConfig.class, SecSecurityConfig.class }) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-mvc-digest-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-digest-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index a4a85a8fa2..0000000000 --- a/spring-security-mvc-digest-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.ClientConfig; -import org.baeldung.spring.MvcConfig; -import org.baeldung.spring.SecSecurityConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { ClientConfig.class, MvcConfig.class, SecSecurityConfig.class }) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-mvc-jsonview/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-jsonview/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index e22cd3d71a..0000000000 --- a/spring-security-mvc-jsonview/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung; - -import com.baeldung.spring.AppConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = AppConfig.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-mvc-ldap/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-ldap/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 0b701e9acf..0000000000 --- a/spring-security-mvc-ldap/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SampleLDAPApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 20de02d5c5..0000000000 --- a/spring-security-mvc-login/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration({ "/RedirectionWebSecurityConfig.xml", "/mvc-servlet.xml" }) -@WebAppConfiguration -public class SpringContextIntegrationTest { - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-mvc-persisted-remember-me/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-persisted-remember-me/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index f1df880862..0000000000 --- a/spring-security-mvc-persisted-remember-me/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.MvcConfig; -import org.baeldung.spring.PersistenceConfig; -import org.baeldung.spring.SecurityConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { MvcConfig.class, PersistenceConfig.class, SecurityConfig.class }) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-mvc-socket/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc-socket/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 00202a98cb..0000000000 --- a/spring-security-mvc-socket/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -import com.baeldung.springsecuredsockets.config.AppConfig; -import com.baeldung.springsecuredsockets.config.DataStoreConfig; -import com.baeldung.springsecuredsockets.config.SecurityConfig; -import com.baeldung.springsecuredsockets.config.SocketBrokerConfig; -import com.baeldung.springsecuredsockets.config.SocketSecurityConfig; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { AppConfig.class, DataStoreConfig.class, SecurityConfig.class, - SocketBrokerConfig.class, SocketSecurityConfig.class }) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-mvc/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-security-mvc/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ac9da5ca60..0000000000 --- a/spring-security-mvc/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.session.SpringSessionApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringSessionApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-openid/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-openid/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 79a725dcae..0000000000 --- a/spring-security-openid/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung; - -import org.baeldung.config.SpringOpenidApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringOpenidApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-react/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-react/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index a921976fc3..0000000000 --- a/spring-security-react/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.baeldung.spring.MvcConfig; -import org.baeldung.spring.SecSecurityConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { MvcConfig.class, SecSecurityConfig.class }) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-rest-basic-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-rest-basic-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 31b3f2be87..0000000000 --- a/spring-security-rest-basic-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration({ "/webSecurityConfig.xml" }) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ae0d80bb45..0000000000 --- a/spring-security-rest/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.baeldung; - -import org.baeldung.security.SecurityJavaConfig; -import org.baeldung.spring.ClientWebConfig; -import org.baeldung.spring.WebConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@WebAppConfiguration -@ContextConfiguration(classes = { ClientWebConfig.class, SecurityJavaConfig.class, WebConfig.class }) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-sso/spring-security-sso-auth-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-sso/spring-security-sso-auth-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 66ee232b10..0000000000 --- a/spring-security-sso/spring-security-sso-auth-server/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.baeldung.config.AuthorizationServerApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = AuthorizationServerApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) -public class SpringContextIntegrationTest { - - @Test - public void whenLoadApplication_thenSuccess() { - - } -} diff --git a/spring-security-sso/spring-security-sso-ui-2/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-sso/spring-security-sso-ui-2/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2fb0210929..0000000000 --- a/spring-security-sso/spring-security-sso-ui-2/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.baeldung.config.UiApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = UiApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) -public class SpringContextIntegrationTest { - - @Test - public void whenLoadApplication_thenSuccess() { - - } -} diff --git a/spring-security-sso/spring-security-sso-ui/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-sso/spring-security-sso-ui/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2fb0210929..0000000000 --- a/spring-security-sso/spring-security-sso-ui/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.baeldung.config.UiApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = UiApplication.class, webEnvironment = WebEnvironment.RANDOM_PORT) -public class SpringContextIntegrationTest { - - @Test - public void whenLoadApplication_thenSuccess() { - - } -} diff --git a/spring-security-x509/spring-security-x509-basic-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-x509/spring-security-x509-basic-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 7ec6125f84..0000000000 --- a/spring-security-x509/spring-security-x509-basic-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.security.x509.X509AuthenticationServer; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = X509AuthenticationServer.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-security-x509/spring-security-x509-client-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-security-x509/spring-security-x509-client-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 7ec6125f84..0000000000 --- a/spring-security-x509/spring-security-x509-client-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.security.x509.X509AuthenticationServer; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = X509AuthenticationServer.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-session/spring-session-jdbc/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-session/spring-session-jdbc/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index b921f76a0d..0000000000 --- a/spring-session/spring-session-jdbc/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.springsessionjdbc.SpringSessionJdbcApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringSessionJdbcApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 1acc6a5cb1..0000000000 --- a/spring-session/spring-session-mongodb/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.baeldung; - -import com.baeldung.springsessionmongodb.SpringSessionMongoDBApplication; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SpringSessionMongoDBApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-sleuth/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-sleuth/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index ef722ecba0..0000000000 --- a/spring-sleuth/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.spring.session.SleuthWebApp; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = SleuthWebApp.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-social-login/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-social-login/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 29ed401118..0000000000 --- a/spring-social-login/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.baeldung; - -import org.baeldung.config.Application; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.context.junit4.SpringRunner; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, webEnvironment = WebEnvironment.RANDOM_PORT) -public class SpringContextIntegrationTest { - - @Test - public void whenLoadApplication_thenSuccess() { - - } -} diff --git a/spring-spel/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-spel/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index f394374a94..0000000000 --- a/spring-spel/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = {"classpath:applicationContext.xml"}) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-state-machine/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-state-machine/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 72292a5089..0000000000 --- a/spring-state-machine/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.baeldung.spring.statemachine.config.ForkJoinStateMachineConfiguration; -import com.baeldung.spring.statemachine.config.HierarchicalStateMachineConfiguration; -import com.baeldung.spring.statemachine.config.JunctionStateMachineConfiguration; -import com.baeldung.spring.statemachine.config.SimpleEnumStateMachineConfiguration; -import com.baeldung.spring.statemachine.config.SimpleStateMachineConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { SimpleStateMachineConfiguration.class, SimpleEnumStateMachineConfiguration.class, - JunctionStateMachineConfiguration.class, HierarchicalStateMachineConfiguration.class, - ForkJoinStateMachineConfiguration.class }) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-static-resources/src/test/java/com/baeldung/SpringContextIntegrationTest.java b/spring-static-resources/src/test/java/com/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 67dc50030c..0000000000 --- a/spring-static-resources/src/test/java/com/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.baeldung; - -import org.baeldung.spring.SecSecurityConfig; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.support.AnnotationConfigContextLoader; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(classes = { SecSecurityConfig.class }, loader = AnnotationConfigContextLoader.class) -@WebAppConfiguration -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - - } -} diff --git a/spring-swagger-codegen/spring-swagger-codegen-app/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-swagger-codegen/spring-swagger-codegen-app/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index 2143dc7f4d..0000000000 --- a/spring-swagger-codegen/spring-swagger-codegen-app/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.petstore.app.PetStoreApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = PetStoreApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/SpringContextIntegrationTest.java b/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/SpringContextIntegrationTest.java deleted file mode 100644 index 9a066b3101..0000000000 --- a/spring-thymeleaf/src/test/java/com/baeldung/thymeleaf/SpringContextIntegrationTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.baeldung.thymeleaf; - -import com.baeldung.thymeleaf.config.InitSecurity; -import com.baeldung.thymeleaf.config.WebApp; -import com.baeldung.thymeleaf.config.WebMVCConfig; -import com.baeldung.thymeleaf.config.WebMVCSecurity; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; - -@RunWith(SpringJUnit4ClassRunner.class) -@WebAppConfiguration -@ContextConfiguration(classes = { WebApp.class, WebMVCConfig.class, WebMVCSecurity.class, InitSecurity.class }) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -} diff --git a/spring-vertx/src/test/java/org/baeldung/SpringContextIntegrationTest.java b/spring-vertx/src/test/java/org/baeldung/SpringContextIntegrationTest.java deleted file mode 100644 index b1f7b39f7e..0000000000 --- a/spring-vertx/src/test/java/org/baeldung/SpringContextIntegrationTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.baeldung; - -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; - -import com.baeldung.vertxspring.VertxSpringApplication; - -@RunWith(SpringRunner.class) -@SpringBootTest(classes = VertxSpringApplication.class) -public class SpringContextIntegrationTest { - - @Test - public void whenSpringContextIsBootstrapped_thenNoExceptions() { - } -}