Drop mustache - 15d7b54afd

Modified pom.xml

@@ -144,11 +144,6
</dependency>

<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-mustache</artifactId>
- </dependency>
-
- <dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>

Modified src/main/resources/application.properties

@@ -1,12 +1,9
#debug=true
#logging.level.web=TRACE
#logging.level.org.springframework=DEBUG
spring.main.banner-mode=off
server.compression.enabled=true
server.error.whitelabel.enabled=false
-spring.mustache.prefix=classpath:/tablier/template/
-spring.mustache.suffix=.mustache
-spring.mustache.cache=true
management.server.port=8081
management.server.address=127.0.0.1
management.endpoint.prometheus.enabled=true

Modified src/test/resources/application.properties

@@ -1,3 +1,2
spring.main.banner-mode=off
-spring.mustache.prefix=classpath:/tablier/template/
spring.main.allow-bean-definition-overriding=true

Modified src/main/java/co/caio/cerberus/boot/BootApplication.java

@@ -1,17 +1,12
package co.caio.cerberus.boot;

import co.caio.cerberus.db.ChronicleRecipeMetadataDatabase;
import co.caio.cerberus.db.RecipeMetadataDatabase;
import co.caio.cerberus.search.Searcher;
-import com.samskivert.mustache.DefaultCollector;
-import com.samskivert.mustache.Mustache;
import io.github.resilience4j.circuitbreaker.CircuitBreaker;
import io.github.resilience4j.micrometer.CircuitBreakerMetrics;
import java.time.Duration;
-import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
-import java.util.OptionalInt;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.context.properties.EnableConfigurationProperties;

@@ -29,24 +24,6

public static void main(String[] args) {
SpringApplication.run(BootApplication.class, args);
- }
-
- @Bean
- Mustache.Compiler mustacheWithOptionalSupport(Mustache.TemplateLoader templateLoader) {
- var collector =
- new DefaultCollector() {
- @Override
- public Iterator<?> toIterator(Object value) {
- if (value instanceof OptionalInt) {
- var optIntValue = (OptionalInt) value;
- return optIntValue.isPresent()
- ? Collections.singleton(optIntValue.getAsInt()).iterator()
- : Collections.emptyIterator();
- }
- return super.toIterator(value);
- }
- };
- return Mustache.compiler().withCollector(collector).withLoader(templateLoader);
}

@Bean("metadataDb")

Modified src/test/java/co/caio/cerberus/boot/BootApplicationTests.java

@@ -1,24 +1,17
package co.caio.cerberus.boot;

-import static org.junit.jupiter.api.Assertions.assertEquals;

import co.caio.cerberus.Util;
import co.caio.cerberus.db.HashMapRecipeMetadataDatabase;
import co.caio.cerberus.db.RecipeMetadataDatabase;
import co.caio.cerberus.search.Searcher;
-import com.samskivert.mustache.Mustache;
-import java.util.Map;
-import java.util.OptionalInt;
import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.TestConfiguration;
import org.springframework.context.annotation.Bean;

@SpringBootTest
class BootApplicationTests {
-
- @Autowired Mustache.Compiler compiler;

@TestConfiguration
static class SampleSettings {

@@ -35,17 +28,4

@Test
void contextLoads() {}
-
- @Test
- void mustacheSettings() {
- checkRendering("", OptionalInt.empty());
- checkRendering("42", OptionalInt.of(42));
- }
-
- private void checkRendering(
- String wanted, @SuppressWarnings("OptionalUsedAsFieldOrParameterType") OptionalInt item) {
- var template = "{{#opt}}{{.}}{{/opt}}";
- var result = compiler.compile(template).execute(Map.of("opt", item));
- assertEquals(wanted, result);
- }
}