From 2336a45881c6199638fa66ce0e032ea594c3cbeb Mon Sep 17 00:00:00 2001 From: YuCheng Hu Date: Tue, 30 Apr 2024 15:10:44 -0400 Subject: [PATCH] Fixed the issue of java compile for 17 --- .idea/compiler.xml | 2 +- .../annotations/ClassWithAnnotation.java | 5 - .../annotations/ClassWithSafeVarargs.java | 11 -- .../ClassWithSuppressWarnings.java | 9 -- .../com/baeldung/annotations/IntConsumer.java | 8 -- .../com/baeldung/annotations/Interval.java | 8 -- .../baeldung/annotations/IntervalUsage.java | 9 -- .../com/baeldung/annotations/Intervals.java | 5 - .../baeldung/annotations/MyAnnotation.java | 11 -- .../annotations/MyAnnotationTarget.java | 16 --- .../com/baeldung/annotations/MyOperation.java | 6 - .../baeldung/annotations/MyOperationImpl.java | 9 -- .../com/baeldung/customannotations/Init.java | 13 -- .../customannotations/JsonElement.java | 13 -- .../customannotations/JsonSerializable.java | 13 -- .../JsonSerializationException.java | 10 -- .../ObjectToJsonConverter.java | 67 ---------- .../baeldung/customannotations/Person.java | 66 ---------- .../com/baeldung/missingannotation/D.java | 4 - .../annotations/AnnotatedClass.java | 4 +- .../ClassWithSuppressWarningsNames.java | 2 +- .../annotations/RetentionAnnotation.java | 2 +- .../missingannotation/A.java | 2 +- .../missingannotation/B.java | 2 +- .../missingannotation/C.java | 2 +- .../java/com/ossez/missingannotation/D.java | 4 + .../readannotations/ClassWithAnnotations.java | 2 +- .../readannotations/FirstAnnotation.java | 2 +- .../readannotations/SecondAnnotation.java | 2 +- .../readannotations/ThirdAnnotation.java | 2 +- .../annotations/AnnotatedClassUnitTest.java | 3 +- .../ObjectToJsonConverterUnitTest.java | 2 +- .../ClassWithAnnotationsUnitTest.java | 2 +- core-java-modules/core-java-io/pom.xml | 6 + .../java/com/baeldung/unzip/UnzipFile.java | 2 +- .../baeldung/close/StreamCloseUnitTest.java | 118 ------------------ persistence-modules/pom.xml | 2 +- pom.xml | 34 ++--- ...TemporaryDirectoryWithCleanupUnitTest.java | 36 ------ 39 files changed, 48 insertions(+), 468 deletions(-) delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/IntConsumer.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/Interval.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/IntervalUsage.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/Intervals.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyAnnotation.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyOperation.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyOperationImpl.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/Init.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonElement.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonSerializable.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonSerializationException.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/Person.java delete mode 100644 core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/D.java rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/annotations/AnnotatedClass.java (56%) rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/annotations/ClassWithSuppressWarningsNames.java (97%) rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/annotations/RetentionAnnotation.java (88%) rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/missingannotation/A.java (78%) rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/missingannotation/B.java (76%) rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/missingannotation/C.java (80%) create mode 100644 core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/D.java rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/readannotations/ClassWithAnnotations.java (78%) rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/readannotations/FirstAnnotation.java (80%) rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/readannotations/SecondAnnotation.java (80%) rename core-java-modules/core-java-annotations/src/main/java/com/{baeldung => ossez}/readannotations/ThirdAnnotation.java (80%) rename core-java-modules/core-java-annotations/src/test/java/com/{baeldung => ossez}/annotations/AnnotatedClassUnitTest.java (86%) rename core-java-modules/core-java-annotations/src/test/java/com/{baeldung => ossez}/customannotations/ObjectToJsonConverterUnitTest.java (96%) rename core-java-modules/core-java-annotations/src/test/java/com/{baeldung => ossez}/readannotations/ClassWithAnnotationsUnitTest.java (97%) delete mode 100644 core-java-modules/core-java-io/src/test/java/com/baeldung/close/StreamCloseUnitTest.java delete mode 100644 testing-modules/junit-5-basics/src/test/java/com/baeldung/extensions/tempdir/TemporaryDirectoryWithCleanupUnitTest.java diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fe4c2bfffe..71f935e412 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -22,7 +22,6 @@ - @@ -41,6 +40,7 @@ + diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java deleted file mode 100644 index 034e6785a4..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithAnnotation.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.baeldung.annotations; - -@Deprecated -class ClassWithAnnotation { -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java deleted file mode 100644 index cfa91f5951..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSafeVarargs.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.baeldung.annotations; - -class ClassWithSafeVarargs { - - @SafeVarargs - final void iterateOverVarargs(T... args) { - for (T x : args) { - // do stuff with x - } - } -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java deleted file mode 100644 index fe22ec1c24..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarnings.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baeldung.annotations; - -class ClassWithSuppressWarnings { - - @SuppressWarnings("deprecation") - void useDeprecatedMethod() { - ClassWithDeprecatedMethod.deprecatedMethod(); // no warning is generated here - } -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/IntConsumer.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/IntConsumer.java deleted file mode 100644 index 4f16b27281..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/IntConsumer.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.annotations; - -@FunctionalInterface -interface IntConsumer { - - void accept(Integer number); - -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/Interval.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/Interval.java deleted file mode 100644 index f73e6e5b14..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/Interval.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.baeldung.annotations; - -import java.lang.annotation.Repeatable; - -@Repeatable(Intervals.class) -@interface Interval { - int hour() default 1; -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/IntervalUsage.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/IntervalUsage.java deleted file mode 100644 index 2e11de8215..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/IntervalUsage.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baeldung.annotations; - -public class IntervalUsage { - - @Interval(hour = 17) - @Interval(hour = 13) - void doPeriodicCleanup() { - } -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/Intervals.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/Intervals.java deleted file mode 100644 index af469f18cc..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/Intervals.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.baeldung.annotations; - -@interface Intervals { - Interval[] value(); -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyAnnotation.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyAnnotation.java deleted file mode 100644 index 6e71f446b0..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyAnnotation.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.baeldung.annotations; - -import java.lang.annotation.*; - -@Inherited -@Documented -@Retention(RetentionPolicy.RUNTIME) -@Target({ElementType.LOCAL_VARIABLE, ElementType.FIELD}) -@interface MyAnnotation { - -} \ No newline at end of file diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java deleted file mode 100644 index 37f40a624e..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyAnnotationTarget.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.baeldung.annotations; - -class MyAnnotationTarget { - - // this is OK - @MyAnnotation - String someField; - - // @MyAnnotation <- this is invalid usage! - void doSomething() { - - // this also works - @MyAnnotation - String localVariable; - } -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyOperation.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyOperation.java deleted file mode 100644 index a4385bc786..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyOperation.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.baeldung.annotations; - -interface MyOperation { - - void perform(); -} \ No newline at end of file diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyOperationImpl.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyOperationImpl.java deleted file mode 100644 index e6a8ce76d3..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/MyOperationImpl.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.baeldung.annotations; - -class MyOperationImpl implements MyOperation { - - @Override - public void perform() { - - } -} \ No newline at end of file diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/Init.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/Init.java deleted file mode 100644 index c27d7d7980..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/Init.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.customannotations; - -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Retention(RUNTIME) -@Target(METHOD) -public @interface Init { - -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonElement.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonElement.java deleted file mode 100644 index 3c953f9081..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonElement.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.customannotations; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Retention(RUNTIME) -@Target({ FIELD }) -public @interface JsonElement { - public String key() default ""; -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonSerializable.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonSerializable.java deleted file mode 100644 index f6feba1b7b..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonSerializable.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.baeldung.customannotations; - -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -@Retention(RUNTIME) -@Target(TYPE) -public @interface JsonSerializable { - -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonSerializationException.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonSerializationException.java deleted file mode 100644 index 544d1311aa..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/JsonSerializationException.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.baeldung.customannotations; - -public class JsonSerializationException extends RuntimeException { - - private static final long serialVersionUID = 1L; - - public JsonSerializationException(String message) { - super(message); - } -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java deleted file mode 100644 index b809ea0d1d..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/ObjectToJsonConverter.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.baeldung.customannotations; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.stream.Collectors; - -public class ObjectToJsonConverter { - public String convertToJson(Object object) throws JsonSerializationException { - try { - - checkIfSerializable(object); - initializeObject(object); - return getJsonString(object); - - } catch (Exception e) { - throw new JsonSerializationException(e.getMessage()); - } - } - - private void checkIfSerializable(Object object) { - if (Objects.isNull(object)) { - throw new JsonSerializationException("Can't serialize a null object"); - } - - Class clazz = object.getClass(); - if (!clazz.isAnnotationPresent(JsonSerializable.class)) { - throw new JsonSerializationException("The class " + clazz.getSimpleName() + " is not annotated with JsonSerializable"); - } - } - - private void initializeObject(Object object) throws IllegalAccessException, IllegalArgumentException, InvocationTargetException { - Class clazz = object.getClass(); - for (Method method : clazz.getDeclaredMethods()) { - if (method.isAnnotationPresent(Init.class)) { - method.setAccessible(true); - method.invoke(object); - } - } - } - - private String getJsonString(Object object) throws IllegalArgumentException, IllegalAccessException { - Class clazz = object.getClass(); - Map jsonElementsMap = new HashMap<>(); - for (Field field : clazz.getDeclaredFields()) { - field.setAccessible(true); - if (field.isAnnotationPresent(JsonElement.class)) { - jsonElementsMap.put(getKey(field), (String) field.get(object)); - } - } - - String jsonString = jsonElementsMap.entrySet() - .stream() - .map(entry -> "\"" + entry.getKey() + "\":\"" + entry.getValue() + "\"") - .collect(Collectors.joining(",")); - return "{" + jsonString + "}"; - } - - private String getKey(Field field) { - String value = field.getAnnotation(JsonElement.class) - .key(); - return value.isEmpty() ? field.getName() : value; - } -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/Person.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/Person.java deleted file mode 100644 index ba702d6d76..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/customannotations/Person.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.baeldung.customannotations; - -@JsonSerializable -public class Person { - @JsonElement - private String firstName; - @JsonElement - private String lastName; - @JsonElement(key = "personAge") - private String age; - - private String address; - - public Person(String firstName, String lastName) { - super(); - this.firstName = firstName; - this.lastName = lastName; - } - - public Person(String firstName, String lastName, String age) { - this.firstName = firstName; - this.lastName = lastName; - this.age = age; - } - - @Init - private void initNames() { - this.firstName = this.firstName.substring(0, 1) - .toUpperCase() + this.firstName.substring(1); - this.lastName = this.lastName.substring(0, 1) - .toUpperCase() + this.lastName.substring(1); - } - - 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 String getAge() { - return age; - } - - public void setAge(String age) { - this.age = age; - } - - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/D.java b/core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/D.java deleted file mode 100644 index 7c534fa682..0000000000 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/D.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.baeldung.missingannotation; - -public class D { -} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/AnnotatedClass.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/annotations/AnnotatedClass.java similarity index 56% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/AnnotatedClass.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/annotations/AnnotatedClass.java index d5d9c88388..ec31a9a53a 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/AnnotatedClass.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/annotations/AnnotatedClass.java @@ -1,6 +1,6 @@ -package com.baeldung.annotations; +package com.ossez.annotations; -import javax.annotation.Generated; +import javax.annotation.processing.Generated; @RetentionAnnotation @Generated("Available only on source code") diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/annotations/ClassWithSuppressWarningsNames.java similarity index 97% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/annotations/ClassWithSuppressWarningsNames.java index d0a325a155..af361b9e53 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/ClassWithSuppressWarningsNames.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/annotations/ClassWithSuppressWarningsNames.java @@ -1,4 +1,4 @@ -package com.baeldung.annotations; +package com.ossez.annotations; import java.io.Serializable; import java.util.ArrayList; diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/RetentionAnnotation.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/annotations/RetentionAnnotation.java similarity index 88% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/RetentionAnnotation.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/annotations/RetentionAnnotation.java index 4591334dde..01eea5d1db 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/annotations/RetentionAnnotation.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/annotations/RetentionAnnotation.java @@ -1,4 +1,4 @@ -package com.baeldung.annotations; +package com.ossez.annotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/A.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/A.java similarity index 78% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/A.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/A.java index daf9f60b96..107e233487 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/A.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/A.java @@ -1,4 +1,4 @@ -package com.baeldung.missingannotation; +package com.ossez.missingannotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/B.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/B.java similarity index 76% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/B.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/B.java index a86b2f72ec..958dffaeeb 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/B.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/B.java @@ -1,4 +1,4 @@ -package com.baeldung.missingannotation; +package com.ossez.missingannotation; @A @C(D.class) diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/C.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/C.java similarity index 80% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/C.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/C.java index 2adf2b42fa..1d1f9766a1 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/missingannotation/C.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/C.java @@ -1,4 +1,4 @@ -package com.baeldung.missingannotation; +package com.ossez.missingannotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/D.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/D.java new file mode 100644 index 0000000000..3de91f9e1b --- /dev/null +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/missingannotation/D.java @@ -0,0 +1,4 @@ +package com.ossez.missingannotation; + +public class D { +} diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/ClassWithAnnotations.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/ClassWithAnnotations.java similarity index 78% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/ClassWithAnnotations.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/ClassWithAnnotations.java index 6e6cd4ad6c..f5da589b01 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/ClassWithAnnotations.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/ClassWithAnnotations.java @@ -1,4 +1,4 @@ -package com.baeldung.readannotations; +package com.ossez.readannotations; public class ClassWithAnnotations { diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/FirstAnnotation.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/FirstAnnotation.java similarity index 80% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/FirstAnnotation.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/FirstAnnotation.java index 9193b46873..d0f1edbcb2 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/FirstAnnotation.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/FirstAnnotation.java @@ -1,4 +1,4 @@ -package com.baeldung.readannotations; +package com.ossez.readannotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/SecondAnnotation.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/SecondAnnotation.java similarity index 80% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/SecondAnnotation.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/SecondAnnotation.java index 83c7ab1d6c..0cee611c0c 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/SecondAnnotation.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/SecondAnnotation.java @@ -1,4 +1,4 @@ -package com.baeldung.readannotations; +package com.ossez.readannotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/ThirdAnnotation.java b/core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/ThirdAnnotation.java similarity index 80% rename from core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/ThirdAnnotation.java rename to core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/ThirdAnnotation.java index 24ccdb31b4..d1e8f2e1fe 100644 --- a/core-java-modules/core-java-annotations/src/main/java/com/baeldung/readannotations/ThirdAnnotation.java +++ b/core-java-modules/core-java-annotations/src/main/java/com/ossez/readannotations/ThirdAnnotation.java @@ -1,4 +1,4 @@ -package com.baeldung.readannotations; +package com.ossez.readannotations; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core-java-modules/core-java-annotations/src/test/java/com/baeldung/annotations/AnnotatedClassUnitTest.java b/core-java-modules/core-java-annotations/src/test/java/com/ossez/annotations/AnnotatedClassUnitTest.java similarity index 86% rename from core-java-modules/core-java-annotations/src/test/java/com/baeldung/annotations/AnnotatedClassUnitTest.java rename to core-java-modules/core-java-annotations/src/test/java/com/ossez/annotations/AnnotatedClassUnitTest.java index 9bf0b78cbb..aeeae4f34f 100644 --- a/core-java-modules/core-java-annotations/src/test/java/com/baeldung/annotations/AnnotatedClassUnitTest.java +++ b/core-java-modules/core-java-annotations/src/test/java/com/ossez/annotations/AnnotatedClassUnitTest.java @@ -1,5 +1,6 @@ -package com.baeldung.annotations; +package com.ossez.annotations; +import com.ossez.annotations.AnnotatedClass; import org.junit.Test; import java.lang.annotation.Annotation; diff --git a/core-java-modules/core-java-annotations/src/test/java/com/baeldung/customannotations/ObjectToJsonConverterUnitTest.java b/core-java-modules/core-java-annotations/src/test/java/com/ossez/customannotations/ObjectToJsonConverterUnitTest.java similarity index 96% rename from core-java-modules/core-java-annotations/src/test/java/com/baeldung/customannotations/ObjectToJsonConverterUnitTest.java rename to core-java-modules/core-java-annotations/src/test/java/com/ossez/customannotations/ObjectToJsonConverterUnitTest.java index 6c22b1bb73..e08ff0be0f 100644 --- a/core-java-modules/core-java-annotations/src/test/java/com/baeldung/customannotations/ObjectToJsonConverterUnitTest.java +++ b/core-java-modules/core-java-annotations/src/test/java/com/ossez/customannotations/ObjectToJsonConverterUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.customannotations; +package com.ossez.customannotations; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/core-java-modules/core-java-annotations/src/test/java/com/baeldung/readannotations/ClassWithAnnotationsUnitTest.java b/core-java-modules/core-java-annotations/src/test/java/com/ossez/readannotations/ClassWithAnnotationsUnitTest.java similarity index 97% rename from core-java-modules/core-java-annotations/src/test/java/com/baeldung/readannotations/ClassWithAnnotationsUnitTest.java rename to core-java-modules/core-java-annotations/src/test/java/com/ossez/readannotations/ClassWithAnnotationsUnitTest.java index 710e0a5f57..51bd8cea8d 100644 --- a/core-java-modules/core-java-annotations/src/test/java/com/baeldung/readannotations/ClassWithAnnotationsUnitTest.java +++ b/core-java-modules/core-java-annotations/src/test/java/com/ossez/readannotations/ClassWithAnnotationsUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.readannotations; +package com.ossez.readannotations; import org.junit.Test; diff --git a/core-java-modules/core-java-io/pom.xml b/core-java-modules/core-java-io/pom.xml index b1da8709f5..51214fce4f 100644 --- a/core-java-modules/core-java-io/pom.xml +++ b/core-java-modules/core-java-io/pom.xml @@ -177,6 +177,12 @@ nimbus-jose-jwt ${nimbus-jose-jwt.version} + + jakarta.activation + jakarta.activation-api + 2.1.2 + test + diff --git a/core-java-modules/core-java-io/src/main/java/com/baeldung/unzip/UnzipFile.java b/core-java-modules/core-java-io/src/main/java/com/baeldung/unzip/UnzipFile.java index a18663f544..9a5371ecda 100644 --- a/core-java-modules/core-java-io/src/main/java/com/baeldung/unzip/UnzipFile.java +++ b/core-java-modules/core-java-io/src/main/java/com/baeldung/unzip/UnzipFile.java @@ -40,7 +40,7 @@ public class UnzipFile { } /** - * @see https://snyk.io/research/zip-slip-vulnerability + * @see Zip Slip Vulnerability */ public static File newFile(File destinationDir, ZipEntry zipEntry) throws IOException { File destFile = new File(destinationDir, zipEntry.getName()); diff --git a/core-java-modules/core-java-io/src/test/java/com/baeldung/close/StreamCloseUnitTest.java b/core-java-modules/core-java-io/src/test/java/com/baeldung/close/StreamCloseUnitTest.java deleted file mode 100644 index aa462ba984..0000000000 --- a/core-java-modules/core-java-io/src/test/java/com/baeldung/close/StreamCloseUnitTest.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.baeldung.close; - -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.io.*; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.io.input.AutoCloseInputStream; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.junit.MockitoJUnitRunner; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -@RunWith(MockitoJUnitRunner.class) -public class StreamCloseUnitTest { - - private static final Logger log = LoggerFactory.getLogger(StreamCloseUnitTest.class); - - @Mock - private OutputStream wrappedOutputStream; - - @Mock - private InputStream wrappedInputStream; - - @Test - public void whenStreamClosedByFinally_thenIOStreamsCloseCalled() throws IOException { - - InputStream inputStream = null; - OutputStream outputStream = null; - - try { - inputStream = new BufferedInputStream(wrappedInputStream); - outputStream = new BufferedOutputStream(wrappedOutputStream); - } - finally { - try { - if (inputStream != null) - inputStream.close(); - } - catch (IOException ioe1) { - log.error("Cannot close InputStream"); - } - try { - if (outputStream != null) - outputStream.close(); - } - catch (IOException ioe2) { - log.error("Cannot close OutputStream"); - } - } - - verify(wrappedInputStream).close(); - verify(wrappedOutputStream).close(); - } - - @Test - public void whenStreamClosedByCloseQuietly_thenIOStreamsCloseCalled() throws IOException { - - InputStream inputStream = null; - OutputStream outputStream = null; - - try { - inputStream = new BufferedInputStream(wrappedInputStream); - outputStream = new BufferedOutputStream(wrappedOutputStream); - } - finally { - IOUtils.closeQuietly(inputStream); - IOUtils.closeQuietly(outputStream); - } - - verify(wrappedInputStream).close(); - verify(wrappedOutputStream).close(); - } - - @Test - public void whenFinishReadOnAutoCloseInputStream_thenInputStreamsCloseCalled() throws IOException { - - // Mimic no more data in the InputStream - when(wrappedInputStream.read(any(byte[].class))).thenReturn(-1); - - InputStream inputStream = AutoCloseInputStream.builder().setInputStream(wrappedInputStream).get(); - - byte[] buffer = new byte[256]; - while (inputStream.read(buffer) != -1) { - } - - verify(wrappedInputStream).close(); - } - - @Test - public void whenStreamClosedByWithResources_thenIOStreamsCloseCalled() throws IOException { - - try (BufferedInputStream inputStream = new BufferedInputStream(wrappedInputStream); - BufferedOutputStream outputStream = new BufferedOutputStream(wrappedOutputStream)) { - } - - verify(wrappedInputStream).close(); - verify(wrappedOutputStream).close(); - } - - @Test - public void whenStreamClosedByWithResourcesJava9_thenIOStreamsCloseCalled() throws IOException { - - InputStream inputStream = new BufferedInputStream(wrappedInputStream); - OutputStream outputStream = new BufferedOutputStream(wrappedOutputStream); - - try (inputStream; outputStream) { - } - - verify(wrappedInputStream).close(); - verify(wrappedOutputStream).close(); - } - -} \ No newline at end of file diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml index 86b2acfa1b..718929d3bc 100644 --- a/persistence-modules/pom.xml +++ b/persistence-modules/pom.xml @@ -72,7 +72,7 @@ - spring-data-jpa-repo-2 + diff --git a/pom.xml b/pom.xml index ca542f303a..b819422a80 100644 --- a/pom.xml +++ b/pom.xml @@ -54,7 +54,7 @@ - 11 + 17 UTF-8 UTF-8 @@ -126,6 +126,7 @@ 3.3.1 3.0.0-M8 3.10.1 + 3.6.3 @@ -353,6 +354,23 @@ UTF-8 + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + ${java.version} + UTF-8 + + + + attach-javadocs + + jar + + + + org.apache.maven.plugins maven-resources-plugin @@ -385,19 +403,7 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - 3.4.0 - - - attach-javadocs - - jar - - - - + org.apache.maven.plugins maven-gpg-plugin diff --git a/testing-modules/junit-5-basics/src/test/java/com/baeldung/extensions/tempdir/TemporaryDirectoryWithCleanupUnitTest.java b/testing-modules/junit-5-basics/src/test/java/com/baeldung/extensions/tempdir/TemporaryDirectoryWithCleanupUnitTest.java deleted file mode 100644 index 739212ec04..0000000000 --- a/testing-modules/junit-5-basics/src/test/java/com/baeldung/extensions/tempdir/TemporaryDirectoryWithCleanupUnitTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.baeldung.extensions.tempdir; - -import org.junit.jupiter.api.MethodOrderer; -import org.junit.jupiter.api.Order; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.TestMethodOrder; -import org.junit.jupiter.api.io.TempDir; - -import java.nio.file.Path; - -import static org.junit.Assert.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.io.CleanupMode.NEVER; - -@TestMethodOrder(MethodOrderer.OrderAnnotation.class) -@TestInstance(TestInstance.Lifecycle.PER_CLASS) -class TemporaryDirectoryWithCleanupUnitTest { - - private Path theTempDirToBeChecked = null; - - @Test - @Order(1) - void whenTestMethodWithTempDirNeverCleanup_thenSetInstanceVariable(@TempDir(cleanup = NEVER) Path tempDir) { - theTempDirToBeChecked = tempDir; - System.out.println(tempDir.toFile().getAbsolutePath()); - } - - @Test - @Order(2) - void whenTestMethodWithTempDirNeverCleanup_thenTempDirShouldNotBeRemoved() { - assertNotNull(theTempDirToBeChecked); - assertTrue(theTempDirToBeChecked.toFile().isDirectory()); - } - -} \ No newline at end of file