From bc3dff98ed7a8ac8a2d56c9f84bdf09968ebfde8 Mon Sep 17 00:00:00 2001 From: Luca Foppiano Date: Mon, 19 Jun 2023 13:34:17 +0900 Subject: [PATCH] Update migration --- .../grobid/core/engines/QuantitiesEngine.java | 4 +-- .../grobid/core/engines/QuantityParser.java | 2 +- .../service/GrobidEngineInitialiser.java | 4 +-- .../service/QuantitiesServiceModule.java | 29 ++++++++++++++++++- .../controller/AnnotationController.java | 4 +-- .../service/controller/HealthCheck.java | 4 +-- .../GrobidExceptionsTranslationUtility.java | 2 +- 7 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/grobid/core/engines/QuantitiesEngine.java b/src/main/java/org/grobid/core/engines/QuantitiesEngine.java index 5ef07570..03a64add 100644 --- a/src/main/java/org/grobid/core/engines/QuantitiesEngine.java +++ b/src/main/java/org/grobid/core/engines/QuantitiesEngine.java @@ -34,8 +34,8 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import jakarta.ws.rs.core.Response; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; diff --git a/src/main/java/org/grobid/core/engines/QuantityParser.java b/src/main/java/org/grobid/core/engines/QuantityParser.java index 34da6d2e..3fc70325 100644 --- a/src/main/java/org/grobid/core/engines/QuantityParser.java +++ b/src/main/java/org/grobid/core/engines/QuantityParser.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/org/grobid/service/GrobidEngineInitialiser.java b/src/main/java/org/grobid/service/GrobidEngineInitialiser.java index 22f4e06a..67114c77 100644 --- a/src/main/java/org/grobid/service/GrobidEngineInitialiser.java +++ b/src/main/java/org/grobid/service/GrobidEngineInitialiser.java @@ -1,6 +1,8 @@ package org.grobid.service; import com.google.common.collect.ImmutableList; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.grobid.core.main.GrobidHomeFinder; import org.grobid.core.main.LibraryLoader; import org.grobid.core.utilities.GrobidProperties; @@ -8,8 +10,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.inject.Inject; -import javax.inject.Singleton; @Singleton public class GrobidEngineInitialiser { diff --git a/src/main/java/org/grobid/service/QuantitiesServiceModule.java b/src/main/java/org/grobid/service/QuantitiesServiceModule.java index 0cd60a5b..04476c8c 100644 --- a/src/main/java/org/grobid/service/QuantitiesServiceModule.java +++ b/src/main/java/org/grobid/service/QuantitiesServiceModule.java @@ -1,6 +1,12 @@ package org.grobid.service; +import com.codahale.metrics.MetricRegistry; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.inject.AbstractModule; +import com.google.inject.Binder; +import com.google.inject.Provides; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; import org.grobid.core.engines.QuantitiesEngine; import org.grobid.core.engines.QuantityParser; import org.grobid.service.configuration.GrobidQuantitiesConfiguration; @@ -10,9 +16,10 @@ import org.grobid.service.exceptions.mapper.GrobidExceptionsTranslationUtility; import org.grobid.service.exceptions.mapper.GrobidServiceExceptionMapper; import org.grobid.service.exceptions.mapper.WebApplicationExceptionMapper; +import ru.vyarus.dropwizard.guice.module.support.DropwizardAwareModule; -public class QuantitiesServiceModule extends AbstractModule { +public class QuantitiesServiceModule extends DropwizardAwareModule { @Override public void configure() { @@ -34,4 +41,24 @@ public void configure() { bind(WebApplicationExceptionMapper.class); } + /*@Provides + protected ObjectMapper getObjectMapper() { + return getEnvironment().getObjectMapper(); + } + + @Provides + protected MetricRegistry provideMetricRegistry() { + return getMetricRegistry(); + } + + //for unit tests + protected MetricRegistry getMetricRegistry() { + return getEnvironment().metrics(); + }*/ + + @Provides + Client provideClient() { + return ClientBuilder.newClient(); + } + } \ No newline at end of file diff --git a/src/main/java/org/grobid/service/controller/AnnotationController.java b/src/main/java/org/grobid/service/controller/AnnotationController.java index a9c870fd..ab607a00 100644 --- a/src/main/java/org/grobid/service/controller/AnnotationController.java +++ b/src/main/java/org/grobid/service/controller/AnnotationController.java @@ -13,8 +13,8 @@ import org.grobid.core.engines.QuantityParser; import org.grobid.service.configuration.GrobidQuantitiesConfiguration; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import java.io.InputStream; import java.util.List; diff --git a/src/main/java/org/grobid/service/controller/HealthCheck.java b/src/main/java/org/grobid/service/controller/HealthCheck.java index 34308d73..afbbdb0c 100644 --- a/src/main/java/org/grobid/service/controller/HealthCheck.java +++ b/src/main/java/org/grobid/service/controller/HealthCheck.java @@ -2,8 +2,8 @@ import org.grobid.service.configuration.GrobidQuantitiesConfiguration; -import javax.inject.Inject; -import javax.inject.Singleton; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; diff --git a/src/main/java/org/grobid/service/exceptions/mapper/GrobidExceptionsTranslationUtility.java b/src/main/java/org/grobid/service/exceptions/mapper/GrobidExceptionsTranslationUtility.java index af666f3b..8149611e 100644 --- a/src/main/java/org/grobid/service/exceptions/mapper/GrobidExceptionsTranslationUtility.java +++ b/src/main/java/org/grobid/service/exceptions/mapper/GrobidExceptionsTranslationUtility.java @@ -10,7 +10,7 @@ import org.grobid.core.exceptions.GrobidExceptionStatus; import org.slf4j.MDC; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.io.IOException; import java.util.ArrayList; import java.util.List;