diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 742bfec4fa..fe4c2bfffe 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -12,7 +12,6 @@ - @@ -38,6 +37,7 @@ + diff --git a/core-java-modules/core-java-11-2/README.md b/core-java-modules/core-java-11-2/README.md deleted file mode 100644 index fc633703ba..0000000000 --- a/core-java-modules/core-java-11-2/README.md +++ /dev/null @@ -1,12 +0,0 @@ -## Java 11 核心（Core Java 11） - -本模块中包含有关 Java 11 核心新增功能的的一些文章 - -### 相关文章 -- [Guide to Java Reflection](http://www.baeldung.com/java-reflection) -- [Guide to Java 8’s Collectors](https://www.baeldung.com/java-8-collectors) -- [New Features in Java 11](https://www.baeldung.com/java-11-new-features) -- [Getting the Java Version at Runtime](https://www.baeldung.com/get-java-version-runtime) -- [Invoking a SOAP Web Service in Java](https://www.baeldung.com/java-soap-web-service) -- [Java HTTPS Client Certificate Authentication](https://www.baeldung.com/java-https-client-certificate-authentication) -- [Call Methods at Runtime Using Java Reflection](https://www.baeldung.com/java-method-reflection) diff --git a/core-java-modules/core-java-11-2/pom.xml b/core-java-modules/core-java-11-2/pom.xml deleted file mode 100644 index 5d7b1b7ddb..0000000000 --- a/core-java-modules/core-java-11-2/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - core-java-11-2 - 0.1.0-SNAPSHOT - core-java-11-2 - jar - - - com.ossez.core-java-modules - core-java-modules - 0.0.2-SNAPSHOT - - - - - com.google.guava - guava - ${version.guava} - - - org.mock-server - mockserver-junit-jupiter - ${mockserver.version} - - - org.apache.commons - commons-lang3 - ${commons-lang3.version} - - - jakarta.xml.ws - jakarta.xml.ws-api - ${jakarta.ws-api.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${maven.compiler.source.version} - ${maven.compiler.target.version} - - - - - com.sun.xml.ws - jaxws-maven-plugin - ${jaxws-maven-plugin.version} - - - http://localhost:8888/ws/country?wsdl - - true - com.baeldung.soap.ws.client.generated - src/main/java - - - - - - - 11 - 11 - 5.11.1 - 3.0.1 - 3.0.2 - - - \ No newline at end of file diff --git a/core-java-modules/core-java-11-2/src/test/java/com/ossez/optional/OptionalUnitTest.java b/core-java-modules/core-java-11-2/src/test/java/com/ossez/optional/OptionalUnitTest.java deleted file mode 100644 index 571c0a5ec5..0000000000 --- a/core-java-modules/core-java-11-2/src/test/java/com/ossez/optional/OptionalUnitTest.java +++ /dev/null @@ -1,272 +0,0 @@ -package com.ossez.optional; - -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Arrays; -import java.util.List; -import java.util.NoSuchElementException; -import java.util.Optional; - -import static org.junit.Assert.*; - -/** - * Test for Java Optional - * - *

https://www.ossez.com/t/java-8-optional/13964

