diff --git a/apache-libraries-2/README.md b/apache-libraries-2/README.md index 0cc96d70fbf6..0087975c0632 100644 --- a/apache-libraries-2/README.md +++ b/apache-libraries-2/README.md @@ -1,8 +1,11 @@ ## Relevant Articles -- [Understanding XSLT Processing in Java](https://www.baeldung.com/java-extensible-stylesheet-language-transformations) - [Add Camel Route at Runtime in Java](https://www.baeldung.com/java-camel-dynamic-route) - [Logging in Apache Camel](https://www.baeldung.com/java-apache-camel-logging) - [How to Handle Default Values in Avro](https://www.baeldung.com/java-avro-default-values) - [How to Send a Post Request in Camel](https://www.baeldung.com/java-apache-camel-send-post-request) -- More articles: [[<-- prev]](../apache-libraries) - +- [Introduction to Apache Beam](https://www.baeldung.com/apache-beam) +- [Introduction to Apache Pulsar](https://www.baeldung.com/apache-pulsar) +- [Introduction to Apache Curator](https://www.baeldung.com/apache-curator) +- [Introduction to Apache BVal](https://www.baeldung.com/apache-bval) +- [Building a Microservice with Apache Meecrowave](https://www.baeldung.com/apache-meecrowave) +- More articles: [[<-- prev]](../apache-libraries) \ No newline at end of file diff --git a/apache-libraries-2/pom.xml b/apache-libraries-2/pom.xml index db85477f16f5..828fa9d12ebb 100644 --- a/apache-libraries-2/pom.xml +++ b/apache-libraries-2/pom.xml @@ -14,11 +14,7 @@ - - javax.validation - validation-api - ${javax.validation.validation-api.version} - + org.apache.camel camel-core @@ -45,6 +41,129 @@ camel-http ${camel.version} + + + org.apache.beam + beam-sdks-java-core + ${beam.version} + + + org.apache.beam + beam-runners-direct-java + ${beam.version} + runtime + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + org.apache.pulsar + pulsar-client + ${pulsar-client.version} + + + + org.apache.curator + curator-x-async + ${curator.version} + + + org.apache.zookeeper + zookeeper + + + + + org.apache.curator + curator-recipes + ${curator.version} + + + com.jayway.awaitility + awaitility + ${avaitility.version} + test + + + org.apache.zookeeper + zookeeper + ${zookeeper.version} + + + + org.apache.bval + bval-jsr + ${bval.version} + + + jakarta.validation + jakarta.validation-api + ${jakarta.validation.validation-api.version} + + + org.apache.bval + bval-extras + ${bval.version} + + + + org.apache.meecrowave + meecrowave-core + ${meecrowave-core.version} + jakarta + + + * + * + + + + + org.apache.meecrowave + meecrowave-jpa + ${meecrowave-jpa.version} + + + org.apache.xbean + xbean-asm9-shaded + ${xbean.version} + + + org.apache.xbean + xbean-reflect + ${xbean.version} + + + com.squareup.okhttp3 + okhttp + ${okhttp.version} + + + org.apache.meecrowave + meecrowave-junit + ${meecrowave-junit.version} + jakarta + + + * + * + + + test + org.apache.avro avro @@ -73,8 +192,8 @@ avro-maven-plugin ${apache.avro.version} - ${project.basedir}/src/main/java/com/baeldung/avro/ - ${project.basedir}/src/main/java/com/baeldung/avro/ + src/main/java/com/baeldung/apache/avro/ + src/main/java/com/baeldung/apache/avro/ String @@ -86,13 +205,31 @@ + + + org.apache.meecrowave + meecrowave-maven-plugin + ${meecrowave-maven-plugin.version} + - 2.0.1.Final + 3.0.1 + 3.1.0 4.4.1 1.11.3 + 2.45.0 + 2.1.1-incubating + 4.0.1 + 1.7.0 + 3.4.11 + 1.2.15 + 5.0.0-alpha.12 + 1.2.15 + 1.2.15 + 1.2.15 + 4.24 \ No newline at end of file diff --git a/apache-libraries-2/src/main/java/com/baeldung/avro/SerializationDeserializationLogic.java b/apache-libraries-2/src/main/java/com/baeldung/apache/avro/SerializationDeserializationLogic.java similarity index 92% rename from apache-libraries-2/src/main/java/com/baeldung/avro/SerializationDeserializationLogic.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/avro/SerializationDeserializationLogic.java index fc5b0460de87..d8422c6f8fd5 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/avro/SerializationDeserializationLogic.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/avro/SerializationDeserializationLogic.java @@ -1,6 +1,6 @@ -package com.baeldung.avro; +package com.baeldung.apache.avro; -import generated.avro.Car; +import com.baeldung.apache.avro.generated.Car; import org.apache.avro.file.DataFileReader; import org.apache.avro.file.DataFileWriter; diff --git a/apache-libraries-2/src/main/java/com/baeldung/avro/car.avsc b/apache-libraries-2/src/main/java/com/baeldung/apache/avro/car.avsc similarity index 91% rename from apache-libraries-2/src/main/java/com/baeldung/avro/car.avsc rename to apache-libraries-2/src/main/java/com/baeldung/apache/avro/car.avsc index c7690b65ecf4..e19300d176a6 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/avro/car.avsc +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/avro/car.avsc @@ -1,5 +1,5 @@ { - "namespace": "generated.avro", + "namespace": "generated", "type": "record", "name": "Car", "fields": [ diff --git a/apache-libraries-2/src/main/java/com/baeldung/apache/avro/generated/Car.java b/apache-libraries-2/src/main/java/com/baeldung/apache/avro/generated/Car.java new file mode 100644 index 000000000000..e007956d51a6 --- /dev/null +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/avro/generated/Car.java @@ -0,0 +1,492 @@ +/** + * Autogenerated by Avro + * + * DO NOT EDIT DIRECTLY + */ +package com.baeldung.apache.avro.generated; + +import org.apache.avro.specific.SpecificData; +import org.apache.avro.message.BinaryMessageEncoder; +import org.apache.avro.message.BinaryMessageDecoder; +import org.apache.avro.message.SchemaStore; + +@org.apache.avro.specific.AvroGenerated +public class Car extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { + private static final long serialVersionUID = -8258229058542686289L; + + + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"Car\",\"namespace\":\"generated.avro\",\"fields\":[{\"name\":\"brand\",\"type\":{\"type\":\"string\",\"avro.java.string\":\"String\"},\"default\":\"Dacia\"},{\"name\":\"number_of_doors\",\"type\":\"int\",\"default\":4},{\"name\":\"color\",\"type\":[\"null\",{\"type\":\"string\",\"avro.java.string\":\"String\"}],\"default\":null}]}"); + public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } + + private static final SpecificData MODEL$ = new SpecificData(); + + private static final BinaryMessageEncoder ENCODER = + new BinaryMessageEncoder<>(MODEL$, SCHEMA$); + + private static final BinaryMessageDecoder DECODER = + new BinaryMessageDecoder<>(MODEL$, SCHEMA$); + + /** + * Return the BinaryMessageEncoder instance used by this class. + * @return the message encoder used by this class + */ + public static BinaryMessageEncoder getEncoder() { + return ENCODER; + } + + /** + * Return the BinaryMessageDecoder instance used by this class. + * @return the message decoder used by this class + */ + public static BinaryMessageDecoder getDecoder() { + return DECODER; + } + + /** + * Create a new BinaryMessageDecoder instance for this class that uses the specified {@link SchemaStore}. + * @param resolver a {@link SchemaStore} used to find schemas by fingerprint + * @return a BinaryMessageDecoder instance for this class backed by the given SchemaStore + */ + public static BinaryMessageDecoder createDecoder(SchemaStore resolver) { + return new BinaryMessageDecoder<>(MODEL$, SCHEMA$, resolver); + } + + /** + * Serializes this Car to a ByteBuffer. + * @return a buffer holding the serialized data for this instance + * @throws java.io.IOException if this instance could not be serialized + */ + public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { + return ENCODER.encode(this); + } + + /** + * Deserializes a Car from a ByteBuffer. + * @param b a byte buffer holding serialized data for an instance of this class + * @return a Car instance decoded from the given buffer + * @throws java.io.IOException if the given bytes could not be deserialized into an instance of this class + */ + public static Car fromByteBuffer( + java.nio.ByteBuffer b) throws java.io.IOException { + return DECODER.decode(b); + } + + private java.lang.String brand; + private int number_of_doors; + private java.lang.String color; + + /** + * Default constructor. Note that this does not initialize fields + * to their default values from the schema. If that is desired then + * one should use newBuilder(). + */ + public Car() {} + + /** + * All-args constructor. + * @param brand The new value for brand + * @param number_of_doors The new value for number_of_doors + * @param color The new value for color + */ + public Car(java.lang.String brand, java.lang.Integer number_of_doors, java.lang.String color) { + this.brand = brand; + this.number_of_doors = number_of_doors; + this.color = color; + } + + @Override + public org.apache.avro.specific.SpecificData getSpecificData() { return MODEL$; } + + @Override + public org.apache.avro.Schema getSchema() { return SCHEMA$; } + + // Used by DatumWriter. Applications should not call. + @Override + public java.lang.Object get(int field$) { + switch (field$) { + case 0: return brand; + case 1: return number_of_doors; + case 2: return color; + default: throw new IndexOutOfBoundsException("Invalid index: " + field$); + } + } + + // Used by DatumReader. Applications should not call. + @Override + @SuppressWarnings(value="unchecked") + public void put(int field$, java.lang.Object value$) { + switch (field$) { + case 0: brand = value$ != null ? value$.toString() : null; break; + case 1: number_of_doors = (java.lang.Integer)value$; break; + case 2: color = value$ != null ? value$.toString() : null; break; + default: throw new IndexOutOfBoundsException("Invalid index: " + field$); + } + } + + /** + * Gets the value of the 'brand' field. + * @return The value of the 'brand' field. + */ + public java.lang.String getBrand() { + return brand; + } + + + /** + * Sets the value of the 'brand' field. + * @param value the value to set. + */ + public void setBrand(java.lang.String value) { + this.brand = value; + } + + /** + * Gets the value of the 'number_of_doors' field. + * @return The value of the 'number_of_doors' field. + */ + public int getNumberOfDoors() { + return number_of_doors; + } + + + /** + * Sets the value of the 'number_of_doors' field. + * @param value the value to set. + */ + public void setNumberOfDoors(int value) { + this.number_of_doors = value; + } + + /** + * Gets the value of the 'color' field. + * @return The value of the 'color' field. + */ + public java.lang.String getColor() { + return color; + } + + + /** + * Sets the value of the 'color' field. + * @param value the value to set. + */ + public void setColor(java.lang.String value) { + this.color = value; + } + + /** + * Creates a new Car RecordBuilder. + * @return A new Car RecordBuilder + */ + public static Car.Builder newBuilder() { + return new Car.Builder(); + } + + /** + * Creates a new Car RecordBuilder by copying an existing Builder. + * @param other The existing builder to copy. + * @return A new Car RecordBuilder + */ + public static Car.Builder newBuilder(Car.Builder other) { + if (other == null) { + return new Car.Builder(); + } else { + return new Car.Builder(other); + } + } + + /** + * Creates a new Car RecordBuilder by copying an existing Car instance. + * @param other The existing instance to copy. + * @return A new Car RecordBuilder + */ + public static Car.Builder newBuilder(Car other) { + if (other == null) { + return new Car.Builder(); + } else { + return new Car.Builder(other); + } + } + + /** + * RecordBuilder for Car instances. + */ + @org.apache.avro.specific.AvroGenerated + public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase + implements org.apache.avro.data.RecordBuilder { + + private java.lang.String brand; + private int number_of_doors; + private java.lang.String color; + + /** Creates a new Builder */ + private Builder() { + super(SCHEMA$, MODEL$); + } + + /** + * Creates a Builder by copying an existing Builder. + * @param other The existing Builder to copy. + */ + private Builder(Car.Builder other) { + super(other); + if (isValidValue(fields()[0], other.brand)) { + this.brand = data().deepCopy(fields()[0].schema(), other.brand); + fieldSetFlags()[0] = other.fieldSetFlags()[0]; + } + if (isValidValue(fields()[1], other.number_of_doors)) { + this.number_of_doors = data().deepCopy(fields()[1].schema(), other.number_of_doors); + fieldSetFlags()[1] = other.fieldSetFlags()[1]; + } + if (isValidValue(fields()[2], other.color)) { + this.color = data().deepCopy(fields()[2].schema(), other.color); + fieldSetFlags()[2] = other.fieldSetFlags()[2]; + } + } + + /** + * Creates a Builder by copying an existing Car instance + * @param other The existing instance to copy. + */ + private Builder(Car other) { + super(SCHEMA$, MODEL$); + if (isValidValue(fields()[0], other.brand)) { + this.brand = data().deepCopy(fields()[0].schema(), other.brand); + fieldSetFlags()[0] = true; + } + if (isValidValue(fields()[1], other.number_of_doors)) { + this.number_of_doors = data().deepCopy(fields()[1].schema(), other.number_of_doors); + fieldSetFlags()[1] = true; + } + if (isValidValue(fields()[2], other.color)) { + this.color = data().deepCopy(fields()[2].schema(), other.color); + fieldSetFlags()[2] = true; + } + } + + /** + * Gets the value of the 'brand' field. + * @return The value. + */ + public java.lang.String getBrand() { + return brand; + } + + + /** + * Sets the value of the 'brand' field. + * @param value The value of 'brand'. + * @return This builder. + */ + public Car.Builder setBrand(java.lang.String value) { + validate(fields()[0], value); + this.brand = value; + fieldSetFlags()[0] = true; + return this; + } + + /** + * Checks whether the 'brand' field has been set. + * @return True if the 'brand' field has been set, false otherwise. + */ + public boolean hasBrand() { + return fieldSetFlags()[0]; + } + + + /** + * Clears the value of the 'brand' field. + * @return This builder. + */ + public Car.Builder clearBrand() { + brand = null; + fieldSetFlags()[0] = false; + return this; + } + + /** + * Gets the value of the 'number_of_doors' field. + * @return The value. + */ + public int getNumberOfDoors() { + return number_of_doors; + } + + + /** + * Sets the value of the 'number_of_doors' field. + * @param value The value of 'number_of_doors'. + * @return This builder. + */ + public Car.Builder setNumberOfDoors(int value) { + validate(fields()[1], value); + this.number_of_doors = value; + fieldSetFlags()[1] = true; + return this; + } + + /** + * Checks whether the 'number_of_doors' field has been set. + * @return True if the 'number_of_doors' field has been set, false otherwise. + */ + public boolean hasNumberOfDoors() { + return fieldSetFlags()[1]; + } + + + /** + * Clears the value of the 'number_of_doors' field. + * @return This builder. + */ + public Car.Builder clearNumberOfDoors() { + fieldSetFlags()[1] = false; + return this; + } + + /** + * Gets the value of the 'color' field. + * @return The value. + */ + public java.lang.String getColor() { + return color; + } + + + /** + * Sets the value of the 'color' field. + * @param value The value of 'color'. + * @return This builder. + */ + public Car.Builder setColor(java.lang.String value) { + validate(fields()[2], value); + this.color = value; + fieldSetFlags()[2] = true; + return this; + } + + /** + * Checks whether the 'color' field has been set. + * @return True if the 'color' field has been set, false otherwise. + */ + public boolean hasColor() { + return fieldSetFlags()[2]; + } + + + /** + * Clears the value of the 'color' field. + * @return This builder. + */ + public Car.Builder clearColor() { + color = null; + fieldSetFlags()[2] = false; + return this; + } + + @Override + @SuppressWarnings("unchecked") + public Car build() { + try { + Car record = new Car(); + record.brand = fieldSetFlags()[0] ? this.brand : (java.lang.String) defaultValue(fields()[0]); + record.number_of_doors = fieldSetFlags()[1] ? this.number_of_doors : (java.lang.Integer) defaultValue(fields()[1]); + record.color = fieldSetFlags()[2] ? this.color : (java.lang.String) defaultValue(fields()[2]); + return record; + } catch (org.apache.avro.AvroMissingFieldException e) { + throw e; + } catch (java.lang.Exception e) { + throw new org.apache.avro.AvroRuntimeException(e); + } + } + } + + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumWriter + WRITER$ = (org.apache.avro.io.DatumWriter)MODEL$.createDatumWriter(SCHEMA$); + + @Override public void writeExternal(java.io.ObjectOutput out) + throws java.io.IOException { + WRITER$.write(this, SpecificData.getEncoder(out)); + } + + @SuppressWarnings("unchecked") + private static final org.apache.avro.io.DatumReader + READER$ = (org.apache.avro.io.DatumReader)MODEL$.createDatumReader(SCHEMA$); + + @Override public void readExternal(java.io.ObjectInput in) + throws java.io.IOException { + READER$.read(this, SpecificData.getDecoder(in)); + } + + @Override protected boolean hasCustomCoders() { return true; } + + @Override public void customEncode(org.apache.avro.io.Encoder out) + throws java.io.IOException + { + out.writeString(this.brand); + + out.writeInt(this.number_of_doors); + + if (this.color == null) { + out.writeIndex(0); + out.writeNull(); + } else { + out.writeIndex(1); + out.writeString(this.color); + } + + } + + @Override public void customDecode(org.apache.avro.io.ResolvingDecoder in) + throws java.io.IOException + { + org.apache.avro.Schema.Field[] fieldOrder = in.readFieldOrderIfDiff(); + if (fieldOrder == null) { + this.brand = in.readString(); + + this.number_of_doors = in.readInt(); + + if (in.readIndex() != 1) { + in.readNull(); + this.color = null; + } else { + this.color = in.readString(); + } + + } else { + for (int i = 0; i < 3; i++) { + switch (fieldOrder[i].pos()) { + case 0: + this.brand = in.readString(); + break; + + case 1: + this.number_of_doors = in.readInt(); + break; + + case 2: + if (in.readIndex() != 1) { + in.readNull(); + this.color = null; + } else { + this.color = in.readString(); + } + break; + + default: + throw new java.io.IOException("Corrupt ResolvingDecoder."); + } + } + } + } +} + + + + + + + + + + diff --git a/apache-libraries/src/main/java/com/baeldung/apache/beam/intro/WordCount.java b/apache-libraries-2/src/main/java/com/baeldung/apache/beam/WordCount.java similarity index 98% rename from apache-libraries/src/main/java/com/baeldung/apache/beam/intro/WordCount.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/beam/WordCount.java index f2dfb478106e..632cc97e6cd6 100644 --- a/apache-libraries/src/main/java/com/baeldung/apache/beam/intro/WordCount.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/beam/WordCount.java @@ -1,4 +1,4 @@ -package com.baeldung.apache.beam.intro; +package com.baeldung.apache.beam; import java.util.Arrays; diff --git a/apache-libraries/src/main/java/com/baeldung/bval/model/User.java b/apache-libraries-2/src/main/java/com/baeldung/apache/bval/model/User.java similarity index 96% rename from apache-libraries/src/main/java/com/baeldung/bval/model/User.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/bval/model/User.java index 1fbf55559666..c4774f9505e7 100644 --- a/apache-libraries/src/main/java/com/baeldung/bval/model/User.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/bval/model/User.java @@ -1,4 +1,4 @@ -package com.baeldung.bval.model; +package com.baeldung.apache.bval.model; import java.io.File; @@ -13,7 +13,7 @@ import org.apache.bval.extras.constraints.file.Directory; import org.apache.bval.extras.constraints.net.InetAddress; -import com.baeldung.bval.validation.Password; +import com.baeldung.apache.bval.validation.Password; public class User { @NotNull diff --git a/apache-libraries/src/main/java/com/baeldung/bval/validation/Password.java b/apache-libraries-2/src/main/java/com/baeldung/apache/bval/validation/Password.java similarity index 93% rename from apache-libraries/src/main/java/com/baeldung/bval/validation/Password.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/bval/validation/Password.java index 055e11f5188c..3d36fd6040bc 100644 --- a/apache-libraries/src/main/java/com/baeldung/bval/validation/Password.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/bval/validation/Password.java @@ -1,4 +1,4 @@ -package com.baeldung.bval.validation; +package com.baeldung.apache.bval.validation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/apache-libraries/src/main/java/com/baeldung/bval/validation/PasswordValidator.java b/apache-libraries-2/src/main/java/com/baeldung/apache/bval/validation/PasswordValidator.java similarity index 95% rename from apache-libraries/src/main/java/com/baeldung/bval/validation/PasswordValidator.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/bval/validation/PasswordValidator.java index 428f4e8abdb2..25fa144abcef 100644 --- a/apache-libraries/src/main/java/com/baeldung/bval/validation/PasswordValidator.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/bval/validation/PasswordValidator.java @@ -1,4 +1,4 @@ -package com.baeldung.bval.validation; +package com.baeldung.apache.bval.validation; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/apache-libraries-2/src/main/java/com/baeldung/dynamicrouter/DynamicRouterBean.java b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/DynamicRouterBean.java similarity index 95% rename from apache-libraries-2/src/main/java/com/baeldung/dynamicrouter/DynamicRouterBean.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/camel/DynamicRouterBean.java index a28c3959a40f..0601bc749124 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/dynamicrouter/DynamicRouterBean.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/DynamicRouterBean.java @@ -1,4 +1,4 @@ -package com.baeldung.dynamicrouter; +package com.baeldung.apache.camel; import org.apache.camel.ExchangeProperties; diff --git a/apache-libraries-2/src/main/java/com/baeldung/dynamicrouter/DynamicRouterRoute.java b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/DynamicRouterRoute.java similarity index 87% rename from apache-libraries-2/src/main/java/com/baeldung/dynamicrouter/DynamicRouterRoute.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/camel/DynamicRouterRoute.java index 875263f0b1e2..d9c9c0b882f0 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/dynamicrouter/DynamicRouterRoute.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/DynamicRouterRoute.java @@ -1,4 +1,4 @@ -package com.baeldung.dynamicrouter; +package com.baeldung.apache.camel; import org.apache.camel.builder.RouteBuilder; diff --git a/apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/CamelLoggingMainApp.java b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/CamelLoggingMainApp.java similarity index 86% rename from apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/CamelLoggingMainApp.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/CamelLoggingMainApp.java index 8eaad9595907..cd54c2de75be 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/CamelLoggingMainApp.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/CamelLoggingMainApp.java @@ -1,4 +1,4 @@ -package com.baeldung.apachecamellogging; +package com.baeldung.apache.camel.logging; import org.apache.camel.main.Main; diff --git a/apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/FileCopierCamelRoute.java b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/FileCopierCamelRoute.java similarity index 95% rename from apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/FileCopierCamelRoute.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/FileCopierCamelRoute.java index cd09174d5498..c9ae6dd0db18 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/FileCopierCamelRoute.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/FileCopierCamelRoute.java @@ -1,4 +1,4 @@ -package com.baeldung.apachecamellogging; +package com.baeldung.apache.camel.logging; import org.apache.camel.LoggingLevel; import org.apache.camel.builder.RouteBuilder; diff --git a/apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/FileCopierTracerCamelRoute.java b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/FileCopierTracerCamelRoute.java similarity index 93% rename from apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/FileCopierTracerCamelRoute.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/FileCopierTracerCamelRoute.java index fea144ce66cd..eebbf93952b2 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/FileCopierTracerCamelRoute.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/FileCopierTracerCamelRoute.java @@ -1,4 +1,4 @@ -package com.baeldung.apachecamellogging; +package com.baeldung.apache.camel.logging; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.model.dataformat.JsonLibrary; diff --git a/apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/FileProcessor.java b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/FileProcessor.java similarity index 92% rename from apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/FileProcessor.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/FileProcessor.java index 478fb0ced01b..c7658f207e64 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/apachecamellogging/FileProcessor.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/logging/FileProcessor.java @@ -1,4 +1,4 @@ -package com.baeldung.apachecamellogging; +package com.baeldung.apache.camel.logging; import org.apache.camel.Body; diff --git a/apache-libraries-2/src/main/java/com/baeldung/apachecamelpostrequest/Post.java b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/postrequest/Post.java similarity index 93% rename from apache-libraries-2/src/main/java/com/baeldung/apachecamelpostrequest/Post.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/camel/postrequest/Post.java index 129b8194d4ec..fd77a9c484f0 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/apachecamelpostrequest/Post.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/postrequest/Post.java @@ -1,4 +1,4 @@ -package com.baeldung.apachecamelpostrequest; +package com.baeldung.apache.camel.postrequest; public class Post { diff --git a/apache-libraries-2/src/main/java/com/baeldung/apachecamelpostrequest/PostRequestRoute.java b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/postrequest/PostRequestRoute.java similarity index 96% rename from apache-libraries-2/src/main/java/com/baeldung/apachecamelpostrequest/PostRequestRoute.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/camel/postrequest/PostRequestRoute.java index 568cb389d2e1..bf5561caae5d 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/apachecamelpostrequest/PostRequestRoute.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/camel/postrequest/PostRequestRoute.java @@ -1,4 +1,4 @@ -package com.baeldung.apachecamelpostrequest; +package com.baeldung.apache.camel.postrequest; import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; diff --git a/apache-libraries/src/main/java/com/baeldung/apache/curator/modeled/HostConfig.java b/apache-libraries-2/src/main/java/com/baeldung/apache/curator/HostConfig.java similarity index 91% rename from apache-libraries/src/main/java/com/baeldung/apache/curator/modeled/HostConfig.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/curator/HostConfig.java index bab713374275..8a670d0e1a80 100644 --- a/apache-libraries/src/main/java/com/baeldung/apache/curator/modeled/HostConfig.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/curator/HostConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.apache.curator.modeled; +package com.baeldung.apache.curator; public class HostConfig { private String hostname; diff --git a/apache-libraries/src/main/java/com/baeldung/meecrowave/Article.java b/apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/Article.java similarity index 92% rename from apache-libraries/src/main/java/com/baeldung/meecrowave/Article.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/Article.java index 7925e8ff99ec..9088c746b001 100644 --- a/apache-libraries/src/main/java/com/baeldung/meecrowave/Article.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/Article.java @@ -1,4 +1,4 @@ -package com.baeldung.meecrowave; +package com.baeldung.apache.meecrowave; public class Article { private String name; diff --git a/apache-libraries/src/main/java/com/baeldung/meecrowave/ArticleEndpoints.java b/apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/ArticleEndpoints.java similarity index 94% rename from apache-libraries/src/main/java/com/baeldung/meecrowave/ArticleEndpoints.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/ArticleEndpoints.java index edb92619269c..c70d5e281910 100644 --- a/apache-libraries/src/main/java/com/baeldung/meecrowave/ArticleEndpoints.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/ArticleEndpoints.java @@ -1,4 +1,4 @@ -package com.baeldung.meecrowave; +package com.baeldung.apache.meecrowave; import jakarta.enterprise.context.RequestScoped; import jakarta.inject.Inject; diff --git a/apache-libraries/src/main/java/com/baeldung/meecrowave/ArticleService.java b/apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/ArticleService.java similarity index 82% rename from apache-libraries/src/main/java/com/baeldung/meecrowave/ArticleService.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/ArticleService.java index 1af92e6c6e07..19cd4adfef01 100644 --- a/apache-libraries/src/main/java/com/baeldung/meecrowave/ArticleService.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/ArticleService.java @@ -1,4 +1,4 @@ -package com.baeldung.meecrowave; +package com.baeldung.apache.meecrowave; import jakarta.enterprise.context.ApplicationScoped; diff --git a/apache-libraries/src/main/java/com/baeldung/meecrowave/Server.java b/apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/Server.java similarity index 91% rename from apache-libraries/src/main/java/com/baeldung/meecrowave/Server.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/Server.java index 2aa7d0556f1e..a2934c223745 100644 --- a/apache-libraries/src/main/java/com/baeldung/meecrowave/Server.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/meecrowave/Server.java @@ -1,4 +1,4 @@ -package com.baeldung.meecrowave; +package com.baeldung.apache.meecrowave; import org.apache.meecrowave.Meecrowave; diff --git a/apache-libraries/src/main/java/com/baeldung/zookeeper/connection/ZKConnection.java b/apache-libraries-2/src/main/java/com/baeldung/apache/zookeeper/connection/ZKConnection.java similarity index 94% rename from apache-libraries/src/main/java/com/baeldung/zookeeper/connection/ZKConnection.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/zookeeper/connection/ZKConnection.java index 0678250d57d7..58da02fee98c 100644 --- a/apache-libraries/src/main/java/com/baeldung/zookeeper/connection/ZKConnection.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/zookeeper/connection/ZKConnection.java @@ -1,13 +1,13 @@ -package com.baeldung.zookeeper.connection; - -import java.io.IOException; -import java.util.concurrent.CountDownLatch; +package com.baeldung.apache.zookeeper.connection; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; import org.apache.zookeeper.Watcher.Event.KeeperState; import org.apache.zookeeper.ZooKeeper; +import java.io.IOException; +import java.util.concurrent.CountDownLatch; + public class ZKConnection { private ZooKeeper zoo; final CountDownLatch connectionLatch = new CountDownLatch(1); diff --git a/apache-libraries/src/main/java/com/baeldung/zookeeper/manager/ZKManager.java b/apache-libraries-2/src/main/java/com/baeldung/apache/zookeeper/manager/ZKManager.java similarity index 94% rename from apache-libraries/src/main/java/com/baeldung/zookeeper/manager/ZKManager.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/zookeeper/manager/ZKManager.java index 0c0ad52123c3..3d111758c95a 100644 --- a/apache-libraries/src/main/java/com/baeldung/zookeeper/manager/ZKManager.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/zookeeper/manager/ZKManager.java @@ -1,4 +1,4 @@ -package com.baeldung.zookeeper.manager; +package com.baeldung.apache.zookeeper.manager; import org.apache.zookeeper.KeeperException; diff --git a/apache-libraries/src/main/java/com/baeldung/zookeeper/manager/ZKManagerImpl.java b/apache-libraries-2/src/main/java/com/baeldung/apache/zookeeper/manager/ZKManagerImpl.java similarity index 93% rename from apache-libraries/src/main/java/com/baeldung/zookeeper/manager/ZKManagerImpl.java rename to apache-libraries-2/src/main/java/com/baeldung/apache/zookeeper/manager/ZKManagerImpl.java index adf76bc0f2eb..efe505f647e5 100644 --- a/apache-libraries/src/main/java/com/baeldung/zookeeper/manager/ZKManagerImpl.java +++ b/apache-libraries-2/src/main/java/com/baeldung/apache/zookeeper/manager/ZKManagerImpl.java @@ -1,12 +1,11 @@ -package com.baeldung.zookeeper.manager; +package com.baeldung.apache.zookeeper.manager; +import com.baeldung.apache.zookeeper.connection.ZKConnection; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.ZooDefs; import org.apache.zookeeper.ZooKeeper; -import com.baeldung.zookeeper.connection.ZKConnection; - public class ZKManagerImpl implements ZKManager { private static ZooKeeper zkeeper; private static ZKConnection zkConnection; diff --git a/apache-libraries-2/src/test/java/com/baeldung/avro/AvroDefaultValuesUnitTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/avro/AvroDefaultValuesUnitTest.java similarity index 89% rename from apache-libraries-2/src/test/java/com/baeldung/avro/AvroDefaultValuesUnitTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/avro/AvroDefaultValuesUnitTest.java index bd43af899e8b..99861b26bb9a 100644 --- a/apache-libraries-2/src/test/java/com/baeldung/avro/AvroDefaultValuesUnitTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/avro/AvroDefaultValuesUnitTest.java @@ -1,6 +1,6 @@ -package com.baeldung.avro; +package com.baeldung.apache.avro; -import generated.avro.Car; +import com.baeldung.apache.avro.generated.Car; import org.junit.jupiter.api.Test; diff --git a/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/beam/WordCountIntegrationTest.java similarity index 74% rename from apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/beam/WordCountIntegrationTest.java index 5d51d8e5fa07..242e71e91863 100644 --- a/apache-libraries/src/test/java/com/baeldung/apache/beam/intro/WordCountIntegrationTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/beam/WordCountIntegrationTest.java @@ -1,11 +1,9 @@ -package com.baeldung.apache.beam.intro; +package com.baeldung.apache.beam; -import static org.junit.Assert.assertTrue; - -import org.junit.Ignore; +import com.baeldung.apache.beam.WordCount; import org.junit.Test; -import com.baeldung.apache.beam.intro.WordCount; +import static org.junit.Assert.assertTrue; public class WordCountIntegrationTest { diff --git a/apache-libraries-2/src/test/java/com/baeldung/dynamicrouter/DynamicRouterRouteUnitTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/camel/DynamicRouterRouteUnitTest.java similarity index 96% rename from apache-libraries-2/src/test/java/com/baeldung/dynamicrouter/DynamicRouterRouteUnitTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/camel/DynamicRouterRouteUnitTest.java index 4b93d40dac10..ad1a58a025cb 100644 --- a/apache-libraries-2/src/test/java/com/baeldung/dynamicrouter/DynamicRouterRouteUnitTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/camel/DynamicRouterRouteUnitTest.java @@ -1,6 +1,6 @@ -package com.baeldung.dynamicrouter; +package com.baeldung.apache.camel; -import com.baeldung.dynamicrouter.DynamicRouterRoute; +import com.baeldung.apache.camel.DynamicRouterRoute; import org.apache.camel.RoutesBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.apache.camel.test.junit5.CamelTestSupport; diff --git a/apache-libraries-2/src/test/java/com/baeldung/apachecamelpostrequest/PostRequestRouteUnitTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/camel/postrequest/PostRequestRouteUnitTest.java similarity index 87% rename from apache-libraries-2/src/test/java/com/baeldung/apachecamelpostrequest/PostRequestRouteUnitTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/camel/postrequest/PostRequestRouteUnitTest.java index 211f051225fe..62bd89f9619d 100644 --- a/apache-libraries-2/src/test/java/com/baeldung/apachecamelpostrequest/PostRequestRouteUnitTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/camel/postrequest/PostRequestRouteUnitTest.java @@ -1,5 +1,7 @@ -package com.baeldung.apachecamelpostrequest; +package com.baeldung.apache.camel.postrequest; +import com.baeldung.apache.camel.postrequest.Post; +import com.baeldung.apache.camel.postrequest.PostRequestRoute; import org.apache.camel.EndpointInject; import org.apache.camel.Exchange; import org.apache.camel.Produce; diff --git a/apache-libraries/src/test/java/com/baeldung/apache/curator/BaseManualTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/curator/BaseManualTest.java similarity index 100% rename from apache-libraries/src/test/java/com/baeldung/apache/curator/BaseManualTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/curator/BaseManualTest.java diff --git a/apache-libraries/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java similarity index 99% rename from apache-libraries/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java index 1a6fe6ccd0a7..957662675500 100644 --- a/apache-libraries/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/curator/configuration/ConfigurationManagementManualTest.java @@ -8,12 +8,11 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; +import com.baeldung.apache.curator.BaseManualTest; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.x.async.AsyncCuratorFramework; import org.junit.Test; -import com.baeldung.apache.curator.BaseManualTest; - public class ConfigurationManagementManualTest extends BaseManualTest { private static final String KEY_FORMAT = "/%s"; diff --git a/apache-libraries/src/test/java/com/baeldung/apache/curator/connection/ConnectionManagementManualTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/curator/connection/ConnectionManagementManualTest.java similarity index 94% rename from apache-libraries/src/test/java/com/baeldung/apache/curator/connection/ConnectionManagementManualTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/curator/connection/ConnectionManagementManualTest.java index 61fa1c7c2cdd..1969c2c5cba3 100644 --- a/apache-libraries/src/test/java/com/baeldung/apache/curator/connection/ConnectionManagementManualTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/curator/connection/ConnectionManagementManualTest.java @@ -3,6 +3,7 @@ import static com.jayway.awaitility.Awaitility.await; import static org.assertj.core.api.Assertions.assertThat; +import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.curator.RetryPolicy; @@ -26,8 +27,8 @@ public void givenRunningZookeeper_whenOpenConnection_thenClientIsOpened() .newClient("127.0.0.1:2181", retryPolicy)) { client.start(); - assertThat(client.checkExists() - .forPath("/")).isNotNull(); + assertThat(Collections.singletonList(client.checkExists() + .forPath("/"))).isNotNull(); } } diff --git a/apache-libraries/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java similarity index 97% rename from apache-libraries/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java index d7caa18ce9e9..5e62b2571871 100644 --- a/apache-libraries/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/curator/modeled/ModelTypedExamplesManualTest.java @@ -3,6 +3,8 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; +import com.baeldung.apache.curator.BaseManualTest; +import com.baeldung.apache.curator.HostConfig; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.x.async.AsyncCuratorFramework; import org.apache.curator.x.async.modeled.JacksonModelSerializer; @@ -11,8 +13,6 @@ import org.apache.curator.x.async.modeled.ZPath; import org.junit.Test; -import com.baeldung.apache.curator.BaseManualTest; - public class ModelTypedExamplesManualTest extends BaseManualTest { @Test diff --git a/apache-libraries/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java similarity index 100% rename from apache-libraries/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java index 0c5890ad5980..b2e5d5da3515 100644 --- a/apache-libraries/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/curator/recipes/RecipesManualTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; +import com.baeldung.apache.curator.BaseManualTest; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.recipes.leader.LeaderSelector; import org.apache.curator.framework.recipes.leader.LeaderSelectorListener; @@ -10,7 +11,6 @@ import org.apache.curator.framework.state.ConnectionState; import org.junit.Test; -import com.baeldung.apache.curator.BaseManualTest; public class RecipesManualTest extends BaseManualTest { diff --git a/apache-libraries/src/test/java/com/baeldung/meecrowave/ArticleEndpointsIntegrationTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/meecrowave/ArticleEndpointsIntegrationTest.java similarity index 96% rename from apache-libraries/src/test/java/com/baeldung/meecrowave/ArticleEndpointsIntegrationTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/meecrowave/ArticleEndpointsIntegrationTest.java index dbd777231c4f..b4a1b856b2e7 100644 --- a/apache-libraries/src/test/java/com/baeldung/meecrowave/ArticleEndpointsIntegrationTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/meecrowave/ArticleEndpointsIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.meecrowave; +package com.baeldung.apache.meecrowave; import static org.junit.Assert.assertEquals; diff --git a/apache-libraries/src/main/java/com/baeldung/pulsar/ConsumerUnitTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/ConsumerLiveTest.java similarity index 96% rename from apache-libraries/src/main/java/com/baeldung/pulsar/ConsumerUnitTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/ConsumerLiveTest.java index be94f1a97564..77acd4502c78 100644 --- a/apache-libraries/src/main/java/com/baeldung/pulsar/ConsumerUnitTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/ConsumerLiveTest.java @@ -1,4 +1,4 @@ -package com.baeldung.pulsar; +package com.baeldung.apache.pulsar; import java.io.IOException; @@ -7,7 +7,7 @@ import org.apache.pulsar.client.api.PulsarClient; import org.apache.pulsar.client.api.SubscriptionType; -public class ConsumerUnitTest { +public class ConsumerLiveTest { private static final String SERVICE_URL = "pulsar://localhost:6650"; private static final String TOPIC_NAME = "test-topic"; diff --git a/apache-libraries/src/main/java/com/baeldung/pulsar/ProducerUnitTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/ProducerLiveTest.java similarity index 96% rename from apache-libraries/src/main/java/com/baeldung/pulsar/ProducerUnitTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/ProducerLiveTest.java index 45c4def5590c..d8bb869eb610 100644 --- a/apache-libraries/src/main/java/com/baeldung/pulsar/ProducerUnitTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/ProducerLiveTest.java @@ -1,4 +1,4 @@ -package com.baeldung.pulsar; +package com.baeldung.apache.pulsar; import org.apache.pulsar.client.api.CompressionType; import org.apache.pulsar.client.api.Message; @@ -11,7 +11,7 @@ import java.io.IOException; import java.util.stream.IntStream; -public class ProducerUnitTest { +public class ProducerLiveTest { private static final String SERVICE_URL = "pulsar://localhost:6650"; private static final String TOPIC_NAME = "test-topic"; diff --git a/apache-libraries/src/main/java/com/baeldung/pulsar/subscriptions/ExclusiveSubscriptionUnitTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/subscriptions/ExclusiveSubscriptionLiveTest.java similarity index 95% rename from apache-libraries/src/main/java/com/baeldung/pulsar/subscriptions/ExclusiveSubscriptionUnitTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/subscriptions/ExclusiveSubscriptionLiveTest.java index 57d4ed5d0069..662fe24b53d7 100644 --- a/apache-libraries/src/main/java/com/baeldung/pulsar/subscriptions/ExclusiveSubscriptionUnitTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/subscriptions/ExclusiveSubscriptionLiveTest.java @@ -1,4 +1,4 @@ -package com.baeldung.pulsar.subscriptions; +package com.baeldung.apache.pulsar.subscriptions; import org.apache.pulsar.client.api.ConsumerBuilder; import org.apache.pulsar.client.api.Message; @@ -10,7 +10,7 @@ import java.util.stream.IntStream; -public class ExclusiveSubscriptionUnitTest { +public class ExclusiveSubscriptionLiveTest { private static final String SERVICE_URL = "pulsar://localhost:6650"; private static final String TOPIC_NAME = "test-topic"; private static final String SUBSCRIPTION_NAME = "test-subscription"; diff --git a/apache-libraries/src/main/java/com/baeldung/pulsar/subscriptions/FailoverSubscriptionUnitTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/subscriptions/FailoverSubscriptionLiveTest.java similarity index 96% rename from apache-libraries/src/main/java/com/baeldung/pulsar/subscriptions/FailoverSubscriptionUnitTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/subscriptions/FailoverSubscriptionLiveTest.java index c5395da6062d..cce9db95d749 100644 --- a/apache-libraries/src/main/java/com/baeldung/pulsar/subscriptions/FailoverSubscriptionUnitTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/pulsar/subscriptions/FailoverSubscriptionLiveTest.java @@ -1,4 +1,4 @@ -package com.baeldung.pulsar.subscriptions; +package com.baeldung.apache.pulsar.subscriptions; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.ConsumerBuilder; @@ -11,7 +11,7 @@ import java.util.stream.IntStream; -public class FailoverSubscriptionUnitTest { +public class FailoverSubscriptionLiveTest { private static final String SERVICE_URL = "pulsar://localhost:6650"; private static final String TOPIC_NAME = "failover-subscription-test-topic"; private static final String SUBSCRIPTION_NAME = "test-subscription"; diff --git a/apache-libraries/src/test/java/com/baeldung/bval/validation/ValidationIntegrationTest.java b/apache-libraries-2/src/test/java/com/baeldung/apache/validation/ValidationIntegrationTest.java similarity index 97% rename from apache-libraries/src/test/java/com/baeldung/bval/validation/ValidationIntegrationTest.java rename to apache-libraries-2/src/test/java/com/baeldung/apache/validation/ValidationIntegrationTest.java index 1b76f3375c24..da0de495bf01 100644 --- a/apache-libraries/src/test/java/com/baeldung/bval/validation/ValidationIntegrationTest.java +++ b/apache-libraries-2/src/test/java/com/baeldung/apache/validation/ValidationIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.bval.validation; +package com.baeldung.apache.validation; import java.io.File; import java.util.Set; @@ -13,7 +13,7 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.baeldung.bval.model.User; +import com.baeldung.apache.bval.model.User; import static org.junit.Assert.*; diff --git a/apache-libraries/src/test/resources/wordcount.txt b/apache-libraries-2/src/test/resources/wordcount.txt similarity index 100% rename from apache-libraries/src/test/resources/wordcount.txt rename to apache-libraries-2/src/test/resources/wordcount.txt diff --git a/apache-libraries/README.md b/apache-libraries/README.md index 410c0a2b3622..ac5ff90703cd 100644 --- a/apache-libraries/README.md +++ b/apache-libraries/README.md @@ -4,14 +4,9 @@ This module contains articles about various Apache libraries and utilities ### Relevant Articles: - [Guide to Apache Avro](https://www.baeldung.com/java-apache-avro) -- [Introduction to Apache Beam](https://www.baeldung.com/apache-beam) -- [Intro to Apache BVal](https://www.baeldung.com/apache-bval) -- [Building a Microservice with Apache Meecrowave](https://www.baeldung.com/apache-meecrowave) - [Intro to Apache OpenNLP](https://www.baeldung.com/apache-open-nlp) -- [Introduction to Apache Pulsar](https://www.baeldung.com/apache-pulsar) - [Getting Started with Java and Zookeeper](https://www.baeldung.com/java-zookeeper) -- [Introduction to Apache Curator](https://www.baeldung.com/apache-curator) - [A Quick Guide to Apache Geode](https://www.baeldung.com/apache-geode) - [Guide To Solr in Java With Apache SolrJ](https://www.baeldung.com/apache-solrj) - +- [Understanding XSLT Processing in Java](https://www.baeldung.com/java-extensible-stylesheet-language-transformations) - More articles: [[next -->]](../apache-libraries-2) \ No newline at end of file diff --git a/apache-libraries/pom.xml b/apache-libraries/pom.xml index 2457671abb47..fde951b2ce7e 100644 --- a/apache-libraries/pom.xml +++ b/apache-libraries/pom.xml @@ -30,19 +30,6 @@ avro-maven-plugin ${avro.version} - - - org.apache.beam - beam-sdks-java-core - ${beam.version} - - - - org.apache.beam - beam-runners-direct-java - ${beam.version} - runtime - org.apache.bval @@ -59,89 +46,12 @@ bval-extras ${bval.version} - - - org.apache.meecrowave - meecrowave-core - ${meecrowave-core.version} - jakarta - - - * - * - - - - - - org.apache.meecrowave - meecrowave-jpa - ${meecrowave-jpa.version} - - - org.apache.xbean - xbean-asm9-shaded - ${xbean.version} - - - org.apache.xbean - xbean-reflect - ${xbean.version} - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - - - org.apache.meecrowave - meecrowave-junit - ${meecrowave-junit.version} - jakarta - - - * - * - - - test - org.apache.opennlp opennlp-tools ${opennlp.opennlp-tools.version} - - - org.apache.pulsar - pulsar-client - ${pulsar-client.version} - compile - - - - org.apache.zookeeper - zookeeper - ${zookeeper.version} - - - - org.apache.curator - curator-x-async - ${curator.version} - - - org.apache.zookeeper - zookeeper - - - - - org.apache.curator - curator-recipes - ${curator.version} - com.fasterxml.jackson.core jackson-core @@ -157,12 +67,6 @@ jackson-annotations ${jackson.version} - - com.jayway.awaitility - awaitility - ${avaitility.version} - test - org.apache.geode @@ -210,31 +114,13 @@ - - - org.apache.meecrowave - meecrowave-maven-plugin - ${meecrowave-maven-plugin.version} - 1.8.2 - 2.45.0 3.0.1 - 3.1.0 - 1.2.15 - 5.0.0-alpha.12 - 1.2.15 - 1.2.15 - 1.2.15 - 4.24 - 1.8.4 - 2.1.1-incubating - 3.4.11 - 4.0.1 - 1.7.0 + 3.1.01.8.4 1.15.1 6.4.0 diff --git a/apache-libraries/src/main/java/com/baeldung/avro/model/Active.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/model/Active.java similarity index 91% rename from apache-libraries/src/main/java/com/baeldung/avro/model/Active.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/model/Active.java index 06624df24686..56ec60a4830c 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/model/Active.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/model/Active.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package com.baeldung.avro.model; +package com.baeldung.apache.avro.model; @SuppressWarnings("all") @org.apache.avro.specific.AvroGenerated public enum Active { diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/model/AvroHttpRequest.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/model/AvroHttpRequest.java similarity index 99% rename from apache-libraries/src/main/java/com/baeldung/avro/util/model/AvroHttpRequest.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/model/AvroHttpRequest.java index 56b36050a52d..e81338d8406e 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/util/model/AvroHttpRequest.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/model/AvroHttpRequest.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package com.baeldung.avro.util.model; +package com.baeldung.apache.avro.model; import org.apache.avro.specific.SpecificData; import org.apache.avro.message.BinaryMessageEncoder; diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/model/ClientIdentifier.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/model/ClientIdentifier.java similarity index 99% rename from apache-libraries/src/main/java/com/baeldung/avro/util/model/ClientIdentifier.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/model/ClientIdentifier.java index 503dde40dfe5..f1d5fb497eaa 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/util/model/ClientIdentifier.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/model/ClientIdentifier.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package com.baeldung.avro.util.model; +package com.baeldung.apache.avro.model; import org.apache.avro.specific.SpecificData; import org.apache.avro.message.BinaryMessageEncoder; diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/AvroClassGenerator.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/AvroClassGenerator.java similarity index 92% rename from apache-libraries/src/main/java/com/baeldung/avro/util/AvroClassGenerator.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/util/AvroClassGenerator.java index 718b62a75295..723991fcc481 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/util/AvroClassGenerator.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/AvroClassGenerator.java @@ -1,4 +1,4 @@ -package com.baeldung.avro.util; +package com.baeldung.apache.avro.util; import org.apache.avro.Schema; import org.apache.avro.compiler.specific.SpecificCompiler; diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/AvroSchemaBuilder.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/AvroSchemaBuilder.java similarity index 95% rename from apache-libraries/src/main/java/com/baeldung/avro/util/AvroSchemaBuilder.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/util/AvroSchemaBuilder.java index 4a1314cd0050..d198a12edb70 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/util/AvroSchemaBuilder.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/AvroSchemaBuilder.java @@ -1,4 +1,4 @@ -package com.baeldung.avro.util; +package com.baeldung.apache.avro.util; import org.apache.avro.Schema; diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/model/Active.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/model/Active.java similarity index 90% rename from apache-libraries/src/main/java/com/baeldung/avro/util/model/Active.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/util/model/Active.java index 3ae0508394ab..5fb66333b301 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/util/model/Active.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/model/Active.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package com.baeldung.avro.util.model; +package com.baeldung.apache.avro.util.model; @SuppressWarnings("all") @org.apache.avro.specific.AvroGenerated public enum Active { diff --git a/apache-libraries/src/main/java/com/baeldung/avro/model/AvroHttpRequest.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/model/AvroHttpRequest.java similarity index 80% rename from apache-libraries/src/main/java/com/baeldung/avro/model/AvroHttpRequest.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/util/model/AvroHttpRequest.java index 584ccfc21cf7..a3958c9e9246 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/model/AvroHttpRequest.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/model/AvroHttpRequest.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package com.baeldung.avro.model; +package com.baeldung.apache.avro.util.model; import org.apache.avro.specific.SpecificData; import org.apache.avro.message.BinaryMessageEncoder; @@ -52,9 +52,9 @@ public static AvroHttpRequest fromByteBuffer( } @Deprecated public long requestTime; - @Deprecated public com.baeldung.avro.model.ClientIdentifier clientIdentifier; + @Deprecated public ClientIdentifier clientIdentifier; @Deprecated public java.util.List employeeNames; - @Deprecated public com.baeldung.avro.model.Active active; + @Deprecated public Active active; /** * Default constructor. Note that this does not initialize fields @@ -70,7 +70,7 @@ public AvroHttpRequest() {} * @param employeeNames The new value for employeeNames * @param active The new value for active */ - public AvroHttpRequest(java.lang.Long requestTime, com.baeldung.avro.model.ClientIdentifier clientIdentifier, java.util.List employeeNames, com.baeldung.avro.model.Active active) { + public AvroHttpRequest(java.lang.Long requestTime, ClientIdentifier clientIdentifier, java.util.List employeeNames, Active active) { this.requestTime = requestTime; this.clientIdentifier = clientIdentifier; this.employeeNames = employeeNames; @@ -94,9 +94,9 @@ public java.lang.Object get(int field$) { public void put(int field$, java.lang.Object value$) { switch (field$) { case 0: requestTime = (java.lang.Long)value$; break; - case 1: clientIdentifier = (com.baeldung.avro.model.ClientIdentifier)value$; break; + case 1: clientIdentifier = (ClientIdentifier)value$; break; case 2: employeeNames = (java.util.List)value$; break; - case 3: active = (com.baeldung.avro.model.Active)value$; break; + case 3: active = (Active)value$; break; default: throw new org.apache.avro.AvroRuntimeException("Bad index"); } } @@ -121,7 +121,7 @@ public void setRequestTime(java.lang.Long value) { * Gets the value of the 'clientIdentifier' field. * @return The value of the 'clientIdentifier' field. */ - public com.baeldung.avro.model.ClientIdentifier getClientIdentifier() { + public ClientIdentifier getClientIdentifier() { return clientIdentifier; } @@ -129,7 +129,7 @@ public com.baeldung.avro.model.ClientIdentifier getClientIdentifier() { * Sets the value of the 'clientIdentifier' field. * @param value the value to set. */ - public void setClientIdentifier(com.baeldung.avro.model.ClientIdentifier value) { + public void setClientIdentifier(ClientIdentifier value) { this.clientIdentifier = value; } @@ -153,7 +153,7 @@ public void setEmployeeNames(java.util.List value) { * Gets the value of the 'active' field. * @return The value of the 'active' field. */ - public com.baeldung.avro.model.Active getActive() { + public Active getActive() { return active; } @@ -161,7 +161,7 @@ public com.baeldung.avro.model.Active getActive() { * Sets the value of the 'active' field. * @param value the value to set. */ - public void setActive(com.baeldung.avro.model.Active value) { + public void setActive(Active value) { this.active = value; } @@ -169,8 +169,8 @@ public void setActive(com.baeldung.avro.model.Active value) { * Creates a new AvroHttpRequest RecordBuilder. * @return A new AvroHttpRequest RecordBuilder */ - public static com.baeldung.avro.model.AvroHttpRequest.Builder newBuilder() { - return new com.baeldung.avro.model.AvroHttpRequest.Builder(); + public static AvroHttpRequest.Builder newBuilder() { + return new AvroHttpRequest.Builder(); } /** @@ -178,8 +178,8 @@ public static com.baeldung.avro.model.AvroHttpRequest.Builder newBuilder() { * @param other The existing builder to copy. * @return A new AvroHttpRequest RecordBuilder */ - public static com.baeldung.avro.model.AvroHttpRequest.Builder newBuilder(com.baeldung.avro.model.AvroHttpRequest.Builder other) { - return new com.baeldung.avro.model.AvroHttpRequest.Builder(other); + public static AvroHttpRequest.Builder newBuilder(AvroHttpRequest.Builder other) { + return new AvroHttpRequest.Builder(other); } /** @@ -187,8 +187,8 @@ public static com.baeldung.avro.model.AvroHttpRequest.Builder newBuilder(com.bae * @param other The existing instance to copy. * @return A new AvroHttpRequest RecordBuilder */ - public static com.baeldung.avro.model.AvroHttpRequest.Builder newBuilder(com.baeldung.avro.model.AvroHttpRequest other) { - return new com.baeldung.avro.model.AvroHttpRequest.Builder(other); + public static AvroHttpRequest.Builder newBuilder(AvroHttpRequest other) { + return new AvroHttpRequest.Builder(other); } /** @@ -198,10 +198,10 @@ public static class Builder extends org.apache.avro.specific.SpecificRecordBuild implements org.apache.avro.data.RecordBuilder { private long requestTime; - private com.baeldung.avro.model.ClientIdentifier clientIdentifier; - private com.baeldung.avro.model.ClientIdentifier.Builder clientIdentifierBuilder; + private ClientIdentifier clientIdentifier; + private ClientIdentifier.Builder clientIdentifierBuilder; private java.util.List employeeNames; - private com.baeldung.avro.model.Active active; + private Active active; /** Creates a new Builder */ private Builder() { @@ -212,7 +212,7 @@ private Builder() { * Creates a Builder by copying an existing Builder. * @param other The existing Builder to copy. */ - private Builder(com.baeldung.avro.model.AvroHttpRequest.Builder other) { + private Builder(AvroHttpRequest.Builder other) { super(other); if (isValidValue(fields()[0], other.requestTime)) { this.requestTime = data().deepCopy(fields()[0].schema(), other.requestTime); @@ -223,7 +223,7 @@ private Builder(com.baeldung.avro.model.AvroHttpRequest.Builder other) { fieldSetFlags()[1] = true; } if (other.hasClientIdentifierBuilder()) { - this.clientIdentifierBuilder = com.baeldung.avro.model.ClientIdentifier.newBuilder(other.getClientIdentifierBuilder()); + this.clientIdentifierBuilder = ClientIdentifier.newBuilder(other.getClientIdentifierBuilder()); } if (isValidValue(fields()[2], other.employeeNames)) { this.employeeNames = data().deepCopy(fields()[2].schema(), other.employeeNames); @@ -239,7 +239,7 @@ private Builder(com.baeldung.avro.model.AvroHttpRequest.Builder other) { * Creates a Builder by copying an existing AvroHttpRequest instance * @param other The existing instance to copy. */ - private Builder(com.baeldung.avro.model.AvroHttpRequest other) { + private Builder(AvroHttpRequest other) { super(SCHEMA$); if (isValidValue(fields()[0], other.requestTime)) { this.requestTime = data().deepCopy(fields()[0].schema(), other.requestTime); @@ -273,7 +273,7 @@ public java.lang.Long getRequestTime() { * @param value The value of 'requestTime'. * @return This builder. */ - public com.baeldung.avro.model.AvroHttpRequest.Builder setRequestTime(long value) { + public AvroHttpRequest.Builder setRequestTime(long value) { validate(fields()[0], value); this.requestTime = value; fieldSetFlags()[0] = true; @@ -293,7 +293,7 @@ public boolean hasRequestTime() { * Clears the value of the 'requestTime' field. * @return This builder. */ - public com.baeldung.avro.model.AvroHttpRequest.Builder clearRequestTime() { + public AvroHttpRequest.Builder clearRequestTime() { fieldSetFlags()[0] = false; return this; } @@ -302,7 +302,7 @@ public com.baeldung.avro.model.AvroHttpRequest.Builder clearRequestTime() { * Gets the value of the 'clientIdentifier' field. * @return The value. */ - public com.baeldung.avro.model.ClientIdentifier getClientIdentifier() { + public ClientIdentifier getClientIdentifier() { return clientIdentifier; } @@ -311,7 +311,7 @@ public com.baeldung.avro.model.ClientIdentifier getClientIdentifier() { * @param value The value of 'clientIdentifier'. * @return This builder. */ - public com.baeldung.avro.model.AvroHttpRequest.Builder setClientIdentifier(com.baeldung.avro.model.ClientIdentifier value) { + public AvroHttpRequest.Builder setClientIdentifier(ClientIdentifier value) { validate(fields()[1], value); this.clientIdentifierBuilder = null; this.clientIdentifier = value; @@ -331,12 +331,12 @@ public boolean hasClientIdentifier() { * Gets the Builder instance for the 'clientIdentifier' field and creates one if it doesn't exist yet. * @return This builder. */ - public com.baeldung.avro.model.ClientIdentifier.Builder getClientIdentifierBuilder() { + public ClientIdentifier.Builder getClientIdentifierBuilder() { if (clientIdentifierBuilder == null) { if (hasClientIdentifier()) { - setClientIdentifierBuilder(com.baeldung.avro.model.ClientIdentifier.newBuilder(clientIdentifier)); + setClientIdentifierBuilder(ClientIdentifier.newBuilder(clientIdentifier)); } else { - setClientIdentifierBuilder(com.baeldung.avro.model.ClientIdentifier.newBuilder()); + setClientIdentifierBuilder(ClientIdentifier.newBuilder()); } } return clientIdentifierBuilder; @@ -347,7 +347,7 @@ public com.baeldung.avro.model.ClientIdentifier.Builder getClientIdentifierBuild * @param value The builder instance that must be set. * @return This builder. */ - public com.baeldung.avro.model.AvroHttpRequest.Builder setClientIdentifierBuilder(com.baeldung.avro.model.ClientIdentifier.Builder value) { + public AvroHttpRequest.Builder setClientIdentifierBuilder(ClientIdentifier.Builder value) { clearClientIdentifier(); clientIdentifierBuilder = value; return this; @@ -365,7 +365,7 @@ public boolean hasClientIdentifierBuilder() { * Clears the value of the 'clientIdentifier' field. * @return This builder. */ - public com.baeldung.avro.model.AvroHttpRequest.Builder clearClientIdentifier() { + public AvroHttpRequest.Builder clearClientIdentifier() { clientIdentifier = null; clientIdentifierBuilder = null; fieldSetFlags()[1] = false; @@ -385,7 +385,7 @@ public java.util.List getEmployeeNames() { * @param value The value of 'employeeNames'. * @return This builder. */ - public com.baeldung.avro.model.AvroHttpRequest.Builder setEmployeeNames(java.util.List value) { + public AvroHttpRequest.Builder setEmployeeNames(java.util.List value) { validate(fields()[2], value); this.employeeNames = value; fieldSetFlags()[2] = true; @@ -405,7 +405,7 @@ public boolean hasEmployeeNames() { * Clears the value of the 'employeeNames' field. * @return This builder. */ - public com.baeldung.avro.model.AvroHttpRequest.Builder clearEmployeeNames() { + public AvroHttpRequest.Builder clearEmployeeNames() { employeeNames = null; fieldSetFlags()[2] = false; return this; @@ -415,7 +415,7 @@ public com.baeldung.avro.model.AvroHttpRequest.Builder clearEmployeeNames() { * Gets the value of the 'active' field. * @return The value. */ - public com.baeldung.avro.model.Active getActive() { + public Active getActive() { return active; } @@ -424,7 +424,7 @@ public com.baeldung.avro.model.Active getActive() { * @param value The value of 'active'. * @return This builder. */ - public com.baeldung.avro.model.AvroHttpRequest.Builder setActive(com.baeldung.avro.model.Active value) { + public AvroHttpRequest.Builder setActive(Active value) { validate(fields()[3], value); this.active = value; fieldSetFlags()[3] = true; @@ -444,7 +444,7 @@ public boolean hasActive() { * Clears the value of the 'active' field. * @return This builder. */ - public com.baeldung.avro.model.AvroHttpRequest.Builder clearActive() { + public AvroHttpRequest.Builder clearActive() { active = null; fieldSetFlags()[3] = false; return this; @@ -459,10 +459,10 @@ public AvroHttpRequest build() { if (clientIdentifierBuilder != null) { record.clientIdentifier = this.clientIdentifierBuilder.build(); } else { - record.clientIdentifier = fieldSetFlags()[1] ? this.clientIdentifier : (com.baeldung.avro.model.ClientIdentifier) defaultValue(fields()[1]); + record.clientIdentifier = fieldSetFlags()[1] ? this.clientIdentifier : (ClientIdentifier) defaultValue(fields()[1]); } record.employeeNames = fieldSetFlags()[2] ? this.employeeNames : (java.util.List) defaultValue(fields()[2]); - record.active = fieldSetFlags()[3] ? this.active : (com.baeldung.avro.model.Active) defaultValue(fields()[3]); + record.active = fieldSetFlags()[3] ? this.active : (Active) defaultValue(fields()[3]); return record; } catch (java.lang.Exception e) { throw new org.apache.avro.AvroRuntimeException(e); diff --git a/apache-libraries/src/main/java/com/baeldung/avro/model/ClientIdentifier.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/model/ClientIdentifier.java similarity index 89% rename from apache-libraries/src/main/java/com/baeldung/avro/model/ClientIdentifier.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/util/model/ClientIdentifier.java index 6d1f9a7e7579..13d19817e933 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/model/ClientIdentifier.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/model/ClientIdentifier.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package com.baeldung.avro.model; +package com.baeldung.apache.avro.util.model; import org.apache.avro.specific.SpecificData; import org.apache.avro.message.BinaryMessageEncoder; @@ -127,8 +127,8 @@ public void setIpAddress(java.lang.CharSequence value) { * Creates a new ClientIdentifier RecordBuilder. * @return A new ClientIdentifier RecordBuilder */ - public static com.baeldung.avro.model.ClientIdentifier.Builder newBuilder() { - return new com.baeldung.avro.model.ClientIdentifier.Builder(); + public static ClientIdentifier.Builder newBuilder() { + return new ClientIdentifier.Builder(); } /** @@ -136,8 +136,8 @@ public static com.baeldung.avro.model.ClientIdentifier.Builder newBuilder() { * @param other The existing builder to copy. * @return A new ClientIdentifier RecordBuilder */ - public static com.baeldung.avro.model.ClientIdentifier.Builder newBuilder(com.baeldung.avro.model.ClientIdentifier.Builder other) { - return new com.baeldung.avro.model.ClientIdentifier.Builder(other); + public static ClientIdentifier.Builder newBuilder(ClientIdentifier.Builder other) { + return new ClientIdentifier.Builder(other); } /** @@ -145,8 +145,8 @@ public static com.baeldung.avro.model.ClientIdentifier.Builder newBuilder(com.ba * @param other The existing instance to copy. * @return A new ClientIdentifier RecordBuilder */ - public static com.baeldung.avro.model.ClientIdentifier.Builder newBuilder(com.baeldung.avro.model.ClientIdentifier other) { - return new com.baeldung.avro.model.ClientIdentifier.Builder(other); + public static ClientIdentifier.Builder newBuilder(ClientIdentifier other) { + return new ClientIdentifier.Builder(other); } /** @@ -167,7 +167,7 @@ private Builder() { * Creates a Builder by copying an existing Builder. * @param other The existing Builder to copy. */ - private Builder(com.baeldung.avro.model.ClientIdentifier.Builder other) { + private Builder(ClientIdentifier.Builder other) { super(other); if (isValidValue(fields()[0], other.hostName)) { this.hostName = data().deepCopy(fields()[0].schema(), other.hostName); @@ -183,7 +183,7 @@ private Builder(com.baeldung.avro.model.ClientIdentifier.Builder other) { * Creates a Builder by copying an existing ClientIdentifier instance * @param other The existing instance to copy. */ - private Builder(com.baeldung.avro.model.ClientIdentifier other) { + private Builder(ClientIdentifier other) { super(SCHEMA$); if (isValidValue(fields()[0], other.hostName)) { this.hostName = data().deepCopy(fields()[0].schema(), other.hostName); @@ -208,7 +208,7 @@ public java.lang.CharSequence getHostName() { * @param value The value of 'hostName'. * @return This builder. */ - public com.baeldung.avro.model.ClientIdentifier.Builder setHostName(java.lang.CharSequence value) { + public ClientIdentifier.Builder setHostName(java.lang.CharSequence value) { validate(fields()[0], value); this.hostName = value; fieldSetFlags()[0] = true; @@ -228,7 +228,7 @@ public boolean hasHostName() { * Clears the value of the 'hostName' field. * @return This builder. */ - public com.baeldung.avro.model.ClientIdentifier.Builder clearHostName() { + public ClientIdentifier.Builder clearHostName() { hostName = null; fieldSetFlags()[0] = false; return this; @@ -247,7 +247,7 @@ public java.lang.CharSequence getIpAddress() { * @param value The value of 'ipAddress'. * @return This builder. */ - public com.baeldung.avro.model.ClientIdentifier.Builder setIpAddress(java.lang.CharSequence value) { + public ClientIdentifier.Builder setIpAddress(java.lang.CharSequence value) { validate(fields()[1], value); this.ipAddress = value; fieldSetFlags()[1] = true; @@ -267,7 +267,7 @@ public boolean hasIpAddress() { * Clears the value of the 'ipAddress' field. * @return This builder. */ - public com.baeldung.avro.model.ClientIdentifier.Builder clearIpAddress() { + public ClientIdentifier.Builder clearIpAddress() { ipAddress = null; fieldSetFlags()[1] = false; return this; diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroDeSerializer.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/serialization/AvroDeSerializer.java similarity index 92% rename from apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroDeSerializer.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/util/serialization/AvroDeSerializer.java index cf4c360ba4b4..3a7512ba4383 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroDeSerializer.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/serialization/AvroDeSerializer.java @@ -1,6 +1,6 @@ -package com.baeldung.avro.util.serialization; +package com.baeldung.apache.avro.util.serialization; -import com.baeldung.avro.util.model.AvroHttpRequest; +import com.baeldung.apache.avro.util.model.AvroHttpRequest; import org.apache.avro.io.DatumReader; import org.apache.avro.io.Decoder; import org.apache.avro.io.DecoderFactory; diff --git a/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroSerializer.java b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/serialization/AvroSerializer.java similarity index 93% rename from apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroSerializer.java rename to apache-libraries/src/main/java/com/baeldung/apache/avro/util/serialization/AvroSerializer.java index 6d39060ec8ba..a9e0862cf8c5 100644 --- a/apache-libraries/src/main/java/com/baeldung/avro/util/serialization/AvroSerializer.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/avro/util/serialization/AvroSerializer.java @@ -1,6 +1,6 @@ -package com.baeldung.avro.util.serialization; +package com.baeldung.apache.avro.util.serialization; -import com.baeldung.avro.util.model.AvroHttpRequest; +import com.baeldung.apache.avro.util.model.AvroHttpRequest; import org.apache.avro.io.*; import org.apache.avro.specific.SpecificDatumWriter; import org.slf4j.Logger; diff --git a/apache-libraries/src/main/java/com/baeldung/geode/Customer.java b/apache-libraries/src/main/java/com/baeldung/apache/geode/Customer.java similarity index 98% rename from apache-libraries/src/main/java/com/baeldung/geode/Customer.java rename to apache-libraries/src/main/java/com/baeldung/apache/geode/Customer.java index 82ee5ecaebf8..d24ae9e2d74a 100644 --- a/apache-libraries/src/main/java/com/baeldung/geode/Customer.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/geode/Customer.java @@ -1,4 +1,4 @@ -package com.baeldung.geode; +package com.baeldung.apache.geode; import java.io.Serializable; import java.util.Objects; diff --git a/apache-libraries/src/main/java/com/baeldung/geode/CustomerKey.java b/apache-libraries/src/main/java/com/baeldung/apache/geode/CustomerKey.java similarity index 97% rename from apache-libraries/src/main/java/com/baeldung/geode/CustomerKey.java rename to apache-libraries/src/main/java/com/baeldung/apache/geode/CustomerKey.java index bfa64870c071..545dfcb6b638 100644 --- a/apache-libraries/src/main/java/com/baeldung/geode/CustomerKey.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/geode/CustomerKey.java @@ -1,4 +1,4 @@ -package com.baeldung.geode; +package com.baeldung.apache.geode; import java.io.Serializable; diff --git a/apache-libraries/src/main/java/com/baeldung/geode/functions/UpperCaseNames.java b/apache-libraries/src/main/java/com/baeldung/apache/geode/functions/UpperCaseNames.java similarity index 87% rename from apache-libraries/src/main/java/com/baeldung/geode/functions/UpperCaseNames.java rename to apache-libraries/src/main/java/com/baeldung/apache/geode/functions/UpperCaseNames.java index 5ff8e53da876..d2d04ccdb257 100644 --- a/apache-libraries/src/main/java/com/baeldung/geode/functions/UpperCaseNames.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/geode/functions/UpperCaseNames.java @@ -1,7 +1,7 @@ -package com.baeldung.geode.functions; +package com.baeldung.apache.geode.functions; -import com.baeldung.geode.Customer; -import com.baeldung.geode.CustomerKey; +import com.baeldung.apache.geode.Customer; +import com.baeldung.apache.geode.CustomerKey; import org.apache.geode.cache.Region; import org.apache.geode.cache.execute.Function; import org.apache.geode.cache.execute.FunctionContext; diff --git a/apache-libraries/src/main/java/com/baeldung/solrjava/ProductBean.java b/apache-libraries/src/main/java/com/baeldung/apache/solrjava/ProductBean.java similarity index 95% rename from apache-libraries/src/main/java/com/baeldung/solrjava/ProductBean.java rename to apache-libraries/src/main/java/com/baeldung/apache/solrjava/ProductBean.java index 14eea8f2f9e2..46efef71298e 100644 --- a/apache-libraries/src/main/java/com/baeldung/solrjava/ProductBean.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/solrjava/ProductBean.java @@ -1,4 +1,4 @@ -package com.baeldung.solrjava; +package com.baeldung.apache.solrjava; import org.apache.solr.client.solrj.beans.Field; diff --git a/apache-libraries/src/main/java/com/baeldung/solrjava/SolrJavaIntegration.java b/apache-libraries/src/main/java/com/baeldung/apache/solrjava/SolrJavaIntegration.java similarity index 97% rename from apache-libraries/src/main/java/com/baeldung/solrjava/SolrJavaIntegration.java rename to apache-libraries/src/main/java/com/baeldung/apache/solrjava/SolrJavaIntegration.java index c55e1c9ada10..67efdcb8acd4 100644 --- a/apache-libraries/src/main/java/com/baeldung/solrjava/SolrJavaIntegration.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/solrjava/SolrJavaIntegration.java @@ -1,4 +1,4 @@ -package com.baeldung.solrjava; +package com.baeldung.apache.solrjava; import java.io.IOException; diff --git a/apache-libraries-2/src/main/java/com/baeldung/xslt/XSLTProcessor.java b/apache-libraries/src/main/java/com/baeldung/apache/xslt/XSLTProcessor.java similarity index 95% rename from apache-libraries-2/src/main/java/com/baeldung/xslt/XSLTProcessor.java rename to apache-libraries/src/main/java/com/baeldung/apache/xslt/XSLTProcessor.java index 6bc002348544..33e39921acb6 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/xslt/XSLTProcessor.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/xslt/XSLTProcessor.java @@ -1,4 +1,4 @@ -package com.baeldung.xslt; +package com.baeldung.apache.xslt; import javax.xml.transform.*; import javax.xml.transform.stream.StreamResult; diff --git a/apache-libraries-2/src/main/java/com/baeldung/xsltProcessing/XSLTProcessorWithParametersAndOption.java b/apache-libraries/src/main/java/com/baeldung/apache/xslt/XSLTProcessorWithParametersAndOption.java similarity index 96% rename from apache-libraries-2/src/main/java/com/baeldung/xsltProcessing/XSLTProcessorWithParametersAndOption.java rename to apache-libraries/src/main/java/com/baeldung/apache/xslt/XSLTProcessorWithParametersAndOption.java index 07efab080dde..d7465b2829d3 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/xsltProcessing/XSLTProcessorWithParametersAndOption.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/xslt/XSLTProcessorWithParametersAndOption.java @@ -1,4 +1,4 @@ -package com.baeldung.xsltProcessing; +package com.baeldung.apache.xslt; import javax.xml.transform.*; import javax.xml.transform.stream.StreamResult; diff --git a/apache-libraries-2/src/main/java/com/baeldung/xsltProcessing/XSLTProcessorWithTemplate.java b/apache-libraries/src/main/java/com/baeldung/apache/xslt/XSLTProcessorWithTemplate.java similarity index 95% rename from apache-libraries-2/src/main/java/com/baeldung/xsltProcessing/XSLTProcessorWithTemplate.java rename to apache-libraries/src/main/java/com/baeldung/apache/xslt/XSLTProcessorWithTemplate.java index 017fc0db8b7b..6acbcd85612b 100644 --- a/apache-libraries-2/src/main/java/com/baeldung/xsltProcessing/XSLTProcessorWithTemplate.java +++ b/apache-libraries/src/main/java/com/baeldung/apache/xslt/XSLTProcessorWithTemplate.java @@ -1,4 +1,4 @@ -package com.baeldung.xsltProcessing; +package com.baeldung.apache.xslt; import javax.xml.transform.*; import javax.xml.transform.stream.StreamResult; diff --git a/apache-libraries/src/test/java/com/baeldung/avro/util/serialization/AvroSerializerDeSerializerIntegrationTest.java b/apache-libraries/src/test/java/com/baeldung/apache/avro/util/serialization/AvroSerializerDeSerializerIntegrationTest.java similarity index 87% rename from apache-libraries/src/test/java/com/baeldung/avro/util/serialization/AvroSerializerDeSerializerIntegrationTest.java rename to apache-libraries/src/test/java/com/baeldung/apache/avro/util/serialization/AvroSerializerDeSerializerIntegrationTest.java index 964eeb6d87e7..22936f0f086b 100644 --- a/apache-libraries/src/test/java/com/baeldung/avro/util/serialization/AvroSerializerDeSerializerIntegrationTest.java +++ b/apache-libraries/src/test/java/com/baeldung/apache/avro/util/serialization/AvroSerializerDeSerializerIntegrationTest.java @@ -1,8 +1,10 @@ -package com.baeldung.avro.util.serialization; +package com.baeldung.apache.avro.util.serialization; -import com.baeldung.avro.util.model.Active; -import com.baeldung.avro.util.model.AvroHttpRequest; -import com.baeldung.avro.util.model.ClientIdentifier; +import com.baeldung.apache.avro.util.model.Active; +import com.baeldung.apache.avro.util.model.AvroHttpRequest; +import com.baeldung.apache.avro.util.model.ClientIdentifier; +import com.baeldung.apache.avro.util.serialization.AvroDeSerializer; +import com.baeldung.apache.avro.util.serialization.AvroSerializer; import org.junit.After; import org.junit.Before; import org.junit.Test; diff --git a/apache-libraries/src/test/java/com/baeldung/geode/GeodeSamplesLiveTest.java b/apache-libraries/src/test/java/com/baeldung/apache/geode/GeodeSamplesLiveTest.java similarity index 95% rename from apache-libraries/src/test/java/com/baeldung/geode/GeodeSamplesLiveTest.java rename to apache-libraries/src/test/java/com/baeldung/apache/geode/GeodeSamplesLiveTest.java index 359568db9836..ee833355fd2c 100644 --- a/apache-libraries/src/test/java/com/baeldung/geode/GeodeSamplesLiveTest.java +++ b/apache-libraries/src/test/java/com/baeldung/apache/geode/GeodeSamplesLiveTest.java @@ -1,6 +1,8 @@ -package com.baeldung.geode; +package com.baeldung.apache.geode; -import com.baeldung.geode.functions.UpperCaseNames; +import com.baeldung.apache.geode.Customer; +import com.baeldung.apache.geode.CustomerKey; +import com.baeldung.apache.geode.functions.UpperCaseNames; import org.apache.geode.cache.Region; import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientCacheFactory; diff --git a/apache-libraries/src/test/java/com/baeldung/solrjava/SolrJavaLiveTest.java b/apache-libraries/src/test/java/com/baeldung/apache/solrjava/SolrJavaLiveTest.java similarity index 96% rename from apache-libraries/src/test/java/com/baeldung/solrjava/SolrJavaLiveTest.java rename to apache-libraries/src/test/java/com/baeldung/apache/solrjava/SolrJavaLiveTest.java index eaf0271b551a..a3a036d968bf 100644 --- a/apache-libraries/src/test/java/com/baeldung/solrjava/SolrJavaLiveTest.java +++ b/apache-libraries/src/test/java/com/baeldung/apache/solrjava/SolrJavaLiveTest.java @@ -1,9 +1,11 @@ -package com.baeldung.solrjava; +package com.baeldung.apache.solrjava; import static org.junit.Assert.assertEquals; import java.io.IOException; +import com.baeldung.apache.solrjava.ProductBean; +import com.baeldung.apache.solrjava.SolrJavaIntegration; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.response.QueryResponse; diff --git a/apache-libraries-2/src/test/java/com/baeldung/xslt/XSLTProcessorUnitTest.java b/apache-libraries/src/test/java/com/baeldung/apache/xslt/XSLTProcessorUnitTest.java similarity index 68% rename from apache-libraries-2/src/test/java/com/baeldung/xslt/XSLTProcessorUnitTest.java rename to apache-libraries/src/test/java/com/baeldung/apache/xslt/XSLTProcessorUnitTest.java index cbfbf78c878c..371b2efa6ddc 100644 --- a/apache-libraries-2/src/test/java/com/baeldung/xslt/XSLTProcessorUnitTest.java +++ b/apache-libraries/src/test/java/com/baeldung/apache/xslt/XSLTProcessorUnitTest.java @@ -1,5 +1,6 @@ -package com.baeldung.xslt; +package com.baeldung.apache.xslt; +import com.baeldung.apache.xslt.XSLTProcessor; import org.junit.jupiter.api.Test; import javax.xml.transform.TransformerException; @@ -14,16 +15,12 @@ public class XSLTProcessorUnitTest { @Test public void givenValidInputAndStylesheet_whenTransformingXML_thenOutputHTMLCreated() throws TransformerException, IOException { - // Given - String inputXMLPath = "src/test/resources/input.xml"; - String xsltPath = "src/test/resources/stylesheet.xslt"; - String outputHTMLPath = "src/test/resources/output.html"; - - + String inputXMLPath = "src/test/resources/xslt/input.xml"; + String xsltPath = "src/test/resources/xslt/stylesheet.xslt"; + String outputHTMLPath = "src/test/resources/xslt/output.html"; XSLTProcessor.transformXMLUsingXSLT(inputXMLPath, xsltPath, outputHTMLPath); - - Path outputFile = Paths.get(outputHTMLPath); assertTrue(Files.exists(outputFile)); } + } diff --git a/apache-libraries-2/src/test/resources/input.xml b/apache-libraries/src/test/resources/xslt/input.xml similarity index 100% rename from apache-libraries-2/src/test/resources/input.xml rename to apache-libraries/src/test/resources/xslt/input.xml diff --git a/apache-libraries-2/src/test/resources/output.html b/apache-libraries/src/test/resources/xslt/output.html similarity index 100% rename from apache-libraries-2/src/test/resources/output.html rename to apache-libraries/src/test/resources/xslt/output.html diff --git a/apache-libraries-2/src/test/resources/stylesheet.xslt b/apache-libraries/src/test/resources/xslt/stylesheet.xslt similarity index 100% rename from apache-libraries-2/src/test/resources/stylesheet.xslt rename to apache-libraries/src/test/resources/xslt/stylesheet.xslt