diff --git a/coreutils-common/pom.xml b/coreutils-common/pom.xml index 264b67e..78c21de 100644 --- a/coreutils-common/pom.xml +++ b/coreutils-common/pom.xml @@ -25,7 +25,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.grycap.coreutils + es.upv.grycap.coreutils coreutils 0.1.0 @@ -38,9 +38,9 @@ that you distribute must include a readable copy of the "NOTICE" text file. - org.grycap.coreutils + es.upv.grycap.coreutils coreutils-test - ${org.grycap.coreutils.version} + ${es.upv.grycap.coreutils.version} test diff --git a/coreutils-common/src/main/java/es/upv/grycap/coreutils/common/Configurer.java b/coreutils-common/src/main/java/es/upv/grycap/coreutils/common/Configurer.java index 6a7f301..286d3c6 100644 --- a/coreutils-common/src/main/java/es/upv/grycap/coreutils/common/Configurer.java +++ b/coreutils-common/src/main/java/es/upv/grycap/coreutils/common/Configurer.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.common; +package es.upv.grycap.coreutils.common; import static org.apache.commons.lang3.StringUtils.trimToNull; diff --git a/coreutils-fiber/pom.xml b/coreutils-fiber/pom.xml index 64a40a7..b38a99e 100644 --- a/coreutils-fiber/pom.xml +++ b/coreutils-fiber/pom.xml @@ -26,7 +26,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. 4.0.0 - org.grycap.coreutils + es.upv.grycap.coreutils coreutils 0.1.0 @@ -39,14 +39,14 @@ that you distribute must include a readable copy of the "NOTICE" text file. - org.grycap.coreutils + es.upv.grycap.coreutils coreutils-logging - ${org.grycap.coreutils.version} + ${es.upv.grycap.coreutils.version} - org.grycap.coreutils + es.upv.grycap.coreutils coreutils-test - ${org.grycap.coreutils.version} + ${es.upv.grycap.coreutils.version} test @@ -249,7 +249,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. org.mock-server mockserver-maven-plugin - org.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer + es.upv.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer diff --git a/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/http/Http2Client.java b/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/http/Http2Client.java index e3d3676..4a04c39 100644 --- a/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/http/Http2Client.java +++ b/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/http/Http2Client.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.http; +package es.upv.grycap.coreutils.fiber.http; import static com.google.common.collect.Lists.newArrayList; import static java.nio.file.Files.createTempDirectory; diff --git a/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/http/HttpDataFetcher.java b/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/http/HttpDataFetcher.java index ccb1340..597e897 100644 --- a/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/http/HttpDataFetcher.java +++ b/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/http/HttpDataFetcher.java @@ -21,18 +21,18 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.http; +package es.upv.grycap.coreutils.fiber.http; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; import static com.google.common.collect.ImmutableMap.of; +import static es.upv.grycap.coreutils.fiber.net.UrlBuilder.getUrlBuilder; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; import static java.util.Collections.synchronizedList; import static java.util.Objects.requireNonNull; import static java.util.Optional.ofNullable; import static org.apache.commons.lang3.StringUtils.removeEnd; import static org.apache.commons.lang3.StringUtils.trimToNull; -import static org.grycap.coreutils.fiber.net.UrlBuilder.getUrlBuilder; import static org.slf4j.LoggerFactory.getLogger; import java.io.File; @@ -66,12 +66,12 @@ import org.apache.http.message.BasicHttpRequest; import org.apache.http.nio.client.methods.ZeroCopyConsumer; import org.apache.http.nio.protocol.BasicAsyncRequestProducer; import org.apache.http.nio.protocol.HttpAsyncRequestProducer; -import org.grycap.coreutils.fiber.net.UrlBuilder; import org.slf4j.Logger; import com.google.common.collect.Range; import co.paralleluniverse.fibers.httpasyncclient.FiberCloseableHttpAsyncClient; +import es.upv.grycap.coreutils.fiber.net.UrlBuilder; /** * High-concurrency data fetcher. Note that this class will name fetched files using a convention-over-configuration pattern diff --git a/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/net/UrlBuilder.java b/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/net/UrlBuilder.java index 9e1fa17..adfadb1 100644 --- a/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/net/UrlBuilder.java +++ b/coreutils-fiber/src/main/java/es/upv/grycap/coreutils/fiber/net/UrlBuilder.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.net; +package es.upv.grycap.coreutils.fiber.net; import static java.net.URLDecoder.decode; import static java.nio.charset.Charset.defaultCharset; diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchCancellationTest.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchCancellationTest.java index 4f64236..4820f0b 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchCancellationTest.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchCancellationTest.java @@ -21,10 +21,10 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test; +package es.upv.grycap.coreutils.fiber.test; +import static es.upv.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; -import static org.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -38,11 +38,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.grycap.coreutils.fiber.http.HttpDataFetcher; -import org.grycap.coreutils.fiber.http.HttpDataFetcher.FetchStatus; -import org.grycap.coreutils.test.category.IntegrationTests; -import org.grycap.coreutils.test.rules.TestPrinter; -import org.grycap.coreutils.test.rules.TestWatcher2; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -52,6 +47,11 @@ import org.junit.rules.TestRule; import com.google.common.collect.ImmutableList; import co.paralleluniverse.fibers.futures.AsyncCompletionStage; +import es.upv.grycap.coreutils.fiber.http.HttpDataFetcher; +import es.upv.grycap.coreutils.fiber.http.HttpDataFetcher.FetchStatus; +import es.upv.grycap.coreutils.test.category.IntegrationTests; +import es.upv.grycap.coreutils.test.rules.TestPrinter; +import es.upv.grycap.coreutils.test.rules.TestWatcher2; /** * Tests data fetching with cancellation. diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchTest.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchTest.java index 24afdb4..4fe3afa 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchTest.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchTest.java @@ -21,14 +21,14 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test; +package es.upv.grycap.coreutils.fiber.test; +import static es.upv.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; +import static es.upv.grycap.coreutils.fiber.test.mockserver.ObjectResponseValidator.validateJson; +import static es.upv.grycap.coreutils.fiber.test.mockserver.ObjectResponseValidator.validateXml; import static java.util.Collections.emptyList; import static org.apache.commons.collections.ListUtils.union; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; -import static org.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; -import static org.grycap.coreutils.fiber.test.mockserver.ObjectResponseValidator.validateJson; -import static org.grycap.coreutils.fiber.test.mockserver.ObjectResponseValidator.validateXml; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.hasItem; @@ -46,12 +46,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import org.grycap.coreutils.fiber.http.HttpDataFetcher; -import org.grycap.coreutils.fiber.http.HttpDataFetcher.FecthFuture; -import org.grycap.coreutils.fiber.http.HttpDataFetcher.FetchStatus; -import org.grycap.coreutils.test.category.IntegrationTests; -import org.grycap.coreutils.test.rules.TestPrinter; -import org.grycap.coreutils.test.rules.TestWatcher2; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -65,6 +59,12 @@ import org.junit.runners.Parameterized.Parameters; import com.google.common.collect.ImmutableList; import co.paralleluniverse.fibers.futures.AsyncCompletionStage; +import es.upv.grycap.coreutils.fiber.http.HttpDataFetcher; +import es.upv.grycap.coreutils.fiber.http.HttpDataFetcher.FecthFuture; +import es.upv.grycap.coreutils.fiber.http.HttpDataFetcher.FetchStatus; +import es.upv.grycap.coreutils.test.category.IntegrationTests; +import es.upv.grycap.coreutils.test.rules.TestPrinter; +import es.upv.grycap.coreutils.test.rules.TestWatcher2; /** * Tests data fetching. diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchValidationTest.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchValidationTest.java index 9d2f8dd..15c65b3 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchValidationTest.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/FetchValidationTest.java @@ -21,20 +21,16 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test; +package es.upv.grycap.coreutils.fiber.test; +import static es.upv.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; import static java.util.Collections.emptyList; import static org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric; -import static org.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import java.net.URL; -import org.grycap.coreutils.fiber.http.HttpDataFetcher; -import org.grycap.coreutils.test.category.SanityTests; -import org.grycap.coreutils.test.rules.TestPrinter; -import org.grycap.coreutils.test.rules.TestWatcher2; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -43,6 +39,11 @@ import org.junit.rules.TestRule; import com.google.common.collect.ImmutableList; +import es.upv.grycap.coreutils.fiber.http.HttpDataFetcher; +import es.upv.grycap.coreutils.test.category.SanityTests; +import es.upv.grycap.coreutils.test.rules.TestPrinter; +import es.upv.grycap.coreutils.test.rules.TestWatcher2; + /** * Tests fetcher with invalid inputs. * @author Erik Torres diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/HighlyConcurrencyTest.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/HighlyConcurrencyTest.java index dc09afb..0010eb5 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/HighlyConcurrencyTest.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/HighlyConcurrencyTest.java @@ -21,11 +21,11 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test; +package es.upv.grycap.coreutils.fiber.test; import static com.google.common.collect.ImmutableList.of; -import static org.grycap.coreutils.fiber.http.Http2Client.getHttp2Client; -import static org.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; +import static es.upv.grycap.coreutils.fiber.http.Http2Client.getHttp2Client; +import static es.upv.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; @@ -34,10 +34,6 @@ import static org.hamcrest.MatcherAssert.assertThat; import java.io.IOException; import java.util.concurrent.TimeUnit; -import org.grycap.coreutils.fiber.http.Http2Client; -import org.grycap.coreutils.test.category.IntegrationTests; -import org.grycap.coreutils.test.rules.TestPrinter; -import org.grycap.coreutils.test.rules.TestWatcher2; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -47,6 +43,10 @@ import com.squareup.okhttp.Callback; import com.squareup.okhttp.Request; import com.squareup.okhttp.Response; +import es.upv.grycap.coreutils.fiber.http.Http2Client; +import es.upv.grycap.coreutils.test.category.IntegrationTests; +import es.upv.grycap.coreutils.test.rules.TestPrinter; +import es.upv.grycap.coreutils.test.rules.TestWatcher2; import net.jodah.concurrentunit.Waiter; /** diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/Http2ClientTest.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/Http2ClientTest.java index 3fe9597..a625abf 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/Http2ClientTest.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/Http2ClientTest.java @@ -21,15 +21,15 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test; +package es.upv.grycap.coreutils.fiber.test; import static com.google.common.collect.ImmutableList.of; import static com.google.common.collect.Lists.newArrayList; +import static es.upv.grycap.coreutils.fiber.http.Http2Client.getHttp2Client; +import static es.upv.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; +import static es.upv.grycap.coreutils.fiber.test.mockserver.ObjectResponseValidator.isValidJson; +import static es.upv.grycap.coreutils.fiber.test.mockserver.ObjectResponseValidator.isValidXml; import static java.util.Optional.ofNullable; -import static org.grycap.coreutils.fiber.http.Http2Client.getHttp2Client; -import static org.grycap.coreutils.fiber.test.mockserver.FiberExpectationInitializer.MOCK_SERVER_BASE_URL; -import static org.grycap.coreutils.fiber.test.mockserver.ObjectResponseValidator.isValidJson; -import static org.grycap.coreutils.fiber.test.mockserver.ObjectResponseValidator.isValidXml; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.not; @@ -43,10 +43,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.function.Supplier; -import org.grycap.coreutils.fiber.http.Http2Client; -import org.grycap.coreutils.test.category.IntegrationTests; -import org.grycap.coreutils.test.rules.TestPrinter; -import org.grycap.coreutils.test.rules.TestWatcher2; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -60,6 +56,10 @@ import com.squareup.okhttp.Callback; import com.squareup.okhttp.Request; import com.squareup.okhttp.Response; +import es.upv.grycap.coreutils.fiber.http.Http2Client; +import es.upv.grycap.coreutils.test.category.IntegrationTests; +import es.upv.grycap.coreutils.test.rules.TestPrinter; +import es.upv.grycap.coreutils.test.rules.TestWatcher2; import net.jodah.concurrentunit.Waiter; /** diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/UrlBuilderTest.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/UrlBuilderTest.java index 93d0d8c..354a6bd 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/UrlBuilderTest.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/UrlBuilderTest.java @@ -21,12 +21,12 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test; +package es.upv.grycap.coreutils.fiber.test; import static com.google.common.collect.ImmutableMap.of; +import static es.upv.grycap.coreutils.fiber.net.UrlBuilder.getUrlBuilder; import static java.util.Collections.emptyMap; import static org.apache.commons.lang3.StringUtils.trim; -import static org.grycap.coreutils.fiber.net.UrlBuilder.getUrlBuilder; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; @@ -37,10 +37,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Map; -import org.grycap.coreutils.fiber.net.UrlBuilder; -import org.grycap.coreutils.test.category.SanityTests; -import org.grycap.coreutils.test.rules.TestPrinter; -import org.grycap.coreutils.test.rules.TestWatcher2; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -50,6 +46,11 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; +import es.upv.grycap.coreutils.fiber.net.UrlBuilder; +import es.upv.grycap.coreutils.test.category.SanityTests; +import es.upv.grycap.coreutils.test.rules.TestPrinter; +import es.upv.grycap.coreutils.test.rules.TestWatcher2; + /** * Tests {@link UrlBuilder}. * @author Erik Torres diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/AbstractExpectationResponse.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/AbstractExpectationResponse.java index 985ae68..518eea5 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/AbstractExpectationResponse.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/AbstractExpectationResponse.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test.mockserver; +package es.upv.grycap.coreutils.fiber.test.mockserver; import java.util.List; import java.util.Map; diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ExpectationHttpGetResponse.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ExpectationHttpGetResponse.java index 5b4b99f..2a93564 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ExpectationHttpGetResponse.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ExpectationHttpGetResponse.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test.mockserver; +package es.upv.grycap.coreutils.fiber.test.mockserver; import static java.util.Collections.emptyMap; diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ExpectationHttpPostResponse.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ExpectationHttpPostResponse.java index e425ae7..1da0e01 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ExpectationHttpPostResponse.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ExpectationHttpPostResponse.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test.mockserver; +package es.upv.grycap.coreutils.fiber.test.mockserver; import static java.util.Collections.emptyMap; diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/FiberExpectationInitializer.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/FiberExpectationInitializer.java index e3395d4..dc1adf3 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/FiberExpectationInitializer.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/FiberExpectationInitializer.java @@ -21,14 +21,14 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test.mockserver; +package es.upv.grycap.coreutils.fiber.test.mockserver; import static com.google.common.collect.ImmutableMap.of; +import static es.upv.grycap.coreutils.fiber.test.mockserver.ObjectResponseFactory.jsonObject1; +import static es.upv.grycap.coreutils.fiber.test.mockserver.ObjectResponseFactory.jsonObject2; +import static es.upv.grycap.coreutils.fiber.test.mockserver.ObjectResponseFactory.xmlObject1; +import static es.upv.grycap.coreutils.fiber.test.mockserver.ObjectResponseFactory.xmlObject2; import static java.util.Collections.emptyMap; -import static org.grycap.coreutils.fiber.test.mockserver.ObjectResponseFactory.jsonObject1; -import static org.grycap.coreutils.fiber.test.mockserver.ObjectResponseFactory.jsonObject2; -import static org.grycap.coreutils.fiber.test.mockserver.ObjectResponseFactory.xmlObject1; -import static org.grycap.coreutils.fiber.test.mockserver.ObjectResponseFactory.xmlObject2; import static org.mockserver.matchers.Times.exactly; import static org.mockserver.model.HttpRequest.request; import static org.mockserver.model.HttpResponse.response; diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ObjectResponseFactory.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ObjectResponseFactory.java index 2e93338..501850e 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ObjectResponseFactory.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ObjectResponseFactory.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test.mockserver; +package es.upv.grycap.coreutils.fiber.test.mockserver; /** * Creates objects using standard data formats. Despite the format, all objects include a recognizable identifier in the diff --git a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ObjectResponseValidator.java b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ObjectResponseValidator.java index ee1ce6f..1df6285 100644 --- a/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ObjectResponseValidator.java +++ b/coreutils-fiber/src/test/java/es/upv/grycap/coreutils/fiber/test/mockserver/ObjectResponseValidator.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.fiber.test.mockserver; +package es.upv.grycap.coreutils.fiber.test.mockserver; import static java.nio.file.Files.readAllBytes; import static java.util.Optional.ofNullable; diff --git a/coreutils-fiber/src/test/resources/logback-test-tmpfile.xml b/coreutils-fiber/src/test/resources/logback-test-tmpfile.xml index 781f2a1..d04d790 100644 --- a/coreutils-fiber/src/test/resources/logback-test-tmpfile.xml +++ b/coreutils-fiber/src/test/resources/logback-test-tmpfile.xml @@ -35,7 +35,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. - + diff --git a/coreutils-logging/pom.xml b/coreutils-logging/pom.xml index 00b6bc4..f207062 100644 --- a/coreutils-logging/pom.xml +++ b/coreutils-logging/pom.xml @@ -25,7 +25,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.grycap.coreutils + es.upv.grycap.coreutils coreutils 0.1.0 @@ -38,14 +38,14 @@ that you distribute must include a readable copy of the "NOTICE" text file. - org.grycap.coreutils + es.upv.grycap.coreutils coreutils-common - ${org.grycap.coreutils.version} + ${es.upv.grycap.coreutils.version} - org.grycap.coreutils + es.upv.grycap.coreutils coreutils-test - ${org.grycap.coreutils.version} + ${es.upv.grycap.coreutils.version} test diff --git a/coreutils-logging/src/main/java/es/upv/grycap/coreutils/logging/ExtendedLoggerFactory.java b/coreutils-logging/src/main/java/es/upv/grycap/coreutils/logging/ExtendedLoggerFactory.java index cf9d59f..4c881ca 100644 --- a/coreutils-logging/src/main/java/es/upv/grycap/coreutils/logging/ExtendedLoggerFactory.java +++ b/coreutils-logging/src/main/java/es/upv/grycap/coreutils/logging/ExtendedLoggerFactory.java @@ -21,13 +21,12 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.logging; +package es.upv.grycap.coreutils.logging; import static java.util.Objects.requireNonNull; import org.slf4j.Logger; - /** * Wraps the SLF4J {@link org.slf4j.LoggerFactory} * @author Erik Torres @@ -43,7 +42,7 @@ public final class ExtendedLoggerFactory { * @return A logger named corresponding to the class passed as parameter. */ public static Logger getLogger(final Class clazz) { - org.grycap.coreutils.logging.LogManager.getLogManager().init(); + es.upv.grycap.coreutils.logging.LogManager.getLogManager().init(); return org.slf4j.LoggerFactory.getLogger(requireNonNull(clazz, "A non-null class expected")); } diff --git a/coreutils-logging/src/main/java/es/upv/grycap/coreutils/logging/LogManager.java b/coreutils-logging/src/main/java/es/upv/grycap/coreutils/logging/LogManager.java index 7d658f4..86dc626 100644 --- a/coreutils-logging/src/main/java/es/upv/grycap/coreutils/logging/LogManager.java +++ b/coreutils-logging/src/main/java/es/upv/grycap/coreutils/logging/LogManager.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.logging; +package es.upv.grycap.coreutils.logging; import static org.slf4j.LoggerFactory.getLogger; import static org.slf4j.bridge.SLF4JBridgeHandler.install; @@ -44,11 +44,11 @@ public class LogManager { private final static AtomicBoolean PRISTINE = new AtomicBoolean(true); private LogManager() { } - + public static LogManager getLogManager() { return new LogManager(); } - + /** * The logging system is automatically configured when the method {@link LogManager#getLogger(Class)} is called. * This method is conveniently provided to initialize the logging system before creating any logger with this class. diff --git a/coreutils-logging/src/test/java/es/upv/grycap/coreutils/logging/test/LogManagerTest.java b/coreutils-logging/src/test/java/es/upv/grycap/coreutils/logging/test/LogManagerTest.java index 0d7a73d..2966a97 100644 --- a/coreutils-logging/src/test/java/es/upv/grycap/coreutils/logging/test/LogManagerTest.java +++ b/coreutils-logging/src/test/java/es/upv/grycap/coreutils/logging/test/LogManagerTest.java @@ -21,10 +21,10 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.logging.test; +package es.upv.grycap.coreutils.logging.test; +import static es.upv.grycap.coreutils.logging.LogManager.getLogManager; import static org.apache.commons.io.FileUtils.deleteQuietly; -import static org.grycap.coreutils.logging.LogManager.getLogManager; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; @@ -33,9 +33,6 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Paths; -import org.grycap.coreutils.test.category.FunctionalTests; -import org.grycap.coreutils.test.rules.TestPrinter; -import org.grycap.coreutils.test.rules.TestWatcher2; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; @@ -46,6 +43,9 @@ import org.slf4j.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.core.util.StatusPrinter; +import es.upv.grycap.coreutils.test.category.FunctionalTests; +import es.upv.grycap.coreutils.test.rules.TestPrinter; +import es.upv.grycap.coreutils.test.rules.TestWatcher2; /** * Tests the log manager. @@ -77,7 +77,7 @@ public class LogManagerTest { @Test public void testFactory() throws Exception { // setup logging via the factory method that internally calls the initialization method - final Logger logger = org.grycap.coreutils.logging.ExtendedLoggerFactory.getLogger(DummyClass.class); + final Logger logger = es.upv.grycap.coreutils.logging.ExtendedLoggerFactory.getLogger(DummyClass.class); assertThat("Logger is not null", logger, notNullValue()); // j.u.l. logger diff --git a/coreutils-logging/src/test/resources/logback-test.xml b/coreutils-logging/src/test/resources/logback-test.xml index 51976c5..b8072f5 100644 --- a/coreutils-logging/src/test/resources/logback-test.xml +++ b/coreutils-logging/src/test/resources/logback-test.xml @@ -41,7 +41,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. - + diff --git a/coreutils-test/pom.xml b/coreutils-test/pom.xml index 39062a1..4ac756c 100644 --- a/coreutils-test/pom.xml +++ b/coreutils-test/pom.xml @@ -26,7 +26,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. 4.0.0 - org.grycap.coreutils + es.upv.grycap.coreutils coreutils 0.1.0 diff --git a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/FunctionalTests.java b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/FunctionalTests.java index 1168583..2b803de 100644 --- a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/FunctionalTests.java +++ b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/FunctionalTests.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.test.category; +package es.upv.grycap.coreutils.test.category; /** * Categorize unit tests that belongs to the functional testing group. diff --git a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/IntegrationTests.java b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/IntegrationTests.java index d22e6dc..bd87ffe 100644 --- a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/IntegrationTests.java +++ b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/IntegrationTests.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.test.category; +package es.upv.grycap.coreutils.test.category; /** * Categorize unit tests that belongs to the integration testing group. diff --git a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/SanityTests.java b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/SanityTests.java index 3e8addb..270658e 100644 --- a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/SanityTests.java +++ b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/category/SanityTests.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.test.category; +package es.upv.grycap.coreutils.test.category; /** * Categorize unit tests that belongs to the sanity testing group. diff --git a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/rules/TestPrinter.java b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/rules/TestPrinter.java index ff00ea9..82713e4 100644 --- a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/rules/TestPrinter.java +++ b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/rules/TestPrinter.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.test.rules; +package es.upv.grycap.coreutils.test.rules; import static java.util.Optional.ofNullable; diff --git a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/rules/TestWatcher2.java b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/rules/TestWatcher2.java index f63dd69..a6b42a3 100644 --- a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/rules/TestWatcher2.java +++ b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/rules/TestWatcher2.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.test.rules; +package es.upv.grycap.coreutils.test.rules; import static java.util.Optional.ofNullable; @@ -42,7 +42,7 @@ public class TestWatcher2 extends TestWatcher { * Default header that will be printed before the status messages. */ private static final String DEFAULT_HEADER = " >>> TestUtils >>> "; - + /** * Default footer that will be printed after the status messages. */ diff --git a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/util/ResourceLoadingUtils.java b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/util/ResourceLoadingUtils.java index 7924f88..29f9422 100644 --- a/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/util/ResourceLoadingUtils.java +++ b/coreutils-test/src/main/java/es/upv/grycap/coreutils/test/util/ResourceLoadingUtils.java @@ -21,7 +21,7 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.test.util; +package es.upv.grycap.coreutils.test.util; import static java.io.File.separator; import static java.util.Arrays.asList; @@ -56,7 +56,7 @@ public class ResourceLoadingUtils { * subdirectories). */ public static final String TEST_DIRNAME = "testfiles"; - + /** * Finds the directory where the test files are located. */ @@ -109,9 +109,9 @@ public class ResourceLoadingUtils { * @since 0.1.0 */ public static class ExtensionFilter implements FilenameFilter { - + private final List extensions; - + /** * Convenient constructor to initialize the valid file extensions from an array. * @param extensions - valid file extensions @@ -119,7 +119,7 @@ public class ResourceLoadingUtils { public ExtensionFilter(final @Nullable String[] extensions) { this(asList(ofNullable(extensions).orElse(new String[]{}))); } - + /** * Convenient constructor to initialize the valid file extensions from a list. * @param extensions - valid file extensions @@ -129,14 +129,14 @@ public class ResourceLoadingUtils { .map(e -> e != null ? e.trim().toLowerCase() : null) .filter(Objects::nonNull).collect(Collectors.toList()); } - + @Override public boolean accept(final File file, final String name) { final String name2 = (name != null ? name.trim().toLowerCase() : null); if (name2 == null) return false; return extensions.stream().anyMatch(e -> name2.endsWith(e)); } - + } } \ No newline at end of file diff --git a/coreutils-test/src/test/java/es/upv/grycap/coreutils/test/ResourceLoadingTest.java b/coreutils-test/src/test/java/es/upv/grycap/coreutils/test/ResourceLoadingTest.java index 8f4bddd..371fab4 100644 --- a/coreutils-test/src/test/java/es/upv/grycap/coreutils/test/ResourceLoadingTest.java +++ b/coreutils-test/src/test/java/es/upv/grycap/coreutils/test/ResourceLoadingTest.java @@ -21,10 +21,10 @@ * that you distribute must include a readable copy of the "NOTICE" text file. */ -package org.grycap.coreutils.test; +package es.upv.grycap.coreutils.test; +import static es.upv.grycap.coreutils.test.util.ResourceLoadingUtils.getResourceFiles; import static java.io.File.separator; -import static org.grycap.coreutils.test.util.ResourceLoadingUtils.getResourceFiles; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.notNullValue; @@ -34,15 +34,16 @@ import static org.hamcrest.collection.IsEmptyCollection.empty; import java.util.List; -import org.grycap.coreutils.test.category.FunctionalTests; -import org.grycap.coreutils.test.rules.TestPrinter; -import org.grycap.coreutils.test.rules.TestWatcher2; -import org.grycap.coreutils.test.util.ResourceLoadingUtils; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.junit.rules.TestRule; +import es.upv.grycap.coreutils.test.category.FunctionalTests; +import es.upv.grycap.coreutils.test.rules.TestPrinter; +import es.upv.grycap.coreutils.test.rules.TestWatcher2; +import es.upv.grycap.coreutils.test.util.ResourceLoadingUtils; + /** * Tests resource loading utilities provided by {@link ResourceLoadingUtils}. * @author Erik Torres diff --git a/pom.xml b/pom.xml index 2b086e5..8967b4a 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.grycap.coreutils + es.upv.grycap.coreutils coreutils 0.1.0 pom @@ -74,7 +74,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. 1.1.3 4.12 - ${project.version} + ${project.version} 1.3 3.10.2 1.7.13 @@ -262,7 +262,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. **/*Test.java - org.grycap.coreutils.test.category.IntegrationTests + es.upv.grycap.coreutils.test.category.IntegrationTests @@ -290,7 +290,7 @@ that you distribute must include a readable copy of the "NOTICE" text file. **/*Test.java - org.grycap.coreutils.test.category.IntegrationTests + es.upv.grycap.coreutils.test.category.IntegrationTests