- * - * @author YuCheng - */ -public class OptionalUnitTest { - - private static final Logger LOG = LoggerFactory.getLogger(OptionalUnitTest.class); - - // creating Optional - @Test - public void whenCreatesEmptyOptional_thenCorrect() { - Optional empty = Optional.empty(); - assertFalse(empty.isPresent()); - } - - @Test - public void givenNonNull_whenCreatesNonNullable_thenCorrect() { - String name = "HoneyMoose"; - Optional opt = Optional.of(name); - assertTrue(opt.isPresent()); - } - - @Test(expected = NullPointerException.class) - public void givenNull_whenThrowsErrorOnCreate_thenCorrect() { - String name = null; - Optional.of(name); - } - - @Test - public void givenNonNull_whenCreatesOptional_thenCorrect() { - String name = "HoneyMoose"; - Optional opt = Optional.of(name); - assertTrue(opt.isPresent()); - } - - @Test - public void givenNonNull_whenCreatesNullable_thenCorrect() { - String name = "HoneyMoose"; - Optional opt = Optional.ofNullable(name); - assertTrue(opt.isPresent()); - } - - @Test - public void givenNull_whenCreatesNullable_thenCorrect() { - String name = null; - Optional opt = Optional.ofNullable(name); - assertFalse(opt.isPresent()); - } - // Checking Value With isPresent() - - @Test - public void givenOptional_whenIsPresentWorks_thenCorrect() { - Optional opt = Optional.of("HoneyMoose"); - assertTrue(opt.isPresent()); - - opt = Optional.ofNullable(null); - assertFalse(opt.isPresent()); - } - - // Condition Action With ifPresent() - @Test - public void givenOptional_whenIfPresentWorks_thenCorrect() { - Optional opt = Optional.of("HoneyMoose"); - opt.ifPresent(name -> LOG.debug("{}", name.length())); - } - - // returning Value With get() - @Test - public void givenOptional_whenGetsValue_thenCorrect() { - Optional opt = Optional.of("HoneyMoose"); - String name = opt.get(); - assertEquals("HoneyMoose", name); - } - - @Test(expected = NoSuchElementException.class) - public void givenOptionalWithNull_whenGetThrowsException_thenCorrect() { - Optional opt = Optional.ofNullable(null); - String name = opt.get(); - } - - @Test - public void givenAnEmptyOptional_thenIsEmptyBehavesAsExpected() { - Optional opt = Optional.of("HoneyMoose"); - assertTrue(opt.isPresent()); - - opt = Optional.ofNullable(null); - assertFalse(opt.isPresent()); - } - - // This code only can be run in JDK 11 - @Test - public void givenAnEmptyOptional_thenIsEmptyBehavesAsExpected_JDK11() { - Optional opt = Optional.of("Baeldung"); - assertFalse(opt.isEmpty()); - - opt = Optional.ofNullable(null); - assertTrue(opt.isEmpty()); - } - - // Conditional Return With filter() - @Test - public void whenOptionalFilterWorks_thenCorrect() { - Integer year = 2016; - Optional yearOptional = Optional.of(year); - boolean is2016 = yearOptional.filter(y -> y == 2016).isPresent(); - assertTrue(is2016); - boolean is2017 = yearOptional.filter(y -> y == 2017).isPresent(); - assertFalse(is2017); - } - - @Test - public void whenFiltersWithoutOptional_thenCorrect() { - assertTrue(priceIsInRange1(new Modem(10.0))); - assertFalse(priceIsInRange1(new Modem(9.9))); - assertFalse(priceIsInRange1(new Modem(null))); - assertFalse(priceIsInRange1(new Modem(15.5))); - assertFalse(priceIsInRange1(null)); - - } - - @Test - public void whenFiltersWithOptional_thenCorrect() { - assertTrue(priceIsInRange2(new Modem(10.0))); - assertFalse(priceIsInRange2(new Modem(9.9))); - assertFalse(priceIsInRange2(new Modem(null))); - assertFalse(priceIsInRange2(new Modem(15.5))); - assertFalse(priceIsInRange1(null)); - } - - public boolean priceIsInRange1(Modem modem) { - boolean isInRange = false; - if (modem != null && modem.getPrice() != null && (modem.getPrice() >= 10 && modem.getPrice() <= 15)) { - isInRange = true; - } - return isInRange; - } - - public boolean priceIsInRange2(Modem modem2) { - return Optional.ofNullable(modem2).map(Modem::getPrice).filter(p -> p >= 10).filter(p -> p <= 15).isPresent(); - } - - // Transforming Value With map() - @Test - public void givenOptional_whenMapWorks_thenCorrect() { - List companyNames = Arrays.asList("paypal", "oracle", "", "microsoft", "", "apple"); - Optional> listOptional = Optional.of(companyNames); - - int size = listOptional.map(List::size).orElse(0); - assertEquals(6, size); - } - - @Test - public void givenOptional_whenMapWorks_thenCorrect2() { - String name = "HoneyMoose"; - Optional nameOptional = Optional.of(name); - - int len = nameOptional.map(String::length).orElse(0); - assertEquals(10, len); - } - - @Test - public void givenOptional_whenMapWorksWithFilter_thenCorrect() { - String password = " password "; - Optional passOpt = Optional.of(password); - boolean correctPassword = passOpt.filter(pass -> pass.equals("password")).isPresent(); - assertFalse(correctPassword); - - correctPassword = passOpt.map(String::trim).filter(pass -> pass.equals("password")).isPresent(); - assertTrue(correctPassword); - } - - // Transforming Value With flatMap() - @Test - public void givenOptional_whenFlatMapWorks_thenCorrect2() { - Person person = new Person("john", 26); - Optional personOptional = Optional.of(person); - - Optional> nameOptionalWrapper = personOptional.map(Person::getName); - Optional nameOptional = nameOptionalWrapper.orElseThrow(IllegalArgumentException::new); - String name1 = nameOptional.orElseThrow(IllegalArgumentException::new); - assertEquals("john", name1); - - String name = personOptional.flatMap(Person::getName).orElseThrow(IllegalArgumentException::new); - assertEquals("john", name); - } - - @Test - public void givenOptional_whenFlatMapWorksWithFilter_thenCorrect() { - Person person = new Person("john", 26); - person.setPassword("password"); - Optional personOptional = Optional.of(person); - - String password = personOptional.flatMap(Person::getPassword).filter(cleanPass -> cleanPass.equals("password")).orElseThrow(IllegalArgumentException::new); - assertEquals("password", password); - } - - // Default Value With orElse - @Test - public void whenOrElseWorks_thenCorrect() { - String nullName = null; - String name = Optional.ofNullable(nullName).orElse("john"); - assertEquals("john", name); - } - - // Default Value With orElseGet - @Test - public void whenOrElseGetWorks_thenCorrect() { - String nullName = null; - String name = Optional.ofNullable(nullName).orElseGet(() -> "john"); - assertEquals("john", name); - } - - @Test - public void whenOrElseGetAndOrElseOverlap_thenCorrect() { - String text = null; - LOG.debug("Using orElseGet:"); - String defaultText = Optional.ofNullable(text).orElseGet(this::getMyDefault); - assertEquals("Default Value", defaultText); - - LOG.debug("Using orElse:"); - defaultText = Optional.ofNullable(text).orElse(getMyDefault()); - assertEquals("Default Value", defaultText); - } - - @Test - public void whenOrElseGetAndOrElseDiffer_thenCorrect() { - String text = "Text present"; - LOG.debug("Using orElseGet:"); - String defaultText = Optional.ofNullable(text).orElseGet(this::getMyDefault); - assertEquals("Text present", defaultText); - - LOG.debug("Using orElse:"); - defaultText = Optional.ofNullable(text).orElse(getMyDefault()); - assertEquals("Text present", defaultText); - } - - // Exceptions With orElseThrow - @Test(expected = IllegalArgumentException.class) - public void whenOrElseThrowWorks_thenCorrect() { - String nullName = null; - String name = Optional.ofNullable(nullName).orElseThrow(IllegalArgumentException::new); - } - - @Test(expected = NoSuchElementException.class) - public void whenNoArgOrElseThrowWorks_thenCorrect() { - String nullName = null; - String name = Optional.ofNullable(nullName).orElseThrow(); - } - - public String getMyDefault() { - LOG.debug("Getting default value..."); - return "Default Value"; - } - - -} \ No newline at end of file diff --git a/core-java-modules/core-java-11/README.md b/core-java-modules/core-java-11/README.md index 17b1f0c827..b7a76b0ce7 100644 --- a/core-java-modules/core-java-11/README.md +++ b/core-java-modules/core-java-11/README.md @@ -14,4 +14,11 @@ This module contains articles about Java 11 core features - [Negate a Predicate Method Reference with Java 11](https://www.baeldung.com/java-negate-predicate-method-reference) - [Benchmark JDK Collections vs Eclipse Collections](https://www.baeldung.com/jdk-collections-vs-eclipse-collections) - [Pre-compile Regex Patterns Into Pattern Objects](https://www.baeldung.com/java-regex-pre-compile) +- [Guide to Java Reflection](http://www.baeldung.com/java-reflection) +- [Guide to Java 8’s Collectors](https://www.baeldung.com/java-8-collectors) +- [New Features in Java 11](https://www.baeldung.com/java-11-new-features) +- [Getting the Java Version at Runtime](https://www.baeldung.com/get-java-version-runtime) +- [Invoking a SOAP Web Service in Java](https://www.baeldung.com/java-soap-web-service) +- [Java HTTPS Client Certificate Authentication](https://www.baeldung.com/java-https-client-certificate-authentication) +- [Call Methods at Runtime Using Java Reflection](https://www.baeldung.com/java-method-reflection) diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/features/MainClass.java b/core-java-modules/core-java-11/src/main/java/com/ossez/features/MainClass.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/features/MainClass.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/features/MainClass.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/httpsclientauthentication/SSLScocketClient.java b/core-java-modules/core-java-11/src/main/java/com/ossez/httpsclientauthentication/SSLScocketClient.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/httpsclientauthentication/SSLScocketClient.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/httpsclientauthentication/SSLScocketClient.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/httpsclientauthentication/SSLSocketEchoServer.java b/core-java-modules/core-java-11/src/main/java/com/ossez/httpsclientauthentication/SSLSocketEchoServer.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/httpsclientauthentication/SSLSocketEchoServer.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/httpsclientauthentication/SSLSocketEchoServer.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/optional/Modem.java b/core-java-modules/core-java-11/src/main/java/com/ossez/optional/Modem.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/optional/Modem.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/optional/Modem.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/optional/Person.java b/core-java-modules/core-java-11/src/main/java/com/ossez/optional/Person.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/optional/Person.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/optional/Person.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Animal.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Animal.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Animal.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Animal.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Bird.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Bird.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Bird.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Bird.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/DynamicGreeter.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/DynamicGreeter.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/DynamicGreeter.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/DynamicGreeter.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Eating.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Eating.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Eating.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Eating.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Goat.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Goat.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Goat.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Goat.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Greeter.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Greeter.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Greeter.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Greeter.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/GreetingAnnotation.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/GreetingAnnotation.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/GreetingAnnotation.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/GreetingAnnotation.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Greetings.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Greetings.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Greetings.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Greetings.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Locomotion.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Locomotion.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Locomotion.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Locomotion.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Operations.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Operations.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Operations.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Operations.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Person.java b/core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Person.java similarity index 100% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/reflection/Person.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/reflection/Person.java diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/Country.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/Country.java similarity index 98% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/Country.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/Country.java index 189cff70b5..95fe383cf4 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/Country.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/Country.java @@ -1,5 +1,5 @@ -package com.ossez.soap.ws.client.generated; +package com.ossez.ws.client.generated; import jakarta.xml.bind.annotation.XmlAccessType; import jakarta.xml.bind.annotation.XmlAccessorType; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/CountryService.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/CountryService.java similarity index 95% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/CountryService.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/CountryService.java index dc80a0b833..fa970b2ca6 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/CountryService.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/CountryService.java @@ -1,5 +1,5 @@ -package com.ossez.soap.ws.client.generated; +package com.ossez.ws.client.generated; import jakarta.jws.WebMethod; import jakarta.jws.WebParam; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/CountryServiceImplService.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/CountryServiceImplService.java similarity index 98% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/CountryServiceImplService.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/CountryServiceImplService.java index 4a8823d8b0..9ea60648aa 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/CountryServiceImplService.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/CountryServiceImplService.java @@ -1,5 +1,5 @@ -package com.ossez.soap.ws.client.generated; +package com.ossez.ws.client.generated; import java.net.MalformedURLException; import java.net.URL; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/Currency.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/Currency.java similarity index 94% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/Currency.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/Currency.java index 7d448f3c41..dbadafe37b 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/Currency.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/Currency.java @@ -1,5 +1,5 @@ -package com.ossez.soap.ws.client.generated; +package com.ossez.ws.client.generated; import jakarta.xml.bind.annotation.XmlEnum; import jakarta.xml.bind.annotation.XmlType; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/ObjectFactory.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/ObjectFactory.java similarity index 95% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/ObjectFactory.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/ObjectFactory.java index 9048a426ad..97edc04c81 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/ObjectFactory.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/ObjectFactory.java @@ -1,5 +1,5 @@ -package com.ossez.soap.ws.client.generated; +package com.ossez.ws.client.generated; import jakarta.xml.bind.annotation.XmlRegistry; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/package-info.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/package-info.java similarity index 67% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/package-info.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/package-info.java index c0d7f254e0..5e2330ec33 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/client/generated/package-info.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/client/generated/package-info.java @@ -1,2 +1,2 @@ @jakarta.xml.bind.annotation.XmlSchema(namespace = "http://server.ws.soap.baeldung.com/") -package com.ossez.soap.ws.client.generated; +package com.ossez.ws.client.generated; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/Country.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/Country.java similarity index 95% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/Country.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/Country.java index cb3b51aadc..91547cb3d1 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/Country.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/Country.java @@ -1,4 +1,4 @@ -package com.ossez.soap.ws.server; +package com.ossez.ws.server; public class Country { protected String name; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryRepository.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryRepository.java similarity index 96% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryRepository.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryRepository.java index e6e9082741..2b1a36dbdb 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryRepository.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryRepository.java @@ -1,4 +1,4 @@ -package com.ossez.soap.ws.server; +package com.ossez.ws.server; import java.util.HashMap; import java.util.Map; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryService.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryService.java similarity index 89% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryService.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryService.java index 68fe93cfb4..6d2ac224c3 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryService.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryService.java @@ -1,4 +1,4 @@ -package com.ossez.soap.ws.server; +package com.ossez.ws.server; import jakarta.jws.WebMethod; import jakarta.jws.WebService; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryServiceImpl.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryServiceImpl.java similarity index 72% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryServiceImpl.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryServiceImpl.java index ba7b2aecb2..aacf0dd60c 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryServiceImpl.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryServiceImpl.java @@ -1,8 +1,8 @@ -package com.ossez.soap.ws.server; +package com.ossez.ws.server; import jakarta.jws.WebService; -@WebService(endpointInterface = "com.ossez.soap.ws.server.CountryService") +@WebService(endpointInterface = "com.ossez.ws.server.CountryService") public class CountryServiceImpl implements CountryService { private CountryRepository countryRepository = new CountryRepository(); diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryServicePublisher.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryServicePublisher.java similarity index 93% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryServicePublisher.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryServicePublisher.java index 991ecaba6d..23739390c4 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/CountryServicePublisher.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/CountryServicePublisher.java @@ -1,4 +1,4 @@ -package com.ossez.soap.ws.server; +package com.ossez.ws.server; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/Currency.java b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/Currency.java similarity index 84% rename from core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/Currency.java rename to core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/Currency.java index c9ad53ace4..e088d4e01e 100644 --- a/core-java-modules/core-java-11-2/src/main/java/com/ossez/soap/ws/server/Currency.java +++ b/core-java-modules/core-java-11/src/main/java/com/ossez/ws/server/Currency.java @@ -1,4 +1,4 @@ -package com.ossez.soap.ws.server; +package com.ossez.ws.server; public enum Currency { diff --git a/core-java-modules/core-java-11-2/src/test/java/com/ossez/collectors/Java8CollectorsUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/ossez/collectors/Java8CollectorsUnitTest.java similarity index 100% rename from core-java-modules/core-java-11-2/src/test/java/com/ossez/collectors/Java8CollectorsUnitTest.java rename to core-java-modules/core-java-11/src/test/java/com/ossez/collectors/Java8CollectorsUnitTest.java diff --git a/core-java-modules/core-java-11-2/src/test/java/com/ossez/features/HttpClientIntegrationTest.java b/core-java-modules/core-java-11/src/test/java/com/ossez/features/HttpClientIntegrationTest.java similarity index 96% rename from core-java-modules/core-java-11-2/src/test/java/com/ossez/features/HttpClientIntegrationTest.java rename to core-java-modules/core-java-11/src/test/java/com/ossez/features/HttpClientIntegrationTest.java index 1ea6f13f3c..3e3b4ed000 100644 --- a/core-java-modules/core-java-11-2/src/test/java/com/ossez/features/HttpClientIntegrationTest.java +++ b/core-java-modules/core-java-11/src/test/java/com/ossez/features/HttpClientIntegrationTest.java @@ -25,7 +25,7 @@ class HttpClientIntegrationTest { @BeforeAll static void startServer() { port = PortFactory.findFreePort(); - mockServer = startClientAndServer(port); + mockServer = ClientAndServer.startClientAndServer(port); mockServer.when(new org.mockserver.model.HttpRequest().withMethod("GET")) .respond(new org.mockserver.model.HttpResponse() .withStatusCode(HttpStatusCode.OK_200.code()) diff --git a/core-java-modules/core-java-11-2/src/test/java/com/ossez/features/JavaElevenFeaturesUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/ossez/features/JavaElevenFeaturesUnitTest.java similarity index 100% rename from core-java-modules/core-java-11-2/src/test/java/com/ossez/features/JavaElevenFeaturesUnitTest.java rename to core-java-modules/core-java-11/src/test/java/com/ossez/features/JavaElevenFeaturesUnitTest.java diff --git a/core-java-modules/core-java-11-2/src/test/java/com/ossez/features/NestedClassesUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/ossez/features/NestedClassesUnitTest.java similarity index 100% rename from core-java-modules/core-java-11-2/src/test/java/com/ossez/features/NestedClassesUnitTest.java rename to core-java-modules/core-java-11/src/test/java/com/ossez/features/NestedClassesUnitTest.java diff --git a/core-java-modules/core-java-11-2/src/test/java/com/ossez/optional/OptionalChainingUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/ossez/optional/OptionalChainingUnitTest.java similarity index 100% rename from core-java-modules/core-java-11-2/src/test/java/com/ossez/optional/OptionalChainingUnitTest.java rename to core-java-modules/core-java-11/src/test/java/com/ossez/optional/OptionalChainingUnitTest.java diff --git a/core-java-modules/core-java-11-2/src/test/java/com/ossez/reflection/OperationsUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/ossez/reflection/OperationsUnitTest.java similarity index 100% rename from core-java-modules/core-java-11-2/src/test/java/com/ossez/reflection/OperationsUnitTest.java rename to core-java-modules/core-java-11/src/test/java/com/ossez/reflection/OperationsUnitTest.java diff --git a/core-java-modules/core-java-11-2/src/test/java/com/ossez/reflection/ReflectionUnitTest.java b/core-java-modules/core-java-11/src/test/java/com/ossez/reflection/ReflectionUnitTest.java similarity index 100% rename from core-java-modules/core-java-11-2/src/test/java/com/ossez/reflection/ReflectionUnitTest.java rename to core-java-modules/core-java-11/src/test/java/com/ossez/reflection/ReflectionUnitTest.java diff --git a/core-java-modules/core-java-11-2/src/test/java/com/ossez/version/VersionManualTest.java b/core-java-modules/core-java-11/src/test/java/com/ossez/version/VersionManualTest.java similarity index 100% rename from core-java-modules/core-java-11-2/src/test/java/com/ossez/version/VersionManualTest.java rename to core-java-modules/core-java-11/src/test/java/com/ossez/version/VersionManualTest.java diff --git a/core-java-modules/pom.xml b/core-java-modules/pom.xml index b638264f5e..0cddbce097 100644 --- a/core-java-modules/pom.xml +++ b/core-java-modules/pom.xml @@ -18,7 +18,6 @@ core-java core-java-8 core-java-11 - core-java-11-2 core-java-annotations core-java-collections core-java-collections-2