You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by re...@apache.org on 2017/09/13 19:08:04 UTC
svn commit: r1808274 - in /uima/uimafit-v3/trunk/uimafit-core/src:
main/java/org/apache/uima/fit/component/
main/java/org/apache/uima/fit/internal/
test/java/org/apache/uima/fit/factory/
Author: rec
Date: Wed Sep 13 19:08:03 2017
New Revision: 1808274
URL: http://svn.apache.org/viewvc?rev=1808274&view=rev
Log:
[UIMA-5568] - uv3: Drop ExtendedLogger from uimaFIT
- Dropped ExtendedLogger
Removed:
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/internal/ExtendedLogger.java
uima/uimafit-v3/trunk/uimafit-core/src/test/java/org/apache/uima/fit/factory/LoggingTest.java
Modified:
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasAnnotator_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -22,7 +22,6 @@ package org.apache.uima.fit.component;
import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
@@ -31,20 +30,6 @@ import org.apache.uima.resource.Resource
*/
public abstract class CasAnnotator_ImplBase extends
org.apache.uima.analysis_component.CasAnnotator_ImplBase {
- private ExtendedLogger logger;
-
- /**
- * Get the logger.
- *
- * @return the logger.
- */
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getContext());
- }
- return logger;
- }
-
@Override
public void initialize(final UimaContext context) throws ResourceInitializationException {
super.initialize(context);
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasCollectionReader_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -25,7 +25,6 @@ import org.apache.uima.collection.Collec
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
@@ -34,16 +33,6 @@ import org.apache.uima.resource.Resource
*/
@OperationalProperties(outputsNewCases = true)
public abstract class CasCollectionReader_ImplBase extends CollectionReader_ImplBase {
- private ExtendedLogger logger;
-
- @Override
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getUimaContext());
- }
- return logger;
- }
-
@Override
// This method should not be overwritten. Overwrite initialize(UimaContext) instead.
public final void initialize() throws ResourceInitializationException {
@@ -65,6 +54,7 @@ public abstract class CasCollectionReade
// Nothing by default
}
+ @Override
public void close() throws IOException {
// Nothing by default
}
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasConsumer_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -22,7 +22,6 @@ import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
@@ -34,20 +33,6 @@ import org.apache.uima.resource.Resource
@OperationalProperties(multipleDeploymentAllowed = false)
public abstract class CasConsumer_ImplBase extends
org.apache.uima.analysis_component.CasAnnotator_ImplBase {
- private ExtendedLogger logger;
-
- /**
- * Get the logger.
- *
- * @return the logger.
- */
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getContext());
- }
- return logger;
- }
-
@Override
public void initialize(final UimaContext context) throws ResourceInitializationException {
super.initialize(context);
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasFlowController_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -20,7 +20,6 @@ package org.apache.uima.fit.component;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.flow.FlowControllerContext;
import org.apache.uima.resource.ResourceInitializationException;
@@ -29,20 +28,6 @@ import org.apache.uima.resource.Resource
public abstract class CasFlowController_ImplBase extends
org.apache.uima.flow.CasFlowController_ImplBase {
- private ExtendedLogger logger;
-
- /**
- * Get the logger.
- *
- * @return the logger.
- */
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getContext());
- }
- return logger;
- }
-
@Override
public void initialize(final FlowControllerContext context)
throws ResourceInitializationException {
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/CasMultiplier_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -22,7 +22,6 @@ import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
@@ -32,20 +31,6 @@ import org.apache.uima.resource.Resource
@OperationalProperties(outputsNewCases = true)
public abstract class CasMultiplier_ImplBase extends
org.apache.uima.analysis_component.CasMultiplier_ImplBase {
- private ExtendedLogger logger;
-
- /**
- * Get the logger.
- *
- * @return the logger.
- */
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getContext());
- }
- return logger;
- }
-
@Override
public void initialize(final UimaContext context) throws ResourceInitializationException {
super.initialize(context);
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasAnnotator_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -21,7 +21,6 @@ package org.apache.uima.fit.component;
import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
@@ -30,20 +29,6 @@ import org.apache.uima.resource.Resource
*/
public abstract class JCasAnnotator_ImplBase extends
org.apache.uima.analysis_component.JCasAnnotator_ImplBase {
- private ExtendedLogger logger;
-
- /**
- * Get the logger.
- *
- * @return the logger.
- */
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getContext());
- }
- return logger;
- }
-
@Override
public void initialize(final UimaContext context) throws ResourceInitializationException {
super.initialize(context);
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasCollectionReader_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -28,7 +28,6 @@ import org.apache.uima.collection.Collec
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.jcas.JCas;
import org.apache.uima.resource.ResourceInitializationException;
@@ -38,16 +37,6 @@ import org.apache.uima.resource.Resource
*/
@OperationalProperties(outputsNewCases = true)
public abstract class JCasCollectionReader_ImplBase extends CollectionReader_ImplBase {
- private ExtendedLogger logger;
-
- @Override
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getUimaContext());
- }
- return logger;
- }
-
// This method should not be overwritten. Overwrite initialize(UimaContext) instead.
@Override
public final void initialize() throws ResourceInitializationException {
@@ -69,6 +58,7 @@ public abstract class JCasCollectionRead
}
// This method should not be overwritten. Overwrite getNext(JCas) instead.
+ @Override
public final void getNext(final CAS cas) throws IOException, CollectionException {
try {
getNext(cas.getJCas());
@@ -89,6 +79,7 @@ public abstract class JCasCollectionRead
*/
public abstract void getNext(JCas jCas) throws IOException, CollectionException;
+ @Override
public void close() throws IOException {
// Do nothing per default
}
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasConsumer_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -22,7 +22,6 @@ import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
@@ -34,20 +33,6 @@ import org.apache.uima.resource.Resource
@OperationalProperties(multipleDeploymentAllowed = false)
public abstract class JCasConsumer_ImplBase extends
org.apache.uima.analysis_component.JCasAnnotator_ImplBase {
- private ExtendedLogger logger;
-
- /**
- * Get the logger.
- *
- * @return the logger.
- */
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getContext());
- }
- return logger;
- }
-
@Override
public void initialize(final UimaContext context) throws ResourceInitializationException {
super.initialize(context);
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasFlowController_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -20,7 +20,6 @@ package org.apache.uima.fit.component;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.flow.FlowControllerContext;
import org.apache.uima.resource.ResourceInitializationException;
@@ -29,20 +28,6 @@ import org.apache.uima.resource.Resource
public abstract class JCasFlowController_ImplBase extends
org.apache.uima.flow.JCasFlowController_ImplBase {
- private ExtendedLogger logger;
-
- /**
- * Get the logger.
- *
- * @return the logger.
- */
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getContext());
- }
- return logger;
- }
-
@Override
public void initialize(final FlowControllerContext context)
throws ResourceInitializationException {
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/JCasMultiplier_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -22,7 +22,6 @@ import org.apache.uima.UimaContext;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.component.initialize.ExternalResourceInitializer;
import org.apache.uima.fit.descriptor.OperationalProperties;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
/**
@@ -32,20 +31,6 @@ import org.apache.uima.resource.Resource
@OperationalProperties(outputsNewCases = true)
public abstract class JCasMultiplier_ImplBase extends
org.apache.uima.analysis_component.JCasMultiplier_ImplBase {
- private ExtendedLogger logger;
-
- /**
- * Get the logger.
- *
- * @return the logger.
- */
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getContext());
- }
- return logger;
- }
-
@Override
public void initialize(final UimaContext context) throws ResourceInitializationException {
super.initialize(context);
Modified: uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java
URL: http://svn.apache.org/viewvc/uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java?rev=1808274&r1=1808273&r2=1808274&view=diff
==============================================================================
--- uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java (original)
+++ uima/uimafit-v3/trunk/uimafit-core/src/main/java/org/apache/uima/fit/component/Resource_ImplBase.java Wed Sep 13 19:08:03 2017
@@ -23,7 +23,6 @@ import java.util.Map;
import org.apache.uima.fit.component.initialize.ConfigurationParameterInitializer;
import org.apache.uima.fit.descriptor.ConfigurationParameter;
import org.apache.uima.fit.factory.ExternalResourceFactory;
-import org.apache.uima.fit.internal.ExtendedLogger;
import org.apache.uima.resource.ResourceInitializationException;
import org.apache.uima.resource.ResourceSpecifier;
@@ -33,21 +32,10 @@ import org.apache.uima.resource.Resource
*/
public abstract class Resource_ImplBase extends org.apache.uima.resource.Resource_ImplBase
implements ExternalResourceAware {
-
- private ExtendedLogger logger;
-
@ConfigurationParameter(name = ExternalResourceFactory.PARAM_RESOURCE_NAME, mandatory = false)
private String resourceName;
@Override
- public ExtendedLogger getLogger() {
- if (logger == null) {
- logger = new ExtendedLogger(getUimaContext());
- }
- return logger;
- }
-
- @Override
public boolean initialize(final ResourceSpecifier aSpecifier,
final Map<String, Object> aAdditionalParams) throws ResourceInitializationException {
if (!super.initialize(aSpecifier, aAdditionalParams)) {
@@ -63,10 +51,12 @@ public abstract class Resource_ImplBase
return true;
}
+ @Override
public String getResourceName() {
return resourceName;
}
+ @Override
public void afterResourcesInitialized() throws ResourceInitializationException {
// Per default nothing is done here.
}