diff --git a/bookingdb-support/batch-job/pom.xml b/bookingdb-support/batch-job/pom.xml index 874ef04..547b1ed 100644 --- a/bookingdb-support/batch-job/pom.xml +++ b/bookingdb-support/batch-job/pom.xml @@ -11,7 +11,7 @@ Batch Jobs Support - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb-support 23.0.0-SNAPSHOT @@ -24,7 +24,7 @@ - org.ujar.boot + dev.knowhowto.boot boot-starter-amqp diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/AbstractJobParameters.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/AbstractJobParameters.java similarity index 92% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/AbstractJobParameters.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/AbstractJobParameters.java index 872b114..1445195 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/AbstractJobParameters.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/AbstractJobParameters.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs; +package dev.knowhowto.bookingdb.jobs; import java.io.Serial; import java.io.Serializable; diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/CitiesImportParameters.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/CitiesImportParameters.java similarity index 87% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/CitiesImportParameters.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/CitiesImportParameters.java index 10ab621..dadf98b 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/CitiesImportParameters.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/CitiesImportParameters.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs; +package dev.knowhowto.bookingdb.jobs; import lombok.Builder; import lombok.Getter; diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/CityHotelsImportParameters.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/CityHotelsImportParameters.java similarity index 87% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/CityHotelsImportParameters.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/CityHotelsImportParameters.java index c31291b..6c90ae6 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/CityHotelsImportParameters.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/CityHotelsImportParameters.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs; +package dev.knowhowto.bookingdb.jobs; import lombok.Builder; import lombok.Getter; diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/CountriesImportParameters.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/CountriesImportParameters.java similarity index 86% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/CountriesImportParameters.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/CountriesImportParameters.java index 31a00a3..a20b142 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/CountriesImportParameters.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/CountriesImportParameters.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs; +package dev.knowhowto.bookingdb.jobs; import lombok.Builder; import lombok.Getter; diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/HotelsImportParameters.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/HotelsImportParameters.java similarity index 88% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/HotelsImportParameters.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/HotelsImportParameters.java index 2da6ba6..69e3a6b 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/HotelsImportParameters.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/HotelsImportParameters.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs; +package dev.knowhowto.bookingdb.jobs; import java.util.List; diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/JobParameters.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/JobParameters.java similarity index 75% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/JobParameters.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/JobParameters.java index 8ec3cf3..ccad923 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/JobParameters.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/JobParameters.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs; +package dev.knowhowto.bookingdb.jobs; import java.time.Instant; diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/JobType.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/JobType.java similarity index 67% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/JobType.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/JobType.java index 9879964..8d7cc03 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/JobType.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/JobType.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs; +package dev.knowhowto.bookingdb.jobs; public enum JobType { IMPORT_COUNTRIES, diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/JobsConfiguration.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/JobsConfiguration.java similarity index 71% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/JobsConfiguration.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/JobsConfiguration.java index 16ba7f7..c70f9d8 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/JobsConfiguration.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/JobsConfiguration.java @@ -1,8 +1,8 @@ -package org.ujar.bookingdb.jobs; +package dev.knowhowto.bookingdb.jobs; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; -import org.ujar.bookingdb.jobs.amqp.AmqpQueuesProperties; +import dev.knowhowto.bookingdb.jobs.amqp.AmqpQueuesProperties; @Configuration @EnableConfigurationProperties({AmqpQueuesProperties.class}) diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/amqp/AbstractProducer.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/amqp/AbstractProducer.java similarity index 83% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/amqp/AbstractProducer.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/amqp/AbstractProducer.java index 5ab61cc..dc961d1 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/amqp/AbstractProducer.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/amqp/AbstractProducer.java @@ -1,7 +1,7 @@ -package org.ujar.bookingdb.jobs.amqp; +package dev.knowhowto.bookingdb.jobs.amqp; import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.ujar.bookingdb.jobs.AbstractJobParameters; +import dev.knowhowto.bookingdb.jobs.AbstractJobParameters; public abstract class AbstractProducer { protected final RabbitTemplate template; diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/amqp/AmqpQueuesProperties.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/amqp/AmqpQueuesProperties.java similarity index 94% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/amqp/AmqpQueuesProperties.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/amqp/AmqpQueuesProperties.java index b591c39..ad775e9 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/amqp/AmqpQueuesProperties.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/amqp/AmqpQueuesProperties.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs.amqp; +package dev.knowhowto.bookingdb.jobs.amqp; import jakarta.validation.constraints.NotNull; diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/amqp/CommonAmqpConfig.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/amqp/CommonAmqpConfig.java similarity index 98% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/amqp/CommonAmqpConfig.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/amqp/CommonAmqpConfig.java index 92d6998..922d0c8 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/amqp/CommonAmqpConfig.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/amqp/CommonAmqpConfig.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs.amqp; +package dev.knowhowto.bookingdb.jobs.amqp; import lombok.RequiredArgsConstructor; import org.springframework.amqp.core.AmqpAdmin; diff --git a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/annotation/EnableJobSupport.java b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/annotation/EnableJobSupport.java similarity index 71% rename from bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/annotation/EnableJobSupport.java rename to bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/annotation/EnableJobSupport.java index 2fed0a1..9bb8e09 100644 --- a/bookingdb-support/batch-job/src/main/java/org/ujar/bookingdb/jobs/annotation/EnableJobSupport.java +++ b/bookingdb-support/batch-job/src/main/java/dev/knowhowto/bookingdb/jobs/annotation/EnableJobSupport.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.jobs.annotation; +package dev.knowhowto.bookingdb.jobs.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,13 +8,13 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.ujar.bookingdb.jobs.JobsConfiguration; -import org.ujar.bookingdb.jobs.amqp.CommonAmqpConfig; +import dev.knowhowto.bookingdb.jobs.JobsConfiguration; +import dev.knowhowto.bookingdb.jobs.amqp.CommonAmqpConfig; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) @Import({JobsConfiguration.class, CommonAmqpConfig.class}) @Configuration -@ComponentScan("org.ujar.bookingdb.jobs") +@ComponentScan("dev.knowhowto.bookingdb.jobs") public @interface EnableJobSupport { } diff --git a/bookingdb-support/booking-api-client/pom.xml b/bookingdb-support/booking-api-client/pom.xml index ee04f06..5316d78 100644 --- a/bookingdb-support/booking-api-client/pom.xml +++ b/bookingdb-support/booking-api-client/pom.xml @@ -12,7 +12,7 @@ - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb-support 23.0.0-SNAPSHOT diff --git a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/annotation/EnableBookingApiClient.java b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/annotation/EnableBookingApiClient.java similarity index 78% rename from bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/annotation/EnableBookingApiClient.java rename to bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/annotation/EnableBookingApiClient.java index dd8f4e7..d626dcf 100644 --- a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/annotation/EnableBookingApiClient.java +++ b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/annotation/EnableBookingApiClient.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.apiclient.annotation; +package dev.knowhowto.bookingdb.apiclient.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,7 +7,7 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.ujar.bookingdb.apiclient.config.ClientConfig; +import dev.knowhowto.bookingdb.apiclient.config.ClientConfig; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) diff --git a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/client/AbstractNetClient.java b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/client/AbstractNetClient.java similarity index 91% rename from bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/client/AbstractNetClient.java rename to bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/client/AbstractNetClient.java index 240e1db..657f428 100644 --- a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/client/AbstractNetClient.java +++ b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/client/AbstractNetClient.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.apiclient.client; +package dev.knowhowto.bookingdb.apiclient.client; import java.io.IOException; import java.net.http.HttpClient; @@ -9,8 +9,8 @@ import java.util.Map; import org.springframework.web.util.UriComponentsBuilder; -import org.ujar.bookingdb.apiclient.config.NetClientProperties; -import org.ujar.bookingdb.apiclient.exception.NetClientCommunicationException; +import dev.knowhowto.bookingdb.apiclient.config.NetClientProperties; +import dev.knowhowto.bookingdb.apiclient.exception.NetClientCommunicationException; public class AbstractNetClient { protected static final String LANGUAGE_CODE = "en"; diff --git a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/client/BookingcomNetClient.java b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/client/BookingcomNetClient.java similarity index 91% rename from bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/client/BookingcomNetClient.java rename to bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/client/BookingcomNetClient.java index c411d5d..222ac5d 100644 --- a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/client/BookingcomNetClient.java +++ b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/client/BookingcomNetClient.java @@ -1,9 +1,9 @@ -package org.ujar.bookingdb.apiclient.client; +package dev.knowhowto.bookingdb.apiclient.client; import java.util.Map; import org.springframework.stereotype.Service; -import org.ujar.bookingdb.apiclient.config.NetClientProperties; +import dev.knowhowto.bookingdb.apiclient.config.NetClientProperties; @Service public class BookingcomNetClient extends AbstractNetClient { diff --git a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/config/ClientConfig.java b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/config/ClientConfig.java similarity index 74% rename from bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/config/ClientConfig.java rename to bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/config/ClientConfig.java index 5116220..50e0209 100644 --- a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/config/ClientConfig.java +++ b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/config/ClientConfig.java @@ -1,11 +1,11 @@ -package org.ujar.bookingdb.apiclient.config; +package dev.knowhowto.bookingdb.apiclient.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @Configuration -@ComponentScan("org.ujar.bookingdb.apiclient.*") +@ComponentScan("dev.knowhowto.bookingdb.apiclient.*") @EnableConfigurationProperties(NetClientProperties.class) public class ClientConfig { } diff --git a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/config/NetClientProperties.java b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/config/NetClientProperties.java similarity index 96% rename from bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/config/NetClientProperties.java rename to bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/config/NetClientProperties.java index db2df18..c3a706d 100644 --- a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/config/NetClientProperties.java +++ b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/config/NetClientProperties.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.apiclient.config; +package dev.knowhowto.bookingdb.apiclient.config; import jakarta.validation.constraints.NotNull; diff --git a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/exception/NetClientCommunicationException.java b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/exception/NetClientCommunicationException.java similarity index 74% rename from bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/exception/NetClientCommunicationException.java rename to bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/exception/NetClientCommunicationException.java index 937a951..932ed4e 100644 --- a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/exception/NetClientCommunicationException.java +++ b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/exception/NetClientCommunicationException.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.apiclient.exception; +package dev.knowhowto.bookingdb.apiclient.exception; public class NetClientCommunicationException extends RuntimeException { public NetClientCommunicationException(Throwable cause) { diff --git a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/exception/NetClientMisconfigurationException.java b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/exception/NetClientMisconfigurationException.java similarity index 80% rename from bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/exception/NetClientMisconfigurationException.java rename to bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/exception/NetClientMisconfigurationException.java index 7584367..5bcb05d 100644 --- a/bookingdb-support/booking-api-client/src/main/java/org/ujar/bookingdb/apiclient/exception/NetClientMisconfigurationException.java +++ b/bookingdb-support/booking-api-client/src/main/java/dev/knowhowto/bookingdb/apiclient/exception/NetClientMisconfigurationException.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.apiclient.exception; +package dev.knowhowto.bookingdb.apiclient.exception; public class NetClientMisconfigurationException extends IllegalStateException { public NetClientMisconfigurationException(Throwable cause) { diff --git a/bookingdb-support/booking-persistence/pom.xml b/bookingdb-support/booking-persistence/pom.xml index 6e3f57d..5be064d 100644 --- a/bookingdb-support/booking-persistence/pom.xml +++ b/bookingdb-support/booking-persistence/pom.xml @@ -11,7 +11,7 @@ Common repositories and entities - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb-support 23.0.0-SNAPSHOT @@ -24,7 +24,7 @@ - org.ujar.boot + dev.knowhowto.boot boot-starter-cache diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/annotation/EnableBookingPersistence.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/annotation/EnableBookingPersistence.java similarity index 70% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/annotation/EnableBookingPersistence.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/annotation/EnableBookingPersistence.java index 11d5832..d4f97fc 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/annotation/EnableBookingPersistence.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/annotation/EnableBookingPersistence.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.persistence.annotation; +package dev.knowhowto.bookingdb.persistence.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -7,8 +7,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; -import org.ujar.bookingdb.persistence.config.CacheConfig; -import org.ujar.bookingdb.persistence.config.PersistenceConfig; +import dev.knowhowto.bookingdb.persistence.config.CacheConfig; +import dev.knowhowto.bookingdb.persistence.config.PersistenceConfig; @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.TYPE}) diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/config/CacheConfig.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/config/CacheConfig.java similarity index 88% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/config/CacheConfig.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/config/CacheConfig.java index 93e90f5..f042785 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/config/CacheConfig.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/config/CacheConfig.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.persistence.config; +package dev.knowhowto.bookingdb.persistence.config; import java.time.Duration; @@ -12,10 +12,10 @@ import org.springframework.cache.annotation.EnableCaching; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.ujar.bookingdb.persistence.entity.City; -import org.ujar.bookingdb.persistence.entity.Country; -import org.ujar.bookingdb.persistence.entity.Hotel; -import org.ujar.boot.cache.CacheProperties; +import dev.knowhowto.bookingdb.persistence.entity.City; +import dev.knowhowto.bookingdb.persistence.entity.Country; +import dev.knowhowto.bookingdb.persistence.entity.Hotel; +import dev.knowhowto.boot.cache.CacheProperties; @Configuration @EnableCaching diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/config/PersistenceConfig.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/config/PersistenceConfig.java similarity index 70% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/config/PersistenceConfig.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/config/PersistenceConfig.java index 7528fa8..108190d 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/config/PersistenceConfig.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/config/PersistenceConfig.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.persistence.config; +package dev.knowhowto.bookingdb.persistence.config; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Configuration; @@ -7,8 +7,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @Configuration -@EnableJpaRepositories({"org.ujar.bookingdb.persistence.repository"}) -@EntityScan({"org.ujar.bookingdb.persistence.entity"}) +@EnableJpaRepositories({"dev.knowhowto.bookingdb.persistence.repository"}) +@EntityScan({"dev.knowhowto.bookingdb.persistence.entity"}) @EnableJpaAuditing @EnableTransactionManagement public class PersistenceConfig { diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/converter/HashMapConverter.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/converter/HashMapConverter.java similarity index 95% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/converter/HashMapConverter.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/converter/HashMapConverter.java index 28bcb63..15524aa 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/converter/HashMapConverter.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/converter/HashMapConverter.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.persistence.converter; +package dev.knowhowto.bookingdb.persistence.converter; import jakarta.persistence.AttributeConverter; import java.io.IOException; diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/entity/City.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/entity/City.java similarity index 96% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/entity/City.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/entity/City.java index 920702c..bb8d537 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/entity/City.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/entity/City.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.persistence.entity; +package dev.knowhowto.bookingdb.persistence.entity; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/entity/Country.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/entity/Country.java similarity index 95% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/entity/Country.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/entity/Country.java index f493d20..9568797 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/entity/Country.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/entity/Country.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.persistence.entity; +package dev.knowhowto.bookingdb.persistence.entity; import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/entity/Hotel.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/entity/Hotel.java similarity index 92% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/entity/Hotel.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/entity/Hotel.java index c2e1f20..587e11a 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/entity/Hotel.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/entity/Hotel.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.persistence.entity; +package dev.knowhowto.bookingdb.persistence.entity; import jakarta.persistence.Column; import jakarta.persistence.Convert; @@ -18,7 +18,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; -import org.ujar.bookingdb.persistence.converter.HashMapConverter; +import dev.knowhowto.bookingdb.persistence.converter.HashMapConverter; @Entity @Getter diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/repository/CityRepository.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/repository/CityRepository.java similarity index 78% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/repository/CityRepository.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/repository/CityRepository.java index 48fc55d..f9b595d 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/repository/CityRepository.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/repository/CityRepository.java @@ -1,11 +1,11 @@ -package org.ujar.bookingdb.persistence.repository; +package dev.knowhowto.bookingdb.persistence.repository; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.PagingAndSortingRepository; -import org.ujar.bookingdb.persistence.entity.City; +import dev.knowhowto.bookingdb.persistence.entity.City; public interface CityRepository extends PagingAndSortingRepository, JpaRepository { diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/repository/CountryRepository.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/repository/CountryRepository.java similarity index 83% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/repository/CountryRepository.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/repository/CountryRepository.java index 8f41b3b..1738f42 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/repository/CountryRepository.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/repository/CountryRepository.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.persistence.repository; +package dev.knowhowto.bookingdb.persistence.repository; import java.util.List; import java.util.Optional; @@ -6,7 +6,7 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.PagingAndSortingRepository; -import org.ujar.bookingdb.persistence.entity.Country; +import dev.knowhowto.bookingdb.persistence.entity.Country; public interface CountryRepository extends PagingAndSortingRepository, JpaRepository { diff --git a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/repository/HotelRepository.java b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/repository/HotelRepository.java similarity index 72% rename from bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/repository/HotelRepository.java rename to bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/repository/HotelRepository.java index ca4600c..b255e0f 100644 --- a/bookingdb-support/booking-persistence/src/main/java/org/ujar/bookingdb/persistence/repository/HotelRepository.java +++ b/bookingdb-support/booking-persistence/src/main/java/dev/knowhowto/bookingdb/persistence/repository/HotelRepository.java @@ -1,8 +1,8 @@ -package org.ujar.bookingdb.persistence.repository; +package dev.knowhowto.bookingdb.persistence.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.repository.PagingAndSortingRepository; -import org.ujar.bookingdb.persistence.entity.Hotel; +import dev.knowhowto.bookingdb.persistence.entity.Hotel; public interface HotelRepository extends PagingAndSortingRepository, JpaRepository { diff --git a/bookingdb-support/pom.xml b/bookingdb-support/pom.xml index 3b93fdb..14d68f2 100644 --- a/bookingdb-support/pom.xml +++ b/bookingdb-support/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb-support 23.0.0-SNAPSHOT pom bookingdb-support - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb 23.0.0-SNAPSHOT diff --git a/dashboard-service/pom.xml b/dashboard-service/pom.xml index 973caf8..618c87d 100644 --- a/dashboard-service/pom.xml +++ b/dashboard-service/pom.xml @@ -11,7 +11,7 @@ Admin REST API Service - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb 23.0.0-SNAPSHOT @@ -22,16 +22,16 @@ ${java.version} false false - org.ujar.bookingdb.dashboard.DashboardApplication + dev.knowhowto.bookingdb.dashboard.DashboardApplication - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp batch-job - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp booking-persistence @@ -39,7 +39,7 @@ spring-boot-starter-web - org.ujar.boot + dev.knowhowto.boot boot-starter-restful @@ -52,11 +52,11 @@ runtime - org.ujar.boot + dev.knowhowto.boot boot-starter-amqp - org.ujar.boot + dev.knowhowto.boot boot-starter-observability diff --git a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/DashboardApplication.java b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/DashboardApplication.java similarity index 92% rename from dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/DashboardApplication.java rename to dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/DashboardApplication.java index ea20dc1..d7badc7 100644 --- a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/DashboardApplication.java +++ b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/DashboardApplication.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.dashboard; +package dev.knowhowto.bookingdb.dashboard; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/config/ApplicationConfig.java b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/config/ApplicationConfig.java similarity index 63% rename from dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/config/ApplicationConfig.java rename to dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/config/ApplicationConfig.java index 3e87cdc..971688d 100644 --- a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/config/ApplicationConfig.java +++ b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/config/ApplicationConfig.java @@ -1,10 +1,10 @@ -package org.ujar.bookingdb.dashboard.config; +package dev.knowhowto.bookingdb.dashboard.config; import io.swagger.v3.oas.annotations.OpenAPIDefinition; import io.swagger.v3.oas.annotations.info.Info; import org.springframework.context.annotation.Configuration; -import org.ujar.bookingdb.jobs.annotation.EnableJobSupport; -import org.ujar.bookingdb.persistence.annotation.EnableBookingPersistence; +import dev.knowhowto.bookingdb.jobs.annotation.EnableJobSupport; +import dev.knowhowto.bookingdb.persistence.annotation.EnableBookingPersistence; @Configuration @EnableJobSupport diff --git a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/producer/ImportServiceProducer.java b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/producer/ImportServiceProducer.java similarity index 68% rename from dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/producer/ImportServiceProducer.java rename to dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/producer/ImportServiceProducer.java index 523c5e8..1b6cfda 100644 --- a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/producer/ImportServiceProducer.java +++ b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/producer/ImportServiceProducer.java @@ -1,14 +1,14 @@ -package org.ujar.bookingdb.dashboard.producer; +package dev.knowhowto.bookingdb.dashboard.producer; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.stereotype.Component; -import org.ujar.bookingdb.jobs.CitiesImportParameters; -import org.ujar.bookingdb.jobs.CityHotelsImportParameters; -import org.ujar.bookingdb.jobs.CountriesImportParameters; -import org.ujar.bookingdb.jobs.HotelsImportParameters; -import org.ujar.bookingdb.jobs.JobParameters; -import org.ujar.bookingdb.jobs.amqp.AbstractProducer; -import org.ujar.bookingdb.jobs.amqp.AmqpQueuesProperties; +import dev.knowhowto.bookingdb.jobs.CitiesImportParameters; +import dev.knowhowto.bookingdb.jobs.CityHotelsImportParameters; +import dev.knowhowto.bookingdb.jobs.CountriesImportParameters; +import dev.knowhowto.bookingdb.jobs.HotelsImportParameters; +import dev.knowhowto.bookingdb.jobs.JobParameters; +import dev.knowhowto.bookingdb.jobs.amqp.AbstractProducer; +import dev.knowhowto.bookingdb.jobs.amqp.AmqpQueuesProperties; @Component public class ImportServiceProducer extends AbstractProducer { diff --git a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/CityResource.java b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/CityResource.java similarity index 91% rename from dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/CityResource.java rename to dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/CityResource.java index fbb5c1e..b2bc75b 100644 --- a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/CityResource.java +++ b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/CityResource.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.dashboard.web; +package dev.knowhowto.bookingdb.dashboard.web; import jakarta.validation.Valid; @@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import org.ujar.bookingdb.persistence.entity.City; -import org.ujar.bookingdb.persistence.repository.CityRepository; -import org.ujar.boot.restful.web.ApiError; -import org.ujar.boot.restful.web.PaginationRequest; +import dev.knowhowto.bookingdb.persistence.entity.City; +import dev.knowhowto.bookingdb.persistence.repository.CityRepository; +import dev.knowhowto.boot.restful.web.ApiError; +import dev.knowhowto.boot.restful.web.PaginationRequest; @RestController @Tag(name = "Cities resource", description = "API for cities management") diff --git a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/CountryResource.java b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/CountryResource.java similarity index 91% rename from dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/CountryResource.java rename to dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/CountryResource.java index 0d09e84..a280123 100644 --- a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/CountryResource.java +++ b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/CountryResource.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.dashboard.web; +package dev.knowhowto.bookingdb.dashboard.web; import jakarta.validation.Valid; @@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import org.ujar.bookingdb.persistence.entity.Country; -import org.ujar.bookingdb.persistence.repository.CountryRepository; -import org.ujar.boot.restful.web.ApiError; -import org.ujar.boot.restful.web.PaginationRequest; +import dev.knowhowto.bookingdb.persistence.entity.Country; +import dev.knowhowto.bookingdb.persistence.repository.CountryRepository; +import dev.knowhowto.boot.restful.web.ApiError; +import dev.knowhowto.boot.restful.web.PaginationRequest; @RestController @Tag(name = "Countries resource", description = "API for countries management") diff --git a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/HotelResource.java b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/HotelResource.java similarity index 91% rename from dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/HotelResource.java rename to dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/HotelResource.java index 271c708..abd5ea8 100644 --- a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/HotelResource.java +++ b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/HotelResource.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.dashboard.web; +package dev.knowhowto.bookingdb.dashboard.web; import jakarta.validation.Valid; @@ -17,10 +17,10 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; -import org.ujar.bookingdb.persistence.entity.Hotel; -import org.ujar.bookingdb.persistence.repository.HotelRepository; -import org.ujar.boot.restful.web.ApiError; -import org.ujar.boot.restful.web.PaginationRequest; +import dev.knowhowto.bookingdb.persistence.entity.Hotel; +import dev.knowhowto.bookingdb.persistence.repository.HotelRepository; +import dev.knowhowto.boot.restful.web.ApiError; +import dev.knowhowto.boot.restful.web.PaginationRequest; @RestController @Tag(name = "Countries resource", description = "API for hotels management") diff --git a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/ImporterJobResource.java b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/ImporterJobResource.java similarity index 91% rename from dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/ImporterJobResource.java rename to dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/ImporterJobResource.java index 81e7723..490bed9 100644 --- a/dashboard-service/src/main/java/org/ujar/bookingdb/dashboard/web/ImporterJobResource.java +++ b/dashboard-service/src/main/java/dev/knowhowto/bookingdb/dashboard/web/ImporterJobResource.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.dashboard.web; +package dev.knowhowto.bookingdb.dashboard.web; import java.util.List; @@ -15,14 +15,14 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -import org.ujar.bookingdb.dashboard.producer.ImportServiceProducer; -import org.ujar.bookingdb.jobs.CitiesImportParameters; -import org.ujar.bookingdb.jobs.CountriesImportParameters; -import org.ujar.bookingdb.jobs.HotelsImportParameters; -import org.ujar.bookingdb.jobs.JobParameters; -import org.ujar.bookingdb.persistence.entity.Country; -import org.ujar.bookingdb.persistence.repository.CountryRepository; -import org.ujar.boot.restful.web.ApiError; +import dev.knowhowto.bookingdb.dashboard.producer.ImportServiceProducer; +import dev.knowhowto.bookingdb.jobs.CitiesImportParameters; +import dev.knowhowto.bookingdb.jobs.CountriesImportParameters; +import dev.knowhowto.bookingdb.jobs.HotelsImportParameters; +import dev.knowhowto.bookingdb.jobs.JobParameters; +import dev.knowhowto.bookingdb.persistence.entity.Country; +import dev.knowhowto.bookingdb.persistence.repository.CountryRepository; +import dev.knowhowto.boot.restful.web.ApiError; @RestController @Tag(name = "Importer job resource", description = "API for job management") diff --git a/dashboard-service/src/test/java/org/ujar/bookingdb/dashboard/DashboardApplicationIT.java b/dashboard-service/src/test/java/dev/knowhowto/bookingdb/dashboard/DashboardApplicationIT.java similarity index 89% rename from dashboard-service/src/test/java/org/ujar/bookingdb/dashboard/DashboardApplicationIT.java rename to dashboard-service/src/test/java/dev/knowhowto/bookingdb/dashboard/DashboardApplicationIT.java index a1d88bd..49640be 100644 --- a/dashboard-service/src/test/java/org/ujar/bookingdb/dashboard/DashboardApplicationIT.java +++ b/dashboard-service/src/test/java/dev/knowhowto/bookingdb/dashboard/DashboardApplicationIT.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.dashboard; +package dev.knowhowto.bookingdb.dashboard; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/init-container-service/src/test/java/org/ujar/bookingdb/init/config/TestDatabaseConfig.java b/dashboard-service/src/test/java/dev/knowhowto/bookingdb/dashboard/config/TestDatabaseConfig.java similarity index 88% rename from init-container-service/src/test/java/org/ujar/bookingdb/init/config/TestDatabaseConfig.java rename to dashboard-service/src/test/java/dev/knowhowto/bookingdb/dashboard/config/TestDatabaseConfig.java index f80b60c..31c45a7 100644 --- a/init-container-service/src/test/java/org/ujar/bookingdb/init/config/TestDatabaseConfig.java +++ b/dashboard-service/src/test/java/dev/knowhowto/bookingdb/dashboard/config/TestDatabaseConfig.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.init.config; +package dev.knowhowto.bookingdb.dashboard.config; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; diff --git a/edge-service/pom.xml b/edge-service/pom.xml index 92af7ed..8f13e42 100644 --- a/edge-service/pom.xml +++ b/edge-service/pom.xml @@ -11,7 +11,7 @@ Gateway service - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb 23.0.0-SNAPSHOT @@ -22,12 +22,12 @@ ${java.version} false false - org.ujar.bookingdb.edge.EdgeApplication + dev.knowhowto.bookingdb.edge.EdgeApplication - org.ujar.boot + dev.knowhowto.boot boot-starter-observability diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/EdgeApplication.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/EdgeApplication.java similarity index 93% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/EdgeApplication.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/EdgeApplication.java index 2a5c9ab..71aa989 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/EdgeApplication.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/EdgeApplication.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge; +package dev.knowhowto.bookingdb.edge; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/config/ApplicationConfig.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/config/ApplicationConfig.java similarity index 84% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/config/ApplicationConfig.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/config/ApplicationConfig.java index 3a9c0db..e4ce666 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/config/ApplicationConfig.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.config; +package dev.knowhowto.bookingdb.edge.config; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/config/GatewayConfig.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/config/GatewayConfig.java similarity index 94% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/config/GatewayConfig.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/config/GatewayConfig.java index 79c0112..4fee9bc 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/config/GatewayConfig.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/config/GatewayConfig.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.config; +package dev.knowhowto.bookingdb.edge.config; import org.springframework.cloud.gateway.route.RouteLocator; import org.springframework.cloud.gateway.route.builder.RouteLocatorBuilder; diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/config/ServicesProperties.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/config/ServicesProperties.java similarity index 81% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/config/ServicesProperties.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/config/ServicesProperties.java index aaad38f..9a5f1a6 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/config/ServicesProperties.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/config/ServicesProperties.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.config; +package dev.knowhowto.bookingdb.edge.config; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/City.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/City.java similarity index 58% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/model/City.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/City.java index 97a23f7..cd3e4b7 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/City.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/City.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.model; +package dev.knowhowto.bookingdb.edge.model; public record City(Long id, String name, Long cityId) { diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/CityPage.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/CityPage.java similarity index 86% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/model/CityPage.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/CityPage.java index e4d0958..1a87c48 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/CityPage.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/CityPage.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.model; +package dev.knowhowto.bookingdb.edge.model; import java.util.List; diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/Country.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/Country.java similarity index 59% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/model/Country.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/Country.java index a2bbcfa..ed163ba 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/Country.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/Country.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.model; +package dev.knowhowto.bookingdb.edge.model; public record Country(Long id, String name, String country) { } diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/CountryPage.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/CountryPage.java similarity index 87% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/model/CountryPage.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/CountryPage.java index 3bcfb84..3c6ca84 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/CountryPage.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/CountryPage.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.model; +package dev.knowhowto.bookingdb.edge.model; import java.util.List; diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/Hotel.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/Hotel.java similarity index 52% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/model/Hotel.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/Hotel.java index f4b7fab..0e625d8 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/Hotel.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/Hotel.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.model; +package dev.knowhowto.bookingdb.edge.model; public record Hotel(Long id, Long hotelId) { diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/HotelPage.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/HotelPage.java similarity index 86% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/model/HotelPage.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/HotelPage.java index d165d90..cff7f13 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/HotelPage.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/HotelPage.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.model; +package dev.knowhowto.bookingdb.edge.model; import java.util.List; diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/Pageable.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/Pageable.java similarity index 74% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/model/Pageable.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/Pageable.java index 08f59e5..1091beb 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/model/Pageable.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/model/Pageable.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge.model; +package dev.knowhowto.bookingdb.edge.model; public record Pageable(Integer offset, Integer pageNumber, diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/service/DashboardService.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/service/DashboardService.java similarity index 86% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/service/DashboardService.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/service/DashboardService.java index f2f21c9..4b45a8e 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/service/DashboardService.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/service/DashboardService.java @@ -1,13 +1,13 @@ -package org.ujar.bookingdb.edge.service; +package dev.knowhowto.bookingdb.edge.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.reactive.function.client.WebClient; -import org.ujar.bookingdb.edge.config.ServicesProperties; -import org.ujar.bookingdb.edge.model.CityPage; -import org.ujar.bookingdb.edge.model.CountryPage; -import org.ujar.bookingdb.edge.model.HotelPage; +import dev.knowhowto.bookingdb.edge.config.ServicesProperties; +import dev.knowhowto.bookingdb.edge.model.CityPage; +import dev.knowhowto.bookingdb.edge.model.CountryPage; +import dev.knowhowto.bookingdb.edge.model.HotelPage; import reactor.core.publisher.Mono; @Service diff --git a/edge-service/src/main/java/org/ujar/bookingdb/edge/web/DashboardResource.java b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/web/DashboardResource.java similarity index 75% rename from edge-service/src/main/java/org/ujar/bookingdb/edge/web/DashboardResource.java rename to edge-service/src/main/java/dev/knowhowto/bookingdb/edge/web/DashboardResource.java index d9c0c2c..c81f114 100644 --- a/edge-service/src/main/java/org/ujar/bookingdb/edge/web/DashboardResource.java +++ b/edge-service/src/main/java/dev/knowhowto/bookingdb/edge/web/DashboardResource.java @@ -1,14 +1,14 @@ -package org.ujar.bookingdb.edge.web; +package dev.knowhowto.bookingdb.edge.web; import jakarta.validation.constraints.NotNull; import org.springframework.graphql.data.method.annotation.Argument; import org.springframework.graphql.data.method.annotation.QueryMapping; import org.springframework.stereotype.Controller; -import org.ujar.bookingdb.edge.model.CityPage; -import org.ujar.bookingdb.edge.model.CountryPage; -import org.ujar.bookingdb.edge.model.HotelPage; -import org.ujar.bookingdb.edge.service.DashboardService; +import dev.knowhowto.bookingdb.edge.model.CityPage; +import dev.knowhowto.bookingdb.edge.model.CountryPage; +import dev.knowhowto.bookingdb.edge.model.HotelPage; +import dev.knowhowto.bookingdb.edge.service.DashboardService; import reactor.core.publisher.Mono; @Controller diff --git a/edge-service/src/test/java/org/ujar/bookingdb/edge/EdgeApplicationIT.java b/edge-service/src/test/java/dev/knowhowto/bookingdb/edge/EdgeApplicationIT.java similarity index 90% rename from edge-service/src/test/java/org/ujar/bookingdb/edge/EdgeApplicationIT.java rename to edge-service/src/test/java/dev/knowhowto/bookingdb/edge/EdgeApplicationIT.java index 15ab2bc..aa5d51b 100644 --- a/edge-service/src/test/java/org/ujar/bookingdb/edge/EdgeApplicationIT.java +++ b/edge-service/src/test/java/dev/knowhowto/bookingdb/edge/EdgeApplicationIT.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.edge; +package dev.knowhowto.bookingdb.edge; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/importer-service/pom.xml b/importer-service/pom.xml index 2e74ec9..49d41e6 100644 --- a/importer-service/pom.xml +++ b/importer-service/pom.xml @@ -11,7 +11,7 @@ Import GEO data form Booking.com API - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb 23.0.0-SNAPSHOT @@ -22,20 +22,20 @@ ${java.version} false false - org.ujar.bookingdb.importer.ImporterApplication + dev.knowhowto.bookingdb.importer.ImporterApplication - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp booking-api-client - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp batch-job - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp booking-persistence @@ -43,11 +43,11 @@ spring-boot-starter-web - org.ujar.boot + dev.knowhowto.boot boot-starter-cache - org.ujar.boot + dev.knowhowto.boot boot-starter-restful @@ -64,11 +64,11 @@ hibernate-types-60 - org.ujar.boot + dev.knowhowto.boot boot-starter-amqp - org.ujar.boot + dev.knowhowto.boot boot-starter-observability diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/ImporterApplication.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/ImporterApplication.java similarity index 92% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/ImporterApplication.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/ImporterApplication.java index 7fa2e09..784c78e 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/ImporterApplication.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/ImporterApplication.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer; +package dev.knowhowto.bookingdb.importer; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/config/AmqpConfig.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/config/AmqpConfig.java similarity index 89% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/config/AmqpConfig.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/config/AmqpConfig.java index 82437d4..142e6c9 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/config/AmqpConfig.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/config/AmqpConfig.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer.config; +package dev.knowhowto.bookingdb.importer.config; import lombok.RequiredArgsConstructor; import org.springframework.amqp.core.AcknowledgeMode; @@ -7,10 +7,10 @@ import org.springframework.amqp.rabbit.listener.adapter.MessageListenerAdapter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.ujar.bookingdb.importer.consumer.ImportCitiesConsumer; -import org.ujar.bookingdb.importer.consumer.ImportCountriesConsumer; -import org.ujar.bookingdb.importer.consumer.ImportHotelConsumer; -import org.ujar.bookingdb.jobs.amqp.AmqpQueuesProperties; +import dev.knowhowto.bookingdb.importer.consumer.ImportCitiesConsumer; +import dev.knowhowto.bookingdb.importer.consumer.ImportCountriesConsumer; +import dev.knowhowto.bookingdb.importer.consumer.ImportHotelConsumer; +import dev.knowhowto.bookingdb.jobs.amqp.AmqpQueuesProperties; @Configuration @RequiredArgsConstructor diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/config/ApplicationConfig.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/config/ApplicationConfig.java similarity index 51% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/config/ApplicationConfig.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/config/ApplicationConfig.java index f2be0bd..eb1c099 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/config/ApplicationConfig.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/config/ApplicationConfig.java @@ -1,10 +1,10 @@ -package org.ujar.bookingdb.importer.config; +package dev.knowhowto.bookingdb.importer.config; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.annotation.EnableTransactionManagement; -import org.ujar.bookingdb.apiclient.annotation.EnableBookingApiClient; -import org.ujar.bookingdb.jobs.annotation.EnableJobSupport; -import org.ujar.bookingdb.persistence.annotation.EnableBookingPersistence; +import dev.knowhowto.bookingdb.apiclient.annotation.EnableBookingApiClient; +import dev.knowhowto.bookingdb.jobs.annotation.EnableJobSupport; +import dev.knowhowto.bookingdb.persistence.annotation.EnableBookingPersistence; @Configuration @EnableJobSupport diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/consumer/ImportCitiesConsumer.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/consumer/ImportCitiesConsumer.java similarity index 70% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/consumer/ImportCitiesConsumer.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/consumer/ImportCitiesConsumer.java index 70ef73c..3fa4e89 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/consumer/ImportCitiesConsumer.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/consumer/ImportCitiesConsumer.java @@ -1,10 +1,10 @@ -package org.ujar.bookingdb.importer.consumer; +package dev.knowhowto.bookingdb.importer.consumer; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.ujar.bookingdb.importer.service.CityImporterService; -import org.ujar.bookingdb.jobs.CitiesImportParameters; +import dev.knowhowto.bookingdb.importer.service.CityImporterService; +import dev.knowhowto.bookingdb.jobs.CitiesImportParameters; @Component @RequiredArgsConstructor diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/consumer/ImportCountriesConsumer.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/consumer/ImportCountriesConsumer.java similarity index 69% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/consumer/ImportCountriesConsumer.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/consumer/ImportCountriesConsumer.java index 4da0b6c..d3b2fa9 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/consumer/ImportCountriesConsumer.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/consumer/ImportCountriesConsumer.java @@ -1,10 +1,10 @@ -package org.ujar.bookingdb.importer.consumer; +package dev.knowhowto.bookingdb.importer.consumer; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.ujar.bookingdb.importer.service.CountryImporterService; -import org.ujar.bookingdb.jobs.CountriesImportParameters; +import dev.knowhowto.bookingdb.importer.service.CountryImporterService; +import dev.knowhowto.bookingdb.jobs.CountriesImportParameters; @Component @RequiredArgsConstructor diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/consumer/ImportHotelConsumer.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/consumer/ImportHotelConsumer.java similarity index 69% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/consumer/ImportHotelConsumer.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/consumer/ImportHotelConsumer.java index a044b04..6036cbb 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/consumer/ImportHotelConsumer.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/consumer/ImportHotelConsumer.java @@ -1,10 +1,10 @@ -package org.ujar.bookingdb.importer.consumer; +package dev.knowhowto.bookingdb.importer.consumer; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.ujar.bookingdb.importer.service.HotelImporterService; -import org.ujar.bookingdb.jobs.CityHotelsImportParameters; +import dev.knowhowto.bookingdb.importer.service.HotelImporterService; +import dev.knowhowto.bookingdb.jobs.CityHotelsImportParameters; @Component @RequiredArgsConstructor diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/CityImporterService.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/CityImporterService.java similarity index 74% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/service/CityImporterService.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/CityImporterService.java index 24ad6f6..8c25599 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/CityImporterService.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/CityImporterService.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer.service; +package dev.knowhowto.bookingdb.importer.service; import org.springframework.stereotype.Service; diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/CountryImporterService.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/CountryImporterService.java similarity index 72% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/service/CountryImporterService.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/CountryImporterService.java index 3415f73..478dee1 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/CountryImporterService.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/CountryImporterService.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer.service; +package dev.knowhowto.bookingdb.importer.service; import org.springframework.stereotype.Service; diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/HotelImporterService.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/HotelImporterService.java similarity index 72% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/service/HotelImporterService.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/HotelImporterService.java index 124aa0c..529b84c 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/HotelImporterService.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/HotelImporterService.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer.service; +package dev.knowhowto.bookingdb.importer.service; import org.springframework.stereotype.Service; diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/impl/CityImporterServiceImpl.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/impl/CityImporterServiceImpl.java similarity index 84% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/service/impl/CityImporterServiceImpl.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/impl/CityImporterServiceImpl.java index b9abb4e..698a17b 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/impl/CityImporterServiceImpl.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/impl/CityImporterServiceImpl.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer.service.impl; +package dev.knowhowto.bookingdb.importer.service.impl; import jakarta.transaction.Transactional; import java.util.ArrayList; @@ -13,11 +13,11 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.ujar.bookingdb.apiclient.client.BookingcomNetClient; -import org.ujar.bookingdb.importer.service.CityImporterService; -import org.ujar.bookingdb.persistence.entity.City; -import org.ujar.bookingdb.persistence.repository.CityRepository; -import org.ujar.bookingdb.persistence.repository.CountryRepository; +import dev.knowhowto.bookingdb.apiclient.client.BookingcomNetClient; +import dev.knowhowto.bookingdb.importer.service.CityImporterService; +import dev.knowhowto.bookingdb.persistence.entity.City; +import dev.knowhowto.bookingdb.persistence.repository.CityRepository; +import dev.knowhowto.bookingdb.persistence.repository.CountryRepository; @Service @Slf4j diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/impl/CountryImporterServiceImpl.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/impl/CountryImporterServiceImpl.java similarity index 86% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/service/impl/CountryImporterServiceImpl.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/impl/CountryImporterServiceImpl.java index d610a76..1ef6529 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/impl/CountryImporterServiceImpl.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/impl/CountryImporterServiceImpl.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer.service.impl; +package dev.knowhowto.bookingdb.importer.service.impl; import jakarta.transaction.Transactional; import java.util.List; @@ -11,10 +11,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.ujar.bookingdb.apiclient.client.BookingcomNetClient; -import org.ujar.bookingdb.importer.service.CountryImporterService; -import org.ujar.bookingdb.persistence.entity.Country; -import org.ujar.bookingdb.persistence.repository.CountryRepository; +import dev.knowhowto.bookingdb.apiclient.client.BookingcomNetClient; +import dev.knowhowto.bookingdb.importer.service.CountryImporterService; +import dev.knowhowto.bookingdb.persistence.entity.Country; +import dev.knowhowto.bookingdb.persistence.repository.CountryRepository; @Service @Slf4j diff --git a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/impl/HotelImporterServiceImpl.java b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/impl/HotelImporterServiceImpl.java similarity index 81% rename from importer-service/src/main/java/org/ujar/bookingdb/importer/service/impl/HotelImporterServiceImpl.java rename to importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/impl/HotelImporterServiceImpl.java index 068494c..64651d4 100644 --- a/importer-service/src/main/java/org/ujar/bookingdb/importer/service/impl/HotelImporterServiceImpl.java +++ b/importer-service/src/main/java/dev/knowhowto/bookingdb/importer/service/impl/HotelImporterServiceImpl.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer.service.impl; +package dev.knowhowto.bookingdb.importer.service.impl; import jakarta.transaction.Transactional; import java.util.List; @@ -9,12 +9,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import org.ujar.bookingdb.apiclient.client.BookingcomNetClient; -import org.ujar.bookingdb.importer.service.HotelImporterService; -import org.ujar.bookingdb.persistence.entity.City; -import org.ujar.bookingdb.persistence.entity.Hotel; -import org.ujar.bookingdb.persistence.repository.CityRepository; -import org.ujar.bookingdb.persistence.repository.HotelRepository; +import dev.knowhowto.bookingdb.apiclient.client.BookingcomNetClient; +import dev.knowhowto.bookingdb.importer.service.HotelImporterService; +import dev.knowhowto.bookingdb.persistence.entity.City; +import dev.knowhowto.bookingdb.persistence.entity.Hotel; +import dev.knowhowto.bookingdb.persistence.repository.CityRepository; +import dev.knowhowto.bookingdb.persistence.repository.HotelRepository; @Service @Slf4j diff --git a/importer-service/src/test/java/org/ujar/bookingdb/importer/ImporterApplicationIT.java b/importer-service/src/test/java/dev/knowhowto/bookingdb/importer/ImporterApplicationIT.java similarity index 89% rename from importer-service/src/test/java/org/ujar/bookingdb/importer/ImporterApplicationIT.java rename to importer-service/src/test/java/dev/knowhowto/bookingdb/importer/ImporterApplicationIT.java index aeb24f3..37026e2 100644 --- a/importer-service/src/test/java/org/ujar/bookingdb/importer/ImporterApplicationIT.java +++ b/importer-service/src/test/java/dev/knowhowto/bookingdb/importer/ImporterApplicationIT.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer; +package dev.knowhowto.bookingdb.importer; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/importer-service/src/test/java/org/ujar/bookingdb/importer/config/TestDatabaseConfig.java b/importer-service/src/test/java/dev/knowhowto/bookingdb/importer/config/TestDatabaseConfig.java similarity index 88% rename from importer-service/src/test/java/org/ujar/bookingdb/importer/config/TestDatabaseConfig.java rename to importer-service/src/test/java/dev/knowhowto/bookingdb/importer/config/TestDatabaseConfig.java index 1cf743f..92777c0 100644 --- a/importer-service/src/test/java/org/ujar/bookingdb/importer/config/TestDatabaseConfig.java +++ b/importer-service/src/test/java/dev/knowhowto/bookingdb/importer/config/TestDatabaseConfig.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.importer.config; +package dev.knowhowto.bookingdb.importer.config; import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; diff --git a/init-container-service/pom.xml b/init-container-service/pom.xml index b3c55b4..a4b1ba6 100644 --- a/init-container-service/pom.xml +++ b/init-container-service/pom.xml @@ -11,7 +11,7 @@ Update database structure using Liquibase - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb 23.0.0-SNAPSHOT @@ -22,7 +22,7 @@ ${java.version} false false - org.ujar.bookingdb.init.InitContainerApplication + dev.knowhowto.bookingdb.init.InitContainerApplication @@ -31,7 +31,7 @@ spring-boot-starter-web - org.ujar.boot + dev.knowhowto.boot boot-starter-observability diff --git a/init-container-service/src/main/java/org/ujar/bookingdb/init/InitContainerApplication.java b/init-container-service/src/main/java/dev/knowhowto/bookingdb/init/InitContainerApplication.java similarity index 88% rename from init-container-service/src/main/java/org/ujar/bookingdb/init/InitContainerApplication.java rename to init-container-service/src/main/java/dev/knowhowto/bookingdb/init/InitContainerApplication.java index 9bfc1db..186f503 100644 --- a/init-container-service/src/main/java/org/ujar/bookingdb/init/InitContainerApplication.java +++ b/init-container-service/src/main/java/dev/knowhowto/bookingdb/init/InitContainerApplication.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.init; +package dev.knowhowto.bookingdb.init; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/init-container-service/src/main/java/org/ujar/bookingdb/init/config/ApplicationConfig.java b/init-container-service/src/main/java/dev/knowhowto/bookingdb/init/config/ApplicationConfig.java similarity index 70% rename from init-container-service/src/main/java/org/ujar/bookingdb/init/config/ApplicationConfig.java rename to init-container-service/src/main/java/dev/knowhowto/bookingdb/init/config/ApplicationConfig.java index 72fd88d..517f813 100644 --- a/init-container-service/src/main/java/org/ujar/bookingdb/init/config/ApplicationConfig.java +++ b/init-container-service/src/main/java/dev/knowhowto/bookingdb/init/config/ApplicationConfig.java @@ -1,4 +1,4 @@ -package org.ujar.bookingdb.init.config; +package dev.knowhowto.bookingdb.init.config; import org.springframework.context.annotation.Configuration; diff --git a/init-container-service/src/main/resources/migrations/changelog/20220704000000_create_countries_table.xml b/init-container-service/src/main/resources/migrations/changelog/20220704000000_create_countries_table.xml index 9ec228c..2ad6a63 100644 --- a/init-container-service/src/main/resources/migrations/changelog/20220704000000_create_countries_table.xml +++ b/init-container-service/src/main/resources/migrations/changelog/20220704000000_create_countries_table.xml @@ -5,7 +5,7 @@ http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> - + diff --git a/init-container-service/src/main/resources/migrations/changelog/20220707000000_create_cities_table.xml b/init-container-service/src/main/resources/migrations/changelog/20220707000000_create_cities_table.xml index 9a6fb8f..f9ea68f 100644 --- a/init-container-service/src/main/resources/migrations/changelog/20220707000000_create_cities_table.xml +++ b/init-container-service/src/main/resources/migrations/changelog/20220707000000_create_cities_table.xml @@ -5,7 +5,7 @@ http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.4.xsd"> - + @@ -24,7 +24,7 @@ - + - + @@ -25,7 +25,7 @@ - + 4.0.0 - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp bookingdb 23.0.0-SNAPSHOT pom @@ -33,7 +33,7 @@ - org.ujar.boot + dev.knowhowto.boot boot-parent-pom 23.0.0-SNAPSHOT @@ -55,17 +55,17 @@ - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp batch-job ${project.version} - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp booking-persistence ${project.version} - org.ujar.sample-bookingdb-mix-rest-graphql-amqp + dev.knowhowto.sample-bookingdb-mix-rest-graphql-amqp booking-api-client ${project.version} diff --git a/src/main/docker/prometheus/prometheus.yml b/src/main/docker/prometheus/prometheus.yml index 72a345e..2696564 100644 --- a/src/main/docker/prometheus/prometheus.yml +++ b/src/main/docker/prometheus/prometheus.yml @@ -7,7 +7,7 @@ global : # Attach these labels to any time series or alerts when communicating with # external systems (federation, remote storage, Alertmanager). external_labels : - monitor : 'ujar' + monitor : 'knowhowto' # A scrape configuration containing exactly one endpoint to scrape: # Here it's Prometheus itself.