This is an automated email from the ASF dual-hosted git repository. rec pushed a commit to branch refactoring/379-Clean-up-code in repository https://gitbox.apache.org/repos/asf/uima-uimaj.git
commit d4fd95cc73c9890e7608918f9f222c36389e14ca Author: Richard Eckart de Castilho <[email protected]> AuthorDate: Mon Aug 19 12:51:39 2024 +0200 Issue #379: Clean up code - Cleaning up... --- .../uima/analysis_engine/AnalysisEngine.java | 9 +++-- .../analysis_engine/AnalysisEngineManagement.java | 2 +- .../impl/AnalysisEngineImplBase.java | 6 ++-- .../impl/AnalysisEngineManagementImpl.java | 2 +- .../impl/AnalysisEngineProcessorAdapter.java | 3 ++ .../AnalysisComponentAdapterFactory.java | 12 +++---- .../service/impl/AnalysisEngineService_impl.java | 9 +++-- .../main/java/org/apache/uima/cas/impl/AllFSs.java | 18 +++++----- .../uima/impl/AnalysisEngineFactory_impl.java | 5 ++- .../resource/metadata/impl/AllowedValue_impl.java | 2 +- .../impl/AnalysisEngineDescription_implTest.java | 28 +++++++-------- .../impl/AnalysisEngineManagementImplTest.java | 17 +++++---- .../impl/AnalysisEngine_implTest.java | 42 +++++++++++----------- .../uima/impl/AnalysisEngineFactory_implTest.java | 31 +++++++--------- .../uima/internal/util/AnalysisEnginePoolTest.java | 19 +++++----- 15 files changed, 101 insertions(+), 104 deletions(-) diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java index f12bf3774..03eb9f686 100644 --- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java +++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngine.java @@ -91,8 +91,9 @@ public interface AnalysisEngine extends ConfigurableResource, CasObjectProcessor * {@link #initialize(ResourceSpecifier,Map)} method. * * @deprecated use {@link Resource#PARAM_RESOURCE_MANAGER} + * @forRemoval 4.0.0 */ - @Deprecated + @Deprecated(since = "2.5.0") String PARAM_RESOURCE_MANAGER = Resource.PARAM_RESOURCE_MANAGER; /** @@ -103,8 +104,9 @@ public interface AnalysisEngine extends ConfigurableResource, CasObjectProcessor * {@link #initialize(ResourceSpecifier,Map)} method. * * @deprecated use {@link Resource#PARAM_CONFIG_PARAM_SETTINGS} + * @forRemoval 4.0.0 */ - @Deprecated + @Deprecated(since = "2.5.0") String PARAM_CONFIG_PARAM_SETTINGS = Resource.PARAM_CONFIG_PARAM_SETTINGS; /** @@ -372,8 +374,9 @@ public interface AnalysisEngine extends ConfigurableResource, CasObjectProcessor * * @deprecated This is no longer used by the framework and was never intended for users to call. * Use {#link #process(CAS)} instead. + * @forRemoval 4.0.0 */ - @Deprecated + @Deprecated(since = "2.3.1") void process(AnalysisProcessData aProcessData, ResultSpecification aResultSpec) throws ResultNotSupportedException, AnalysisEngineProcessException; diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java index ffc70cf07..a831bb64f 100644 --- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java +++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/AnalysisEngineManagement.java @@ -35,7 +35,7 @@ import org.apache.uima.resource.ManagementObject; public interface AnalysisEngineManagement extends ManagementObject { public enum State { Unavailable, Initializing, Ready - }; + } /** * Gets a name for this AnalysisEngineManagement object, which will be unique among all of its diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java index 158bad5a5..4e1791621 100644 --- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java +++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineImplBase.java @@ -40,6 +40,7 @@ import org.apache.uima.cas.CAS; import org.apache.uima.cas.CASException; import org.apache.uima.cas.TypeSystem; import org.apache.uima.cas.impl.CASImpl; +import org.apache.uima.cas.impl.FeatureImpl; import org.apache.uima.cas.impl.TypeImpl; import org.apache.uima.cas.impl.TypeSystemImpl; import org.apache.uima.cas.text.Language; @@ -71,6 +72,7 @@ import org.slf4j.MDC; public abstract class AnalysisEngineImplBase extends ConfigurableResource_ImplBase implements TextAnalysisEngine { + @SuppressWarnings("java:S1185") @Override protected void setMetaData(ResourceMetaData aMetaData) { // ***************************************************************************************** @@ -262,7 +264,7 @@ public abstract class AnalysisEngineImplBase extends ConfigurableResource_ImplBa } @Override - @Deprecated + @Deprecated(since = "2.3.1") public void process(org.apache.uima.analysis_engine.AnalysisProcessData aProcessData, ResultSpecification aResultSpec) throws ResultNotSupportedException, AnalysisEngineProcessException { @@ -320,7 +322,7 @@ public abstract class AnalysisEngineImplBase extends ConfigurableResource_ImplBa TypeImpl t = ts.getType(aTypeName); return (t == null) ? null - : t.getFeaturesAsStream().map(f -> f.getShortName()).toArray(size -> new String[size]); + : t.getFeaturesAsStream().map(FeatureImpl::getShortName).toArray(String[]::new); } @Override diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java index 642fdbaa2..9e868f777 100644 --- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java +++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImpl.java @@ -49,7 +49,7 @@ public class AnalysisEngineManagementImpl * This static set is needed to keep track of what names we've already used for "root" MBeans * (those representing top-level AEs and CPEs). */ - private final static ConcurrentHashMapWithProducer<String, AtomicInteger> usedRootNames = new ConcurrentHashMapWithProducer<>(); + private static final ConcurrentHashMapWithProducer<String, AtomicInteger> usedRootNames = new ConcurrentHashMapWithProducer<>(); private String name; diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineProcessorAdapter.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineProcessorAdapter.java index 346a76128..345dbeb8e 100644 --- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineProcessorAdapter.java +++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/AnalysisEngineProcessorAdapter.java @@ -50,7 +50,10 @@ public abstract class AnalysisEngineProcessorAdapter extends AnalysisEngineImplB /** * The resource metadata, cached so that service does not have to be called each time metadata is * needed. + * @deprecated Field no longer used + * @forRemoval 4.0.0 */ + @Deprecated(since = "3.6.0") private ResourceMetaData mCachedMetaData; /** diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnalysisComponentAdapterFactory.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnalysisComponentAdapterFactory.java index 6ce3cd4ea..c049e2204 100644 --- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnalysisComponentAdapterFactory.java +++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/impl/compatibility/AnalysisComponentAdapterFactory.java @@ -59,12 +59,12 @@ public class AnalysisComponentAdapterFactory { */ public static AnalysisComponent createAdapter(Object aAdaptee, AnalysisEngineMetaData aMetaData, Map<String, Object> aAdditionalParams) throws ResourceInitializationException { - if (aAdaptee instanceof BaseAnnotator) { - return new AnnotatorAdapter((BaseAnnotator) aAdaptee, aMetaData, aAdditionalParams); - } else if (aAdaptee instanceof CasConsumer) { - return new CasConsumerAdapter((CasConsumer) aAdaptee, aMetaData); - } else if (aAdaptee instanceof CollectionReader) { - return new CollectionReaderAdapter((CollectionReader) aAdaptee, aMetaData); + if (aAdaptee instanceof BaseAnnotator baseAnnotator) { + return new AnnotatorAdapter(baseAnnotator, aMetaData, aAdditionalParams); + } else if (aAdaptee instanceof CasConsumer casConsumer) { + return new CasConsumerAdapter(casConsumer, aMetaData); + } else if (aAdaptee instanceof CollectionReader collectionReader) { + return new CollectionReaderAdapter(collectionReader, aMetaData); } else { throw new ResourceInitializationException( ResourceInitializationException.NOT_AN_ANALYSIS_COMPONENT, diff --git a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java index f895aaabb..a94c657a4 100644 --- a/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java +++ b/uimaj-core/src/main/java/org/apache/uima/analysis_engine/service/impl/AnalysisEngineService_impl.java @@ -140,13 +140,12 @@ public class AnalysisEngineService_impl extends ResourceService_impl { // return results return new ServiceDataCargo(cas, trace); + } catch (ResourceServiceException e) { + resultMessage = e.getLocalizedMessage(); + throw e; } catch (Exception e) { resultMessage = e.getLocalizedMessage(); - if (e instanceof ResourceServiceException) { - throw (ResourceServiceException) e; - } else { - throw new ResourceServiceException(e); - } + throw new ResourceServiceException(e); } finally { // release CAS if (cas != null) { diff --git a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java index 799bca96b..109a9de6d 100644 --- a/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java +++ b/uimaj-core/src/main/java/org/apache/uima/cas/impl/AllFSs.java @@ -41,12 +41,12 @@ import org.apache.uima.util.IteratorNvc; class AllFSs { final CASImpl cas; - final private MarkerImpl mark; - final private PositiveIntSet foundFSs = new PositiveIntSet_impl(4096, 1, 4096); - final private PositiveIntSet foundFSsBelowMark; - final private ArrayList<TOP> toBeScanned = new ArrayList<>(); - final private Predicate<TOP> includeFilter; - final private CasTypeSystemMapper typeMapper; + private final MarkerImpl mark; + private final PositiveIntSet foundFSs = new PositiveIntSet_impl(4096, 1, 4096); + private final PositiveIntSet foundFSsBelowMark; + private final ArrayList<TOP> toBeScanned = new ArrayList<>(); + private final Predicate<TOP> includeFilter; + private final CasTypeSystemMapper typeMapper; AllFSs(CASImpl cas, MarkerImpl mark, Predicate<TOP> includeFilter, CasTypeSystemMapper typeMapper) { @@ -89,7 +89,7 @@ class AllFSs { } private AllFSs getAllFSsAllViews_sofas() { - cas.forAllSofas(sofa -> enqueueFS(sofa)); + cas.forAllSofas(this::enqueueFS); cas.forAllViews(view -> getFSsForView(view.indexRepository.getIndexedFSs())); return this; } @@ -143,8 +143,8 @@ class AllFSs { } private void enqueueFeatures(TOP fs) { - if (fs instanceof FSArray) { - for (TOP item : ((FSArray) fs)._getTheArray()) { + if (fs instanceof FSArray fsArray) { + for (TOP item : fsArray._getTheArray()) { enqueueFS(item); } return; diff --git a/uimaj-core/src/main/java/org/apache/uima/impl/AnalysisEngineFactory_impl.java b/uimaj-core/src/main/java/org/apache/uima/impl/AnalysisEngineFactory_impl.java index b60acff0d..39498aeaa 100644 --- a/uimaj-core/src/main/java/org/apache/uima/impl/AnalysisEngineFactory_impl.java +++ b/uimaj-core/src/main/java/org/apache/uima/impl/AnalysisEngineFactory_impl.java @@ -58,19 +58,18 @@ public class AnalysisEngineFactory_impl implements ResourceFactory { && aAdditionalParams.containsKey(AnalysisEngine.PARAM_NUM_SIMULTANEOUS_REQUESTS); Resource resource = null; - if (aSpecifier instanceof ResourceCreationSpecifier + if (aSpecifier instanceof ResourceCreationSpecifier spec && aResourceClass.isAssignableFrom(TextAnalysisEngine.class)) // NOTE: for backwards-compatibility, we have to check TextAnalysisEngine, // not AnalysisEngine. Otherwise produceTAE would fail becasue // TextAnalysisEngien.class.isAssignableFrom(AnalysisEngine.class) is false. { - ResourceCreationSpecifier spec = (ResourceCreationSpecifier) aSpecifier; if (multiprocessing) { resource = new MultiprocessingAnalysisEngine_impl(); } else { String frameworkImpl = spec.getFrameworkImplementation(); - if (frameworkImpl == null || frameworkImpl.length() == 0) { + if (frameworkImpl == null || frameworkImpl.isEmpty()) { throw new ResourceInitializationException( ResourceInitializationException.MISSING_FRAMEWORK_IMPLEMENTATION, new Object[] { aSpecifier.getSourceUrlString() }); diff --git a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/AllowedValue_impl.java b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/AllowedValue_impl.java index ddd766fb7..f55b27bf3 100644 --- a/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/AllowedValue_impl.java +++ b/uimaj-core/src/main/java/org/apache/uima/resource/metadata/impl/AllowedValue_impl.java @@ -75,7 +75,7 @@ public class AllowedValue_impl extends MetaDataObject_impl implements AllowedVal return XMLIZATION_INFO; } - static final private XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("value", + private static final XmlizationInfo XMLIZATION_INFO = new XmlizationInfo("value", new PropertyXmlInfo[] { new PropertyXmlInfo("string"), new PropertyXmlInfo("description", false), }); } diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java index 0e4455eab..ecd9fcf1a 100644 --- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java +++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineDescription_implTest.java @@ -274,7 +274,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void testMulticoreInitialize() throws Exception { + void testMulticoreInitialize() throws Exception { var resourceManager = newDefaultResourceManager(); var configManager = newConfigurationManager(); var logger = UIMAFramework.getLogger(this.getClass()); @@ -332,7 +332,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void thatComplexDescriptorCanBeXMLized() throws Exception { + void thatComplexDescriptorCanBeXMLized() throws Exception { // test a complex descriptor var desc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource( getFile("AnnotatorContextTest/AnnotatorWithGroupsAndNonGroupParams.xml"))); @@ -349,7 +349,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void thatDescriptorWithCasConsumerCanBeXMLized() throws Exception { + void thatDescriptorWithCasConsumerCanBeXMLized() throws Exception { // test a descriptor that includes a CasConsumer var desc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource( getFile("TextAnalysisEngineImplTest/AggregateTaeWithCasConsumer.xml"))); @@ -360,7 +360,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void thatPrimitiveDescriptorCanBeXMLized() throws Exception { + void thatPrimitiveDescriptorCanBeXMLized() throws Exception { // write objects to XML String primitiveDescXml = toXmlString(primitiveDesc); @@ -372,7 +372,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void thatAggregateDescriptorCanBeXMLized() throws Exception { + void thatAggregateDescriptorCanBeXMLized() throws Exception { String aggregateDescXml = toXmlString(aggregateDesc); try (var is = new ByteArrayInputStream(aggregateDescXml.getBytes(UTF_8))) { var newAggregateDesc = xmlParser.parseAnalysisEngineDescription(new XMLInputSource(is)); @@ -429,7 +429,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void thatCloneDoesNotResolveDelegateImports() throws Exception { + void thatCloneDoesNotResolveDelegateImports() throws Exception { // create aggregate TAE description and add delegate AE import Import_impl delegateImport = new Import_impl(); delegateImport.setLocation( @@ -469,7 +469,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void thatHiddenStateIsCloned() throws Exception { + void thatHiddenStateIsCloned() throws Exception { // create aggregate TAE description and add delegate AE import Import_impl delegateImport = new Import_impl(); delegateImport.setLocation( @@ -494,7 +494,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void testDoFullValidation() throws Exception { + void testDoFullValidation() throws Exception { // try some descriptors that are invalid due to config. param problems for (int i = 1; i <= 13; i++) { assertDescriptorIsNotValid("TextAnalysisEngineImplTest/InvalidConfigParams" + i + ".xml"); @@ -540,7 +540,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void thatAggregateWithImportByNameAndConfigParameterOverridesValidates() throws Exception { + void thatAggregateWithImportByNameAndConfigParameterOverridesValidates() throws Exception { // test aggregate with import by name and configuration parameter overrides var in = new XMLInputSource( getFile("TextAnalysisEngineImplTest/AeWithConfigParamOverridesAndImportByName.xml")); @@ -552,7 +552,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void testValidate() throws Exception { + void testValidate() throws Exception { // test aggregate with import by name and configuration parameter overrides var in = new XMLInputSource( getFile("TextAnalysisEngineImplTest/AeWithConfigParamOverridesAndImportByName.xml")); @@ -578,7 +578,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void testGetAllComponentSpecifiers() throws Exception { + void testGetAllComponentSpecifiers() throws Exception { Map<String, ResourceSpecifier> allSpecs = aggregateDesc.getAllComponentSpecifiers(null); assertThat((FlowControllerDescription) allSpecs.get("TestFlowController")) // @@ -591,7 +591,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void testDocumentAnnotationRedefine() throws Exception { + void testDocumentAnnotationRedefine() throws Exception { File file = getFile( "org/apache/uima/analysis_engine/impl/documentAnnotationRedefinitionTS.xml"); TypeSystemDescription tsd = xmlParser.parseTypeSystemDescription(new XMLInputSource(file)); @@ -601,7 +601,7 @@ class AnalysisEngineDescription_implTest { } @Test - public void testNoDelegatesToResolve() throws Exception { + void testNoDelegatesToResolve() throws Exception { ResourceSpecifierFactory f = UIMAFramework.getResourceSpecifierFactory(); AnalysisEngineDescription outer = f.createAnalysisEngineDescription(); @@ -625,7 +625,7 @@ class AnalysisEngineDescription_implTest { desc.doFullValidation(); } - private void assertDescriptorIsNotValid(String aPath) throws IOException { + private void assertDescriptorIsNotValid(String aPath) { File file = getFile(aPath); assertThat(file).exists(); diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplTest.java index 02ccc2b68..2668c9846 100644 --- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplTest.java +++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngineManagementImplTest.java @@ -18,9 +18,6 @@ */ package org.apache.uima.analysis_engine.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.util.Collections; import java.util.Random; import java.util.Set; @@ -30,13 +27,15 @@ import org.apache.uima.internal.util.Misc; import org.apache.uima.internal.util.MultiThreadUtils; import org.junit.jupiter.api.Test; -public class AnalysisEngineManagementImplTest { +import static org.assertj.core.api.Assertions.assertThat; + +class AnalysisEngineManagementImplTest { @Test - public void testNameGenerate() throws Exception { - assertEquals("foo", AnalysisEngineManagementImpl.getRootName("foo")); - assertEquals("foo2", AnalysisEngineManagementImpl.getRootName("foo")); - assertEquals("foo3", AnalysisEngineManagementImpl.getRootName("foo")); + void testNameGenerate() throws Exception { + assertThat(AnalysisEngineManagementImpl.getRootName("foo")).isEqualTo("foo"); + assertThat(AnalysisEngineManagementImpl.getRootName("foo")).isEqualTo("foo2"); + assertThat(AnalysisEngineManagementImpl.getRootName("foo")).isEqualTo("foo3"); // Try multi-threaded final Random random = new Random(); @@ -52,7 +51,7 @@ public class AnalysisEngineManagementImplTest { public void call(int threadNbr, int repeatNbr, StringBuilder sb) throws Exception { // Random random = new Random(); for (int j = 0; j < 2; j++) { - assertTrue(s.add(AnalysisEngineManagementImpl.getRootName("bar"))); + assertThat(s.add(AnalysisEngineManagementImpl.getRootName("bar"))).isTrue(); // Thread.sleep(10, random.nextInt(2000)); if ((threadNbr % 2) == 0) { Thread.sleep(0, random.nextInt(2000)); // sleep for 2 microseconds diff --git a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java index 70288a3c5..1d2eb7a32 100644 --- a/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java +++ b/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java @@ -109,11 +109,10 @@ import org.xmlunit.assertj3.XmlAssert; /** * Tests the TextAnalysisEngine_impl class. - * */ -public class AnalysisEngine_implTest { +class AnalysisEngine_implTest { @Test - public void testInitialize() throws Exception { + void testInitialize() throws Exception { try { PrimitiveAnalysisEngine_impl ae1 = new PrimitiveAnalysisEngine_impl(); @@ -414,7 +413,7 @@ public class AnalysisEngine_implTest { } @Test - public void testParameterGroups() throws Exception { + void testParameterGroups() throws Exception { // Check that both groups parameters and non-group parameters are validated XMLInputSource in = new XMLInputSource(JUnitExtension .getFile("TextAnalysisEngineImplTest/AnnotatorWithGroupParameterError.xml")); @@ -459,7 +458,7 @@ public class AnalysisEngine_implTest { // } @Test - public void testProcess() throws Exception { + void testProcess() throws Exception { try { // test simple primitive TextAnalysisEngine (using TestAnnotator class) // This test should work with or without a type system description @@ -612,7 +611,7 @@ public class AnalysisEngine_implTest { } @Test - public void testReconfigure() throws Exception { + void testReconfigure() throws Exception { try { CAS cas = CasCreationUtils.createCas(); @@ -684,7 +683,7 @@ public class AnalysisEngine_implTest { } @Test - public void thatConfigurationManagerSessionIsValidAfterInitializingDelegateComponent() + void thatConfigurationManagerSessionIsValidAfterInitializingDelegateComponent() throws Exception { AnalysisEngineDescription pseudoAggregateDesc = UIMAFramework.getResourceSpecifierFactory() .createAnalysisEngineDescription(); @@ -717,7 +716,7 @@ public class AnalysisEngine_implTest { } @Test - public void testCreateAnalysisProcessData() throws Exception { + void testCreateAnalysisProcessData() throws Exception { try { // create simple primitive TAE with type system and indexes AnalysisEngineDescription desc = new AnalysisEngineDescription_impl(); @@ -854,7 +853,7 @@ public class AnalysisEngine_implTest { } @Test - public void testProcessDelegateAnalysisEngineMetaData() throws Exception { + void testProcessDelegateAnalysisEngineMetaData() throws Exception { try { // create aggregate analysis engine whose delegates each declare // type system, type priorities, and indexes @@ -956,7 +955,7 @@ public class AnalysisEngine_implTest { } @Test - public void testCollectionProcessComplete() throws Exception { + void testCollectionProcessComplete() throws Exception { try { // test simple primitive TextAnalysisEngine (using TestAnnotator class) AnalysisEngineDescription primitiveDesc = new AnalysisEngineDescription_impl(); @@ -993,7 +992,7 @@ public class AnalysisEngine_implTest { } @Test - public void testBatchProcessComplete() throws Exception { + void testBatchProcessComplete() throws Exception { try { // test simple primitive TextAnalysisEngine (using TestAnnotator class) AnalysisEngineDescription primitiveDesc = new AnalysisEngineDescription_impl(); @@ -1022,7 +1021,7 @@ public class AnalysisEngine_implTest { } @Test - public void testTypeSystemInit() throws Exception { + void testTypeSystemInit() throws Exception { try { AnalysisEngineDescription aggWithCcDesc = UIMAFramework.getXMLParser() .parseAnalysisEngineDescription(new XMLInputSource(JUnitExtension @@ -1040,7 +1039,7 @@ public class AnalysisEngine_implTest { } @Test - public void testProcessAndOutputNewCASes() throws Exception { + void testProcessAndOutputNewCASes() throws Exception { try { // primitive AnalysisEngineDescription segmenterDesc = UIMAFramework.getXMLParser() @@ -1254,7 +1253,7 @@ public class AnalysisEngine_implTest { } @Test - public void testProcessAndOutputNewCASesWithError() throws Exception { + void testProcessAndOutputNewCASesWithError() throws Exception { try { // aggregate AnalysisEngineDescription aggSegDesc = UIMAFramework.getXMLParser() @@ -1464,7 +1463,7 @@ public class AnalysisEngine_implTest { } @Test - public void testResegment() throws Exception { + void testResegment() throws Exception { try { // primitive AnalysisEngineDescription segmenterDesc = UIMAFramework.getXMLParser() @@ -1554,7 +1553,7 @@ public class AnalysisEngine_implTest { } @Test - public void testProcessWithError() throws Exception { + void testProcessWithError() throws Exception { try { // This test uses an aggregate AE fails if the document text is set to "ERROR". AnalysisEngineDescription aeDesc = UIMAFramework.getXMLParser() @@ -1617,7 +1616,7 @@ public class AnalysisEngine_implTest { } @Test - public void testThrottleLogging() throws Exception { + void testThrottleLogging() throws Exception { // This test uses an aggregate AE fails if the document text is set to "ERROR". AnalysisEngineDescription aeDesc = UIMAFramework.getXMLParser() .parseAnalysisEngineDescription(new XMLInputSource(JUnitExtension @@ -1668,7 +1667,7 @@ public class AnalysisEngine_implTest { } @Test - public void testMissingSuper() throws Exception { + void testMissingSuper() throws Exception { try { // initialize simple primitive TextAnalysisEngine AnalysisEngine ae1 = new PrimitiveAnalysisEngine_impl(); @@ -1684,7 +1683,7 @@ public class AnalysisEngine_implTest { } @Test - public void testManyDelegates() throws Exception { + void testManyDelegates() throws Exception { // test with and without validation - UIMA-2453 UIMAFramework.getXMLParser().enableSchemaValidation(true); try { @@ -1748,7 +1747,7 @@ public class AnalysisEngine_implTest { } @Test - public void testMultiViewAnnotatorInput() throws Exception { + void testMultiViewAnnotatorInput() throws Exception { try { AnalysisEngineDescription transAnnotatorDesc = UIMAFramework.getXMLParser() .parseAnalysisEngineDescription(new XMLInputSource( @@ -1788,7 +1787,7 @@ public class AnalysisEngine_implTest { * Creating an AE with an unseen type, type-priority, or index should fail. */ @Test - public void testAdditionalAEs() throws Exception { + void testAdditionalAEs() throws Exception { // Create an AE and "freeze" the type-system AnalysisEngineDescription desc = UIMAFramework.getXMLParser() @@ -1846,5 +1845,4 @@ public class AnalysisEngine_implTest { UIMAFramework.getLogger().setLevel(Level.INFO); } } - } diff --git a/uimaj-core/src/test/java/org/apache/uima/impl/AnalysisEngineFactory_implTest.java b/uimaj-core/src/test/java/org/apache/uima/impl/AnalysisEngineFactory_implTest.java index e7362352d..bbcbe8a86 100644 --- a/uimaj-core/src/test/java/org/apache/uima/impl/AnalysisEngineFactory_implTest.java +++ b/uimaj-core/src/test/java/org/apache/uima/impl/AnalysisEngineFactory_implTest.java @@ -18,42 +18,37 @@ */ package org.apache.uima.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - import java.util.Collections; import org.apache.uima.analysis_engine.AnalysisEngine; import org.apache.uima.analysis_engine.AnalysisEngineDescription; import org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_impl; import org.apache.uima.resource.ResourceInitializationException; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class AnalysisEngineFactory_implTest { +class AnalysisEngineFactory_implTest { private AnalysisEngineFactory_impl aeFactory; @BeforeEach - public void setUp() throws Exception { + public void setUp() { aeFactory = new AnalysisEngineFactory_impl(); } @Test - public void testInvalidFrameworkImplementation() { + void testInvalidFrameworkImplementation() { AnalysisEngineDescription desc = new AnalysisEngineDescription_impl(); desc.setFrameworkImplementation("foo"); - try { - aeFactory.produceResource(AnalysisEngine.class, desc, Collections.EMPTY_MAP); - fail(); - } catch (ResourceInitializationException e) { - assertNotNull(e.getMessage()); - assertFalse(e.getMessage().startsWith("EXCEPTION MESSAGE LOCALIZATION FAILED")); - assertEquals(e.getMessageKey(), - ResourceInitializationException.UNSUPPORTED_FRAMEWORK_IMPLEMENTATION); - } - } + Assertions.assertThatExceptionOfType(ResourceInitializationException.class) + .isThrownBy(() -> { + aeFactory.produceResource(AnalysisEngine.class, desc, Collections.emptyMap()); + }) + .withMessageNotContaining("EXCEPTION MESSAGE LOCALIZATION FAILED") + .satisfies(ex -> { + Assertions.assertThat(ex.getMessageKey()).isEqualTo(ResourceInitializationException.UNSUPPORTED_FRAMEWORK_IMPLEMENTATION); + }); + } } diff --git a/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java b/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java index 6e4c54067..86e931857 100644 --- a/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java +++ b/uimaj-core/src/test/java/org/apache/uima/internal/util/AnalysisEnginePoolTest.java @@ -45,12 +45,12 @@ import org.apache.uima.test.junit_extension.JUnitExtension; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -public class AnalysisEnginePoolTest { +class AnalysisEnginePoolTest { private TypeSystem mLastTypeSystem; @BeforeEach - public void setUp() throws Exception { + void setUp() throws Exception { try { mSimpleDesc = new AnalysisEngineDescription_impl(); mSimpleDesc.setFrameworkImplementation(Constants.JAVA_FRAMEWORK_NAME); @@ -70,7 +70,7 @@ public class AnalysisEnginePoolTest { } @Test - public void testGetAnalysisEngineMetaData() throws Exception { + void testGetAnalysisEngineMetaData() throws Exception { AnalysisEnginePool pool = null; try { // create pool @@ -90,7 +90,7 @@ public class AnalysisEnginePoolTest { } @Test - public void testProcess() throws Exception { + void testProcess() throws Exception { try { // test simple primitive MultithreadableTextAnalysisEngine // (using TestAnnotator class) @@ -135,21 +135,20 @@ public class AnalysisEnginePoolTest { // Check TestAnnotator fields only at the very end of processing, // we can't test from the threads themsleves since the state of // these fields is nondeterministic during the multithreaded processing. - assertEquals("testing...", TestAnnotator.getLastDocument()); + assertThat(TestAnnotator.getLastDocument()).isEqualTo("testing..."); ResultSpecification resultSpec = new ResultSpecification_impl( TestAnnotator.getLastResultSpec().getTypeSystem()); resultSpec.addResultType("NamedEntity", true); - assertEquals(resultSpec, TestAnnotator.getLastResultSpec()); + assertThat(TestAnnotator.getLastResultSpec()).isEqualTo(resultSpec); MultiThreadUtils.terminateThreads(threads); } catch (Exception e) { JUnitExtension.handleException(e); } - } @Test - public void testReconfigure() throws Exception { + void testReconfigure() throws Exception { try { // create simple primitive TextAnalysisEngine descriptor (using TestAnnotator class) AnalysisEngineDescription primitiveDesc = new AnalysisEngineDescription_impl(); @@ -172,14 +171,14 @@ public class AnalysisEnginePoolTest { AnalysisEngine tae = pool.getAnalysisEngine(); try { // check value of string param (TestAnnotator saves it in a static field) - assertEquals("Test1", TestAnnotator.stringParamValue); + assertThat( TestAnnotator.stringParamValue).isEqualTo("Test1"); // reconfigure tae.setConfigParameterValue("StringParam", "Test2"); tae.reconfigure(); // test again - assertEquals("Test2", TestAnnotator.stringParamValue); + assertThat(TestAnnotator.stringParamValue).isEqualTo("Test2"); // check pool metadata pool.getMetaData().setUUID(tae.getMetaData().getUUID());
