org.springframework.boot
spring-boot-starter
diff --git a/friendly-id-spring-boot-starter/src/main/java/com/devskiller/friendly_id/boot/FriendlyIdAutoConfiguration.java b/friendly-id-spring-boot-starter/src/main/java/com/devskiller/friendly_id/boot/FriendlyIdAutoConfiguration.java
index de81846..3a30185 100644
--- a/friendly-id-spring-boot-starter/src/main/java/com/devskiller/friendly_id/boot/FriendlyIdAutoConfiguration.java
+++ b/friendly-id-spring-boot-starter/src/main/java/com/devskiller/friendly_id/boot/FriendlyIdAutoConfiguration.java
@@ -1,12 +1,25 @@
package com.devskiller.friendly_id.boot;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import com.devskiller.friendly_id.spring.EnableFriendlyId;
-@Configuration
-@ConditionalOnExpression("${com.devskiller.friendly_id.auto:true}")
+/**
+ * Auto-configuration for FriendlyId integration with Spring Boot.
+ *
+ * Automatically enables FriendlyId converters and Jackson module when Spring Boot is detected.
+ * Can be disabled by setting {@code com.devskiller.friendly-id.enabled=false} in application properties.
+ */
+@AutoConfiguration
+@ConditionalOnWebApplication
+@ConditionalOnProperty(
+ prefix = "com.devskiller.friendly-id",
+ name = "enabled",
+ havingValue = "true",
+ matchIfMissing = true
+)
@EnableFriendlyId
public class FriendlyIdAutoConfiguration {
diff --git a/friendly-id-spring-boot-starter/src/main/resources/META-INF/spring.factories b/friendly-id-spring-boot-starter/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 561642c..0000000
--- a/friendly-id-spring-boot-starter/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration = com.devskiller.friendly_id.boot.FriendlyIdAutoConfiguration
\ No newline at end of file
diff --git a/friendly-id-spring-boot/pom.xml b/friendly-id-spring-boot/pom.xml
index 8b8f357..da30023 100644
--- a/friendly-id-spring-boot/pom.xml
+++ b/friendly-id-spring-boot/pom.xml
@@ -1,30 +1,36 @@
+ 4.0.0
+
com.devskiller.friendly-id
friendly-id-project
- 1.1.1-SNAPSHOT
+ ${revision}
..
- 4.0.0
friendly-id-spring-boot
+ FriendlyId Spring Boot
+ Spring Boot integration for FriendlyId - provides converters and Jackson module configuration
+
-
- org.springframework.boot
- spring-boot-starter
- provided
-
org.springframework.boot
spring-boot-starter-web
+ provided
com.devskiller.friendly-id
friendly-id-jackson-datatype
${project.version}
+
+
+ tools.jackson.core
+ jackson-databind
+ provided
+
\ No newline at end of file
diff --git a/friendly-id-spring-boot/src/main/java/com/devskiller/friendly_id/spring/EnableFriendlyId.java b/friendly-id-spring-boot/src/main/java/com/devskiller/friendly_id/spring/EnableFriendlyId.java
index a85f856..f6b3810 100644
--- a/friendly-id-spring-boot/src/main/java/com/devskiller/friendly_id/spring/EnableFriendlyId.java
+++ b/friendly-id-spring-boot/src/main/java/com/devskiller/friendly_id/spring/EnableFriendlyId.java
@@ -1,5 +1,6 @@
package com.devskiller.friendly_id.spring;
+import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -7,8 +8,33 @@
import org.springframework.context.annotation.Import;
+/**
+ * Enable FriendlyId support in Spring MVC applications.
+ *
+ * Add this annotation to a {@code @Configuration} class to enable automatic conversion
+ * between FriendlyId strings and UUIDs in:
+ *
+ * - Path variables ({@code @PathVariable UUID id})
+ * - Request parameters ({@code @RequestParam UUID id})
+ * - JSON request/response bodies (via Jackson)
+ *
+ *
+ * Example usage:
+ *
+ * @Configuration
+ * @EnableFriendlyId
+ * public class WebConfig {
+ * }
+ *
+ *
+ * Note: When using {@code spring-boot-starter-friendly-id}, this configuration
+ * is applied automatically and this annotation is not required.
+ *
+ * @see FriendlyIdConfiguration
+ */
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
+@Documented
@Import(FriendlyIdConfiguration.class)
public @interface EnableFriendlyId {
diff --git a/friendly-id-spring-boot/src/main/java/com/devskiller/friendly_id/spring/FriendlyIdConfiguration.java b/friendly-id-spring-boot/src/main/java/com/devskiller/friendly_id/spring/FriendlyIdConfiguration.java
index 263e61a..56fc78a 100644
--- a/friendly-id-spring-boot/src/main/java/com/devskiller/friendly_id/spring/FriendlyIdConfiguration.java
+++ b/friendly-id-spring-boot/src/main/java/com/devskiller/friendly_id/spring/FriendlyIdConfiguration.java
@@ -2,46 +2,45 @@
import java.util.UUID;
-import com.fasterxml.jackson.databind.Module;
+import tools.jackson.databind.JacksonModule;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import org.springframework.core.convert.converter.Converter;
import org.springframework.format.FormatterRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import com.devskiller.friendly_id.FriendlyId;
import com.devskiller.friendly_id.jackson.FriendlyIdModule;
+import static com.devskiller.friendly_id.FriendlyId.toFriendlyId;
+import static com.devskiller.friendly_id.FriendlyId.toUuid;
+
+/**
+ * Configuration for FriendlyId integration with Spring MVC.
+ *
+ * This configuration:
+ *
+ * - Registers converters for automatic String ⇄ UUID conversion in path variables and request parameters
+ * - Registers Jackson module for JSON serialization/deserialization of UUIDs as FriendlyIds
+ *
+ *
+ * Enable this configuration by adding {@link EnableFriendlyId @EnableFriendlyId} to your configuration class,
+ * or use the spring-boot-starter for automatic configuration.
+ */
@Configuration
public class FriendlyIdConfiguration implements WebMvcConfigurer {
@Override
public void addFormatters(FormatterRegistry registry) {
- registry.addConverter(new StringToUuidConverter());
- registry.addConverter(new UuidToStringConverter());
+ registry.addConverter(String.class, UUID.class, id -> toUuid(id));
+ registry.addConverter(UUID.class, String.class, id -> toFriendlyId(id));
+ registry.addConverter(String.class, com.devskiller.friendly_id.type.FriendlyId.class,
+ com.devskiller.friendly_id.type.FriendlyId::fromString);
+ registry.addConverter(com.devskiller.friendly_id.type.FriendlyId.class, String.class,
+ com.devskiller.friendly_id.type.FriendlyId::toString);
}
@Bean
- public Module friendlyIdModule() {
+ public JacksonModule friendlyIdModule() {
return new FriendlyIdModule();
}
-
- //FIXME: make this public
- public static class StringToUuidConverter implements Converter {
-
- @Override
- public UUID convert(String id) {
- return FriendlyId.toUuid(id);
- }
- }
-
-
- public static class UuidToStringConverter implements Converter {
-
- @Override
- public String convert(UUID id) {
- return FriendlyId.toFriendlyId(id);
- }
- }
}
diff --git a/friendly-id/pom.xml b/friendly-id/pom.xml
index abfd26e..29d57e9 100644
--- a/friendly-id/pom.xml
+++ b/friendly-id/pom.xml
@@ -6,16 +6,19 @@
com.devskiller.friendly-id
friendly-id-project
- 1.1.1-SNAPSHOT
+ ${revision}
..
friendly-id
+ FriendlyId Core
+ Core library for converting UUIDs to URL-friendly Base62-encoded IDs
+
- junit
- junit
+ org.junit.jupiter
+ junit-jupiter
test
@@ -23,11 +26,6 @@
assertj-core
test
-
- io.vavr
- vavr-test
- test
-
diff --git a/friendly-id/src/main/java/com/devskiller/friendly_id/Base62.java b/friendly-id/src/main/java/com/devskiller/friendly_id/Base62.java
index c6a1c66..3dbec63 100644
--- a/friendly-id/src/main/java/com/devskiller/friendly_id/Base62.java
+++ b/friendly-id/src/main/java/com/devskiller/friendly_id/Base62.java
@@ -38,7 +38,7 @@ static String encode(BigInteger number) {
int digit = divmod[1].intValue();
result.insert(0, DIGITS.charAt(digit));
}
- return (result.length() == 0) ? DIGITS.substring(0, 1) : result.toString();
+ return (result.isEmpty()) ? DIGITS.substring(0, 1) : result.toString();
}
private static BigInteger throwIllegalArgumentException(String format, Object... args) {
@@ -59,7 +59,7 @@ static BigInteger decode(final String string) {
static BigInteger decode(final String string, int bitLimit) {
requireNonNull(string, "Decoded string must not be null");
- if (string.length() == 0) {
+ if (string.isEmpty()) {
return throwIllegalArgumentException("String '%s' must not be empty", string);
}
@@ -79,7 +79,7 @@ static BigInteger decode(final String string, int bitLimit) {
}
- private static BiFunction charAt = (string, index) ->
+ private static final BiFunction charAt = (string, index) ->
DIGITS.indexOf(string.charAt(string.length() - index - 1));
}
\ No newline at end of file
diff --git a/friendly-id-jackson-datatype/src/main/java/com/devskiller/friendly_id/jackson/FriendlyIdFormat.java b/friendly-id/src/main/java/com/devskiller/friendly_id/FriendlyIdFormat.java
similarity index 78%
rename from friendly-id-jackson-datatype/src/main/java/com/devskiller/friendly_id/jackson/FriendlyIdFormat.java
rename to friendly-id/src/main/java/com/devskiller/friendly_id/FriendlyIdFormat.java
index 2fb1985..6e46580 100644
--- a/friendly-id-jackson-datatype/src/main/java/com/devskiller/friendly_id/jackson/FriendlyIdFormat.java
+++ b/friendly-id/src/main/java/com/devskiller/friendly_id/FriendlyIdFormat.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id;
/**
* Friendly ID format
diff --git a/friendly-id-jackson-datatype/src/main/java/com/devskiller/friendly_id/jackson/IdFormat.java b/friendly-id/src/main/java/com/devskiller/friendly_id/IdFormat.java
similarity index 86%
rename from friendly-id-jackson-datatype/src/main/java/com/devskiller/friendly_id/jackson/IdFormat.java
rename to friendly-id/src/main/java/com/devskiller/friendly_id/IdFormat.java
index 999c366..5094a41 100644
--- a/friendly-id-jackson-datatype/src/main/java/com/devskiller/friendly_id/jackson/IdFormat.java
+++ b/friendly-id/src/main/java/com/devskiller/friendly_id/IdFormat.java
@@ -1,4 +1,4 @@
-package com.devskiller.friendly_id.jackson;
+package com.devskiller.friendly_id;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
diff --git a/friendly-id/src/main/java/com/devskiller/friendly_id/type/FriendlyId.java b/friendly-id/src/main/java/com/devskiller/friendly_id/type/FriendlyId.java
new file mode 100644
index 0000000..9fd70d3
--- /dev/null
+++ b/friendly-id/src/main/java/com/devskiller/friendly_id/type/FriendlyId.java
@@ -0,0 +1,135 @@
+package com.devskiller.friendly_id.type;
+
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * Value object representing a FriendlyId that wraps a UUID.
+ *
+ * This class provides a memory-efficient way to work with FriendlyIds in your domain model
+ * while maintaining the compact UUID representation internally. The FriendlyId string
+ * representation is only computed when needed (e.g., for serialization or toString()).
+ *
+ *
+ * This type is designed to be used with:
+ *
+ *
+ * - jOOQ converters for database mapping
+ * - JPA AttributeConverters for entity mapping
+ * - Jackson serializers/deserializers for JSON
+ * - Spring MVC converters for request parameters
+ *
+ *
+ * Memory Efficiency
+ *
+ * Storing FriendlyId as a value object with UUID internally is more memory-efficient
+ * than storing the String representation:
+ *
+ *
+ * - UUID: 16 bytes
+ * - FriendlyId object: ~28 bytes (16 bytes UUID + ~12 bytes object header)
+ * - String: ~40-50 bytes (depending on FriendlyId length)
+ *
+ *
+ * Usage Example
+ * {@code
+ * // Create from UUID
+ * UUID uuid = UUID.randomUUID();
+ * FriendlyId id = FriendlyId.of(uuid);
+ *
+ * // Create from String
+ * FriendlyId id = FriendlyId.fromString("5wbwf6yUxVBcr48AMbz9cb");
+ *
+ * // Create random
+ * FriendlyId id = FriendlyId.random();
+ *
+ * // Get UUID
+ * UUID uuid = id.uuid();
+ *
+ * // Get FriendlyId string (computed on demand)
+ * String friendlyIdString = id.toString();
+ * }
+ *
+ * @since 1.1.1
+ */
+public final class FriendlyId implements Serializable, Comparable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final UUID uuid;
+
+ private FriendlyId(UUID uuid) {
+ this.uuid = Objects.requireNonNull(uuid, "UUID cannot be null");
+ }
+
+ /**
+ * Creates a FriendlyId from a UUID.
+ *
+ * @param uuid the UUID to wrap, must not be null
+ * @return a new FriendlyId instance
+ * @throws NullPointerException if uuid is null
+ */
+ public static FriendlyId of(UUID uuid) {
+ return new FriendlyId(uuid);
+ }
+
+ /**
+ * Creates a FriendlyId from a FriendlyId string representation.
+ *
+ * @param friendlyId the FriendlyId string to decode, must not be null
+ * @return a new FriendlyId instance
+ * @throws NullPointerException if friendlyId is null
+ * @throws IllegalArgumentException if friendlyId is not a valid FriendlyId
+ */
+ public static FriendlyId fromString(String friendlyId) {
+ Objects.requireNonNull(friendlyId, "FriendlyId string cannot be null");
+ return new FriendlyId(com.devskiller.friendly_id.FriendlyId.toUuid(friendlyId));
+ }
+
+ /**
+ * Creates a random FriendlyId.
+ *
+ * @return a new random FriendlyId instance
+ */
+ public static FriendlyId random() {
+ return new FriendlyId(UUID.randomUUID());
+ }
+
+ /**
+ * Returns the underlying UUID.
+ *
+ * @return the UUID
+ */
+ public UUID uuid() {
+ return uuid;
+ }
+
+ /**
+ * Returns the FriendlyId string representation.
+ *
+ * The string is computed on demand from the internal UUID.
+ *
+ *
+ * @return the FriendlyId string
+ */
+ @Override
+ public String toString() {
+ return com.devskiller.friendly_id.FriendlyId.toFriendlyId(uuid);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return this == o || (o instanceof FriendlyId that && uuid.equals(that.uuid));
+ }
+
+ @Override
+ public int hashCode() {
+ return uuid.hashCode();
+ }
+
+ @Override
+ public int compareTo(FriendlyId other) {
+ return this.uuid.compareTo(other.uuid);
+ }
+}
diff --git a/friendly-id/src/main/java/com/devskiller/friendly_id/type/package-info.java b/friendly-id/src/main/java/com/devskiller/friendly_id/type/package-info.java
new file mode 100644
index 0000000..0a9a83e
--- /dev/null
+++ b/friendly-id/src/main/java/com/devskiller/friendly_id/type/package-info.java
@@ -0,0 +1,11 @@
+/**
+ * Value objects for FriendlyId domain model.
+ *
+ * This package provides type-safe, memory-efficient value objects for working with FriendlyIds
+ * in domain models and persistence layers.
+ *
+ *
+ * @see com.devskiller.friendly_id.type.FriendlyId
+ * @since 1.1.1
+ */
+package com.devskiller.friendly_id.type;
diff --git a/friendly-id/src/test/java/com/devskiller/friendly_id/AnalyzeGeneratedIdsTest.java b/friendly-id/src/test/java/com/devskiller/friendly_id/AnalyzeGeneratedIdsTest.java
index 829c541..0eac895 100644
--- a/friendly-id/src/test/java/com/devskiller/friendly_id/AnalyzeGeneratedIdsTest.java
+++ b/friendly-id/src/test/java/com/devskiller/friendly_id/AnalyzeGeneratedIdsTest.java
@@ -1,21 +1,21 @@
package com.devskiller.friendly_id;
+import org.junit.jupiter.api.Test;
+
import java.util.ArrayList;
import java.util.IntSummaryStatistics;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
-import org.junit.Test;
-
import static org.assertj.core.api.Assertions.assertThat;
-public class AnalyzeGeneratedIdsTest {
+class AnalyzeGeneratedIdsTest {
private List ids = new ArrayList<>();
@Test
- public void analyzeGeneratedValueStatistics() {
+ void analyzeGeneratedValueStatistics() {
for (int i = 0; i < 100_000; i++) {
this.ids.add(Base62.encode(UuidConverter.toBigInteger(UUID.randomUUID())));
}
diff --git a/friendly-id/src/test/java/com/devskiller/friendly_id/Base62Test.java b/friendly-id/src/test/java/com/devskiller/friendly_id/Base62Test.java
index 266a8b9..8304f61 100644
--- a/friendly-id/src/test/java/com/devskiller/friendly_id/Base62Test.java
+++ b/friendly-id/src/test/java/com/devskiller/friendly_id/Base62Test.java
@@ -1,45 +1,48 @@
package com.devskiller.friendly_id;
-import org.junit.Test;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigInteger;
+import java.util.Random;
import static com.devskiller.friendly_id.IdUtil.areEqualIgnoringLeadingZeros;
-import static io.vavr.test.Property.def;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
-import static org.assertj.core.util.Objects.areEqual;
-public class Base62Test {
+class Base62Test {
@Test
- public void decodingValuePrefixedWithZeros() {
+ void decodingValuePrefixedWithZeros() {
assertThat(Base62.encode(Base62.decode("00001"))).isEqualTo("1");
assertThat(Base62.encode(Base62.decode("01001"))).isEqualTo("1001");
assertThat(Base62.encode(Base62.decode("00abcd"))).isEqualTo("abcd");
}
@Test
- public void shouldCheck128BitLimits() {
+ void shouldCheck128BitLimits() {
assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
Base62.decode("1Vkp6axDWu5pI3q1xQO3oO0"));
}
- @Test
- public void decodingIdShouldBeReversible() {
- def("areEqualIgnoringLeadingZeros(Base62.toFriendlyId(Base62.toUuid(id)), id)")
- .forAll(DataProvider.FRIENDLY_IDS)
- .suchThat(id -> areEqualIgnoringLeadingZeros(Base62.encode(Base62.decode(id)), id))
- .check(24, 100_000)
- .assertIsSatisfied();
+ @RepeatedTest(1000)
+ void decodingIdShouldBeReversible() {
+ String id = generateRandomFriendlyId();
+ String result = Base62.encode(Base62.decode(id));
+ assertThat(areEqualIgnoringLeadingZeros(result, id)).isTrue();
}
- @Test
- public void encodingNumberShouldBeReversible() {
- def("areEqualIgnoringLeadingZeros(Base62.toFriendlyId(Base62.toUuid(id)), id)")
- .forAll(DataProvider.POSITIVE_BIG_INTEGERS)
- .suchThat(bigInteger -> areEqual(Base62.decode(Base62.encode(bigInteger)), bigInteger)
- )
- .check(-1, 100_000)
- .assertIsSatisfied();
+ @RepeatedTest(1000)
+ void encodingNumberShouldBeReversible() {
+ BigInteger bigInteger = new BigInteger(128, new Random());
+ BigInteger result = Base62.decode(Base62.encode(bigInteger));
+ assertThat(result).isEqualTo(bigInteger);
+ }
+
+ private String generateRandomFriendlyId() {
+ Random random = new Random();
+ BigInteger bigInt = new BigInteger(128, random);
+ return Base62.encode(bigInt);
}
}
diff --git a/friendly-id/src/test/java/com/devskiller/friendly_id/BigIntegerPairingTest.java b/friendly-id/src/test/java/com/devskiller/friendly_id/BigIntegerPairingTest.java
index ed15c2c..9b8b73f 100644
--- a/friendly-id/src/test/java/com/devskiller/friendly_id/BigIntegerPairingTest.java
+++ b/friendly-id/src/test/java/com/devskiller/friendly_id/BigIntegerPairingTest.java
@@ -1,21 +1,20 @@
package com.devskiller.friendly_id;
-import java.math.BigInteger;
-import java.util.Arrays;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
-import io.vavr.Tuple2;
-import org.junit.Test;
+import java.math.BigInteger;
+import java.util.Random;
import static com.devskiller.friendly_id.BigIntegerPairing.pair;
import static com.devskiller.friendly_id.BigIntegerPairing.unpair;
-import static io.vavr.test.Property.def;
import static java.math.BigInteger.valueOf;
import static org.assertj.core.api.Assertions.assertThat;
-public class BigIntegerPairingTest {
+class BigIntegerPairingTest {
@Test
- public void shouldPairTwoLongs() {
+ void shouldPairTwoLongs() {
long x = 1;
long y = 2;
@@ -24,30 +23,27 @@ public void shouldPairTwoLongs() {
assertThat(unpair(z)).contains(valueOf(x), valueOf(y));
}
- @Test
- public void resultOfPairingShouldBePositive() {
- def("pair(longs).signum() > 0")
- .forAll(DataProvider.LONG_PAIRS)
- .suchThat(longs -> makePair(longs).signum() > 0)
- .check(-1, 100_000)
- .assertIsSatisfied();
- }
+ @RepeatedTest(1000)
+ void resultOfPairingShouldBePositive() {
+ Random random = new Random();
+ long x = random.nextLong();
+ long y = random.nextLong();
- private BigInteger makePair(Tuple2 longs) {
- return longs.apply((x, y) -> pair(valueOf(x), valueOf(y)));
- }
+ BigInteger paired = pair(valueOf(x), valueOf(y));
- @Test
- public void pairingLongsShouldBeReversible() {
- def("Arrays.equals(unpair(pair(longs)), asArray(longs))")
- .forAll(DataProvider.LONG_PAIRS)
- .suchThat(longs -> Arrays.equals(unpair(makePair(longs)), asArray(longs)))
- .check(-1, 100_000)
- .assertIsSatisfied();
+ assertThat(paired.signum()).isGreaterThan(0);
}
- private BigInteger[] asArray(Tuple2 longsPair) {
- return longsPair.apply((x, y) -> new BigInteger[]{valueOf(x), valueOf(y)});
+ @RepeatedTest(1000)
+ void pairingLongsShouldBeReversible() {
+ Random random = new Random();
+ long x = random.nextLong();
+ long y = random.nextLong();
+
+ BigInteger paired = pair(valueOf(x), valueOf(y));
+ BigInteger[] unpaired = unpair(paired);
+
+ assertThat(unpaired).containsExactly(valueOf(x), valueOf(y));
}
}
\ No newline at end of file
diff --git a/friendly-id/src/test/java/com/devskiller/friendly_id/DataProvider.java b/friendly-id/src/test/java/com/devskiller/friendly_id/DataProvider.java
deleted file mode 100644
index fb9ec31..0000000
--- a/friendly-id/src/test/java/com/devskiller/friendly_id/DataProvider.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.devskiller.friendly_id;
-
-import java.math.BigInteger;
-import java.util.Random;
-import java.util.UUID;
-
-import io.vavr.Tuple;
-import io.vavr.Tuple2;
-import io.vavr.test.Arbitrary;
-import io.vavr.test.Gen;
-import org.assertj.core.util.Strings;
-
-public class DataProvider {
-
- public static Arbitrary> LONG_PAIRS = ignored -> {
- Gen longs = Gen.choose(Long.MIN_VALUE, Long.MAX_VALUE);
- return random -> Tuple.of(longs.apply(random), longs.apply(random));
- };
- static Arbitrary UUIDS = ignored -> random -> UUID.randomUUID();
- static Arbitrary POSITIVE_BIG_INTEGERS = ignored -> random ->
- new BigInteger(128, new Random());
- static Arbitrary FRIENDLY_IDS = Arbitrary.string(
- Gen.frequency(
- Tuple.of(1, Gen.choose('A', 'Z')),
- Tuple.of(1, Gen.choose('a', 'z')),
- Tuple.of(1, Gen.choose('0', '9'))))
- .filter(code -> !Strings.isNullOrEmpty(code))
- .filter(code -> Base62.decode(code, -1).bitLength() <= 128);
-
-}
-
diff --git a/friendly-id/src/test/java/com/devskiller/friendly_id/FriendlyIdTest.java b/friendly-id/src/test/java/com/devskiller/friendly_id/FriendlyIdTest.java
index 6c8e9c3..1bb19ce 100644
--- a/friendly-id/src/test/java/com/devskiller/friendly_id/FriendlyIdTest.java
+++ b/friendly-id/src/test/java/com/devskiller/friendly_id/FriendlyIdTest.java
@@ -1,41 +1,43 @@
package com.devskiller.friendly_id;
-import io.vavr.test.Arbitrary;
-import org.junit.Test;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigInteger;
+import java.util.Random;
+import java.util.UUID;
import static com.devskiller.friendly_id.FriendlyId.toFriendlyId;
import static com.devskiller.friendly_id.FriendlyId.toUuid;
import static com.devskiller.friendly_id.IdUtil.areEqualIgnoringLeadingZeros;
-import static io.vavr.test.Property.def;
-import static org.assertj.core.util.Objects.areEqual;
-
-public class FriendlyIdTest {
-
- @Test
- public void shouldCreateValidIdsThatConformToUuidType4() {
- def("areEqual(FriendlyId.toUuid(FriendlyId.toFriendlyId(uuid))), uuid)")
- .forAll(Arbitrary.integer())
- .suchThat(ignored -> toUuid(FriendlyId.createFriendlyId()).version() == 4)
- .check(-1, 100_000)
- .assertIsSatisfied();
+import static org.assertj.core.api.Assertions.assertThat;
+
+class FriendlyIdTest {
+
+ @RepeatedTest(1000)
+ void shouldCreateValidIdsThatConformToUuidType4() {
+ UUID uuid = toUuid(FriendlyId.createFriendlyId());
+ assertThat(uuid.version()).isEqualTo(4);
+ }
+
+ @RepeatedTest(1000)
+ void encodingUuidShouldBeReversible() {
+ UUID uuid = UUID.randomUUID();
+ UUID result = toUuid(toFriendlyId(uuid));
+ assertThat(result).isEqualTo(uuid);
}
- @Test
- public void encodingUuidShouldBeReversible() {
- def("areEqual(FriendlyId.toUuid(FriendlyId.toFriendlyId(uuid))), uuid)")
- .forAll(DataProvider.UUIDS)
- .suchThat(uuid -> areEqual(toUuid(toFriendlyId(uuid)), uuid))
- .check(-1, 100_000)
- .assertIsSatisfied();
+ @RepeatedTest(1000)
+ void decodingIdShouldBeReversible() {
+ String id = generateRandomFriendlyId();
+ String result = toFriendlyId(toUuid(id));
+ assertThat(areEqualIgnoringLeadingZeros(result, id)).isTrue();
}
- @Test
- public void decodingIdShouldBeReversible() {
- def("areEqualIgnoringLeadingZeros(Url62.toFriendlyId(Url62.toUuid(id)), id)")
- .forAll(DataProvider.FRIENDLY_IDS)
- .suchThat(id -> areEqualIgnoringLeadingZeros(toFriendlyId(toUuid(id)), id))
- .check(100, 100_000)
- .assertIsSatisfied();
+ private String generateRandomFriendlyId() {
+ Random random = new Random();
+ BigInteger bigInt = new BigInteger(128, random);
+ return Base62.encode(bigInt);
}
}
\ No newline at end of file
diff --git a/friendly-id/src/test/java/com/devskiller/friendly_id/Url62Test.java b/friendly-id/src/test/java/com/devskiller/friendly_id/Url62Test.java
index e3d0097..90c9740 100644
--- a/friendly-id/src/test/java/com/devskiller/friendly_id/Url62Test.java
+++ b/friendly-id/src/test/java/com/devskiller/friendly_id/Url62Test.java
@@ -1,34 +1,34 @@
package com.devskiller.friendly_id;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
-public class Url62Test {
+class Url62Test {
@Test
- public void shouldExplodeWhenContainsIllegalCharacters() {
+ void shouldExplodeWhenContainsIllegalCharacters() {
assertThatThrownBy(() -> Url62.decode("Foo Bar"))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("contains illegal characters");
}
@Test
- public void shouldFaildOnEmptyString() {
+ void shouldFaildOnEmptyString() {
assertThatThrownBy(() -> Url62.decode(""))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("must not be empty");
}
@Test
- public void shouldFailsOnNullString() {
+ void shouldFailsOnNullString() {
assertThatThrownBy(() -> Url62.decode(null))
.isInstanceOf(NullPointerException.class)
.hasMessageContaining("must not be null");
}
@Test
- public void shouldFailsWhenStringContainsMoreThan128bitInformation() {
+ void shouldFailsWhenStringContainsMoreThan128bitInformation() {
assertThatThrownBy(() -> Url62.decode("7NLCAyd6sKR7kDHxgAWFPas"))
.isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("contains more than 128bit information");
diff --git a/friendly-id/src/test/java/com/devskiller/friendly_id/type/FriendlyIdTest.java b/friendly-id/src/test/java/com/devskiller/friendly_id/type/FriendlyIdTest.java
new file mode 100644
index 0000000..780f31d
--- /dev/null
+++ b/friendly-id/src/test/java/com/devskiller/friendly_id/type/FriendlyIdTest.java
@@ -0,0 +1,137 @@
+package com.devskiller.friendly_id.type;
+
+import org.junit.jupiter.api.Test;
+
+import java.util.UUID;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class FriendlyIdTest {
+
+ @Test
+ void shouldCreateFromUuid() {
+ // given
+ UUID uuid = UUID.fromString("7b0f3a3e-3b3a-4b3a-8b3a-3b3a3b3a3b3a");
+
+ // when
+ FriendlyId friendlyId = FriendlyId.of(uuid);
+
+ // then
+ assertEquals(uuid, friendlyId.uuid());
+ }
+
+ @Test
+ void shouldCreateFromString() {
+ // given
+ String friendlyIdString = "5wbwf6yUxVBcr48AMbz9cb";
+
+ // when
+ FriendlyId friendlyId = FriendlyId.fromString(friendlyIdString);
+
+ // then
+ assertEquals(friendlyIdString, friendlyId.toString());
+ }
+
+ @Test
+ void shouldCreateRandom() {
+ // when
+ FriendlyId friendlyId1 = FriendlyId.random();
+ FriendlyId friendlyId2 = FriendlyId.random();
+
+ // then
+ assertNotEquals(friendlyId1, friendlyId2);
+ assertNotNull(friendlyId1.uuid());
+ assertNotNull(friendlyId2.uuid());
+ }
+
+ @Test
+ void shouldConvertToString() {
+ // given
+ UUID uuid = UUID.fromString("7b0f3a3e-3b3a-4b3a-8b3a-3b3a3b3a3b3a");
+ FriendlyId friendlyId = FriendlyId.of(uuid);
+
+ // when
+ String result = friendlyId.toString();
+
+ // then
+ assertEquals(com.devskiller.friendly_id.FriendlyId.toFriendlyId(uuid), result);
+ }
+
+ @Test
+ void shouldBeEqualWhenUuidIsEqual() {
+ // given
+ UUID uuid = UUID.randomUUID();
+ FriendlyId id1 = FriendlyId.of(uuid);
+ FriendlyId id2 = FriendlyId.of(uuid);
+
+ // then
+ assertEquals(id1, id2);
+ assertEquals(id1.hashCode(), id2.hashCode());
+ }
+
+ @Test
+ void shouldNotBeEqualWhenUuidIsDifferent() {
+ // given
+ FriendlyId id1 = FriendlyId.random();
+ FriendlyId id2 = FriendlyId.random();
+
+ // then
+ assertNotEquals(id1, id2);
+ }
+
+ @Test
+ void shouldBeComparable() {
+ // given
+ UUID uuid1 = UUID.fromString("00000000-0000-0000-0000-000000000001");
+ UUID uuid2 = UUID.fromString("00000000-0000-0000-0000-000000000002");
+ FriendlyId id1 = FriendlyId.of(uuid1);
+ FriendlyId id2 = FriendlyId.of(uuid2);
+
+ // then
+ assertTrue(id1.compareTo(id2) < 0);
+ assertTrue(id2.compareTo(id1) > 0);
+ assertEquals(0, id1.compareTo(id1));
+ }
+
+ @Test
+ void shouldThrowExceptionWhenUuidIsNull() {
+ // when/then
+ assertThrows(NullPointerException.class, () -> FriendlyId.of(null));
+ }
+
+ @Test
+ void shouldThrowExceptionWhenStringIsNull() {
+ // when/then
+ assertThrows(NullPointerException.class, () -> FriendlyId.fromString(null));
+ }
+
+ @Test
+ void shouldBeReversible() {
+ // given
+ UUID originalUuid = UUID.randomUUID();
+ FriendlyId friendlyId = FriendlyId.of(originalUuid);
+
+ // when
+ String friendlyIdString = friendlyId.toString();
+ FriendlyId reconstructed = FriendlyId.fromString(friendlyIdString);
+
+ // then
+ assertEquals(friendlyId, reconstructed);
+ assertEquals(originalUuid, reconstructed.uuid());
+ }
+
+ @Test
+ void shouldBeEqualRegardlessOfCreationMethod() {
+ // given
+ UUID uuid = UUID.fromString("7b0f3a3e-3b3a-4b3a-8b3a-3b3a3b3a3b3a");
+
+ // when
+ FriendlyId fromUuid = FriendlyId.of(uuid);
+ FriendlyId fromString = FriendlyId.fromString(com.devskiller.friendly_id.FriendlyId.toFriendlyId(uuid));
+
+ // then
+ assertEquals(fromUuid, fromString);
+ assertEquals(fromUuid.hashCode(), fromString.hashCode());
+ assertEquals(fromUuid.toString(), fromString.toString());
+ }
+}
diff --git a/mvnw b/mvnw
index d2f0ea3..bd8896b 100755
--- a/mvnw
+++ b/mvnw
@@ -19,292 +19,277 @@
# ----------------------------------------------------------------------------
# ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
-#
-# Required ENV vars:
-# ------------------
-# JAVA_HOME - location of a JDK home dir
+# Apache Maven Wrapper startup batch script, version 3.3.4
#
# Optional ENV vars
# -----------------
-# M2_HOME - location of maven2's installed home dir
-# MAVEN_OPTS - parameters passed to the Java VM when running Maven
-# e.g. to debug Maven itself, use
-# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-# MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# JAVA_HOME - location of a JDK home dir, required when download maven via java source
+# MVNW_REPOURL - repo url base for downloading maven distribution
+# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
# ----------------------------------------------------------------------------
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
- if [ -f /etc/mavenrc ] ; then
- . /etc/mavenrc
- fi
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
- if [ -f "$HOME/.mavenrc" ] ; then
- . "$HOME/.mavenrc"
- fi
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+ [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+ native_path() { cygpath --path --windows "$1"; }
+ ;;
+esac
-fi
+# set JAVACMD and JAVACCMD
+set_java_home() {
+ # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+ if [ -n "${JAVA_HOME-}" ]; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACCMD="$JAVA_HOME/jre/sh/javac"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ JAVACCMD="$JAVA_HOME/bin/javac"
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "`uname`" in
- CYGWIN*) cygwin=true ;;
- MINGW*) mingw=true;;
- Darwin*) darwin=true
- # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
- # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
- if [ -z "$JAVA_HOME" ]; then
- if [ -x "/usr/libexec/java_home" ]; then
- export JAVA_HOME="`/usr/libexec/java_home`"
- else
- export JAVA_HOME="/Library/Java/Home"
+ if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+ echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+ echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+ return 1
fi
fi
- ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
- if [ -r /etc/gentoo-release ] ; then
- JAVA_HOME=`java-config --jre-home`
+ else
+ JAVACMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v java
+ )" || :
+ JAVACCMD="$(
+ 'set' +e
+ 'unset' -f command 2>/dev/null
+ 'command' -v javac
+ )" || :
+
+ if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+ echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+ return 1
+ fi
fi
-fi
-
-if [ -z "$M2_HOME" ] ; then
- ## resolve links - $0 may be a link to maven's home
- PRG="$0"
+}
- # need this for relative symlinks
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG="`dirname "$PRG"`/$link"
- fi
+# hash string like Java String::hashCode
+hash_string() {
+ str="${1:-}" h=0
+ while [ -n "$str" ]; do
+ char="${str%"${str#?}"}"
+ h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+ str="${str#?}"
done
+ printf %x\\n $h
+}
- saveddir=`pwd`
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
- M2_HOME=`dirname "$PRG"`/..
+die() {
+ printf %s\\n "$1" >&2
+ exit 1
+}
- # make it fully qualified
- M2_HOME=`cd "$M2_HOME" && pwd`
+trim() {
+ # MWRAPPER-139:
+ # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+ # Needed for removing poorly interpreted newline sequences when running in more
+ # exotic environments such as mingw bash on Windows.
+ printf "%s" "${1}" | tr -d '[:space:]'
+}
- cd "$saveddir"
- # echo Using m2 at $M2_HOME
-fi
+scriptDir="$(dirname "$0")"
+scriptName="$(basename "$0")"
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+ case "${key-}" in
+ distributionUrl) distributionUrl=$(trim "${value-}") ;;
+ distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+ esac
+done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+ MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+ case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+ *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+ :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+ :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+ :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+ *)
+ echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+ distributionPlatform=linux-amd64
+ ;;
+ esac
+ distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+ ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --unix "$M2_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
-fi
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+ unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+ exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
- [ -n "$M2_HOME" ] &&
- M2_HOME="`(cd "$M2_HOME"; pwd)`"
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+if [ -d "$MAVEN_HOME" ]; then
+ verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+ exec_maven "$@"
fi
-if [ -z "$JAVA_HOME" ]; then
- javaExecutable="`which javac`"
- if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
- # readlink(1) is not available as standard on Solaris 10.
- readLink=`which readlink`
- if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
- if $darwin ; then
- javaHome="`dirname \"$javaExecutable\"`"
- javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
- else
- javaExecutable="`readlink -f \"$javaExecutable\"`"
- fi
- javaHome="`dirname \"$javaExecutable\"`"
- javaHome=`expr "$javaHome" : '\(.*\)/bin'`
- JAVA_HOME="$javaHome"
- export JAVA_HOME
- fi
- fi
-fi
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
-if [ -z "$JAVACMD" ] ; then
- if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
- else
- JAVACMD="$JAVA_HOME/bin/java"
- fi
- else
- JAVACMD="`which java`"
- fi
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+ clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+ trap clean HUP INT TERM EXIT
+else
+ die "cannot create temp dir"
fi
-if [ ! -x "$JAVACMD" ] ; then
- echo "Error: JAVA_HOME is not defined correctly." >&2
- echo " We cannot execute $JAVACMD" >&2
- exit 1
-fi
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
-if [ -z "$JAVA_HOME" ] ; then
- echo "Warning: JAVA_HOME environment variable is not set."
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+ distributionUrl="${distributionUrl%.zip}.tar.gz"
+ distributionUrlName="${distributionUrl##*/}"
fi
-CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
- if [ -z "$1" ]
- then
- echo "Path not specified to find_maven_basedir"
- return 1
- fi
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+ verbose "Found wget ... using wget"
+ wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+ verbose "Found curl ... using curl"
+ curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+ verbose "Falling back to use Java to download"
+ javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+ targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+ cat >"$javaSource" <<-END
+ public class Downloader extends java.net.Authenticator
+ {
+ protected java.net.PasswordAuthentication getPasswordAuthentication()
+ {
+ return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+ }
+ public static void main( String[] args ) throws Exception
+ {
+ setDefault( new Downloader() );
+ java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+ }
+ }
+ END
+ # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+ verbose " - Compiling Downloader.java ..."
+ "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+ verbose " - Running Downloader.java ..."
+ "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
- basedir="$1"
- wdir="$1"
- while [ "$wdir" != '/' ] ; do
- if [ -d "$wdir"/.mvn ] ; then
- basedir=$wdir
- break
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+ distributionSha256Result=false
+ if [ "$MVN_CMD" = mvnd.sh ]; then
+ echo "Checksum validation is not supported for maven-mvnd." >&2
+ echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+ exit 1
+ elif command -v sha256sum >/dev/null; then
+ if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
+ distributionSha256Result=true
fi
- # workaround for JBEAP-8937 (on Solaris 10/Sparc)
- if [ -d "${wdir}" ]; then
- wdir=`cd "$wdir/.."; pwd`
+ elif command -v shasum >/dev/null; then
+ if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+ distributionSha256Result=true
fi
- # end of workaround
- done
- echo "${basedir}"
-}
-
-# concatenates all lines of a file
-concat_lines() {
- if [ -f "$1" ]; then
- echo "$(tr -s '\n' ' ' < "$1")"
+ else
+ echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+ echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+ exit 1
+ fi
+ if [ $distributionSha256Result = false ]; then
+ echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+ echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+ exit 1
fi
-}
-
-BASE_DIR=`find_maven_basedir "$(pwd)"`
-if [ -z "$BASE_DIR" ]; then
- exit 1;
fi
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found .mvn/wrapper/maven-wrapper.jar"
- fi
+# unzip and move
+if command -v unzip >/dev/null; then
+ unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
else
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
- fi
- if [ -n "$MVNW_REPOURL" ]; then
- jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
- else
- jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
- fi
- while IFS="=" read key value; do
- case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
- esac
- done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Downloading from: $jarUrl"
- fi
- wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
- if $cygwin; then
- wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
- fi
-
- if command -v wget > /dev/null; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found wget ... using wget"
- fi
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- wget "$jarUrl" -O "$wrapperJarPath"
- else
- wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
- fi
- elif command -v curl > /dev/null; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Found curl ... using curl"
- fi
- if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
- curl -o "$wrapperJarPath" "$jarUrl" -f
- else
- curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
- fi
-
- else
- if [ "$MVNW_VERBOSE" = true ]; then
- echo "Falling back to using Java to download"
- fi
- javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
- # For Cygwin, switch paths to Windows format before running javac
- if $cygwin; then
- javaClass=`cygpath --path --windows "$javaClass"`
- fi
- if [ -e "$javaClass" ]; then
- if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Compiling MavenWrapperDownloader.java ..."
- fi
- # Compiling the Java class
- ("$JAVA_HOME/bin/javac" "$javaClass")
- fi
- if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
- # Running the downloader
- if [ "$MVNW_VERBOSE" = true ]; then
- echo " - Running MavenWrapperDownloader.java ..."
- fi
- ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
- fi
- fi
- fi
+ tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
fi
-##########################################################################################
-# End of extension
-##########################################################################################
-export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
-if [ "$MVNW_VERBOSE" = true ]; then
- echo $MAVEN_PROJECTBASEDIR
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+actualDistributionDir=""
+
+# First try the expected directory name (for regular distributions)
+if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
+ if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
+ actualDistributionDir="$distributionUrlNameMain"
+ fi
fi
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- [ -n "$M2_HOME" ] &&
- M2_HOME=`cygpath --path --windows "$M2_HOME"`
- [ -n "$JAVA_HOME" ] &&
- JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
- [ -n "$CLASSPATH" ] &&
- CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
- [ -n "$MAVEN_PROJECTBASEDIR" ] &&
- MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if [ -z "$actualDistributionDir" ]; then
+ # enable globbing to iterate over items
+ set +f
+ for dir in "$TMP_DOWNLOAD_DIR"/*; do
+ if [ -d "$dir" ]; then
+ if [ -f "$dir/bin/$MVN_CMD" ]; then
+ actualDistributionDir="$(basename "$dir")"
+ break
+ fi
+ fi
+ done
+ set -f
fi
-# Provide a "standardized" way to retrieve the CLI args that will
-# work with both Windows and non-Windows executions.
-MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
-export MAVEN_CMD_LINE_ARGS
+if [ -z "$actualDistributionDir" ]; then
+ verbose "Contents of $TMP_DOWNLOAD_DIR:"
+ verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
+ die "Could not find Maven distribution directory in extracted archive"
+fi
-WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
-exec "$JAVACMD" \
- $MAVEN_OPTS \
- -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
- "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
- ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"
+clean || :
+exec_maven "$@"
diff --git a/mvnw.cmd b/mvnw.cmd
index b26ab24..5761d94 100644
--- a/mvnw.cmd
+++ b/mvnw.cmd
@@ -1,182 +1,189 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements. See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership. The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@REM "License"); you may not use this file except in compliance
-@REM with the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied. See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Maven2 Start Up Batch script
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM M2_HOME - location of maven2's installed home dir
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
-if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
-
-FOR /F "tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
- IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
- if "%MVNW_VERBOSE%" == "true" (
- echo Found %WRAPPER_JAR%
- )
-) else (
- if not "%MVNW_REPOURL%" == "" (
- SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.5/maven-wrapper-0.5.5.jar"
- )
- if "%MVNW_VERBOSE%" == "true" (
- echo Couldn't find %WRAPPER_JAR%, downloading it ...
- echo Downloading from: %DOWNLOAD_URL%
- )
-
- powershell -Command "&{"^
- "$webclient = new-object System.Net.WebClient;"^
- "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
- "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
- "}"^
- "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
- "}"
- if "%MVNW_VERBOSE%" == "true" (
- echo Finished downloading %WRAPPER_JAR%
- )
-)
-@REM End of extension
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
-if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%" == "on" pause
-
-if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
-
-exit /B %ERROR_CODE%
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements. See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership. The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License. You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied. See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.4
+@REM
+@REM Optional ENV vars
+@REM MVNW_REPOURL - repo url base for downloading maven distribution
+@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+ IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+ $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+ Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+ "maven-mvnd-*" {
+ $USE_MVND = $true
+ $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+ $MVN_CMD = "mvnd.cmd"
+ break
+ }
+ default {
+ $USE_MVND = $false
+ $MVN_CMD = $script -replace '^mvnw','mvn'
+ break
+ }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/
+if ($env:MVNW_REPOURL) {
+ $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+ $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+
+$MAVEN_M2_PATH = "$HOME/.m2"
+if ($env:MAVEN_USER_HOME) {
+ $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
+}
+
+if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
+ New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
+}
+
+$MAVEN_WRAPPER_DISTS = $null
+if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
+ $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
+} else {
+ $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
+}
+
+$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+ Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+ Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+ exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+ Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+ if ($TMP_DOWNLOAD_DIR.Exists) {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+ }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+ $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+ if ($USE_MVND) {
+ Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+ }
+ Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+ if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+ Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+ }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+$actualDistributionDir = ""
+
+# First try the expected directory name (for regular distributions)
+$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
+$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
+if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
+ $actualDistributionDir = $distributionUrlNameMain
+}
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if (!$actualDistributionDir) {
+ Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
+ $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
+ if (Test-Path -Path $testPath -PathType Leaf) {
+ $actualDistributionDir = $_.Name
+ }
+ }
+}
+
+if (!$actualDistributionDir) {
+ Write-Error "Could not find Maven distribution directory in extracted archive"
+}
+
+Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+ Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+ if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+ Write-Error "fail to move MAVEN_HOME"
+ }
+} finally {
+ try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+ catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
diff --git a/pom.xml b/pom.xml
index 69edfbb..9c752ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
com.devskiller.friendly-id
friendly-id-project
pom
- 1.1.1-SNAPSHOT
+ ${revision}
friendly id
Library to convert uuid to url friendly IDs basing on base62
@@ -15,17 +15,26 @@
friendly-id
friendly-id-jackson-datatype
+ friendly-id-jackson2-datatype
+ friendly-id-jooq
+ friendly-id-jpa
+ friendly-id-openfeign
friendly-id-spring-boot
friendly-id-spring-boot-starter
friendly-id-samples
+
+ 2.0.0-SNAPSHOT
+
UTF-8
UTF-8
- 1.8
- 1.8
- 2.2.2.RELEASE
+ 21
+ 21
+ 4.0.1
+ 2025.0.0
+ 3.20.1
@@ -39,7 +48,7 @@
- Mariusz Smykula
+ Mariusz S
mariuszs@gmail.com
Devskiller
@@ -53,16 +62,16 @@
-
- oss
- Sonatype Nexus Snapshots
- http://oss.sonatype.org/content/repositories/snapshots
-
- oss
- Nexus Release Repository
- http://oss.sonatype.org/service/local/staging/deploy/maven2/
+ central
+ Central Repository
+ https://central.sonatype.com/api/v1/publisher
+
+ central
+ Central Repository Snapshots
+ https://central.sonatype.com/api/v1/publisher
+
@@ -71,8 +80,8 @@
- Travis
- https://travis-ci.org/Devskiller/friendly-id
+ GitHub Actions
+ https://github.com/SkillPanel/friendly-id/actions
@@ -84,17 +93,28 @@
pom
import
+