Skip to content

Commit

Permalink
Inline SameSiteConverter (#10466)
Browse files Browse the repository at this point in the history
  • Loading branch information
dstepanov committed Feb 8, 2024
1 parent be413ff commit c7def78
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,10 @@
import io.micronaut.core.convert.TypeConverterRegistrar;
import io.micronaut.core.util.StringUtils;
import io.micronaut.http.cookie.SameSite;
import io.micronaut.http.cookie.SameSiteConverter;

import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;

/**
* The HTTP converters registrar.
Expand All @@ -47,6 +48,18 @@ public void register(MutableConversionService conversionService) {
}
}
});
conversionService.addConverter(CharSequence.class, SameSite.class, new SameSiteConverter());
Map<CharSequence, Optional<SameSite>> conversions = new ConcurrentHashMap<>();
conversionService.addConverter(CharSequence.class, SameSite.class, (object, targetType, context) -> {
if (object == null) {
return Optional.empty();
}
return conversions.computeIfAbsent(object, charSequence -> {
try {
return Optional.of(SameSite.valueOf(StringUtils.capitalize(object.toString().toLowerCase())));
} catch (IllegalArgumentException e) {
return Optional.empty();
}
});
});
}
}
57 changes: 0 additions & 57 deletions http/src/main/java/io/micronaut/http/cookie/SameSiteConverter.java

This file was deleted.

0 comments on commit c7def78

Please sign in to comment.