Skip to content

Add support for automatic coversion of integer Identifier to its wrapped primitive #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LordJust wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add support for automatic coversion of integer Identifier to its wrapped primitive #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d89e1a
fix: restrict contructor parameter to a type from `primitives`
LordJust Jul 6, 2025
5a84b32
feat: convert interger backed `Identfier` automatically to its primitive
LordJust Jul 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jmolecules-spring/src/main/java/org/jmolecules/spring/IdentifierToPrimitivesConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
public class IdentifierToPrimitivesConverter implements ConditionalGenericConverter {

private static final Map<Class<?>, Optional<Field>> CACHE = new ConcurrentReferenceHashMap<>();
private static final List<Class<?>> DEFAULT_PRIMITIVES = Arrays.asList(UUID.class, String.class);
private static final List<Class<?>> DEFAULT_PRIMITIVES = Arrays.asList(UUID.class, String.class, Long.class, long.class, Integer.class, int.class);

private final Supplier<? extends ConversionService> conversionService;
private Set<Class<?>> primitives;
Expand Down
3 changes: 2 additions & 1 deletion jmolecules-spring/src/main/java/org/jmolecules/spring/PrimitivesToIdentifierConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class PrimitivesToIdentifierConverter implements ConditionalGenericConver

private static final Map<Class<?>, Optional<Instantiator>> CREATORS = new ConcurrentReferenceHashMap<>();

private static final Set<Class<?>> DEFAULT_PRIMITIVES = new HashSet<>(Arrays.asList(String.class, UUID.class));
private static final Set<Class<?>> DEFAULT_PRIMITIVES = new HashSet<>(Arrays.asList(String.class, UUID.class, Long.class, long.class, Integer.class, int.class));
private static final Set<String> DEFAULT_FACTORY_METHOD_NAMES = new HashSet<>(Arrays.asList("of"));

private final Supplier<? extends ConversionService> conversionService;
Expand Down Expand Up @@ -168,6 +168,7 @@ private Optional<Instantiator> detectConstructor(Class<?> type, Class<?> paramet

return Arrays.stream(type.getDeclaredConstructors())
.filter(it -> it.getParameterCount() == 1)
.filter(it -> primitives.contains(it.getParameterTypes()[0]))
.filter(it -> isAssignableOrConvertable(parameterType, it.getParameterTypes()[0]))
.peek(ReflectionUtils::makeAccessible)
.findFirst()
Expand Down
41 changes: 32 additions & 9 deletions ...-spring/src/test/java/org/jmolecules/spring/IdentifierToPrimitivesConverterUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/
package org.jmolecules.spring;

import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;

import java.util.UUID;

Expand All @@ -30,7 +31,9 @@ class IdentifierToPrimitivesConverterUnitTests {

static final TypeDescriptor UUID_DESCRIPTOR = TypeDescriptor.valueOf(UUID.class);
static final TypeDescriptor STRING_DESCRIPTOR = TypeDescriptor.valueOf(String.class);
static final TypeDescriptor IDENTIFIER_DESCRIPTOR = TypeDescriptor.valueOf(SampleIdentifier.class);
static final TypeDescriptor INT_DESCRIPTOR = TypeDescriptor.valueOf(int.class);
static final TypeDescriptor UUID_IDENTIFIER_DESCRIPTOR = TypeDescriptor.valueOf(SampleIdentifier.class);
static final TypeDescriptor INT_IDENTIFIER_DESCRIPTOR = TypeDescriptor.valueOf(SampleIntegerIdentifier.class);

ConversionService conversionService;
IdentifierToPrimitivesConverter converter;
Expand All @@ -46,29 +49,49 @@ void setUp() {
}

@Test // #16
void convertsToPrimitiveSources() {
void convertsUuidIdetifierToPrimitiveSources() {

UUID uuid = UUID.randomUUID();
SampleIdentifier identifier = SampleIdentifier.of(uuid);

assertThat(conversionService.convert(identifier, UUID.class)).isEqualTo(uuid);
assertThat(conversionService.convert(identifier, String.class)).isEqualTo(uuid.toString());
}

@Test // #16
void convertsIntegerIdentifierToPrimitiveSources() {

int id = 1;
SampleIntegerIdentifier identifier = SampleIntegerIdentifier.of(id);

assertThat(conversionService.convert(identifier, Long.class)).isEqualTo(id);
assertThat(conversionService.convert(identifier, long.class)).isEqualTo(id);
assertThat(conversionService.convert(identifier, Integer.class)).isEqualTo(id);
assertThat(conversionService.convert(identifier, int.class)).isEqualTo(id);
assertThat(conversionService.convert(identifier, String.class)).isEqualTo(Integer.toString(id));
}

@Test // #16
void matchesPrimitives() {

assertThat(converter.matches(IDENTIFIER_DESCRIPTOR, UUID_DESCRIPTOR)).isTrue();
assertThat(converter.matches(IDENTIFIER_DESCRIPTOR, STRING_DESCRIPTOR)).isTrue();
assertThat(converter.matches(IDENTIFIER_DESCRIPTOR, TypeDescriptor.valueOf(Long.class))).isFalse();
assertThat(converter.matches(UUID_IDENTIFIER_DESCRIPTOR, UUID_DESCRIPTOR)).isTrue();
assertThat(converter.matches(UUID_IDENTIFIER_DESCRIPTOR, STRING_DESCRIPTOR)).isTrue();
assertThat(converter.matches(UUID_IDENTIFIER_DESCRIPTOR, TypeDescriptor.valueOf(Long.class))).isFalse();

assertThat(converter.matches(INT_IDENTIFIER_DESCRIPTOR, TypeDescriptor.valueOf(Long.class))).isTrue();
assertThat(converter.matches(INT_IDENTIFIER_DESCRIPTOR, TypeDescriptor.valueOf(long.class))).isTrue();
assertThat(converter.matches(INT_IDENTIFIER_DESCRIPTOR, TypeDescriptor.valueOf(Integer.class))).isTrue();
assertThat(converter.matches(INT_IDENTIFIER_DESCRIPTOR, INT_DESCRIPTOR)).isTrue();
assertThat(converter.matches(INT_IDENTIFIER_DESCRIPTOR, STRING_DESCRIPTOR)).isTrue();
assertThat(converter.matches(INT_IDENTIFIER_DESCRIPTOR, UUID_DESCRIPTOR)).isFalse();
}

@Test // #16
void handlesNullValues() {

assertThat(converter.convert(null, IDENTIFIER_DESCRIPTOR, UUID_DESCRIPTOR)).isNull();
assertThat(converter.convert(null, UUID_IDENTIFIER_DESCRIPTOR, UUID_DESCRIPTOR)).isNull();
assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> {
converter.convert(SampleIdentifier.of(null), IDENTIFIER_DESCRIPTOR, UUID_DESCRIPTOR);
converter.convert(SampleIdentifier.of(null), UUID_IDENTIFIER_DESCRIPTOR, UUID_DESCRIPTOR);
});
}

Expand All @@ -94,7 +117,7 @@ void avoidsSelfCreationIfConversionTargetIsSameType() {

var identifier = SampleIdentifier.of(UUID.randomUUID());

assertThat(converter.convert(identifier, IDENTIFIER_DESCRIPTOR, IDENTIFIER_DESCRIPTOR)).isSameAs(identifier);
assertThat(converter.convert(identifier, UUID_IDENTIFIER_DESCRIPTOR, UUID_IDENTIFIER_DESCRIPTOR)).isSameAs(identifier);
}

static abstract class IdentifierBase implements Identifier {
Expand Down
38 changes: 30 additions & 8 deletions ...-spring/src/test/java/org/jmolecules/spring/PrimitivesToIdentifierConverterUnitTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,9 @@ class PrimitivesToIdentifierConverterUnitTests {

static final TypeDescriptor UUID_DESCRIPTOR = TypeDescriptor.valueOf(UUID.class);
static final TypeDescriptor STRING_DESCRIPTOR = TypeDescriptor.valueOf(String.class);
static final TypeDescriptor IDENTIFIER_DESCRIPTOR = TypeDescriptor.valueOf(SampleIdentifier.class);
static final TypeDescriptor LONG_DESCRIPTOR = TypeDescriptor.valueOf(Long.class);
static final TypeDescriptor INT_DESCRIPTOR = TypeDescriptor.valueOf(int.class);
static final TypeDescriptor UUID_IDENTIFIER_DESCRIPTOR = TypeDescriptor.valueOf(SampleIdentifier.class);
static final TypeDescriptor INT_IDENTIFIER_DESCRIPTOR = TypeDescriptor.valueOf(SampleIntegerIdentifier.class);

ConfigurableConversionService conversionService;
PrimitivesToIdentifierConverter converter;
Expand All @@ -48,28 +49,49 @@ void setUp() {
}

@Test // #16
void convertsFromPrimitiveSources() {
void convertsToUuidIdentifierFromPrimitiveSources() {

UUID uuid = UUID.randomUUID();

assertThat(conversionService.convert(uuid, SampleIdentifier.class).getId()).isEqualTo(uuid);
assertThat(conversionService.convert(uuid.toString(), SampleIdentifier.class).getId()).isEqualTo(uuid);

assertThatExceptionOfType(ConverterNotFoundException.class)
.isThrownBy(() -> converter.convert(1L, LONG_DESCRIPTOR, IDENTIFIER_DESCRIPTOR));
.isThrownBy(() -> converter.convert(1L, INT_DESCRIPTOR, UUID_IDENTIFIER_DESCRIPTOR));
}

@Test // #16
void convertsToIntegerIdentifierFromPrimitiveSources() {

int id = 1;

assertThat(conversionService.convert(id, SampleIntegerIdentifier.class).getId()).isEqualTo(id);
assertThat(conversionService.convert(Integer.valueOf(id), SampleIntegerIdentifier.class).getId()).isEqualTo(id);
assertThat(conversionService.convert(Long.valueOf(id), SampleIntegerIdentifier.class).getId()).isEqualTo(id);
assertThat(conversionService.convert(Long.valueOf(id).longValue(), SampleIntegerIdentifier.class).getId()).isEqualTo(id);

UUID uuid = UUID.randomUUID();
assertThatExceptionOfType(ConverterNotFoundException.class)
.isThrownBy(() -> converter.convert(uuid, UUID_DESCRIPTOR, INT_IDENTIFIER_DESCRIPTOR));
}

@Test // #16
void matchesPrimitives() {

assertThat(converter.matches(UUID_DESCRIPTOR, IDENTIFIER_DESCRIPTOR)).isTrue();
assertThat(converter.matches(STRING_DESCRIPTOR, IDENTIFIER_DESCRIPTOR)).isTrue();
assertThat(converter.matches(TypeDescriptor.valueOf(Long.class), IDENTIFIER_DESCRIPTOR)).isFalse();
assertThat(converter.matches(UUID_DESCRIPTOR, UUID_IDENTIFIER_DESCRIPTOR)).isTrue();
assertThat(converter.matches(STRING_DESCRIPTOR, UUID_IDENTIFIER_DESCRIPTOR)).isTrue();
assertThat(converter.matches(INT_DESCRIPTOR, INT_IDENTIFIER_DESCRIPTOR)).isTrue();
assertThat(converter.matches(TypeDescriptor.valueOf(Integer.class), INT_IDENTIFIER_DESCRIPTOR)).isTrue();
assertThat(converter.matches(TypeDescriptor.valueOf(long.class), INT_IDENTIFIER_DESCRIPTOR)).isTrue();
assertThat(converter.matches(TypeDescriptor.valueOf(Long.class), INT_IDENTIFIER_DESCRIPTOR)).isTrue();

assertThat(converter.matches(INT_DESCRIPTOR, UUID_IDENTIFIER_DESCRIPTOR)).isFalse();
assertThat(converter.matches(UUID_DESCRIPTOR, INT_IDENTIFIER_DESCRIPTOR)).isFalse();
}

@Test // #16
void handlesNullValues() {
assertThat(converter.convert(null, UUID_DESCRIPTOR, IDENTIFIER_DESCRIPTOR)).isNull();
assertThat(converter.convert(null, UUID_DESCRIPTOR, UUID_IDENTIFIER_DESCRIPTOR)).isNull();
}

@Test // #46
Expand Down
25 changes: 25 additions & 0 deletions jmolecules-spring/src/test/java/org/jmolecules/spring/SampleIntegerIdentifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright 2021-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jmolecules.spring;

import org.jmolecules.ddd.types.Identifier;

import lombok.Value;

@Value(staticConstructor = "of")
public class SampleIntegerIdentifier implements Identifier {
int id;
}